svn commit: r12996 - trunk/src_new/org/argouml/uml/diagram: . collaboration/ui deployment/ui static_structure/ui use_case/ui

Author: bobtarling
Date: 2007-07-08 08:44:29-0700
New Revision: 12996

Modified:
   trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java
   trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java
   trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java
   trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java
   trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java

Log:
Move duplicate methods to their common superclass

Modified: trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java?view=diff&rev=12996&p1=trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java&r1=12995&r2=12996
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java	2007-07-08 08:44:29-0700
@@ -301,4 +301,15 @@
 
         return newEdge;
     }
+    
+    final protected void setSourcePort(FigEdge edge, FigNode source) {
+        edge.setSourcePortFig(source);
+        edge.setSourceFigNode(source);
+    }
+
+    final protected void setDestPort(FigEdge edge, FigNode dest) {
+        edge.setDestPortFig(dest);
+        edge.setDestFigNode(dest);
+    }
+
 } /* end class CollabDiagramRenderer */

Modified: trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java?view=diff&rev=12996&p1=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java&r1=12995&r2=12996
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java	2007-07-08 08:44:29-0700
@@ -167,14 +167,4 @@
         lay.add(newEdge);
         return newEdge;
     }
-    
-    private void setSourcePort(FigEdge edge, FigNode source) {
-        edge.setSourcePortFig(source);
-        edge.setSourceFigNode(source);
-    }
-
-    private void setDestPort(FigEdge edge, FigNode dest) {
-        edge.setDestPortFig(dest);
-        edge.setDestFigNode(dest);
-    }
 } /* end class CollabDiagramRenderer */

Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java?view=diff&rev=12996&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java&r1=12995&r2=12996
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java	2007-07-08 08:44:29-0700
@@ -219,15 +219,4 @@
         lay.add(newEdge);
         return newEdge;
     }
-    
-
-    private void setSourcePort(FigEdge edge, FigNode source) {
-        edge.setSourcePortFig(source);
-        edge.setSourceFigNode(source);
-    }
-
-    private void setDestPort(FigEdge edge, FigNode dest) {
-        edge.setDestPortFig(dest);
-        edge.setDestFigNode(dest);
-    }
 }

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java?view=diff&rev=12996&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java&r1=12995&r2=12996
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java	2007-07-08 08:44:29-0700
@@ -313,16 +313,6 @@
         return newEdge;
     }
 
-    private void setSourcePort(FigEdge edge, FigNode source) {
-        edge.setSourcePortFig(source);
-        edge.setSourceFigNode(source);
-    }
-
-    private void setDestPort(FigEdge edge, FigNode dest) {
-        edge.setDestPortFig(dest);
-        edge.setDestFigNode(dest);
-    }
-    
     /**
      * Get the FigNode from the given layer that represents the given
      * model element.

Modified: trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java?view=diff&rev=12996&p1=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java&r1=12995&r2=12996
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java	2007-07-08 08:44:29-0700
@@ -155,6 +155,30 @@
         endArrow.setLineColor(getLineColor());
         super.paint(g);
     }
+
+
+    /**
+     * @return
+     * @see org.tigris.gef.presentation.FigEdge#getDestPortFig()
+     */
+    @Override
+    public Fig getDestPortFig() {
+        // TODO: Auto-generated method stub
+        return super.getDestPortFig();
+    }
+
+
+    /**
+     * @return
+     * @see org.tigris.gef.presentation.FigEdge#getSourcePortFig()
+     */
+    @Override
+    public Fig getSourcePortFig() {
+        // TODO: Auto-generated method stub
+        return super.getSourcePortFig();
+    }
+    
+    
     
 } /* end class FigInclude */
 

Modified: trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java?view=diff&rev=12996&p1=trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java&r1=12995&r2=12996
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java	2007-07-08 08:44:29-0700
@@ -69,6 +69,9 @@
  * @author abonner
  */
 public class UseCaseDiagramRenderer extends UmlDiagramRenderer {
+    
+    static final long serialVersionUID = 2217410137377934879L;
+
     /**
      * Logger.
      */
@@ -284,16 +287,4 @@
         return newEdge;
     }
 
-    private void setSourcePort(FigEdge edge, FigNode source) {
-        edge.setSourcePortFig(source);
-        edge.setSourceFigNode(source);
-    }
-
-    private void setDestPort(FigEdge edge, FigNode dest) {
-        edge.setDestPortFig(dest);
-        edge.setDestFigNode(dest);
-    }
-
-    static final long serialVersionUID = 2217410137377934879L;
-
 } /* end class UseCaseDiagramRenderer */