svn commit: r19153 - branches/BRANCH_0_32_x: . src/argouml-app src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui src/argouml-app/tests/org/argouml/profile src/argouml-app/tests/org/argouml/uml/ui/foundation/extension_mechanisms src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui

Author: linus
Date: 2011-03-30 12:48:40-0700
New Revision: 19153

Modified:
   branches/BRANCH_0_32_x/   (props changed)
   branches/BRANCH_0_32_x/src/argouml-app/   (props changed)
   branches/BRANCH_0_32_x/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java
   branches/BRANCH_0_32_x/src/argouml-app/tests/org/argouml/profile/   (props changed)
   branches/BRANCH_0_32_x/src/argouml-app/tests/org/argouml/uml/ui/foundation/extension_mechanisms/TestUMLTagDefinitionComboBoxModel.java   (props changed)
   branches/BRANCH_0_32_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java

Log:
Merge solution to issue 6203 (from r19114) and
solution to issue 5600 (from r19144).

Modified: branches/BRANCH_0_32_x/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_32_x/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java?view=diff&pathrev=19153&r1=19152&r2=19153
==============================================================================
--- branches/BRANCH_0_32_x/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java	(original)
+++ branches/BRANCH_0_32_x/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java	2011-03-30 12:48:40-0700
@@ -807,7 +807,6 @@
                 ((Model.getFacade().getSuppliers(modelElement).toArray())[0]);
             Object client =
                 ((Model.getFacade().getClients(modelElement).toArray())[0]);
-            figEdge = new FigDependency(modelElement, settings);
             FigNode supFN = (FigNode) getLayer().presentationFor(supplier);
             FigNode cliFN = (FigNode) getLayer().presentationFor(client);
 

Modified: branches/BRANCH_0_32_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_32_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java?view=diff&pathrev=19153&r1=19152&r2=19153
==============================================================================
--- branches/BRANCH_0_32_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java	(original)
+++ branches/BRANCH_0_32_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java	2011-03-30 12:48:40-0700
@@ -213,6 +213,7 @@
         JComponent control = null;
         
         final String propertyName = prop.getPropertyName();
+        final Class<?> type = prop.getType();
         
         if ("initialValue".equals(prop.getPropertyName())) {        
             UMLExpressionModel model = 
@@ -230,8 +231,8 @@
             UMLTextArea osta = new UMLTextArea(document);
             osta.setRows(3);
             control = new JScrollPane(osta);
-        } else if ("body".equals(prop.getPropertyName()) && "String".equals(prop.getType())) {
-            UMLPlainTextDocument document = new UMLCommentBodyDocument(prop.getPropertyName(), target);
+        } else if ("body".equals(propertyName) && type == String.class) {
+            UMLPlainTextDocument document = new UMLCommentBodyDocument(propertyName, target);
             UMLTextArea text = new UMLTextArea(document);
             text.setLineWrap(true);
             text.setRows(5);

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2715431

To unsubscribe from this discussion, e-mail: [[email protected]].