Author: bobtarling
Date: 2011-04-26 11:54:57-0700
New Revision: 19276
Added:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java
- copied, changed from r19269,
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedConcavePentagon.java
- copied, changed from r19268,
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedPentagon.java
- copied, changed from r19268,
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRRect.java
- copied, changed from r19268,
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java
- copied, changed from r19268,
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java
Removed:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java
Modified:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElementBuilder.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java
Log:
Rename some classes to match latest documentation
Removed:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java?view=markup&pathrev=19275
Removed:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java?view=markup&pathrev=19275
Modified:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElementBuilder.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElementBuilder.java?view=diff&pathrev=19276&r1=19275&r2=19276
==============================================================================
---
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElementBuilder.java
(original)
+++
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElementBuilder.java
2011-04-26 11:54:57-0700
@@ -35,7 +35,7 @@
// For classifiers
} else if (style.equals("rect")) {
fig.setDisplayState(
- new RectDisplayState(
+ new FigNamedRect(
bounds,
fig.getLineColor(),
fig.getFillColor(),
@@ -43,7 +43,7 @@
settings));
} else if (style.equals("rrect")) {
fig.setDisplayState(
- new RRectDisplayState(
+ new FigNamedRRect(
bounds,
fig.getLineColor(),
fig.getFillColor(),
@@ -51,7 +51,7 @@
settings));
} else if (style.equals("pentagon")) {
fig.setDisplayState(
- new PentagonDisplayState(
+ new FigNamedPentagon(
bounds,
fig.getLineColor(),
fig.getFillColor(),
@@ -59,7 +59,7 @@
settings));
} else if (style.equals("concave-pentagon")) {
fig.setDisplayState(
- new ConcavePentagonDisplayState(
+ new FigNamedConcavePentagon(
bounds,
fig.getLineColor(),
fig.getFillColor(),
Modified:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java?view=diff&pathrev=19276&r1=19275&r2=19276
==============================================================================
---
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java
(original)
+++
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java
2011-04-26 11:54:57-0700
@@ -27,7 +27,7 @@
*/
class FigBaseNode extends FigNode implements DiagramNode {
- private BaseDisplayState displayState;
+ private FigBasePresentation displayState;
private final DiagramSettings settings;
private DiagramElement nameDiagramElement;
@@ -47,7 +47,7 @@
this.settings = settings;
}
- void setDisplayState(BaseDisplayState displayState) {
+ void setDisplayState(FigBasePresentation displayState) {
this.displayState = displayState;
displayState.setOwner(getOwner());
addFig(displayState);
Copied:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java
(from r19269,
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java)
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java?view=diff&pathrev=19276&r1=19269&r2=19276
==============================================================================
---
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java
(original)
+++
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java
2011-04-26 11:54:57-0700
@@ -23,7 +23,7 @@
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigGroup;
-abstract class BaseDisplayState extends FigGroup
+abstract class FigBasePresentation extends FigGroup
implements StereotypeDisplayer, NameDisplayer {
private final DiagramElement bigPort;
@@ -32,7 +32,7 @@
private static final int PADDING = 2;
private static final int MIN_WIDTH = 90;
- public BaseDisplayState(
+ public FigBasePresentation(
final Rectangle rect,
final Color lineColor,
final Color fillColor,
Copied:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedConcavePentagon.java
(from r19268,
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java)
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedConcavePentagon.java?view=diff&pathrev=19276&r1=19268&r2=19276
==============================================================================
---
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java
(original)
+++
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedConcavePentagon.java
2011-04-26 11:54:57-0700
@@ -20,10 +20,10 @@
import org.argouml.uml.diagram.DiagramSettings;
import org.tigris.gef.presentation.FigPoly;
-class ConcavePentagonDisplayState extends BaseDisplayState
+class FigNamedConcavePentagon extends FigBasePresentation
implements StereotypeDisplayer, NameDisplayer {
- public ConcavePentagonDisplayState(Rectangle rect, Color lineColor,
+ public FigNamedConcavePentagon(Rectangle rect, Color lineColor,
Color fillColor, Object modelElement, DiagramSettings settings) {
super(rect, lineColor, fillColor, modelElement, settings);
createBigPort(rect, lineColor, fillColor);
Copied:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedPentagon.java
(from r19268,
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java)
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedPentagon.java?view=diff&pathrev=19276&r1=19268&r2=19276
==============================================================================
---
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java
(original)
+++
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedPentagon.java
2011-04-26 11:54:57-0700
@@ -20,12 +20,12 @@
import org.argouml.uml.diagram.DiagramSettings;
import org.tigris.gef.presentation.FigPoly;
-class PentagonDisplayState extends BaseDisplayState
+class FigNamedPentagon extends FigBasePresentation
implements StereotypeDisplayer, NameDisplayer {
private static final int PADDING = 8;
- public PentagonDisplayState(Rectangle rect, Color lineColor,
+ public FigNamedPentagon(Rectangle rect, Color lineColor,
Color fillColor, Object modelElement, DiagramSettings settings) {
super(rect, lineColor, fillColor, modelElement, settings);
createBigPort(rect, lineColor, fillColor);
Copied:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRRect.java
(from r19268,
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java)
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRRect.java?view=diff&pathrev=19276&r1=19268&r2=19276
==============================================================================
---
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java
(original)
+++
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRRect.java
2011-04-26 11:54:57-0700
@@ -24,12 +24,12 @@
* The state for displaying a node as a rounded rectangle
* @author Bob Tarling
*/
-class RRectDisplayState extends BaseDisplayState
+class FigNamedRRect extends FigBasePresentation
implements StereotypeDisplayer, NameDisplayer {
private static int RADIUS = 16;
- public RRectDisplayState(
+ public FigNamedRRect(
final Rectangle rect,
final Color lineColor,
final Color fillColor,
Copied:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java
(from r19268,
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java)
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java?view=diff&pathrev=19276&r1=19268&r2=19276
==============================================================================
---
/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java
(original)
+++
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java
2011-04-26 11:54:57-0700
@@ -19,12 +19,12 @@
import org.argouml.uml.diagram.DiagramSettings;
import org.tigris.gef.presentation.FigRect;
-class RectDisplayState extends BaseDisplayState
+class FigNamedRect extends FigBasePresentation
implements StereotypeDisplayer, NameDisplayer {
private static final int PADDING = 8;
- public RectDisplayState(
+ public FigNamedRect(
final Rectangle rect, Color lineColor,
Color fillColor, Object modelElement, DiagramSettings settings) {
super(rect, lineColor,
Removed:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java?view=markup&pathrev=19275
Removed:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java?view=markup&pathrev=19275
Removed:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java?view=markup&pathrev=19275
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2724399
To unsubscribe from this discussion, e-mail:
[[email protected]].
