svn commit: r19125 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java

Author: bobtarling
Date: 2011-03-24 04:18:56-0700
New Revision: 19125

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java

Log:
Simplify determineArrowHead

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java?view=diff&pathrev=19125&r1=19124&r2=19125
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java	2011-03-24 04:18:56-0700
@@ -832,15 +832,13 @@
         new ArrowHeadComposite(ArrowHeadDiamond.BlackDiamond,
                    new ArrowHeadGreater());
 
-    // These are a list of arrow types. Positioning is important as we subtract
-    // 3 to convert a navigable arrow to a non navigable with the same
-    // aggregation
+    // These are a list of arrow types.
     private static final int NONE = 0;
     private static final int AGGREGATE = 1;
     private static final int COMPOSITE = 2;
-    private static final int NAV_NONE = 3;
-    private static final int NAV_AGGREGATE = 4;
-    private static final int NAV_COMPOSITE = 5;
+    
+    // Added to the arrow type for navigable
+    private static final int NAV = 3;
     
     /**
      * All the arrow head types.
@@ -850,9 +848,9 @@
         ARROW_HEADS[NONE] = ArrowHeadNone.TheInstance;
         ARROW_HEADS[AGGREGATE] = ArrowHeadDiamond.WhiteDiamond;
         ARROW_HEADS[COMPOSITE] = ArrowHeadDiamond.BlackDiamond;
-        ARROW_HEADS[NAV_NONE] = new ArrowHeadGreater();
-        ARROW_HEADS[NAV_AGGREGATE] = NAV_AGGR;
-        ARROW_HEADS[NAV_COMPOSITE] = NAV_COMP;
+        ARROW_HEADS[NAV + NONE] = new ArrowHeadGreater();
+        ARROW_HEADS[NAV + AGGREGATE] = NAV_AGGR;
+        ARROW_HEADS[NAV + COMPOSITE] = NAV_COMP;
     }
     
     private FigRole role;
@@ -933,28 +931,15 @@
         final Object ak = getAggregateKind();
         boolean nav = Model.getFacade().isNavigable(getOwner());
 
-        if (nav) {
-            if (Model.getAggregationKind().getNone().equals(ak)
-                    || (ak == null)) {
-                arrowType = NAV_NONE;
-            } else if (Model.getAggregationKind().getAggregate()
-                    .equals(ak)) {
-                arrowType = NAV_AGGREGATE;
-            } else if (Model.getAggregationKind().getComposite()
-                    .equals(ak)) {
-                arrowType = NAV_COMPOSITE;
-            }
+        if (Model.getAggregationKind().getAggregate().equals(ak)) {
+            arrowType = AGGREGATE;
+        } else if (Model.getAggregationKind().getComposite().equals(ak)) {
+            arrowType = COMPOSITE;
         } else {
-            if (Model.getAggregationKind().getNone().equals(ak)
-                    || (ak == null)) {
-                arrowType = NONE;
-            } else if (Model.getAggregationKind().getAggregate()
-                    .equals(ak)) {
-                arrowType = AGGREGATE;
-            } else if (Model.getAggregationKind().getComposite()
-                    .equals(ak)) {
-                arrowType = COMPOSITE;
-            }
+            arrowType = NONE;
+        }
+        if (nav) {
+            arrowType += 3;
         }
     }

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

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