svn commit: r16600 - branches/work_issue1048_dthompson/src/argouml-app: . src/org/argouml/uml/diagram/ui

Author: dthompson
Date: 2009-01-14 11:49:11-0800
New Revision: 16600

Modified:
   branches/work_issue1048_dthompson/src/argouml-app/   (props changed)
   branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/ui/SelectionEdgeClarifiers.java

Log:
Merging changes from trunk to branch (catch up).  ClassCastExceptions should no longer happen.

Modified: branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/ui/SelectionEdgeClarifiers.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/ui/SelectionEdgeClarifiers.java?view=diff&pathrev=16600&r1=16599&r2=16600
==============================================================================
--- branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/ui/SelectionEdgeClarifiers.java	(original)
+++ branches/work_issue1048_dthompson/src/argouml-app/src/org/argouml/uml/diagram/ui/SelectionEdgeClarifiers.java	2009-01-14 11:49:11-0800
@@ -28,6 +28,7 @@
 
 import org.tigris.gef.base.Globals;
 import org.tigris.gef.base.PathItemPlacementStrategy;
+import org.tigris.gef.base.SelectionManager;
 import org.tigris.gef.base.SelectionReshape;
 import org.tigris.gef.presentation.Fig;
 import org.tigris.gef.presentation.FigEdge;
@@ -40,10 +41,11 @@
  */
 public class SelectionEdgeClarifiers extends SelectionReshape {
 
+    ////////////////////////////////////////////////////////////////
+    // constructors
 
-    /**
-     * Construct a new SelectionEdgeClarifiers for the given Fig
-     * 
+    /** Construct a new SelectionEdgeClarifiers for the given Fig
+     *
      * @param f the given fig
      */
     public SelectionEdgeClarifiers(Fig f) { super(f); }
@@ -60,10 +62,10 @@
     public void paint(Graphics g) {
         super.paint(g);
         int selectionCount =
-            Globals.curEditor().getSelectionManager().getSelections().size();
+            Globals.curEditor().getSelectionManager().selections().size();
         if (selectionCount == 1) {
-            FigEdge edge = (FigEdge) getContent();
-            ((Clarifiable) edge).paintClarifiers(g);
+            FigEdgeModelElement edge = (FigEdgeModelElement) getContent();
+            edge.paintClarifiers(g);
 	    for (PathItemPlacementStrategy strategy
 	            : edge.getPathItemStrategies()) {
 	        strategy.paint(g);
@@ -71,4 +73,5 @@
 	}
     }
 
-}
+} /* end class SelectionEdgeClarifiers */
+

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

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