svn commit: r16709 - trunk/src/argouml-app/src/org/argouml/uml/reveng/DiagramInterface.java

Author: tfmorris
Date: 2009-01-26 12:27:23-0800
New Revision: 16709

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/reveng/DiagramInterface.java

Log:
RESOLVED - issue 5645: Update to new fig constructors and fix bug which caused attributes & operations to not be displayed if "minimize figs" setting was turned off
http://argouml.tigris.org/issues/show_bug.cgi?id=5645

Modified: trunk/src/argouml-app/src/org/argouml/uml/reveng/DiagramInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/reveng/DiagramInterface.java?view=diff&pathrev=16709&r1=16708&r2=16709
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/reveng/DiagramInterface.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/reveng/DiagramInterface.java	2009-01-26 12:27:23-0800
@@ -24,6 +24,7 @@
 
 package org.argouml.uml.reveng;
 
+import java.awt.Rectangle;
 import java.beans.PropertyVetoException;
 import java.util.ArrayList;
 import java.util.List;
@@ -157,8 +158,9 @@
     public void addPackage(Object newPackage) {
         if (!isInDiagram(newPackage)) {
             if (currentGM.canAddNode(newPackage)) {
-                FigPackage newPackageFig = 
-                    new FigPackage(currentGM, newPackage);
+                FigPackage newPackageFig = new FigPackage(newPackage,
+                        new Rectangle(0, 0, 0, 0), currentDiagram
+                                .getDiagramSettings());
                 currentLayer.add(newPackageFig);
                 currentGM.addNode(newPackage);
                 currentLayer.putInPosition(newPackageFig);
@@ -286,9 +288,12 @@
         if (currentGM.canAddNode(classifier)) {
             FigClassifierBox newFig;
             if (Model.getFacade().isAClass(classifier)) {
-                newFig = new FigClass(currentGM, classifier);
+                newFig = new FigClass(classifier, new Rectangle(0, 0, 0, 0),
+                        currentDiagram.getDiagramSettings());
             } else if (Model.getFacade().isAInterface(classifier)) {
-                newFig = new FigInterface(currentGM, classifier);
+                newFig = new FigInterface(classifier,
+                        new Rectangle(0, 0, 0, 0), currentDiagram
+                                .getDiagramSettings());
             } else {
                 return;
             }
@@ -307,7 +312,7 @@
                 ((FigClass) newFig).setAttributesVisible(!minimise);
             }
 
-            newFig.setSize(newFig.getMinimumSize());
+            newFig.renderingChanged();
         } else {
             // the class is in the diagram
             // so we are on a second pass,

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1055928

To unsubscribe from this discussion, e-mail: [[email protected]].