svn commit: r17213 - trunk/src/argouml-core-diagrams-class2: META-INF 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-02 13:12:49-0700 New Revision: 17213 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigAbstraction2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigActor2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigAssociation2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigAssociationClass2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigAssociationEnd2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClassAssociationClass2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComponent2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComponentInstance2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDependency2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeAssociationClass2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigGeneralization2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigLink2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigMNode2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigNodeAssociation2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigNodeInstance2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigObject2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPermission2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigUsage2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigUseCase2.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionActor.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionClass.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionComponent.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionComponentInstance.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionDataType.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionEnumeration.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionException.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionInterface.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionNode.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionNodeInstance.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionObject.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionSignal.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionStereotype.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionUseCase.java Modified: trunk/src/argouml-core-diagrams-class2/META-INF/MANIFEST.MF trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Renderer.java trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram2.java Log: Move class diagram Figs into the structure module so they can be reused elsewhere. Modified: trunk/src/argouml-core-diagrams-class2/META-INF/MANIFEST.MF Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/META-INF/MANIFEST.MF?view=diff&pathrev=17213&r1=17212&r2=17213 ============================================================================== --- trunk/src/argouml-core-diagrams-class2/META-INF/MANIFEST.MF (original) +++ trunk/src/argouml-core-diagrams-class2/META-INF/MANIFEST.MF 2009-08-02 13:12:49-0700 @@ -9,7 +9,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %pluginProvider Require-Bundle: org.argouml.app, - org.argouml.core.infra + org.argouml.core.infra, + org.argouml.structure2 Bundle-Localization: plugin Eclipse-RegisterBuddy: org.argouml.core.infra Modified: 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-class2/src/org/argouml/class2/diagram/ClassDiagram2Renderer.java?view=diff&pathrev=17213&r1=17212&r2=17213 ============================================================================== --- trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Renderer.java (original) +++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/ClassDiagram2Renderer.java 2009-08-02 13:12:49-0700 @@ -30,6 +30,16 @@ import org.apache.log4j.Logger; import org.argouml.model.CoreFactory; import org.argouml.model.Model; +import org.argouml.structure2.diagram.FigAbstraction2; +import org.argouml.structure2.diagram.FigAssociation2; +import org.argouml.structure2.diagram.FigAssociationClass2; +import org.argouml.structure2.diagram.FigAssociationEnd2; +import org.argouml.structure2.diagram.FigDependency2; +import org.argouml.structure2.diagram.FigEdgeNote2; +import org.argouml.structure2.diagram.FigGeneralization2; +import org.argouml.structure2.diagram.FigLink2; +import org.argouml.structure2.diagram.FigPermission2; +import org.argouml.structure2.diagram.FigUsage2; import org.argouml.uml.CommentEdge; import org.argouml.uml.diagram.ArgoDiagram; import org.argouml.uml.diagram.DiagramSettings; Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigAbstraction2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigAbstraction2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigActor2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigActor2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigAssociation2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigAssociation2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigAssociationClass2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigAssociationClass2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigAssociationEnd2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigAssociationEnd2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClass2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClassAssociationClass2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigClassAssociationClass2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComment2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComponent2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComponent2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComponentInstance2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigComponentInstance2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDataType2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDependency2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigDependency2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeAssociationClass2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeAssociationClass2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEdgeNote2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigEnumeration2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigException2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigGeneralization2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigGeneralization2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigInterface2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigLink2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigLink2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigMNode2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigMNode2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigModel2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigNodeAssociation2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigNodeAssociation2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigNodeInstance2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigNodeInstance2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigObject2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigObject2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPackage2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPermission2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigPermission2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSignal2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigStereotypeDeclaration2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigSubsystem2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigUsage2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigUsage2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigUseCase2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/FigUseCase2.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionActor.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionActor.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionClass.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionClass.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionComponent.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionComponent.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionComponentInstance.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionComponentInstance.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionDataType.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionDataType.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionEnumeration.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionEnumeration.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionException.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionException.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionInterface.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionInterface.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionNode.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionNode.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionNodeInstance.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionNodeInstance.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionObject.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionObject.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionSignal.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionSignal.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionStereotype.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionStereotype.java?view=markup&pathrev=17212 Removed: trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionUseCase.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/SelectionUseCase.java?view=markup&pathrev=17212 Modified: 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-class2/src/org/argouml/class2/diagram/UMLClassDiagram2.java?view=diff&pathrev=17213&r1=17212&r2=17213 ============================================================================== --- trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram2.java (original) +++ trunk/src/argouml-core-diagrams-class2/src/org/argouml/class2/diagram/UMLClassDiagram2.java 2009-08-02 13:12:49-0700 @@ -34,6 +34,24 @@ import org.apache.log4j.Logger; import org.argouml.i18n.Translator; import org.argouml.model.Model; +import org.argouml.structure2.diagram.FigActor2; +import org.argouml.structure2.diagram.FigClass2; +import org.argouml.structure2.diagram.FigComment2; +import org.argouml.structure2.diagram.FigComponent2; +import org.argouml.structure2.diagram.FigComponentInstance2; +import org.argouml.structure2.diagram.FigDataType2; +import org.argouml.structure2.diagram.FigEnumeration2; +import org.argouml.structure2.diagram.FigException2; +import org.argouml.structure2.diagram.FigInterface2; +import org.argouml.structure2.diagram.FigMNode2; +import org.argouml.structure2.diagram.FigModel2; +import org.argouml.structure2.diagram.FigNodeInstance2; +import org.argouml.structure2.diagram.FigObject2; +import org.argouml.structure2.diagram.FigPackage2; +import org.argouml.structure2.diagram.FigSignal2; +import org.argouml.structure2.diagram.FigStereotypeDeclaration2; +import org.argouml.structure2.diagram.FigSubsystem2; +import org.argouml.structure2.diagram.FigUseCase2; import org.argouml.uml.diagram.DiagramSettings; import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel; import org.argouml.uml.diagram.ui.ModeCreateDependency; ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2379316 To unsubscribe from this discussion, e-mail: [[email protected]].