svn commit: r13244 - trunk/src_new/org/argouml/uml/ui: . foundation/core

Author: mvw
Date: 2007-08-04 11:21:22-0700
New Revision: 13244

Modified:
   trunk/src_new/org/argouml/uml/ui/UMLExpressionBodyField.java
   trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java

Log:
Fix for issue 4430: Attribute's "initial value" scroll bar is covering the field. 

Back to 2 columns for the Attribute proppanel.

Modified: trunk/src_new/org/argouml/uml/ui/UMLExpressionBodyField.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/UMLExpressionBodyField.java?view=diff&rev=13244&p1=trunk/src_new/org/argouml/uml/ui/UMLExpressionBodyField.java&p2=trunk/src_new/org/argouml/uml/ui/UMLExpressionBodyField.java&r1=13243&r2=13244
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/UMLExpressionBodyField.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/UMLExpressionBodyField.java	2007-08-04 11:21:22-0700
@@ -68,6 +68,7 @@
         getDocument().addDocumentListener(this);
         setToolTipText(Translator.localize("label.body.tooltip"));
         setFont(LookAndFeelMgr.getInstance().getStandardFont());
+        setRows(2); // make it strech vertically
     }
 
     /*

Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java?view=diff&rev=13244&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java&r1=13243&r2=13244
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java	2007-08-04 11:21:22-0700
@@ -65,10 +65,14 @@
 
         addField(Translator.localize("label.name"),
                 getNameTextField());
-        addField(Translator.localize("label.owner"),
-                getOwnerScroll());
+        addField(Translator.localize("label.type"),
+                new UMLComboBoxNavigator(
+                        Translator.localize("label.class.navigate.tooltip"),
+                        getTypeComboBox()));
         addField(Translator.localize("label.multiplicity"),
                 getMultiplicityComboBox());
+        addField(Translator.localize("label.owner"),
+                getOwnerScroll());
 
         addSeparator();
         
@@ -79,13 +83,6 @@
                 Translator.localize("label.modifiers"));
         modifiersPanel.add(getOwnerScopeCheckbox());
         add(modifiersPanel);
-        
-        addSeparator();
-
-        addField(Translator.localize("label.type"),
-                new UMLComboBoxNavigator(
-                        Translator.localize("label.class.navigate.tooltip"),
-                        getTypeComboBox()));
 
         UMLExpressionModel2 initialModel = new UMLInitialValueExpressionModel(
                 this, "initialValue");