svn commit: r17603 - trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2

Author: bobtarling
Date: 2009-12-04 04:45:18-0800
New Revision: 17603

Modified:
   trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java
   trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UseCaseDiagramRenderer2.java

Log:
Move common code to base class

Modified: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java?view=diff&pathrev=17603&r1=17602&r2=17603
==============================================================================
--- trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java	(original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java	2009-12-04 04:45:18-0800
@@ -225,30 +225,7 @@
             newEdge = new FigEdgeNote2(edge, settings);
         }
 
-        if (newEdge == null) {
-            throw new IllegalArgumentException(
-                    "Don't know how to create FigEdge for model type "
-                    + edge.getClass().getName());
-        }
-        
-        setPorts(lay, newEdge);
-
-        assert newEdge != null : "There has been no FigEdge created";
-
-//        newEdge.setDiElement(
-//            GraphChangeAdapter.getInstance().createElement(gm, edge));
-
-        assert newEdge != null : "There has been no FigEdge created";
-        assert (newEdge.getDestFigNode() != null) 
-            : "The FigEdge has no dest node";
-        assert (newEdge.getDestPortFig() != null) 
-            : "The FigEdge has no dest port";
-        assert (newEdge.getSourceFigNode() != null) 
-            : "The FigEdge has no source node";
-        assert (newEdge.getSourcePortFig() != null) 
-            : "The FigEdge has no source port";
-
-        lay.add(newEdge);
+        addEdge(lay, newEdge, edge);
         return newEdge;
     }
 

Modified: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UseCaseDiagramRenderer2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UseCaseDiagramRenderer2.java?view=diff&pathrev=17603&r1=17602&r2=17603
==============================================================================
--- trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UseCaseDiagramRenderer2.java	(original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UseCaseDiagramRenderer2.java	2009-12-04 04:45:18-0800
@@ -224,20 +224,7 @@
             newEdge = new FigEdgeNote2(edge, settings);
         }
 
-        if (newEdge == null) {
-            throw new IllegalArgumentException(
-                    "Don't know how to create FigEdge for model type "
-                    + edge.getClass().getName());
-        } else {
-            setPorts(lay, newEdge);
-        }
-
-        lay.add(newEdge);
-        newEdge.setLayer(lay);
-        
-//        newEdge.setDiElement(
-//                GraphChangeAdapter.getInstance().createElement(gm, edge));
-
+        addEdge(lay, newEdge, edge);
         return newEdge;
     }
 }

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

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