svn commit: r13827 - trunk/src_new/org/argouml/uml/diagram: deployment/ui sequence/ui state/ui static_structure/ui ui use_case/ui

[email protected]
Newsgroups gmane.comp.lang.uml.argouml.cvs
Message-ID <[email protected]> 
Author: tfmorris
Date: 2007-11-23 15:50:28-0800
New Revision: 13827

Modified:
   trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java
   trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java
   trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigMessage.java
   trunk/src_new/org/argouml/uml/diagram/state/ui/FigTransition.java
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java
   trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java
   trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java

Log:
Use List methods instead of Vector methods to allow easy update in future

Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java?view=diff&rev=13827&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java&r1=13826&r2=13827
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java	2007-11-23 15:50:28-0800
@@ -60,9 +60,9 @@
     public Vector getPopUpActions(MouseEvent me) {
         Vector popUpActions = super.getPopUpActions(me);
         // Modifiers ...
-        popUpActions.insertElementAt(
-                buildModifierPopUp(ABSTRACT | LEAF | ROOT),
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(
+                popUpActions.size() - getPopupAddOffset(),
+                buildModifierPopUp(ABSTRACT | LEAF | ROOT));
         return popUpActions;
     }
 

Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java?view=diff&rev=13827&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java&r1=13826&r2=13827
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java	2007-11-23 15:50:28-0800
@@ -61,9 +61,9 @@
     public Vector getPopUpActions(MouseEvent me) {
         Vector popUpActions = super.getPopUpActions(me);
         // Modifiers ...
-        popUpActions.insertElementAt(
-                buildModifierPopUp(ABSTRACT | LEAF | ROOT),
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(
+                popUpActions.size() - getPopupAddOffset(),
+                buildModifierPopUp(ABSTRACT | LEAF | ROOT));
         return popUpActions;
     }
 

Modified: trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigMessage.java?view=diff&rev=13827&p1=trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigMessage.java&p2=trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigMessage.java&r1=13826&r2=13827
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigMessage.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigMessage.java	2007-11-23 15:50:28-0800
@@ -78,7 +78,7 @@
      * @param     me     a mouse event
      * @return           a collection of menu items
      *
-     * @see org.tigris.gef.ui.PopupGenerator#getPopUpActions(java.awt.event.MouseEvent)
+     * @see org.tigris.gef.ui.PopupGenerator2#getPopUpActions(java.awt.event.MouseEvent)
      */
     public Vector getPopUpActions(MouseEvent me) {
         Vector popUpActions = super.getPopUpActions(me);
@@ -86,8 +86,8 @@
         // the menu item for RE a sequence into the diagram is offered always,
         // because a check (e.g. does a operation with a body exist) would be
         // too expensive
-        popUpActions.insertElementAt(new ActionRESequenceDiagram(this),
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(popUpActions.size() - getPopupAddOffset(),
+                new ActionRESequenceDiagram(this));
 
         return popUpActions;
     }

Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/FigTransition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/FigTransition.java?view=diff&rev=13827&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/FigTransition.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/FigTransition.java&r1=13826&r2=13827
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/FigTransition.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/FigTransition.java	2007-11-23 15:50:28-0800
@@ -66,8 +66,7 @@
      */
     private boolean dashed;
 
-    ////////////////////////////////////////////////////////////////
-    // constructors
+
     /**
      * The main constructor.
      */
@@ -152,7 +151,9 @@
         boolean ms = TargetManager.getInstance().getTargets().size() > 1;
         /* None of the menu-items below apply
          * when multiple modelelements are selected:*/
-        if (ms) return popUpActions;
+        if (ms) {
+            return popUpActions;
+        }
 
         Action a;
 
@@ -170,13 +171,13 @@
         a = new ButtonActionNewTimeEvent();
         a.putValue(Action.NAME, a.getValue(Action.SHORT_DESCRIPTION));
         triggerMenu.add(a);
-        popUpActions.insertElementAt(triggerMenu,
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(
+                popUpActions.size() - getPopupAddOffset(),
+                triggerMenu);
 
         a = new ButtonActionNewGuard();
         a.putValue(Action.NAME, a.getValue(Action.SHORT_DESCRIPTION));
-        popUpActions.insertElementAt(a,
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(popUpActions.size() - getPopupAddOffset(), a);
 
         ArgoJMenu effectMenu =
             new ArgoJMenu("menu.popup.effect");
@@ -204,8 +205,8 @@
         a = ActionNewActionSequence.getButtonInstance();
         a.putValue(Action.NAME, a.getValue(Action.SHORT_DESCRIPTION));
         effectMenu.add(a);
-        popUpActions.insertElementAt(effectMenu,
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(popUpActions.size() - getPopupAddOffset(), 
+                effectMenu);
 
         return popUpActions;
     }

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java?view=diff&rev=13827&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java&r1=13826&r2=13827
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java	2007-11-23 15:50:28-0800
@@ -249,16 +249,19 @@
     
         // Add ...
         ArgoJMenu addMenu = buildAddMenu();
-        popUpActions.insertElementAt(addMenu,
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(
+                popUpActions.size() - getPopupAddOffset(),
+                addMenu);
 
         // Modifier ...
-        popUpActions.insertElementAt(buildModifierPopUp(),
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(
+                popUpActions.size() - getPopupAddOffset(),
+                buildModifierPopUp());
     
         // Visibility ...
-        popUpActions.insertElementAt(buildVisibilityPopUp(),
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(
+                popUpActions.size() - getPopupAddOffset(),
+                buildVisibilityPopUp());
     
         return popUpActions;
     }

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java?view=diff&rev=13827&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java&r1=13826&r2=13827
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java	2007-11-23 15:50:28-0800
@@ -126,8 +126,7 @@
         addMenu.add(new ActionNewTagDefinition());
         addMenu.add(ActionEdgesDisplay.getShowEdges());
         addMenu.add(ActionEdgesDisplay.getHideEdges());
-        popUpActions.insertElementAt(addMenu,
-            popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(popUpActions.size() - getPopupAddOffset(), addMenu);
 
         // Show ...
         ArgoJMenu showMenu = new ArgoJMenu("menu.popup.show");
@@ -136,18 +135,17 @@
             showMenu.add((Action) i.next());
         }
         if (showMenu.getComponentCount() > 0) {
-            popUpActions.insertElementAt(showMenu,
-                    popUpActions.size() - getPopupAddOffset());
+            popUpActions.add(popUpActions.size() - getPopupAddOffset(),
+                    showMenu);
         }
 
         // Modifiers ...
-        popUpActions.insertElementAt(
-                buildModifierPopUp(ABSTRACT | LEAF | ROOT),
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(popUpActions.size() - getPopupAddOffset(),
+                buildModifierPopUp(ABSTRACT | LEAF | ROOT));
 
         // Visibility ...
-        popUpActions.insertElementAt(buildVisibilityPopUp(),
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(popUpActions.size() - getPopupAddOffset(),
+                buildVisibilityPopUp());
 
         return popUpActions;
     }

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java?view=diff&rev=13827&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java&r1=13826&r2=13827
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java	2007-11-23 15:50:28-0800
@@ -24,7 +24,6 @@
 
 package org.argouml.uml.diagram.ui;
 
-import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -276,7 +275,9 @@
         boolean ms = TargetManager.getInstance().getTargets().size() > 1;
         /* None of the menu-items below apply
          * when multiple modelelements are selected:*/
-        if (ms) return popUpActions;
+        if (ms) {
+            return popUpActions;
+        }
 
 	// x^2 + y^2 = r^2  (equation of a circle)
 	Point firstPoint = this.getFirstPoint();
@@ -307,17 +308,16 @@
             multMenu.add(ActionMultiplicity.getSrcMultZeroToOne());
             multMenu.add(ActionMultiplicity.getSrcMultOneToMany());
             multMenu.add(ActionMultiplicity.getSrcMultZeroToMany());
-            popUpActions.insertElementAt(multMenu,
-                popUpActions.size() - getPopupAddOffset());
+            popUpActions.add(popUpActions.size() - getPopupAddOffset(),
+                    multMenu);
 
             ArgoJMenu aggMenu = new ArgoJMenu("menu.popup.aggregation");
 
 	    aggMenu.add(ActionAggregation.getSrcAggNone());
 	    aggMenu.add(ActionAggregation.getSrcAgg());
 	    aggMenu.add(ActionAggregation.getSrcAggComposite());
-	    popUpActions.insertElementAt(aggMenu,
-					 (popUpActions.size()
-					  - getPopupAddOffset()));
+	    popUpActions.add(popUpActions.size() - getPopupAddOffset(),
+                    aggMenu);
 	} else if (destDeterminingFactor < rSquared) {
             ArgoJMenu multMenu =
 		new ArgoJMenu("menu.popup.multiplicity");
@@ -325,17 +325,15 @@
 	    multMenu.add(ActionMultiplicity.getDestMultZeroToOne());
 	    multMenu.add(ActionMultiplicity.getDestMultOneToMany());
 	    multMenu.add(ActionMultiplicity.getDestMultZeroToMany());
-	    popUpActions.insertElementAt(multMenu,
-					 (popUpActions.size()
-					  - getPopupAddOffset()));
+	    popUpActions.add(popUpActions.size() - getPopupAddOffset(),
+                    multMenu);
 
             ArgoJMenu aggMenu = new ArgoJMenu("menu.popup.aggregation");
 	    aggMenu.add(ActionAggregation.getDestAggNone());
 	    aggMenu.add(ActionAggregation.getDestAgg());
 	    aggMenu.add(ActionAggregation.getDestAggComposite());
-	    popUpActions.insertElementAt(aggMenu,
-					 (popUpActions.size()
-					  - getPopupAddOffset()));
+	    popUpActions
+                    .add(popUpActions.size() - getPopupAddOffset(), aggMenu);
 	}
 	// else: No particular options for right click in middle of line
 
@@ -370,9 +368,8 @@
                     ascEnd,
                     ActionNavigability.ENDTOSTART));
 
-		popUpActions.insertElementAt(navMenu,
-					     (popUpActions.size()
-					      - getPopupAddOffset()));
+		popUpActions.add(popUpActions.size() - getPopupAddOffset(),
+                        navMenu);
 	    }
 	}
 

Modified: trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java?view=diff&rev=13827&p1=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java&r1=13826&r2=13827
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java	2007-11-23 15:50:28-0800
@@ -157,9 +157,9 @@
     public Vector getPopUpActions(MouseEvent me) {
         Vector popUpActions = super.getPopUpActions(me);
         // Modifiers ...
-        popUpActions.insertElementAt(
-                buildModifierPopUp(ABSTRACT | LEAF | ROOT),
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(
+                popUpActions.size() - getPopupAddOffset(),
+                buildModifierPopUp(ABSTRACT | LEAF | ROOT));
         return popUpActions;
     }
 

Modified: trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java?view=diff&rev=13827&p1=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java&r1=13826&r2=13827
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java	2007-11-23 15:50:28-0800
@@ -365,12 +365,6 @@
         return figClone;
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // Fig accessors
-    //
-    ///////////////////////////////////////////////////////////////////////////
-
     /**
      * Build a collection of menu items relevant for a right-click
      * popup menu on a Use Case.<p>
@@ -398,14 +392,12 @@
         }
         addMenu.add(new ActionAddNote());
 
-        popUpActions.insertElementAt(addMenu,
-            popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(popUpActions.size() - getPopupAddOffset(), addMenu);
 
         // Modifier menu. Placed one before last, so the "Properties" entry is
         // always last.
-        popUpActions.insertElementAt(
-                buildModifierPopUp(LEAF | ROOT),
-                popUpActions.size() - getPopupAddOffset());
+        popUpActions.add(popUpActions.size() - getPopupAddOffset(),
+                buildModifierPopUp(LEAF | ROOT));
 
         return popUpActions;
     }
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.