svn commit: r15952 - trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java

Author: dthompson
Date: 2008-11-01 01:13:40-0700
New Revision: 15952

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java

Log:
Issue 4430: Rebalanced properties layout and changed scroll behaviour to fix attribute's 'initial value' poor scrolling.

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java?view=diff&rev=15952&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java&r1=15951&r2=15952
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java	2008-11-01 01:13:40-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -28,6 +28,7 @@
 
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.ScrollPaneConstants;
 
 import org.argouml.i18n.Translator;
 import org.argouml.model.Model;
@@ -73,9 +74,10 @@
         addField(Translator.localize("label.owner"),
                 getOwnerScroll());
 
+        add(getVisibilityPanel());
+
         addSeparator();
         
-        add(getVisibilityPanel());
         add(getChangeabilityRadioButtonPanel());
 
         JPanel modifiersPanel = createBorderPanel(
@@ -87,8 +89,11 @@
                 this, "initialValue");
         JPanel initialPanel = createBorderPanel(Translator
                 .localize("label.initial-value"));
-        initialPanel.add(new JScrollPane(new UMLExpressionBodyField(
-                initialModel, true)));
+        JScrollPane jsp = new JScrollPane(new UMLExpressionBodyField(
+                initialModel, true));
+        jsp.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        jsp.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
+        initialPanel.add(jsp);
         initialPanel.add(new UMLExpressionLanguageField(initialModel,
                 false));
         add(initialPanel);