svn commit: r16576 - branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram: collaboration/ui state/ui static_structure/ui use_case/ui

Author: dthompson
Date: 2009-01-11 12:16:13-0800
New Revision: 16576

Modified:
   branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java
   branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigTransition.java
   branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java
   branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigExtend.java
   branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigInclude.java

Log:
Converted all remaining figs to use new draggable labels (association role, transition, link, extend, include).

Modified: branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java?view=diff&pathrev=16576&r1=16575&r2=16576
==============================================================================
--- branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java	(original)
+++ branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java	2009-01-11 12:16:13-0800
@@ -34,8 +34,8 @@
 import org.argouml.uml.diagram.ui.ArgoFigGroup;
 import org.argouml.uml.diagram.ui.FigAssociation;
 import org.argouml.uml.diagram.ui.FigMessage;
+import org.argouml.uml.diagram.ui.PathItemPlacement;
 import org.tigris.gef.base.Layer;
-import org.tigris.gef.base.PathConvPercent;
 import org.tigris.gef.presentation.Fig;
 
 
@@ -64,7 +64,7 @@
     public FigAssociationRole() {
         super();
         messages = new FigMessageGroup();
-        addPathItem(messages, new PathConvPercent(this, 50, 10));
+        addPathItem(messages, new PathItemPlacement(this, messages, 50, 10));
     }
 
     /**
@@ -93,7 +93,7 @@
     public FigAssociationRole(Object owner, DiagramSettings settings) {
         super(owner, settings);
         messages = new FigMessageGroup(owner, settings);
-        addPathItem(messages, new PathConvPercent(this, 50, 10));
+        addPathItem(messages, new PathItemPlacement(this, messages, 50, 10));
     }
     
     /*

Modified: branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigTransition.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigTransition.java?view=diff&pathrev=16576&r1=16575&r2=16576
==============================================================================
--- branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigTransition.java	(original)
+++ branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigTransition.java	2009-01-11 12:16:13-0800
@@ -36,7 +36,7 @@
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.diagram.DiagramSettings;
 import org.argouml.uml.diagram.ui.FigEdgeModelElement;
-import org.argouml.uml.diagram.ui.PathConvPercent2;
+import org.argouml.uml.diagram.ui.PathItemPlacement;
 import org.argouml.uml.ui.behavior.common_behavior.ActionNewActionSequence;
 import org.argouml.uml.ui.behavior.common_behavior.ActionNewCallAction;
 import org.argouml.uml.ui.behavior.common_behavior.ActionNewCreateAction;
@@ -117,7 +117,7 @@
 
     private void initializeTransition() {
         addPathItem(getNameFig(),
-                new PathConvPercent2(this, getNameFig(), 50, 10));
+                new PathItemPlacement(this, getNameFig(), 50, 10));
         getFig().setLineColor(LINE_COLOR);
         setDestArrowHead(endArrow);
         allowRemoveFromDiagram(false);

Modified: branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java?view=diff&pathrev=16576&r1=16575&r2=16576
==============================================================================
--- branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java	(original)
+++ branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java	2009-01-11 12:16:13-0800
@@ -27,7 +27,7 @@
 import org.argouml.model.Model;
 import org.argouml.uml.diagram.ui.FigEdgeModelElement;
 import org.argouml.uml.diagram.ui.FigTextGroup;
-import org.argouml.uml.diagram.ui.PathConvPercent2;
+import org.argouml.uml.diagram.ui.PathItemPlacement;
 import org.tigris.gef.presentation.Fig;
 
 /**
@@ -58,7 +58,7 @@
     public FigLink() {
         middleGroup.addFig(getNameFig());
         addPathItem(middleGroup,
-                new PathConvPercent2(this, middleGroup, 50, 25));
+                new PathItemPlacement(this, middleGroup, 50, 25));
         getNameFig().setUnderline(true);
 	getFig().setLineColor(LINE_COLOR);
 	setBetweenNearestPoints(true);

Modified: branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigExtend.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigExtend.java?view=diff&pathrev=16576&r1=16575&r2=16576
==============================================================================
--- branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigExtend.java	(original)
+++ branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigExtend.java	2009-01-11 12:16:13-0800
@@ -33,7 +33,7 @@
 import org.argouml.notation.providers.uml.NotationUtilityUml;
 import org.argouml.uml.diagram.DiagramSettings;
 import org.argouml.uml.diagram.ui.FigEdgeModelElement;
-import org.tigris.gef.base.PathConvPercent;
+import org.argouml.uml.diagram.ui.PathItemPlacement;
 import org.tigris.gef.presentation.ArrowHeadGreater;
 import org.tigris.gef.presentation.Fig;
 import org.tigris.gef.presentation.FigGroup;
@@ -126,7 +126,7 @@
         // relationship, the arrow points to the base use case, but because of
         // the way we draw it, that is still the destination end.
 
-        addPathItem(fg, new PathConvPercent(this, 50, 10));
+        addPathItem(fg, new PathItemPlacement(this, fg, 50, 10));
 
         setDashed(true);
 

Modified: branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigInclude.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigInclude.java?view=diff&pathrev=16576&r1=16575&r2=16576
==============================================================================
--- branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigInclude.java	(original)
+++ branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigInclude.java	2009-01-11 12:16:13-0800
@@ -30,7 +30,7 @@
 import org.argouml.uml.diagram.DiagramSettings;
 import org.argouml.uml.diagram.ui.FigEdgeModelElement;
 import org.argouml.uml.diagram.ui.FigSingleLineText;
-import org.tigris.gef.base.PathConvPercent;
+import org.argouml.uml.diagram.ui.PathItemPlacement;
 import org.tigris.gef.presentation.ArrowHeadGreater;
 import org.tigris.gef.presentation.Fig;
 
@@ -83,7 +83,7 @@
         label.setEditable(false);
         label.setText("<<include>>");
         
-        addPathItem(label, new PathConvPercent(this, 50, 10));
+        addPathItem(label, new PathItemPlacement(this, label, 50, 10));
         
         // Make the line dashed

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1017474

To unsubscribe from this discussion, e-mail: [[email protected]].