svn commit: r12574 - trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java

Author: tfmorris
Date: 2007-05-09 06:50:29-0700
New Revision: 12574

Modified:
   trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java

Log:
Place Instance after its subtypes in if/then/else tree

Modified: trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java?view=diff&rev=12574&p1=trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java&r1=12573&r2=12574
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java	2007-05-09 06:50:29-0700
@@ -134,8 +134,6 @@
             figNode = new FigStereotypeDeclaration();
         } else if (Model.getFacade().isADataType(node)) {
             figNode = new FigDataType();
-        } else if (Model.getFacade().isAInstance(node)) {
-            figNode = new FigInstance();
         } else if (Model.getFacade().isAModel(node)) {
             figNode = new FigModel(node, x, y);
         } else if (Model.getFacade().isASubsystem(node)) {
@@ -168,6 +166,8 @@
             figNode = new FigComponent();
         } else if (Model.getFacade().isAComponentInstance(node)) {
             figNode = new FigComponentInstance();
+        } else if (Model.getFacade().isAInstance(node)) {
+            figNode = new FigInstance();
         } else if (Model.getFacade().isAObject(node)) {
             figNode = new FigObject();
         } else if (Model.getFacade().isAComment(node)) {