svn commit: r17248 - trunk/src/argouml-core-diagrams-uml2: . src/org/argouml/diagram/uml2
Bob Tarling <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: bobtarling
Date: 2009-08-09 13:47:06-0700
New Revision: 17248
Added:
trunk/src/argouml-core-diagrams-uml2/ArgoUML uml2.launch
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2Factory.java
- copied, changed from r17220, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Factory.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2Module.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2PropPanelFactory.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2Renderer.java
- copied, changed from r17220, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Renderer.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAbstraction2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigAbstraction2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigActor2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigActor2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociation2.java
- copied, changed from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigAssociation2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationClass2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigAssociationClass2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationEnd2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigAssociationEnd2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigClass2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigClass2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigClassAssociationClass2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigClassAssociationClass2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigComment2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigComment2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigComponent2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigComponent2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigComponentInstance2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigComponentInstance2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigDataType2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigDataType2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigDependency2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigDependency2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigEdgeAssociationClass2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigEdgeAssociationClass2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigEdgeNote2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigEdgeNote2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigEnumeration2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigEnumeration2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigException2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigException2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigGeneralization2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigGeneralization2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigInterface2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigInterface2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigLink2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigLink2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigMNode2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigMNode2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigModel2.java
- copied, changed from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigModel2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigNodeAssociation2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigNodeAssociation2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigNodeInstance2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigNodeInstance2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigObject2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigObject2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigPackage2.java
- copied, changed from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigPackage2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigPermission2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigPermission2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigSignal2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigSignal2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigStereotypeDeclaration2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigStereotypeDeclaration2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigSubsystem2.java
- copied, changed from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigSubsystem2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigUsage2.java
- copied, changed from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigUsage2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigUseCase2.java
- copied, changed from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigUseCase2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java
- copied, changed from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/StructureDiagram2Renderer.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagramFactory.java
- copied, changed from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/StructureDiagramFactory.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UMLClassDiagram2.java
- copied, changed from r17220, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram2.java
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UMLStructureDiagram2.java
- copied, changed from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/UMLStructureDiagram2.java
Modified:
trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/Uml2DiagramModule.java
Log:
All UML2 diagram classes now in one module
Added: trunk/src/argouml-core-diagrams-uml2/ArgoUML uml2.launch
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/ArgoUML%20uml2.launch?view=markup&pathrev=17248
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-uml2/ArgoUML uml2.launch 2009-08-09 13:47:06-0700
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/argouml-app/src/org/argouml/application/Main.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="argouml-app" path="1" type="4"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-model-mdr" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-mdr/lib/jmi.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-mdr/lib/jmiutils.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-mdr/lib/mdrapi.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-mdr/lib/mof.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-mdr/lib/nbmdr.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-mdr/lib/openide-util.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="argouml-app"/> </runtimeClasspathEntry> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-tools" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-tools/junit-3.8.2/junit.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-tools/lib/easymock12.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-tools/apache-ant-1.7.0/lib/ant.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-model" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-app" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/antlr-2.7.7.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/commons-logging-1.0.2.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/ocl-argo-1.1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/swidgets-0.1.4.jar" path="3" sourceAttachmentPath="/swidgets/src" sourceRootPath="" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/toolbar-1.4.1-20071227.jar" path="3" sourceAttachmentPath="/toolbar/src" sourceRootPath="" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-infra" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-infra/lib/log4j-1.2.6.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/gef-0.13.1M2.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-diagrams-uml2" type="1"/> "/>
+</listAttribute>
+<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.diagram.uml2.Uml2DiagramModule -Dlog4j.configuration=org/argouml/resource/full_console.lcf"/>
+</launchConfiguration>
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2Factory.java (from r17220, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Factory.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2Factory.java?view=diff&pathrev=17248&r1=17220&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Factory.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2Factory.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.class2.diagram;
+package org.argouml.diagram.uml2;
import java.beans.PropertyVetoException;
@@ -32,10 +32,10 @@
import org.argouml.uml.diagram.DiagramSettings;
/**
- * This factory creates a sequence2 Sequence Diagram.
+ * This factory creates a Class Diagram.
* @see org.argouml.uml.diagram.DiagramFactory
*/
-public class ClassDiagram2Factory implements DiagramFactoryInterface2 {
+class ClassDiagram2Factory implements DiagramFactoryInterface2 {
/**
* Logger.
Added: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2Module.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2Module.java?view=markup&pathrev=17248
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2Module.java 2009-08-09 13:47:06-0700
@@ -0,0 +1,69 @@
+package org.argouml.diagram.uml2;
+
+
+import org.apache.log4j.Logger;
+import org.argouml.moduleloader.ModuleInterface;
+import org.argouml.uml.diagram.DiagramFactory;
+import org.argouml.uml.diagram.DiagramFactoryInterface2;
+import org.argouml.uml.diagram.DiagramFactory.DiagramType;
+import org.argouml.uml.ui.PropPanelFactoryManager;
+
+/**
+ * The Class Diagram Module description.
+ *
+ * @see org.argouml.moduleloader.ModuleInterface
+ */
+public class ClassDiagram2Module implements ModuleInterface {
+
+ private static final Logger LOG =
+ Logger.getLogger(ClassDiagram2Module.class);
+
+ private ClassDiagram2PropPanelFactory propPanelFactory;
+
+ public boolean enable() {
+
+ propPanelFactory =
+ new ClassDiagram2PropPanelFactory();
+ PropPanelFactoryManager.addPropPanelFactory(propPanelFactory);
+ // TODO: Remove the casting to DiagramFactoryInterface2
+ // as soon as DiagramFactoryInterface is removed.
+ DiagramFactory.getInstance().registerDiagramFactory(
+ DiagramType.Class,
+ (DiagramFactoryInterface2) new ClassDiagram2Factory());
+
+ LOG.info("ClassDiagram Module enabled.");
+ return true;
+ }
+
+ public boolean disable() {
+
+ PropPanelFactoryManager.removePropPanelFactory(propPanelFactory);
+
+ // TODO: Remove the casting to DiagramFactoryInterface2
+ // as soon as DiagramFactoryInterface is removed.
+ DiagramFactory.getInstance().registerDiagramFactory(
+ DiagramType.Class, (DiagramFactoryInterface2) null);
+
+ LOG.info("ClassDiagram Module disabled.");
+ return true;
+ }
+
+ public String getName() {
+ return "ArgoUML-Class";
+ }
+
+ public String getInfo(int type) {
+ switch (type) {
+ case DESCRIPTION:
+ return "The new class diagram implementation";
+ case AUTHOR:
+ return "ArgoUML Core Development Team";
+ case VERSION:
+ return "0.28";
+ case DOWNLOADSITE:
+ return "http://argouml.tigris.org";
+ default:
+ return null;
+ }
+ }
+}
\ No newline at end of file
Added: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2PropPanelFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2PropPanelFactory.java?view=markup&pathrev=17248
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2PropPanelFactory.java 2009-08-09 13:47:06-0700
@@ -0,0 +1,37 @@
+package org.argouml.diagram.uml2;
+
+
+import org.argouml.i18n.Translator;
+import org.argouml.uml.diagram.ui.PropPanelDiagram;
+import org.argouml.uml.ui.PropPanel;
+import org.argouml.uml.ui.PropPanelFactory;
+
+/**
+ * Factory implementation for create a sequence diagram prop panel.
+ *
+ * @author Bob Tarling
+ */
+class ClassDiagram2PropPanelFactory implements PropPanelFactory {
+
+ public PropPanel createPropPanel(Object object) {
+ if (object instanceof UMLClassDiagram2) {
+ return new PropPanelUMLClassDiagram();
+ }
+ return null;
+ }
+
+ /**
+ * The properties panel for a class diagram.
+ */
+ class PropPanelUMLClassDiagram extends PropPanelDiagram {
+
+ /**
+ * Constructor for PropPanelUMLClassDiagram.
+ */
+ public PropPanelUMLClassDiagram() {
+ super(Translator.localize("label.class-diagram"),
+ lookupIcon("ClassDiagram"));
+ }
+
+ }
+}
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2Renderer.java (from r17220, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Renderer.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2Renderer.java?view=diff&pathrev=17248&r1=17220&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Renderer.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/ClassDiagram2Renderer.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.class2.diagram;
+package org.argouml.diagram.uml2;
import java.util.Collection;
import java.util.Map;
@@ -30,7 +30,6 @@
import org.apache.log4j.Logger;
import org.argouml.model.CoreFactory;
import org.argouml.model.Model;
-import org.argouml.structure2.diagram.StructureDiagram2Renderer;
import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAbstraction2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigAbstraction2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAbstraction2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigAbstraction2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAbstraction2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.ui.FigAbstraction;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigActor2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigActor2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigActor2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigActor2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigActor2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociation2.java (from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigAssociation2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociation2.java?view=diff&pathrev=17248&r1=17220&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigAssociation2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociation2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.ui.FigAssociation;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationClass2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigAssociationClass2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationClass2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigAssociationClass2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationClass2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.ui.FigAssociationClass;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationEnd2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigAssociationEnd2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationEnd2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigAssociationEnd2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationEnd2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.ui.FigAssociationEnd;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigClass2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigClass2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigClass2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigClass2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigClass2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigClassAssociationClass2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigClassAssociationClass2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigClassAssociationClass2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigClassAssociationClass2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigClassAssociationClass2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigComment2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigComment2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigComment2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigComment2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigComment2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigComponent2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigComponent2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigComponent2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigComponent2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigComponent2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigComponentInstance2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigComponentInstance2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigComponentInstance2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigComponentInstance2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigComponentInstance2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigDataType2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigDataType2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigDataType2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigDataType2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigDataType2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigDependency2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigDependency2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigDependency2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigDependency2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigDependency2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Color;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigEdgeAssociationClass2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigEdgeAssociationClass2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigEdgeAssociationClass2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigEdgeAssociationClass2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigEdgeAssociationClass2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.ui.FigEdgeAssociationClass;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigEdgeNote2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigEdgeNote2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigEdgeNote2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigEdgeNote2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigEdgeNote2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigEnumeration2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigEnumeration2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigEnumeration2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigEnumeration2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigEnumeration2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigException2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigException2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigException2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigException2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigException2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigGeneralization2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigGeneralization2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigGeneralization2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigGeneralization2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigGeneralization2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigInterface2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigInterface2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigInterface2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigInterface2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigInterface2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigLink2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigLink2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigLink2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigLink2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigLink2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigMNode2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigMNode2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigMNode2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigMNode2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigMNode2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigModel2.java (from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigModel2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigModel2.java?view=diff&pathrev=17248&r1=17220&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigModel2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigModel2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigNodeAssociation2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigNodeAssociation2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigNodeAssociation2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigNodeAssociation2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigNodeAssociation2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigNodeInstance2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigNodeInstance2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigNodeInstance2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigNodeInstance2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigNodeInstance2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigObject2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigObject2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigObject2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigObject2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigObject2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigPackage2.java (from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigPackage2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigPackage2.java?view=diff&pathrev=17248&r1=17220&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigPackage2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigPackage2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Color;
import java.awt.Dimension;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigPermission2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigPermission2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigPermission2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigPermission2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigPermission2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.ui.FigPermission;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigSignal2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigSignal2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigSignal2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigSignal2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigSignal2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigStereotypeDeclaration2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigStereotypeDeclaration2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigStereotypeDeclaration2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigStereotypeDeclaration2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigStereotypeDeclaration2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigSubsystem2.java (from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigSubsystem2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigSubsystem2.java?view=diff&pathrev=17248&r1=17220&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigSubsystem2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigSubsystem2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigUsage2.java (from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigUsage2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigUsage2.java?view=diff&pathrev=17248&r1=17220&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigUsage2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigUsage2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.ui.FigUsage;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigUseCase2.java (from r17229, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigUseCase2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigUseCase2.java?view=diff&pathrev=17248&r1=17229&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/FigUseCase2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigUseCase2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java (from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/StructureDiagram2Renderer.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java?view=diff&pathrev=17248&r1=17220&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/StructureDiagram2Renderer.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.util.Collection;
import java.util.Map;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagramFactory.java (from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/StructureDiagramFactory.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagramFactory.java?view=diff&pathrev=17248&r1=17220&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/StructureDiagramFactory.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagramFactory.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactoryInterface2;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UMLClassDiagram2.java (from r17220, /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UMLClassDiagram2.java?view=diff&pathrev=17248&r1=17220&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UMLClassDiagram2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.class2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Point;
import java.awt.Rectangle;
@@ -34,7 +34,6 @@
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
-import org.argouml.structure2.diagram.UMLStructureDiagram2;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
import org.argouml.uml.diagram.ui.ModeCreateDependency;
Copied: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UMLStructureDiagram2.java (from r17220, /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/UMLStructureDiagram2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UMLStructureDiagram2.java?view=diff&pathrev=17248&r1=17220&r2=17248
==============================================================================
--- /trunk/src/argouml-core-diagrams-structure2/src/org/argouml/structure2/diagram/UMLStructureDiagram2.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UMLStructureDiagram2.java 2009-08-09 13:47:06-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.structure2.diagram;
+package org.argouml.diagram.uml2;
import java.awt.Point;
import java.awt.Rectangle;
Modified: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/Uml2DiagramModule.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/Uml2DiagramModule.java?view=diff&pathrev=17248&r1=17247&r2=17248
==============================================================================
--- trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/Uml2DiagramModule.java (original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/Uml2DiagramModule.java 2009-08-09 13:47:06-0700
@@ -1,4 +1,4 @@
-// $Id: Uml2DiagramModule.java 16924 2009-03-23 17:35:16Z thn $
+/// $Id: SequenceDiagramModule.java 16924 2009-03-23 17:35:16Z thn $
// Copyright (c) 2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
@@ -24,23 +24,53 @@
package org.argouml.diagram.uml2;
+import org.apache.log4j.Logger;
import org.argouml.moduleloader.ModuleInterface;
+import org.argouml.uml.diagram.DiagramFactory;
+import org.argouml.uml.diagram.DiagramFactoryInterface2;
+import org.argouml.uml.diagram.DiagramFactory.DiagramType;
+import org.argouml.uml.ui.PropPanelFactoryManager;
/**
- * The UML2 Diagram Module registration class.
+ * The Class Diagram Module description.
*
* @see org.argouml.moduleloader.ModuleInterface
*/
public class Uml2DiagramModule implements ModuleInterface {
+ private static final Logger LOG =
+ Logger.getLogger(Uml2DiagramModule.class);
+
+ private ClassDiagram2PropPanelFactory propPanelFactory;
+
public boolean enable() {
+
+ propPanelFactory =
+ new ClassDiagram2PropPanelFactory();
+ PropPanelFactoryManager.addPropPanelFactory(propPanelFactory);
+ // TODO: Remove the casting to DiagramFactoryInterface2
+ // as soon as DiagramFactoryInterface is removed.
+ DiagramFactory.getInstance().registerDiagramFactory(
+ DiagramType.Class,
+ (DiagramFactoryInterface2) new ClassDiagram2Factory());
+
+ LOG.info("ClassDiagram Module enabled.");
return true;
}
public boolean disable() {
+
+ PropPanelFactoryManager.removePropPanelFactory(propPanelFactory);
+
+ // TODO: Remove the casting to DiagramFactoryInterface2
+ // as soon as DiagramFactoryInterface is removed.
+ DiagramFactory.getInstance().registerDiagramFactory(
+ DiagramType.Class, (DiagramFactoryInterface2) null);
+
+ LOG.info("ClassDiagram Module disabled.");
return true;
}
-
+
public String getName() {
return "ArgoUML-Class";
}
@@ -48,7 +78,7 @@
public String getInfo(int type) {
switch (type) {
case DESCRIPTION:
- return "The UML2 diagram implementations";
+ return "The new class diagram implementation";
case AUTHOR:
return "ArgoUML Core Development Team";
case VERSION:
@@ -59,4 +89,4 @@
return null;
}
}
-}
\ No newline at end of file
+}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2381903
To unsubscribe from this discussion, e-mail: [[email protected]].