svn commit: r14845 - trunk/src/argouml-app/src/org/argouml/uml/ui/behavior: activity_graphs common_behavior state_machines use_cases

Author: bobtarling
Date: 2008-05-31 05:15:59-0700
New Revision: 14845

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java

Log:
Fix height of single row lists

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java?view=diff&rev=14845&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java&r1=14844&r2=14845
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java	2008-05-31 05:15:59-0700
@@ -31,6 +31,7 @@
 
 import javax.swing.JComponent;
 import javax.swing.JList;
+import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
 import org.argouml.i18n.Translator;
@@ -51,7 +52,7 @@
 public class PropPanelPartition extends PropPanelModelElement {
 
     private JScrollPane contentsScroll;
-    private JScrollPane activityGraphScroll;
+    private JPanel activityGraphScroll;
 
     private static UMLPartitionContentListModel contentListModel =
         new UMLPartitionContentListModel("contents");
@@ -106,7 +107,7 @@
         return contentsScroll;
     }
     
-    protected JScrollPane getActivityGraphField() {
+    protected JPanel getActivityGraphField() {
         return activityGraphScroll;
     }
 

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java?view=diff&rev=14845&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java&r1=14844&r2=14845
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java	2008-05-31 05:15:59-0700
@@ -25,6 +25,7 @@
 package org.argouml.uml.ui.behavior.common_behavior;
 
 import javax.swing.ImageIcon;
+import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
 import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
@@ -37,9 +38,9 @@
  */
 public abstract class PropPanelInstance extends PropPanelModelElement {
 
-    private JScrollPane stimuliSenderScroll;
+    private JPanel stimuliSenderScroll;
 
-    private JScrollPane stimuliReceiverScroll;
+    private JPanel stimuliReceiverScroll;
 
     private static UMLInstanceSenderStimulusListModel stimuliSenderListModel 
         = new UMLInstanceSenderStimulusListModel();
@@ -78,7 +79,7 @@
     /**
      * @return the scrollpane for stimuli sender
      */
-    protected JScrollPane getStimuliSenderScroll() {
+    protected JPanel getStimuliSenderScroll() {
         if (stimuliSenderScroll == null) {
             stimuliSenderScroll = getSingleRowScroll(stimuliSenderListModel);
         }
@@ -88,7 +89,7 @@
     /**
      * @return the scrollpane for stimuli receiver
      */
-    protected JScrollPane getStimuliReceiverScroll() {
+    protected JPanel getStimuliReceiverScroll() {
         if (stimuliReceiverScroll == null) {
             stimuliReceiverScroll = 
                 getSingleRowScroll(stimuliReceiverListModel);

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java?view=diff&rev=14845&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java&r1=14844&r2=14845
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java	2008-05-31 05:15:59-0700
@@ -26,6 +26,7 @@
 
 import javax.swing.ImageIcon;
 import javax.swing.JList;
+import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
 import org.argouml.uml.ui.ActionNavigateContainerElement;
@@ -45,7 +46,7 @@
 
     private JScrollPane outgoingScroll;
 
-    private JScrollPane containerScroll;
+    private JPanel containerScroll;
 
     /**
      * Constructor for PropPanelStateVertex.
@@ -108,7 +109,7 @@
     /**
      * @return Returns the containerScroll.
      */
-    protected JScrollPane getContainerScroll() {
+    protected JPanel getContainerScroll() {
         return containerScroll;
     }
 

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=14845&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=14844&r2=14845
==============================================================================
--- 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:15:59-0700
@@ -78,9 +78,11 @@
                 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(

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java?view=diff&rev=14845&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java&r1=14844&r2=14845
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java	2008-05-31 05:15:59-0700
@@ -79,12 +79,10 @@
 
         // Link to the two ends.
         addField("label.usecase-base",
-                getSingleRowScroll(new UMLLinkedList(
-                        new UMLExtendBaseListModel())));
+                getSingleRowScroll(new UMLExtendBaseListModel()));
 
         addField("label.extension",
-                getSingleRowScroll(new UMLLinkedList(
-                        new UMLExtendExtensionListModel())));
+                getSingleRowScroll(new UMLExtendExtensionListModel()));
 
         JList extensionPointList =
 	    new UMLMutableLinkedList(new UMLExtendExtensionPointListModel(),

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java?view=diff&rev=14845&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java&r1=14844&r2=14845
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java	2008-05-31 05:15:59-0700
@@ -56,15 +56,11 @@
 
         addSeparator();
 
-        JList baseBox =
-	    new UMLLinkedList(new UMLIncludeBaseListModel());
         addField("label.usecase-base",
-		 getSingleRowScroll(baseBox));
+		 getSingleRowScroll(new UMLIncludeBaseListModel()));
 
-        JList additionBox =
-	    new UMLLinkedList(new UMLIncludeAdditionListModel());
         addField("label.addition",
-		 getSingleRowScroll(additionBox));
+		 getSingleRowScroll(new UMLIncludeAdditionListModel()));
 
         // Add the toolbar buttons:
         addAction(new ActionNavigateNamespace());