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

Author: mvw
Date: 2007-07-23 10:38:07-0700
New Revision: 13113

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

Log:
Simplify. Remove all dependency on the ProjectMember interface and its implementations.

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=13113&p1=trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java&p2=trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java&r1=13112&r2=13113
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java	(original)
+++ trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java	2007-07-23 10:38:07-0700
@@ -26,18 +26,15 @@
 
 import java.beans.PropertyVetoException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
 import org.apache.log4j.Logger;
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
-import org.argouml.kernel.ProjectMember;
 import org.argouml.model.Model;
-import org.argouml.uml.diagram.DiagramFactory;
 import org.argouml.uml.diagram.ArgoDiagram;
-import org.argouml.uml.diagram.ProjectMemberDiagram;
+import org.argouml.uml.diagram.DiagramFactory;
 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;
@@ -59,7 +56,6 @@
  */
 public class DiagramInterface {
 
-    private static final String DIAGRAM_SUFFIX = ".pgml";
     private static final char DIAGRAM_NAME_SEPARATOR = '_';
     private static final String DIAGRAM_NAME_SUFFIX = "classes";
 
@@ -162,7 +158,6 @@
      * @param newPackage The package to add.
      */
     public void addPackage(Object newPackage) {
-
         if (!isInDiagram(newPackage)) {
             if (currentGM.canAddNode(newPackage)) {
                 FigPackage newPackageFig = 
@@ -183,7 +178,6 @@
      *         false otherwise.
      */
     public boolean isInDiagram(Object p) {
-
 	if (currentDiagram == null) {
             return false;
         } else {
@@ -194,13 +188,12 @@
     /**
      * Check if this diagram already exists in the project.<p>
      *
-     * @param name diagram name.
+     * @param name package name (converted to class name)
      * @return true if diagram exists in project.
      */
     public boolean isDiagramInProject(String name) {
         Project project = ProjectManager.getManager().getCurrentProject();
-	return (findDiagramMemberByUniqueName(project,
-            getDiagramName(name))) != null;
+        return project.getDiagram(getDiagramName(name)) != null;
     }
 
     /**
@@ -229,25 +222,17 @@
      * @param name The fully qualified name of this package.
      */
     public void selectClassDiagram(Object p, String name) {
-
-	// Check if this diagram already exists in the project
-	ProjectMember m;
-	if (isDiagramInProject(name)) {
-            Project project = ProjectManager.getManager().getCurrentProject();
-	    m =
-                findDiagramMemberByUniqueName(project,
-                        getDiagramName(name));
-
-	    // The diagram already exists in this project. Select it
-	    // as the current target.
-	    if (m instanceof ProjectMemberDiagram) {
-		setCurrentDiagram(((ProjectMemberDiagram) m).getDiagram());
-	    }
-
-	} else {
-	    // Otherwise create a new classdiagram for the package.
-	    addClassDiagram(p, name);
-	}
+        // Check if this diagram already exists in the project
+        Project project = ProjectManager.getManager().getCurrentProject();
+        ArgoDiagram m = project.getDiagram(getDiagramName(name));
+        if (m != null) {
+            // The diagram already exists in this project. Select it
+            // as the current target.
+            setCurrentDiagram(m);
+        } else {
+            // Otherwise create a new classdiagram for the package.
+            addClassDiagram(p, name);
+        }
     }
 
     /**
@@ -262,7 +247,6 @@
      */
     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(
@@ -276,7 +260,6 @@
         }
         p.addMember(d);
         setCurrentDiagram(d);
-
     }
 
     /**
@@ -298,9 +281,6 @@
      *                 (of attributes and operations)
      */
     private void addClassifier(Object classifier, boolean minimise) {
-
-        String name = Model.getFacade().getName(classifier);
-        
         // if the classifier is not in the current diagram, add it:
         if (currentGM.canAddNode(classifier)) {
             FigClassifierBox newFig;
@@ -375,7 +355,6 @@
      * @param diagram the diagram
      */
     public void setCurrentDiagram(ArgoDiagram diagram) {
-
         if (diagram == null) {
             throw new RuntimeException("you can't select a null diagram");
         }
@@ -387,25 +366,6 @@
         markDiagramAsModified(diagram);
     }
 
-    /**
-     * @param name the public name of the member to be found
-     * @param project the project
-     * @return the member
-     */
-    public ProjectMember findDiagramMemberByUniqueName(Project project,
-            String name) {
-        name = name + DIAGRAM_SUFFIX;
-        Iterator iter = project.getMembers().iterator();
-        while (iter.hasNext()) {
-            ProjectMember element = (ProjectMember) iter.next();
-            if (element instanceof ProjectMemberDiagram) {
-                if (name.equals(element.getUniqueDiagramName())) {
-                    return element;
-                }
-            }
-        }
-        return null;
-    }
 }