svn commit: r12910 - trunk/src_new/org/argouml: ui/explorer uml/diagram uml/diagram/ui

Author: mvw
Date: 2007-06-27 08:36:24-0700
New Revision: 12910

Added:
   trunk/src_new/org/argouml/uml/diagram/Relocatable.java
      - copied, changed from r12753, /trunk/src_new/org/argouml/ui/explorer/Relocatable.java
Removed:
   trunk/src_new/org/argouml/ui/explorer/Relocatable.java
Modified:
   trunk/src_new/org/argouml/ui/explorer/DnDExplorerTree.java
   trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java

Log:
Remove (cyclic) dependency from UMLDiagram to org.argouml.ui.explorer.

Modified: trunk/src_new/org/argouml/ui/explorer/DnDExplorerTree.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/DnDExplorerTree.java?view=diff&rev=12910&p1=trunk/src_new/org/argouml/ui/explorer/DnDExplorerTree.java&p2=trunk/src_new/org/argouml/ui/explorer/DnDExplorerTree.java&r1=12909&r2=12910
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/DnDExplorerTree.java	(original)
+++ trunk/src_new/org/argouml/ui/explorer/DnDExplorerTree.java	2007-06-27 08:36:24-0700
@@ -73,8 +73,8 @@
 import org.argouml.model.Model;
 import org.argouml.ui.TransferableModelElements;
 import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.Relocatable;
 import org.argouml.uml.diagram.ui.ActionSaveDiagramToClipboard;
-import org.argouml.uml.diagram.ui.UMLDiagram;
 
 /**
  * This class extends the default Argo JTree with Drag and drop capabilities.<p>
@@ -329,8 +329,8 @@
                     LOG.debug("Valid Drag: namespace " + dest);
                     return true;
                 }
-                if (me instanceof UMLDiagram) {
-                    UMLDiagram d = (UMLDiagram) me;
+                if (me instanceof Relocatable) {
+                    Relocatable d = (Relocatable) me;
                     if (d.isRelocationAllowed(dest)) {
                         LOG.debug("Valid Drag: diagram " + dest);
                         return true;
@@ -774,8 +774,8 @@
                                 }
                             }
                         }
-                        if (me instanceof UMLDiagram) {
-                            UMLDiagram d = (UMLDiagram) me;
+                        if (me instanceof Relocatable) {
+                            Relocatable d = (Relocatable) me;
                             if (d.isRelocationAllowed(dest)) {
                                 if (d.relocate(dest)) {
                                     ExplorerEventAdaptor.getInstance()

Removed: trunk/src_new/org/argouml/ui/explorer/Relocatable.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/Relocatable.java?view=auto&rev=12909

Copied: trunk/src_new/org/argouml/uml/diagram/Relocatable.java (from r12753, /trunk/src_new/org/argouml/ui/explorer/Relocatable.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/Relocatable.java?view=diff&rev=12910&p1=/trunk/src_new/org/argouml/ui/explorer/Relocatable.java&p2=trunk/src_new/org/argouml/uml/diagram/Relocatable.java&r1=12753&r2=12910
==============================================================================
--- /trunk/src_new/org/argouml/ui/explorer/Relocatable.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/Relocatable.java	2007-06-27 08:36:24-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2005-2006 The Regents of the University of California. All
+// Copyright (c) 2005-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -22,7 +22,7 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.argouml.ui.explorer;
+package org.argouml.uml.diagram;
 
 /**
  * Interface which is used by the Explorer to determine if a diagram can

Modified: trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java?view=diff&rev=12910&p1=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&r1=12909&r2=12910
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java	2007-06-27 08:36:24-0700
@@ -49,9 +49,9 @@
 import org.argouml.model.Model;
 import org.argouml.model.ModelManagementHelper;
 import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.explorer.Relocatable;
 import org.argouml.uml.UUIDHelper;
 import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.Relocatable;
 import org.argouml.uml.diagram.UMLMutableGraphSupport;
 import org.argouml.util.ToolBarUtility;
 import org.tigris.gef.base.ModeBroom;