Author: mvw
Date: 2010-09-10 02:29:47-0700
New Revision: 18728
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPool.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigForkState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJunctionState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java
Log:
Make code consistent.
Remove the use of deprecated method setBigPort().
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPool.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPool.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPool.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPool.java 2010-09-10 02:29:47-0700
@@ -1,6 +1,6 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
*
* Contributors:
* bobtarling
+ * Michiel van der Wulp
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -55,17 +56,21 @@
* This class represents a Pool of Swimlanes for Activity diagrams. This is
* exists only to act as the GEF style encloser. Other nodes in the same
* must be placed entirely within or outside the boundaries of this Fig
- * but cannot intersect with the boundary.
+ * but cannot intersect with the boundary. <p>
* TODO: There is no actual model element being represented here so we are
* inheriting a lot of behaviour from FigNodeModelElement that we don't want.
* We require to split FigNodeModelElement to separate the code that requires
- * a model element owner. See issue
+ * a model element owner. See issue ... <p>
+ * Remark mvw: Why not give it an owner instead? The ActivityGraph
+ * is the obvious candidate, or maybe the top state.
*
* @author mkl
*/
public class FigPool extends FigNodeModelElement {
private void initialize(Rectangle r) {
+ /* TODO: Replace the next deprecated call. This case is complicated
+ * by the use of parameters. All other Figs work differently. */
setBigPort(new FigEmptyRect(r.x, r.y, r.width, r.height));
getBigPort().setFilled(false);
getBigPort().setLineWidth(0);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java 2010-09-10 02:29:47-0700
@@ -61,8 +61,12 @@
private FigRect cover;
+ @Override
+ protected Fig createBigPortFig() {
+ return new FigRect(X0, Y0, 90, 50, DEBUG_COLOR, DEBUG_COLOR);
+ }
+
private void initFigs() {
- setBigPort(new FigRect(X0, Y0, 90, 50, DEBUG_COLOR, DEBUG_COLOR));
cover = new FigRect(X0, Y0, 90, 50, LINE_COLOR, FILL_COLOR);
getNameFig().setLineWidth(0);
getNameFig().setFilled(false);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java 2010-09-10 02:29:47-0700
@@ -1,13 +1,13 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * mvw
+ * Michiel van der Wulp
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -45,26 +45,25 @@
import java.util.Iterator;
import org.argouml.uml.diagram.DiagramSettings;
+import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigCircle;
/**
* Class to display graphics for a UML Choice State in a diagram - the circle.
*
* TODO: This should really be renamed FigChoiceState. It's the
- * last vestige the UML 1.3 name.
+ * last vestige of the UML 1.3 name.
*
* @author pepargouml
*/
public class FigBranchState extends FigStateVertex {
- private static final int WIDTH = 24;
- private static final int HEIGHT = 24;
+ private static final int BWIDTH = 24;
+ private static final int BHEIGHT = 24;
private FigCircle head;
- private FigCircle bp;
-
/**
* Construct a new FigBranchState.
*
@@ -78,11 +77,15 @@
initFigs();
}
+ @Override
+ protected Fig createBigPortFig() {
+ FigCircle bp = new FigCircle(X0, Y0, BWIDTH, BHEIGHT, DEBUG_COLOR, DEBUG_COLOR);
+ return bp;
+ }
+
private void initFigs() {
setEditable(false);
- bp = new FigCircle(X0, Y0, WIDTH, HEIGHT, DEBUG_COLOR, DEBUG_COLOR);
- setBigPort(bp);
- head = new FigCircle(X0, Y0, WIDTH, HEIGHT, LINE_COLOR, FILL_COLOR);
+ head = new FigCircle(X0, Y0, BWIDTH, BHEIGHT, LINE_COLOR, FILL_COLOR);
// add Figs to the FigNode in back-to-front order
addFig(getBigPort());
@@ -98,7 +101,7 @@
*/
@Override
public Point getClosestPoint(Point anotherPt) {
- Point p = bp.connectionPoint(anotherPt);
+ Point p = getBigPort().connectionPoint(anotherPt);
return p;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigForkState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigForkState.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigForkState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigForkState.java 2010-09-10 02:29:47-0700
@@ -1,13 +1,13 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * mvw
+ * Michiel van der Wulp
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -44,6 +44,7 @@
import java.util.Iterator;
import org.argouml.uml.diagram.DiagramSettings;
+import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigRect;
/**
@@ -74,10 +75,14 @@
initFigs();
}
+ @Override
+ protected Fig createBigPortFig() {
+ return new FigRect(X, Y, STATE_WIDTH, HEIGHT, DEBUG_COLOR,
+ DEBUG_COLOR);
+ }
+
private void initFigs() {
setEditable(false);
- setBigPort(new FigRect(X, Y, STATE_WIDTH, HEIGHT, DEBUG_COLOR,
- DEBUG_COLOR));
head = new FigRect(X, Y, STATE_WIDTH, HEIGHT, LINE_COLOR,
SOLID_FILL_COLOR);
// add Figs to the FigNode in back-to-front order
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java 2010-09-10 02:29:47-0700
@@ -1,13 +1,13 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * mvw
+ * Michiel van der Wulp
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -44,6 +44,7 @@
import java.util.Iterator;
import org.argouml.uml.diagram.DiagramSettings;
+import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigCircle;
import org.tigris.gef.presentation.FigText;
@@ -81,10 +82,14 @@
initFigs();
}
+ @Override
+ protected Fig createBigPortFig() {
+ return new FigCircle(X, Y, WIDTH, HEIGHT, DEBUG_COLOR,
+ DEBUG_COLOR);
+ }
+
private void initFigs() {
setEditable(false);
- setBigPort(new FigCircle(X, Y, WIDTH, HEIGHT, DEBUG_COLOR,
- DEBUG_COLOR));
head = new FigCircle(X, Y, WIDTH, HEIGHT, LINE_COLOR, FILL_COLOR);
h = new FigText(X, Y, WIDTH - 10, HEIGHT - 10);
h.setFont(getSettings().getFontPlain());
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java 2010-09-10 02:29:47-0700
@@ -1,13 +1,13 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * mvw
+ * Michiel van der Wulp
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -49,6 +49,7 @@
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.activity.ui.SelectionActionState;
import org.tigris.gef.base.Selection;
+import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigCircle;
/**
@@ -79,19 +80,22 @@
initFigs();
}
+ @Override
+ protected Fig createBigPortFig() {
+ return
+ new FigCircle(X, Y, STATE_WIDTH, HEIGHT, DEBUG_COLOR, DEBUG_COLOR);
+ }
+
private void initFigs() {
setEditable(false);
- FigCircle bigPort =
- new FigCircle(X, Y, STATE_WIDTH, HEIGHT, DEBUG_COLOR, DEBUG_COLOR);
+
head = new FigCircle(X, Y, STATE_WIDTH, HEIGHT, LINE_COLOR,
SOLID_FILL_COLOR);
// add Figs to the FigNode in back-to-front order
- addFig(bigPort);
+ addFig(getBigPort());
addFig(head);
- setBigPort(bigPort);
-
setBlinkPorts(false); //make port invisible unless mouse enters
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java 2010-09-10 02:29:47-0700
@@ -1,13 +1,13 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * mvw
+ * Michiel van der Wulp
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -44,6 +44,7 @@
import java.util.Iterator;
import org.argouml.uml.diagram.DiagramSettings;
+import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigRect;
/**
@@ -74,10 +75,14 @@
initFigs();
}
+ @Override
+ protected Fig createBigPortFig() {
+ return new FigRect(X, Y, STATE_WIDTH, HEIGHT, DEBUG_COLOR,
+ DEBUG_COLOR);
+ }
+
private void initFigs() {
setEditable(false);
- setBigPort(new FigRect(X, Y, STATE_WIDTH, HEIGHT, DEBUG_COLOR,
- DEBUG_COLOR));
head = new FigRect(X, Y, STATE_WIDTH, HEIGHT, LINE_COLOR,
SOLID_FILL_COLOR);
// add Figs to the FigNode in back-to-front order
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJunctionState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJunctionState.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJunctionState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJunctionState.java 2010-09-10 02:29:47-0700
@@ -1,13 +1,13 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * mvw
+ * Michiel van der Wulp
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -46,6 +46,7 @@
import org.argouml.uml.diagram.DiagramSettings;
import org.tigris.gef.base.Geometry;
+import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigDiamond;
/**
@@ -77,10 +78,14 @@
initFigs();
}
+ @Override
+ protected Fig createBigPortFig() {
+ return new FigDiamond(X, Y, WIDTH, HEIGHT, false,
+ DEBUG_COLOR, DEBUG_COLOR);
+ }
+
private void initFigs() {
setEditable(false);
- setBigPort(new FigDiamond(X, Y, WIDTH, HEIGHT, false,
- DEBUG_COLOR, DEBUG_COLOR));
head = new FigDiamond(X, Y, WIDTH, HEIGHT, false,
LINE_COLOR, FILL_COLOR);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java 2010-09-10 02:29:47-0700
@@ -53,6 +53,7 @@
import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.uml.diagram.DiagramSettings;
+import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigRRect;
import org.tigris.gef.presentation.FigText;
@@ -99,12 +100,16 @@
notation);
}
+ @Override
+ protected Fig createBigPortFig() {
+ return new FigRRect(getInitialX() + 1, getInitialY() + 1,
+ getInitialWidth() - 2, getInitialHeight() - 2,
+ DEBUG_COLOR, DEBUG_COLOR);
+ }
+
private void initializeState() {
// TODO: Get rid of magic numbers! Figure out which represent line
// widths vs padding vs offsets
- setBigPort(new FigRRect(getInitialX() + 1, getInitialY() + 1,
- getInitialWidth() - 2, getInitialHeight() - 2,
- DEBUG_COLOR, DEBUG_COLOR));
getNameFig().setLineWidth(0);
getNameFig().setBounds(getInitialX() + 2, getInitialY() + 2,
getInitialWidth() - 4,
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java 2010-09-10 02:29:47-0700
@@ -1,13 +1,13 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * mvw
+ * Michiel van der Wulp
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -51,6 +51,7 @@
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.ui.SelectionMoveClarifiers;
import org.tigris.gef.base.Selection;
+import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigLine;
import org.tigris.gef.presentation.FigRect;
import org.tigris.gef.presentation.FigText;
@@ -90,13 +91,18 @@
initFigs();
}
+ @Override
+ protected Fig createBigPortFig() {
+ FigRect fr = new FigRect(X, Y, WIDTH, HEIGHT);
+ fr.setLineWidth(0);
+ fr.setFilled(false);
+ return fr;
+ }
+
private void initFigs() {
facade = Model.getFacade();
stateMHelper = Model.getStateMachinesHelper();
- setBigPort(new FigRect(X, Y, WIDTH, HEIGHT));
- getBigPort().setLineWidth(0);
- getBigPort().setFilled(false);
stubline = new FigLine(X,
Y,
WIDTH,
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java 2010-09-10 02:29:47-0700
@@ -1,13 +1,13 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * mvw
+ * Michiel van der Wulp
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -47,6 +47,7 @@
import org.argouml.model.Model;
import org.argouml.uml.diagram.DiagramSettings;
+import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigCircle;
import org.tigris.gef.presentation.FigRect;
import org.tigris.gef.presentation.FigText;
@@ -81,11 +82,15 @@
initFigs();
}
+ @Override
+ protected Fig createBigPortFig() {
+ return new FigCircle(X, Y, WIDTH, HEIGHT, DEBUG_COLOR,
+ DEBUG_COLOR);
+ }
+
private void initFigs() {
setEditable(false);
- setBigPort(new FigCircle(X, Y, WIDTH, HEIGHT, DEBUG_COLOR,
- DEBUG_COLOR));
head = new FigCircle(X, Y, WIDTH, HEIGHT, LINE_COLOR, FILL_COLOR);
bound = new FigText(X - 2, Y + 2, 0, 0, true);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java 2010-09-10 02:29:47-0700
@@ -1,13 +1,13 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * mvw
+ * Michiel van der Wulp
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -122,6 +122,14 @@
*/
private boolean newlyCreated;
+ @Override
+ protected Fig createBigPortFig() {
+ FigRect fr = new FigRect(0, 0, width, height, null, null);
+ fr.setFilled(false);
+ fr.setLineWidth(0);
+ return fr;
+ }
+
private void initialize() {
Color fg = super.getLineColor(); // Use super because not fully init'd
Color fill = super.getFillColor();
@@ -146,11 +154,6 @@
urCorner.setFillColor(col.darker());
urCorner.setLineWidth(LINE_WIDTH);
- setBigPort(new FigRect(0, 0, width, height, null, null));
- getBigPort().setFilled(false);
- getBigPort().setLineWidth(0);
-
-
// add Figs to the FigNode in back-to-front order
addFig(getBigPort());
addFig(outlineFig);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java 2010-09-10 02:29:47-0700
@@ -150,19 +150,23 @@
*/
private boolean stereotypeVisible = true;
+ @Override
+ protected Fig createBigPortFig() {
+ PackagePortFigRect ppfr =
+ new PackagePortFigRect(0, 0, width, height, indentX, tabHeight);
+ ppfr.setFilled(false);
+ ppfr.setLineWidth(0);
+ return ppfr;
+ }
+
private void initialize() {
body.setEditable(false);
-
- setBigPort(
- new PackagePortFigRect(0, 0, width, height, indentX, tabHeight));
+
background = new PackageBackground(0, 0, width, height, indentX, tabHeight);
getNameFig().setBounds(0, 0, width - indentX, textH + 2);
getNameFig().setJustification(FigText.JUSTIFY_LEFT);
- getBigPort().setFilled(false);
- getBigPort().setLineWidth(0);
-
// Set properties of the stereotype box.
// Initially not set to be displayed, but this will be changed
// when we try to render it, if we find we have a stereotype.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java?view=diff&pathrev=18728&r1=18727&r2=18728
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java 2010-09-10 02:29:47-0700
@@ -1,6 +1,6 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
*
* Contributors:
* bobtarling
+ * Michiel van der Wulp
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -52,6 +53,7 @@
import org.tigris.gef.base.LayerPerspective;
import org.tigris.gef.graph.GraphEdgeRenderer;
import org.tigris.gef.graph.MutableGraphModel;
+import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigDiamond;
import org.tigris.gef.presentation.FigEdge;
import org.tigris.gef.presentation.FigNode;
@@ -72,9 +74,13 @@
private FigDiamond head;
+ @Override
+ protected Fig createBigPortFig() {
+ return new FigDiamond(0, 0, 70, 70, DEBUG_COLOR, DEBUG_COLOR);
+ }
+
private void initFigs() {
setEditable(false);
- setBigPort(new FigDiamond(0, 0, 70, 70, DEBUG_COLOR, DEBUG_COLOR));
head = new FigDiamond(0, 0, 70, 70, LINE_COLOR, FILL_COLOR);
getNameFig().setFilled(false);
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2657488
To unsubscribe from this discussion, e-mail: [[email protected]].
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.