svn commit: r16488 - trunk/src/argouml-app/src/org/argouml: gefext uml/diagram/activity/ui uml/diagram/sequence/ui

Author: tfmorris
Date: 2009-01-02 20:50:13-0800
New Revision: 16488

Modified:
   trunk/src/argouml-app/src/org/argouml/gefext/ArgoFigLine.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigActivation.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigLifeLine.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigMessagePort.java

Log:
Add ArgoUML colors to places using GEF defaults

Modified: trunk/src/argouml-app/src/org/argouml/gefext/ArgoFigLine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/gefext/ArgoFigLine.java?view=diff&pathrev=16488&r1=16487&r2=16488
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/gefext/ArgoFigLine.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/gefext/ArgoFigLine.java	2009-01-02 20:50:13-0800
@@ -32,6 +32,7 @@
 import javax.management.NotificationFilter;
 import javax.management.NotificationListener;
 
+import org.argouml.uml.diagram.ui.ArgoFig;
 import org.tigris.gef.presentation.FigLine;
 
 /**
@@ -46,13 +47,23 @@
 
     public ArgoFigLine() {
         super();
+        initFig();
     }
     
     public ArgoFigLine(int x1, int y1, int x2, int y2) {
         super(x1, y1, x2, y2);
+        initFig();
     }
 
-
+    
+    /**
+     * Set default line width and color
+     */
+    private void initFig() {
+        setLineColor(ArgoFig.LINE_COLOR);
+        setLineWidth(ArgoFig.LINE_WIDTH);
+    }
+    
     /*
      * @see org.tigris.gef.presentation.Fig#deleteFromModel()
      */

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java?view=diff&pathrev=16488&r1=16487&r2=16488
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java	2009-01-02 20:50:13-0800
@@ -95,16 +95,16 @@
         getBigPort().setFilled(false);
         getBigPort().setLineWidth(0);
         
-        leftLine = new FigLine(X0, Y0, 10, 300);
-        rightLine = new FigLine(150, Y0, 160, 300);
-        bottomLine = new FigLine(X0, 300, 150, 300);
-        topLine = new FigLine(X0, Y0, 150, 10);
+        leftLine = new FigLine(X0, Y0, 10, 300, LINE_COLOR);
+        rightLine = new FigLine(150, Y0, 160, 300, LINE_COLOR);
+        bottomLine = new FigLine(X0, 300, 150, 300, LINE_COLOR);
+        topLine = new FigLine(X0, Y0, 150, 10, LINE_COLOR);
 
         getNameFig().setLineWidth(0);
         getNameFig().setBounds(X0, Y0, 50, 25);
         getNameFig().setFilled(false);
         
-        seperator = new FigLine(X0, Y0 + 15, 150, 25);
+        seperator = new FigLine(X0, Y0 + 15, 150, 25, LINE_COLOR);
 
         addFig(getBigPort());
         addFig(rightLine);

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigActivation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigActivation.java?view=diff&pathrev=16488&r1=16487&r2=16488
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigActivation.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigActivation.java	2009-01-02 20:50:13-0800
@@ -24,6 +24,7 @@
 
 package org.argouml.uml.diagram.sequence.ui;
 
+import org.argouml.uml.diagram.ui.ArgoFig;
 import org.tigris.gef.presentation.FigRect;
 
 public class FigActivation extends FigRect {
@@ -31,7 +32,8 @@
     private static final long serialVersionUID = -686782941711592971L;
 
     FigActivation(int x, int y, int w, int h) {
-        super(x, y, w, h);
+        super(x, y, w, h, ArgoFig.LINE_COLOR, ArgoFig.FILL_COLOR);
+        setLineWidth(ArgoFig.LINE_WIDTH);
         setFilled(true);
     }
 }

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigLifeLine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigLifeLine.java?view=diff&pathrev=16488&r1=16487&r2=16488
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigLifeLine.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigLifeLine.java	2009-01-02 20:50:13-0800
@@ -51,16 +51,9 @@
 
 class FigLifeLine extends ArgoFigGroup implements HandlerFactory {
 
-    /**
-     * The UID.
-     */
     private static final long serialVersionUID = -1242239243040698287L;
 
-    /**
-     * Logger.
-     */
-    private static final Logger LOG =
-        Logger.getLogger(FigLifeLine.class);
+    private static final Logger LOG = Logger.getLogger(FigLifeLine.class);
 
     static final int WIDTH = 20;
     static final int HEIGHT = 1000;
@@ -81,11 +74,12 @@
     @Deprecated
     FigLifeLine(int x, int y) {
         super();
-        rect = new FigRect(x, y, WIDTH, HEIGHT);
+        rect = new FigRect(x, y, WIDTH, HEIGHT, LINE_COLOR, FILL_COLOR);
         rect.setFilled(false);
         rect.setLineWidth(0);
         line =
             new FigLine(x + WIDTH / 2, y, x + WIDTH / 2, HEIGHT, LINE_COLOR);
+        line.setLineWidth(LINE_WIDTH);
         line.setDashed(true);
         addFig(rect);
         addFig(line);

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigMessagePort.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigMessagePort.java?view=diff&pathrev=16488&r1=16487&r2=16488
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigMessagePort.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigMessagePort.java	2009-01-02 20:50:13-0800
@@ -58,7 +58,7 @@
     public FigMessagePort(Object owner, int x, int y, int x2) {
         super();
         setOwner(owner);
-        FigLine myLine = new FigLine(x, y, x2, y);
+        FigLine myLine = new FigLine(x, y, x2, y, LINE_COLOR);
         addFig(myLine);
         setVisible(false);
     }

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

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