svn commit: r13034 - trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java

Author: tfmorris
Date: 2007-07-10 11:48:19-0700
New Revision: 13034

Modified:
   trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java

Log:
Issue 4789 - Use new DiagramFactory method.  Deprecate Vector based methods and introduce List based methods.

Modified: trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java?view=diff&rev=13034&p1=trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java&p2=trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java&r1=13033&r2=13034
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java	(original)
+++ trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java	2007-07-10 11:48:19-0700
@@ -25,6 +25,7 @@
 package org.argouml.uml.reveng;
 
 import java.beans.PropertyVetoException;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
@@ -34,15 +35,14 @@
 import org.argouml.kernel.ProjectManager;
 import org.argouml.kernel.ProjectMember;
 import org.argouml.model.Model;
-import org.argouml.uml.diagram.ArgoDiagram;
 import org.argouml.uml.diagram.DiagramFactory;
+import org.argouml.uml.diagram.ArgoDiagram;
 import org.argouml.uml.diagram.ProjectMemberDiagram;
 import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
 import org.argouml.uml.diagram.static_structure.ui.FigClass;
 import org.argouml.uml.diagram.static_structure.ui.FigClassifierBox;
 import org.argouml.uml.diagram.static_structure.ui.FigInterface;
 import org.argouml.uml.diagram.static_structure.ui.FigPackage;
-import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
 import org.tigris.gef.base.Editor;
 import org.tigris.gef.base.LayerPerspective;
 import org.tigris.gef.presentation.Fig;
@@ -77,7 +77,8 @@
      * To know what diagrams we have to layout after the import,
      * we store them in this Vector.
      */
-    private Vector modifiedDiagrams = new Vector();
+    private List<ArgoDiagram> modifiedDiagrams = 
+        new ArrayList<ArgoDiagram>();
 
     /**
      * The current GraphModel of the current classdiagram.
@@ -120,10 +121,22 @@
      *
      * @param diagram The diagram to mark as modified.
      */
-    void markDiagramAsModified(Object diagram) {
-	if (!modifiedDiagrams.contains(diagram)) {
-	    modifiedDiagrams.add(diagram);
-	}
+    void markDiagramAsModified(ArgoDiagram diagram) {
+        if (!modifiedDiagrams.contains(diagram)) {
+            modifiedDiagrams.add(diagram);
+        }
+    }
+    
+    /**
+     * Get the list of modified diagrams.
+     * 
+     * @return The list of modified diagrams.
+     * @deprecated for 0.25.4 by tfmorris. Use 
+     * {@link #getModifiedDiagramList()}.
+     */
+    @Deprecated
+    public Vector<ArgoDiagram> getModifiedDiagrams() {
+	return new Vector<ArgoDiagram>(modifiedDiagrams);
     }
 
     /**
@@ -131,15 +144,15 @@
      *
      * @return The list of modified diagrams.
      */
-    public Vector getModifiedDiagrams() {
-	return modifiedDiagrams;
+    public List<ArgoDiagram> getModifiedDiagramList() {
+        return modifiedDiagrams;
     }
-
+    
     /**
      * Reset the list of modified diagrams.
      */
     void resetModifiedDiagrams() {
-	modifiedDiagrams = new Vector();
+	modifiedDiagrams = new ArrayList<ArgoDiagram>();
     }
 
     /**
@@ -249,12 +262,12 @@
      */
     public void addClassDiagram(Object ns, String name) {
         Project p = ProjectManager.getManager().getCurrentProject();
+//        Object root = p.getRoot();
+        Object root = Model.getModelManagementFactory().getRootModel();
 
-        ArgoDiagram d =
-            DiagramFactory.getInstance().createDiagram(
-                    UMLClassDiagram.class,
-                    ns == null ? p.getRoot() : ns,
-                    null);
+        ArgoDiagram d = DiagramFactory.getInstance().createDiagram(
+                DiagramFactory.DiagramType.Class,
+                ns == null ? root : ns, null);
 
         try {
             d.setName(getDiagramName(name));