svn commit: r13103 - trunk/src_new/org/argouml: gefext uml/diagram/ui

Author: mvw
Date: 2007-07-21 11:14:02-0700
New Revision: 13103

Added:
   trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigText.java
      - copied, changed from r13102, /trunk/src_new/org/argouml/gefext/ArgoFigText.java
   trunk/src_new/org/argouml/uml/diagram/ui/ArgoModeCreateFigText.java
      - copied, changed from r13061, /trunk/src_new/org/argouml/gefext/ArgoModeCreateFigText.java
Removed:
   trunk/src_new/org/argouml/gefext/ArgoFigText.java
   trunk/src_new/org/argouml/gefext/ArgoModeCreateFigText.java
Modified:
   trunk/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java
   trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java

Log:
Remove cyclic package dependency from org.argouml.gefext.

Removed: trunk/src_new/org/argouml/gefext/ArgoFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/gefext/ArgoFigText.java?view=auto&rev=13102

Removed: trunk/src_new/org/argouml/gefext/ArgoModeCreateFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/gefext/ArgoModeCreateFigText.java?view=auto&rev=13102

Copied: trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigText.java (from r13102, /trunk/src_new/org/argouml/gefext/ArgoFigText.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigText.java?view=diff&rev=13103&p1=/trunk/src_new/org/argouml/gefext/ArgoFigText.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigText.java&r1=13102&r2=13103
==============================================================================
--- /trunk/src_new/org/argouml/gefext/ArgoFigText.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigText.java	2007-07-21 11:14:02-0700
@@ -22,7 +22,7 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.argouml.gefext;
+package org.argouml.uml.diagram.ui;
 
 import javax.management.ListenerNotFoundException;
 import javax.management.MBeanNotificationInfo;
@@ -35,7 +35,6 @@
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
 import org.argouml.uml.diagram.UMLMutableGraphSupport;
-import org.argouml.uml.diagram.ui.ArgoFig;
 import org.tigris.gef.base.Editor;
 import org.tigris.gef.base.Globals;
 import org.tigris.gef.base.Layer;

Copied: trunk/src_new/org/argouml/uml/diagram/ui/ArgoModeCreateFigText.java (from r13061, /trunk/src_new/org/argouml/gefext/ArgoModeCreateFigText.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ArgoModeCreateFigText.java?view=diff&rev=13103&p1=/trunk/src_new/org/argouml/gefext/ArgoModeCreateFigText.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ArgoModeCreateFigText.java&r1=13061&r2=13103
==============================================================================
--- /trunk/src_new/org/argouml/gefext/ArgoModeCreateFigText.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ArgoModeCreateFigText.java	2007-07-21 11:14:02-0700
@@ -22,7 +22,7 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.argouml.gefext;
+package org.argouml.uml.diagram.ui;
 
 import java.awt.event.MouseEvent;
 

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java?view=diff&rev=13103&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java&r1=13102&r2=13103
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java	2007-07-21 11:14:02-0700
@@ -26,7 +26,6 @@
 
 import java.awt.Color;
 
-import org.argouml.gefext.ArgoFigText;
 import org.tigris.gef.presentation.FigText;
 
 /**

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java?view=diff&rev=13103&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java&r1=13102&r2=13103
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java	2007-07-21 11:14:02-0700
@@ -31,7 +31,6 @@
 import java.beans.PropertyChangeEvent;
 import java.util.Arrays;
 
-import org.argouml.gefext.ArgoFigText;
 import org.argouml.model.AttributeChangeEvent;
 import org.argouml.model.Model;
 import org.argouml.notation.NotationProvider;

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=13103&p1=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&r1=13102&r2=13103
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java	2007-07-21 11:14:02-0700
@@ -39,12 +39,10 @@
 import org.argouml.gefext.ArgoModeCreateFigRRect;
 import org.argouml.gefext.ArgoModeCreateFigRect;
 import org.argouml.gefext.ArgoModeCreateFigSpline;
-import org.argouml.gefext.ArgoModeCreateFigText;
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
 import org.argouml.model.Model;
-import org.argouml.swingext.ArgoToolbarManager;
 import org.argouml.ui.CmdCreateNode;
 import org.argouml.uml.UUIDHelper;
 import org.argouml.uml.diagram.ArgoDiagramImpl;