svn commit: r17207 - trunk/src/argouml-core-diagrams-class2: . src/org/argouml/class2 src/org/argouml/class2/diagram
Bob Tarling <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: bobtarling
Date: 2009-08-01 12:28:32-0700
New Revision: 17207
Added:
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagram2Module.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagramModule.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagram2PropPanelFactory.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagramPropPanelFactory.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Factory.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagramFactory.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Renderer.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagramRenderer.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram2.java
- copied, changed from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram.java
Removed:
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagramModule.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagramPropPanelFactory.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagramFactory.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagramRenderer.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem.java
trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram.java
Modified:
trunk/src/argouml-core-diagrams-class2/ArgoUML class2.launch
Log:
Append 2 to Figs and Diagrams to differentiate UML2 classes from old UML1.4 ones
Modified: trunk/src/argouml-core-diagrams-class2/ArgoUML class2.launch
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/ArgoUML%20class2.launch?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- trunk/src/argouml-core-diagrams-class2/ArgoUML class2.launch (original)
+++ trunk/src/argouml-core-diagrams-class2/ArgoUML class2.launch 2009-08-01 12:28:32-0700
@@ -39,5 +39,5 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.argouml.application.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="argouml-app"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M -ea -Dargouml.modules=org.argouml.class2.ClassDiagramModule -Dlog4j.configuration=org/argouml/resource/full_console.lcf"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M -ea -Dargouml.modules=org.argouml.class2.ClassDiagram2Module -Dlog4j.configuration=org/argouml/resource/full_console.lcf"/>
</launchConfiguration>
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagram2Module.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagramModule.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagram2Module.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagramModule.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagram2Module.java 2009-08-01 12:28:32-0700
@@ -26,7 +26,7 @@
import org.apache.log4j.Logger;
import org.argouml.moduleloader.ModuleInterface;
-import org.argouml.class2.diagram.ClassDiagramFactory;
+import org.argouml.class2.diagram.ClassDiagram2Factory;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.DiagramFactoryInterface2;
import org.argouml.uml.diagram.DiagramFactory.DiagramType;
@@ -37,23 +37,23 @@
*
* @see org.argouml.moduleloader.ModuleInterface
*/
-public class ClassDiagramModule implements ModuleInterface {
+public class ClassDiagram2Module implements ModuleInterface {
private static final Logger LOG =
- Logger.getLogger(ClassDiagramModule.class);
+ Logger.getLogger(ClassDiagram2Module.class);
- private ClassDiagramPropPanelFactory propPanelFactory;
+ private ClassDiagram2PropPanelFactory propPanelFactory;
public boolean enable() {
propPanelFactory =
- new ClassDiagramPropPanelFactory();
+ new ClassDiagram2PropPanelFactory();
PropPanelFactoryManager.addPropPanelFactory(propPanelFactory);
// TODO: Remove the casting to DiagramFactoryInterface2
// as soon as DiagramFactoryInterface is removed.
DiagramFactory.getInstance().registerDiagramFactory(
DiagramType.Class,
- (DiagramFactoryInterface2) new ClassDiagramFactory());
+ (DiagramFactoryInterface2) new ClassDiagram2Factory());
LOG.info("ClassDiagram Module enabled.");
return true;
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagram2PropPanelFactory.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagramPropPanelFactory.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagram2PropPanelFactory.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagramPropPanelFactory.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagram2PropPanelFactory.java 2009-08-01 12:28:32-0700
@@ -25,7 +25,7 @@
package org.argouml.class2;
import org.argouml.i18n.Translator;
-import org.argouml.class2.diagram.UMLClassDiagram;
+import org.argouml.class2.diagram.UMLClassDiagram2;
import org.argouml.uml.diagram.ui.PropPanelDiagram;
import org.argouml.uml.ui.PropPanel;
import org.argouml.uml.ui.PropPanelFactory;
@@ -35,10 +35,10 @@
*
* @author Bob Tarling
*/
-class ClassDiagramPropPanelFactory implements PropPanelFactory {
+class ClassDiagram2PropPanelFactory implements PropPanelFactory {
public PropPanel createPropPanel(Object object) {
- if (object instanceof UMLClassDiagram) {
+ if (object instanceof UMLClassDiagram2) {
return new PropPanelUMLClassDiagram();
}
return null;
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagramModule.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagramModule.java?view=markup&pathrev=17206
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagramPropPanelFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/ClassDiagramPropPanelFactory.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Factory.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagramFactory.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Factory.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagramFactory.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Factory.java 2009-08-01 12:28:32-0700
@@ -35,13 +35,13 @@
* This factory creates a sequence2 Sequence Diagram.
* @see org.argouml.uml.diagram.DiagramFactory
*/
-public class ClassDiagramFactory implements DiagramFactoryInterface2 {
+public class ClassDiagram2Factory implements DiagramFactoryInterface2 {
/**
* Logger.
*/
private static final Logger LOG =
- Logger.getLogger(ClassDiagramFactory.class);
+ Logger.getLogger(ClassDiagram2Factory.class);
/**
* Factory method to create a new instance of an ArgoDiagram.
@@ -56,7 +56,7 @@
*/
public ArgoDiagram createDiagram(Object owner, String name,
DiagramSettings settings) {
- final ArgoDiagram diagram = new UMLClassDiagram(owner);
+ final ArgoDiagram diagram = new UMLClassDiagram2(owner);
if (name != null) {
try {
diagram.setName(name);
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Renderer.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagramRenderer.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Renderer.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagramRenderer.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Renderer.java 2009-08-01 12:28:32-0700
@@ -85,7 +85,7 @@
*
* @author jrobbins
*/
-public class ClassDiagramRenderer extends UmlDiagramRenderer {
+public class ClassDiagram2Renderer extends UmlDiagramRenderer {
/**
* The UID.
@@ -96,7 +96,7 @@
* Logger.
*/
private static final Logger LOG =
- Logger.getLogger(ClassDiagramRenderer.class);
+ Logger.getLogger(ClassDiagram2Renderer.class);
/*
* @see org.tigris.gef.graph.GraphNodeRenderer#getFigNodeFor(
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagramFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagramFactory.java?view=markup&pathrev=17206
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagramRenderer.java?view=markup&pathrev=17206
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass2.java 2009-08-01 12:28:32-0700
@@ -43,7 +43,7 @@
* A Class may show compartments for stereotypes,
* attributes and operations.
*/
-public class FigClass extends FigClassifierBoxWithAttributes {
+public class FigClass2 extends FigClassifierBoxWithAttributes {
private void constructFigs() {
addFig(getBigPort());
@@ -55,7 +55,7 @@
}
/**
- * Constructor for a {@link FigClass} during file load.<p>
+ * Constructor for a {@link FigClass2} during file load.<p>
*
* Parent {@link org.argouml.uml.diagram.ui.FigNodeModelElement}
* will have created the main box {@link #getBigPort()} and its
@@ -78,7 +78,7 @@
* @param bounds rectangle describing bounds
* @param settings rendering settings
*/
- public FigClass(Object element, Rectangle bounds,
+ public FigClass2(Object element, Rectangle bounds,
DiagramSettings settings) {
super(element, bounds, settings);
constructFigs();
@@ -91,7 +91,7 @@
*/
@Override
public Object clone() {
- FigClass figClone = (FigClass) super.clone();
+ FigClass2 figClone = (FigClass2) super.clone();
Iterator thisIter = this.getFigs().iterator();
Iterator cloneIter = figClone.getFigs().iterator();
while (thisIter.hasNext()) {
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment2.java 2009-08-01 12:28:32-0700
@@ -67,7 +67,7 @@
*
* @author Andreas Rueckert
*/
-public class FigComment
+public class FigComment2
extends FigNodeModelElement
implements VetoableChangeListener,
DelayedVChangeListener,
@@ -77,7 +77,7 @@
/**
* Logger.
*/
- private static final Logger LOG = Logger.getLogger(FigComment.class);
+ private static final Logger LOG = Logger.getLogger(FigComment2.class);
////////////////////////////////////////////////////////////////
// constants
@@ -172,7 +172,7 @@
* @param bounds position and size
* @param settings rendering settings
*/
- public FigComment(Object owner, Rectangle bounds,
+ public FigComment2(Object owner, Rectangle bounds,
DiagramSettings settings) {
super(owner, bounds, settings);
@@ -209,7 +209,7 @@
*/
@Override
public Object clone() {
- FigComment figClone = (FigComment) super.clone();
+ FigComment2 figClone = (FigComment2) super.clone();
Iterator thisIter = this.getFigs().iterator();
while (thisIter.hasNext()) {
Object thisFig = thisIter.next();
@@ -634,10 +634,10 @@
/* Remove the commentedge.
* If there are more then one comment-edges between
* the 2 objects, then delete them all. */
- Collection<FigEdgeNote> toRemove = new ArrayList<FigEdgeNote>();
+ Collection<FigEdgeNote2> toRemove = new ArrayList<FigEdgeNote2>();
Collection c = getFigEdges(); // all connected edges
for (Iterator i = c.iterator(); i.hasNext(); ) {
- FigEdgeNote fen = (FigEdgeNote) i.next();
+ FigEdgeNote2 fen = (FigEdgeNote2) i.next();
Object otherEnd = fen.getDestination(); // the UML object
if (otherEnd == getOwner()) { // wrong end of the edge
otherEnd = fen.getSource();
@@ -647,7 +647,7 @@
}
}
- for (FigEdgeNote fen : toRemove) {
+ for (FigEdgeNote2 fen : toRemove) {
fen.removeFromDiagram();
}
}
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType2.java 2009-08-01 12:28:32-0700
@@ -47,9 +47,9 @@
* Every DataType shows a keyword, but it is not
* always <<datatype>>, e.g. for an Enumeration.
*/
-public class FigDataType extends FigClassifierBox {
+public class FigDataType2 extends FigClassifierBox {
- private static final Logger LOG = Logger.getLogger(FigDataType.class);
+ private static final Logger LOG = Logger.getLogger(FigDataType2.class);
private static final int MIN_WIDTH = 40;
@@ -71,7 +71,7 @@
}
/**
- * Primary constructor for a {@link FigDataType}.
+ * Primary constructor for a {@link FigDataType2}.
*
* Parent {@link org.argouml.uml.diagram.ui.FigNodeModelElement}
* will have created the main box {@link #getBigPort()} and
@@ -93,7 +93,7 @@
* @param bounds position and size
* @param settings render settings
*/
- public FigDataType(Object owner, Rectangle bounds,
+ public FigDataType2(Object owner, Rectangle bounds,
DiagramSettings settings) {
super(owner, bounds, settings);
constructFigs();
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote2.java 2009-08-01 12:28:32-0700
@@ -53,10 +53,10 @@
* @author Andreas Rueckert [email protected]
* @author [email protected]
*/
-public class FigEdgeNote extends FigEdgePoly implements ArgoFig, IItemUID,
+public class FigEdgeNote2 extends FigEdgePoly implements ArgoFig, IItemUID,
PropertyChangeListener {
- private static final Logger LOG = Logger.getLogger(FigEdgeNote.class);
+ private static final Logger LOG = Logger.getLogger(FigEdgeNote2.class);
private Object comment;
private Object annotatedElement;
@@ -70,7 +70,7 @@
* is not a UML element.
* @param theSettings render settings
*/
- public FigEdgeNote(Object element, DiagramSettings theSettings) {
+ public FigEdgeNote2(Object element, DiagramSettings theSettings) {
// element will normally be null when called from PGML parser
// It will get it's source & destination set later in attachEdges
super();
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration2.java 2009-08-01 12:28:32-0700
@@ -47,7 +47,7 @@
* It depends on FigDataType for most of its behavior.<p>
*
*/
-public class FigEnumeration extends FigDataType
+public class FigEnumeration2 extends FigDataType2
implements EnumLiteralsCompartmentContainer {
/**
@@ -67,7 +67,7 @@
* @param bounds position and size
* @param settings render settings
*/
- public FigEnumeration(Object owner, Rectangle bounds,
+ public FigEnumeration2(Object owner, Rectangle bounds,
DiagramSettings settings) {
super(owner, bounds, settings);
@@ -96,7 +96,7 @@
@Override
public Object clone() {
- FigEnumeration clone = (FigEnumeration) super.clone();
+ FigEnumeration2 clone = (FigEnumeration2) super.clone();
clone.literalsCompartment =
(FigEnumLiteralsCompartment) literalsCompartment.clone();
return clone;
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException2.java 2009-08-01 12:28:32-0700
@@ -34,7 +34,7 @@
*
* @author Tom Morris
*/
-public class FigException extends FigSignal {
+public class FigException2 extends FigSignal2 {
/**
* Construct an Exception fig.
@@ -43,7 +43,7 @@
* @param bounds position and size
* @param settings render settings
*/
- public FigException(Object owner, Rectangle bounds,
+ public FigException2(Object owner, Rectangle bounds,
DiagramSettings settings) {
super(owner, bounds, settings);
}
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface2.java 2009-08-01 12:28:32-0700
@@ -44,9 +44,9 @@
* An Interface may show compartments for stereotypes
* and operations. Attributes are not supported in ArgoUML.
*/
-public class FigInterface extends FigClassifierBox {
+public class FigInterface2 extends FigClassifierBox {
- private static final Logger LOG = Logger.getLogger(FigInterface.class);
+ private static final Logger LOG = Logger.getLogger(FigInterface2.class);
/**
* Initialization common to multiple constructors. This can be merged back
@@ -85,7 +85,7 @@
* @param bounds position and size
* @param settings rendering settings
*/
- public FigInterface(Object owner, Rectangle bounds,
+ public FigInterface2(Object owner, Rectangle bounds,
DiagramSettings settings) {
super(owner, bounds, settings);
initialize();
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel2.java 2009-08-01 12:28:32-0700
@@ -33,7 +33,7 @@
/**
* Class to display graphics for a UML model in a class diagram.
*/
-public class FigModel extends FigPackage {
+public class FigModel2 extends FigPackage2 {
private FigPoly figPoly = new FigPoly(LINE_COLOR, SOLID_FILL_COLOR);
@@ -57,7 +57,7 @@
* @param bounds position and size
* @param settings rendering settings
*/
- public FigModel(Object owner, Rectangle bounds, DiagramSettings settings) {
+ public FigModel2(Object owner, Rectangle bounds, DiagramSettings settings) {
super(owner, bounds, settings);
constructFigs();
}
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage2.java 2009-08-01 12:28:32-0700
@@ -95,10 +95,10 @@
*
* In front of the name, ArgoUML may optionally show the visibility.
*/
-public class FigPackage extends FigNodeModelElement
+public class FigPackage2 extends FigNodeModelElement
implements StereotypeContainer, VisibilityContainer {
- private static final Logger LOG = Logger.getLogger(FigPackage.class);
+ private static final Logger LOG = Logger.getLogger(FigPackage2.class);
/** The minimal height of the name. */
private static final int MIN_HEIGHT = 21;
@@ -173,7 +173,7 @@
* @param bounds position and size or null if fig hasn't been placed
* @param settings rendering settings
*/
- public FigPackage(Object owner, Rectangle bounds,
+ public FigPackage2(Object owner, Rectangle bounds,
DiagramSettings settings) {
super(owner, bounds, settings);
@@ -194,7 +194,7 @@
*/
@Override
public Object clone() {
- FigPackage figClone = (FigPackage) super.clone();
+ FigPackage2 figClone = (FigPackage2) super.clone();
for (Fig thisFig : (List<Fig>) getFigs()) {
if (thisFig == body) {
figClone.body = (FigText) thisFig;
@@ -601,7 +601,7 @@
// TODO: But in any case, it should be delegating this work to
// to something that knows about the diagrams and they contents -tfm
if (me.getClickCount() >= 2) {
- Object lPkg = FigPackage.this.getOwner();
+ Object lPkg = FigPackage2.this.getOwner();
if (lPkg != null) {
Object lNS = lPkg;
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal2.java 2009-08-01 12:28:32-0700
@@ -45,7 +45,7 @@
*
* @author Tom Morris
*/
-public class FigSignal extends FigClassifierBoxWithAttributes {
+public class FigSignal2 extends FigClassifierBoxWithAttributes {
private void constructFigs() {
getStereotypeFig().setKeyword("signal");
@@ -69,7 +69,7 @@
* @param bounds position and size
* @param settings render settings
*/
- public FigSignal(Object owner, Rectangle bounds, DiagramSettings settings) {
+ public FigSignal2(Object owner, Rectangle bounds, DiagramSettings settings) {
super(owner, bounds, settings);
constructFigs();
}
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration2.java 2009-08-01 12:28:32-0700
@@ -53,7 +53,7 @@
*
* TODO: This is just a placeholder right now! - tfm
*/
-public class FigStereotypeDeclaration extends FigCompartmentBox {
+public class FigStereotypeDeclaration2 extends FigCompartmentBox {
private static final long serialVersionUID = -2702539988691983863L;
@@ -86,7 +86,7 @@
* @param bounds position and size
* @param settings render settings
*/
- public FigStereotypeDeclaration(Object owner, Rectangle bounds,
+ public FigStereotypeDeclaration2(Object owner, Rectangle bounds,
DiagramSettings settings) {
super(owner, bounds, settings);
constructFigs();
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem2.java 2009-08-01 12:28:32-0700
@@ -32,7 +32,7 @@
/** Class to display graphics for a UML subsystem in a class diagram. */
-public class FigSubsystem extends FigPackage {
+public class FigSubsystem2 extends FigPackage2 {
private FigPoly figPoly = new FigPoly(LINE_COLOR, SOLID_FILL_COLOR);
@@ -55,7 +55,7 @@
* @param bounds position and size
* @param settings render settings
*/
- public FigSubsystem(Object owner, Rectangle bounds,
+ public FigSubsystem2(Object owner, Rectangle bounds,
DiagramSettings settings) {
super(owner, bounds, settings);
constructFigs();
Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram.java?view=markup&pathrev=17206
Copied: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram2.java (from r17206, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram2.java?view=diff&pathrev=17207&r1=17206&r2=17207
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram.java (original)
+++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram2.java 2009-08-01 12:28:32-0700
@@ -59,11 +59,11 @@
*
* @author [email protected]
*/
-public class UMLClassDiagram extends UMLDiagram {
+public class UMLClassDiagram2 extends UMLDiagram {
private static final long serialVersionUID = -9192325790126361563L;
- private static final Logger LOG = Logger.getLogger(UMLClassDiagram.class);
+ private static final Logger LOG = Logger.getLogger(UMLClassDiagram2.class);
////////////////
// actions for toolbar
@@ -98,7 +98,7 @@
* @deprecated only for use by PGML parser
*/
@Deprecated
- public UMLClassDiagram() {
+ public UMLClassDiagram2() {
super(new ClassDiagramGraphModel());
}
@@ -110,7 +110,7 @@
* @param name the name for the new diagram
* @param namespace the namespace for the new diagram
*/
- public UMLClassDiagram(String name, Object namespace) {
+ public UMLClassDiagram2(String name, Object namespace) {
super(name, namespace, new ClassDiagramGraphModel());
}
@@ -120,7 +120,7 @@
*
* @param m the namespace
*/
- public UMLClassDiagram(Object m) {
+ public UMLClassDiagram2(Object m) {
// We're going to change the name immediately, so just use ""
super("", m, new ClassDiagramGraphModel());
String name = getNewDiagramName();
@@ -150,7 +150,7 @@
if (init) {
LayerPerspective lay =
new LayerPerspectiveMutable(Model.getFacade().getName(ns), gm);
- ClassDiagramRenderer rend = new ClassDiagramRenderer(); // singleton
+ ClassDiagram2Renderer rend = new ClassDiagram2Renderer(); // singleton
lay.setGraphNodeRenderer(rend);
lay.setGraphEdgeRenderer(rend);
setLayer(lay);
@@ -666,28 +666,28 @@
figNode =
createNaryAssociationNode(droppedObject, bounds, settings);
} else if (Model.getFacade().isAClass(droppedObject)) {
- figNode = new FigClass(droppedObject, bounds, settings);
+ figNode = new FigClass2(droppedObject, bounds, settings);
} else if (Model.getFacade().isAInterface(droppedObject)) {
- figNode = new FigInterface(droppedObject, bounds, settings);
+ figNode = new FigInterface2(droppedObject, bounds, settings);
} else if (Model.getFacade().isAModel(droppedObject)) {
- figNode = new FigModel(droppedObject, bounds, settings);
+ figNode = new FigModel2(droppedObject, bounds, settings);
} else if (Model.getFacade().isASubsystem(droppedObject)) {
- figNode = new FigSubsystem(droppedObject, bounds, settings);
+ figNode = new FigSubsystem2(droppedObject, bounds, settings);
} else if (Model.getFacade().isAPackage(droppedObject)) {
- figNode = new FigPackage(droppedObject, bounds, settings);
+ figNode = new FigPackage2(droppedObject, bounds, settings);
} else if (Model.getFacade().isAComment(droppedObject)) {
- figNode = new FigComment(droppedObject, bounds, settings);
+ figNode = new FigComment2(droppedObject, bounds, settings);
} else if (Model.getFacade().isAEnumeration(droppedObject)) {
- figNode = new FigEnumeration(droppedObject, bounds, settings);
+ figNode = new FigEnumeration2(droppedObject, bounds, settings);
} else if (Model.getFacade().isADataType(droppedObject)) {
- figNode = new FigDataType(droppedObject, bounds, settings);
+ figNode = new FigDataType2(droppedObject, bounds, settings);
} else if (Model.getFacade().isAStereotype(droppedObject)) {
- figNode = new FigStereotypeDeclaration(droppedObject, bounds,
+ figNode = new FigStereotypeDeclaration2(droppedObject, bounds,
settings);
} else if (Model.getFacade().isAException(droppedObject)) {
- figNode = new FigException(droppedObject, bounds, settings);
+ figNode = new FigException2(droppedObject, bounds, settings);
} else if (Model.getFacade().isASignal(droppedObject)) {
- figNode = new FigSignal(droppedObject, bounds, settings);
+ figNode = new FigSignal2(droppedObject, bounds, settings);
} else if (Model.getFacade().isAActor(droppedObject)) {
figNode = new FigActor(droppedObject, bounds, settings);
} else if (Model.getFacade().isAUseCase(droppedObject)) {
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2378278
To unsubscribe from this discussion, e-mail: [[email protected]].