svn commit: r14847 - trunk/src/argouml-app/src/org/argouml/uml/ui: . behavior/state_machines

Author: bobtarling
Date: 2008-05-31 05:33:12-0700
New Revision: 14847

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java

Log:
Fix height of single row lists

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java?view=diff&rev=14847&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java&r1=14846&r2=14847
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java	2008-05-31 05:33:12-0700
@@ -713,14 +713,6 @@
     public void componentResized(ComponentEvent e) {
         // ignored        
     }
-
-    protected JScrollPane getSingleRowScroll(JList list) {
-        // TODO: Temporary fix while we find something better - tfm
-        list.setVisibleRowCount(2);
-//        list.setVisibleRowCount(1);
-        JScrollPane pane = new JScrollPane(list);
-        return pane;
-    }
     
     /**
      * Create a single row scroll pane backed by a ListModel.

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java?view=diff&rev=14847&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java&r1=14846&r2=14847
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java	2008-05-31 05:33:12-0700
@@ -78,17 +78,10 @@
                 getSingleRowScroll(new UMLTransitionTargetListModel()));
         addField("label.trigger",
                 getSingleRowScroll( new UMLTransitionTriggerListModel()));
-        
-        JList guardList = new UMLMutableLinkedList(
-                new UMLTransitionGuardListModel(), null,
-                ActionNewGuard.getSingleton());
-        
         addField("label.guard",
-                getSingleRowScroll(guardList));
-        JList effectList = new UMLTransitionEffectList(
-                new UMLTransitionEffectListModel());
+                getSingleRowScroll(new UMLTransitionGuardListModel()));
         addField("label.effect",
-                getSingleRowScroll(effectList));
+                getSingleRowScroll(new UMLTransitionEffectListModel()));
 
         addAction(new ActionNavigateContainerElement());
         addAction(getTriggerActions());