svn commit: r12567 - trunk/src_new/org/argouml/uml/diagram/static_structure: . ui

Author: tfmorris
Date: 2007-05-06 16:47:09-0700
New Revision: 12567

Modified:
   trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java

Log:
Issue 440, 501 - Allow most classifiers and instances in class diagrams

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java?view=diff&rev=12567&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java&r1=12566&r2=12567
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java	2007-05-06 16:47:09-0700
@@ -229,7 +229,8 @@
         return Model.getFacade().isAClassifier(node)
             || Model.getFacade().isAPackage(node)
             || Model.getFacade().isAStereotype(node)
-            || Model.getFacade().isASignal(node);
+            || Model.getFacade().isASignal(node)
+            || Model.getFacade().isAInstance(node);
     }
 
     /*

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java?view=diff&rev=12567&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java&r1=12566&r2=12567
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java	2007-05-06 16:47:09-0700
@@ -33,6 +33,9 @@
 import org.argouml.model.Model;
 import org.argouml.ui.GraphChangeAdapter;
 import org.argouml.uml.diagram.UmlDiagramRenderer;
+import org.argouml.uml.diagram.deployment.ui.FigComponentInstance;
+import org.argouml.uml.diagram.deployment.ui.FigMNodeInstance;
+import org.argouml.uml.diagram.deployment.ui.FigObject;
 import org.argouml.uml.diagram.ui.FigAssociation;
 import org.argouml.uml.diagram.ui.FigAssociationClass;
 import org.argouml.uml.diagram.ui.FigAssociationEnd;
@@ -44,6 +47,8 @@
 import org.argouml.uml.diagram.ui.FigPermission;
 import org.argouml.uml.diagram.ui.FigRealization;
 import org.argouml.uml.diagram.ui.FigUsage;
+import org.argouml.uml.diagram.use_case.ui.FigActor;
+import org.argouml.uml.diagram.use_case.ui.FigUseCase;
 import org.tigris.gef.base.Layer;
 import org.tigris.gef.graph.GraphModel;
 import org.tigris.gef.presentation.FigEdge;
@@ -132,6 +137,16 @@
             figNode = new FigException(gm, node);
         } else if (Model.getFacade().isASignal(node)) {
             figNode = new FigSignal(gm, node);
+        } else if (Model.getFacade().isAActor(node)) {
+            figNode = new FigActor(gm, node);
+        } else if (Model.getFacade().isAUseCase(node)) {
+            figNode = new FigUseCase(gm, node);
+        } else if (Model.getFacade().isAObject(node)) {
+            figNode = new FigObject(gm, node);
+        } else if (Model.getFacade().isANodeInstance(node)) {
+            figNode = new FigMNodeInstance(gm, node);
+        } else if (Model.getFacade().isAComponentInstance(node)) {
+            figNode = new FigComponentInstance(gm, node);
         } else {
             LOG.error("TODO: ClassDiagramRenderer getFigNodeFor " + node);
             throw new IllegalArgumentException(