svn commit: r13904 - trunk/src_new/org/argouml: application ui ui/cmd ui/explorer uml/diagram/ui uml/ui uml/ui/model_management util

Author: mvw
Date: 2007-12-11 09:41:48-0800
New Revision: 13904

Added:
   trunk/src_new/org/argouml/util/ArgoFrame.java
      - copied, changed from r13896, /branches/work_issue4925_mvw/org/argouml/ui/ArgoFrame.java
Removed:
   trunk/src_new/org/argouml/ui/ArgoFrame.java
Modified:
   trunk/src_new/org/argouml/application/Main.java
   trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java
   trunk/src_new/org/argouml/ui/ActionExportXMI.java
   trunk/src_new/org/argouml/ui/LoadSwingWorker.java
   trunk/src_new/org/argouml/ui/ProgressMonitorWindow.java
   trunk/src_new/org/argouml/ui/ProjectBrowser.java
   trunk/src_new/org/argouml/ui/SaveSwingWorker.java
   trunk/src_new/org/argouml/ui/StylePanelFig.java
   trunk/src_new/org/argouml/ui/SwingWorker.java
   trunk/src_new/org/argouml/ui/cmd/ActionAboutArgoUML.java
   trunk/src_new/org/argouml/ui/cmd/ActionShowXMLDump.java
   trunk/src_new/org/argouml/ui/cmd/ActionSystemInfo.java
   trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java
   trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java
   trunk/src_new/org/argouml/uml/ui/AbstractActionAddModelElement2.java
   trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java
   trunk/src_new/org/argouml/uml/ui/ActionImportFromSources.java
   trunk/src_new/org/argouml/uml/ui/ActionOpenProject.java
   trunk/src_new/org/argouml/uml/ui/ActionRevertToSaved.java
   trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java
   trunk/src_new/org/argouml/uml/ui/ActionSaveGraphics.java
   trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java
   trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java

Log:
Dependency improvement: Move the ArgoFrame into the org.argouml.util package, since it only depends on ArgoDialog.

Modified: trunk/src_new/org/argouml/application/Main.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/Main.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/application/Main.java&p2=trunk/src_new/org/argouml/application/Main.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/application/Main.java	(original)
+++ trunk/src_new/org/argouml/application/Main.java	2007-12-11 09:41:48-0800
@@ -69,7 +69,6 @@
 import org.argouml.notation.ui.InitNotationUI;
 import org.argouml.persistence.PersistenceManager;
 import org.argouml.profile.internal.InitProfileSubsystem;
-import org.argouml.ui.ArgoFrame;
 import org.argouml.ui.LookAndFeelMgr;
 import org.argouml.ui.ProjectBrowser;
 import org.argouml.ui.SplashScreen;
@@ -78,6 +77,7 @@
 import org.argouml.ui.cmd.PrintManager;
 import org.argouml.uml.diagram.ui.InitDiagramAppearanceUI;
 import org.argouml.uml.reveng.java.JavaImport;
+import org.argouml.util.ArgoFrame;
 import org.argouml.util.logging.SimpleTimer;
 import org.tigris.gef.util.Util;
 

Modified: trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java&p2=trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java	(original)
+++ trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java	2007-12-11 09:41:48-0800
@@ -35,6 +35,7 @@
 
 import org.apache.log4j.Logger;
 import org.argouml.i18n.Translator;
+import org.argouml.util.ArgoFrame;
 import org.tigris.swidgets.Orientable;
 import org.tigris.swidgets.Orientation;
 

Modified: trunk/src_new/org/argouml/ui/ActionExportXMI.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ActionExportXMI.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/ui/ActionExportXMI.java&p2=trunk/src_new/org/argouml/ui/ActionExportXMI.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/ui/ActionExportXMI.java	(original)
+++ trunk/src_new/org/argouml/ui/ActionExportXMI.java	2007-12-11 09:41:48-0800
@@ -34,6 +34,7 @@
 import org.argouml.i18n.Translator;
 import org.argouml.persistence.PersistenceManager;
 import org.argouml.uml.ui.ProjectFileView;
+import org.argouml.util.ArgoFrame;
 
 /**
  * Exports the xmi of a project to a file choosen by the user.

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

Modified: trunk/src_new/org/argouml/ui/LoadSwingWorker.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/LoadSwingWorker.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/ui/LoadSwingWorker.java&p2=trunk/src_new/org/argouml/ui/LoadSwingWorker.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/ui/LoadSwingWorker.java	(original)
+++ trunk/src_new/org/argouml/ui/LoadSwingWorker.java	2007-12-11 09:41:48-0800
@@ -31,6 +31,7 @@
 import org.apache.log4j.Logger;
 import org.argouml.i18n.Translator;
 import org.argouml.taskmgmt.ProgressMonitor;
+import org.argouml.util.ArgoFrame;
 
 /**
  * The specialized SwingWorker used for loading projects 

Modified: trunk/src_new/org/argouml/ui/ProgressMonitorWindow.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ProgressMonitorWindow.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/ui/ProgressMonitorWindow.java&p2=trunk/src_new/org/argouml/ui/ProgressMonitorWindow.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/ui/ProgressMonitorWindow.java	(original)
+++ trunk/src_new/org/argouml/ui/ProgressMonitorWindow.java	2007-12-11 09:41:48-0800
@@ -32,6 +32,7 @@
 
 import org.argouml.i18n.Translator;
 import org.argouml.taskmgmt.ProgressEvent;
+import org.argouml.util.ArgoFrame;
 
 /**
  * Manages a ProgressMonitor dialog.

Modified: trunk/src_new/org/argouml/ui/ProjectBrowser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ProjectBrowser.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/ui/ProjectBrowser.java&p2=trunk/src_new/org/argouml/ui/ProjectBrowser.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/ui/ProjectBrowser.java	(original)
+++ trunk/src_new/org/argouml/ui/ProjectBrowser.java	2007-12-11 09:41:48-0800
@@ -94,6 +94,7 @@
 import org.argouml.uml.ui.ActionSaveProject;
 import org.argouml.uml.ui.ProjectFileView;
 import org.argouml.uml.ui.TabProps;
+import org.argouml.util.ArgoFrame;
 import org.argouml.util.ThreadUtils;
 import org.tigris.gef.base.Diagram;
 import org.tigris.gef.base.Editor;

Modified: trunk/src_new/org/argouml/ui/SaveSwingWorker.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/SaveSwingWorker.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/ui/SaveSwingWorker.java&p2=trunk/src_new/org/argouml/ui/SaveSwingWorker.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/ui/SaveSwingWorker.java	(original)
+++ trunk/src_new/org/argouml/ui/SaveSwingWorker.java	2007-12-11 09:41:48-0800
@@ -30,6 +30,7 @@
 
 import org.argouml.i18n.Translator;
 import org.argouml.taskmgmt.ProgressMonitor;
+import org.argouml.util.ArgoFrame;
 import org.tigris.gef.undo.UndoManager;
 
 /**

Modified: trunk/src_new/org/argouml/ui/StylePanelFig.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/StylePanelFig.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/ui/StylePanelFig.java&p2=trunk/src_new/org/argouml/ui/StylePanelFig.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/ui/StylePanelFig.java	(original)
+++ trunk/src_new/org/argouml/ui/StylePanelFig.java	2007-12-11 09:41:48-0800
@@ -47,6 +47,7 @@
 import org.argouml.swingext.SpacerPanel;
 import org.argouml.uml.diagram.ui.FigEdgeModelElement;
 import org.argouml.uml.diagram.ui.FigNodeModelElement;
+import org.argouml.util.ArgoFrame;
 
 /**
  * The basic stylepanel which provides the boundaries box,

Modified: trunk/src_new/org/argouml/ui/SwingWorker.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/SwingWorker.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/ui/SwingWorker.java&p2=trunk/src_new/org/argouml/ui/SwingWorker.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/ui/SwingWorker.java	(original)
+++ trunk/src_new/org/argouml/ui/SwingWorker.java	2007-12-11 09:41:48-0800
@@ -34,6 +34,7 @@
 import org.apache.log4j.Logger;
 import org.argouml.swingext.GlassPane;
 import org.argouml.taskmgmt.ProgressMonitor;
+import org.argouml.util.ArgoFrame;
 
 /**
  * This is the 3rd version of SwingWorker (also known as

Modified: trunk/src_new/org/argouml/ui/cmd/ActionAboutArgoUML.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/ActionAboutArgoUML.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/ui/cmd/ActionAboutArgoUML.java&p2=trunk/src_new/org/argouml/ui/cmd/ActionAboutArgoUML.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/ActionAboutArgoUML.java	(original)
+++ trunk/src_new/org/argouml/ui/cmd/ActionAboutArgoUML.java	2007-12-11 09:41:48-0800
@@ -32,7 +32,7 @@
 import org.argouml.application.helpers.ResourceLoaderWrapper;
 import org.argouml.i18n.Translator;
 import org.argouml.ui.AboutBox;
-import org.argouml.ui.ArgoFrame;
+import org.argouml.util.ArgoFrame;
 
 
 /**

Modified: trunk/src_new/org/argouml/ui/cmd/ActionShowXMLDump.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/ActionShowXMLDump.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/ui/cmd/ActionShowXMLDump.java&p2=trunk/src_new/org/argouml/ui/cmd/ActionShowXMLDump.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/ActionShowXMLDump.java	(original)
+++ trunk/src_new/org/argouml/ui/cmd/ActionShowXMLDump.java	2007-12-11 09:41:48-0800
@@ -36,7 +36,7 @@
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
 import org.argouml.persistence.PersistenceManager;
-import org.argouml.ui.ArgoFrame;
+import org.argouml.util.ArgoFrame;
 import org.argouml.util.UIUtils;
 
 /**

Modified: trunk/src_new/org/argouml/ui/cmd/ActionSystemInfo.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/ActionSystemInfo.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/ui/cmd/ActionSystemInfo.java&p2=trunk/src_new/org/argouml/ui/cmd/ActionSystemInfo.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/ActionSystemInfo.java	(original)
+++ trunk/src_new/org/argouml/ui/cmd/ActionSystemInfo.java	2007-12-11 09:41:48-0800
@@ -33,8 +33,8 @@
 
 import org.argouml.application.helpers.ResourceLoaderWrapper;
 import org.argouml.i18n.Translator;
-import org.argouml.ui.ArgoFrame;
 import org.argouml.ui.SystemInfoDialog;
+import org.argouml.util.ArgoFrame;
 
 /**
  * System information dialog.

Modified: trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java&p2=trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java	(original)
+++ trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java	2007-12-11 09:41:48-0800
@@ -42,9 +42,9 @@
 import org.argouml.model.XmiWriter;

 import org.argouml.persistence.PersistenceManager;

 import org.argouml.persistence.UmlFilePersister;

-import org.argouml.ui.ArgoFrame;

 import org.argouml.profile.Profile;

 import org.argouml.uml.ui.ProjectFileView;

+import org.argouml.util.ArgoFrame;

 

 /**

  * Exports the model of a selected profile as XMI


Modified: trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java	2007-12-11 09:41:48-0800
@@ -42,8 +42,8 @@
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
 import org.argouml.kernel.ProjectSettings;
-import org.argouml.ui.ArgoFrame;
 import org.argouml.ui.ArgoJFontChooser;
+import org.argouml.util.ArgoFrame;
 
 /**
  * Settings tab panel for handling diagram appearance settings.

Modified: trunk/src_new/org/argouml/uml/ui/AbstractActionAddModelElement2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/AbstractActionAddModelElement2.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/uml/ui/AbstractActionAddModelElement2.java&p2=trunk/src_new/org/argouml/uml/ui/AbstractActionAddModelElement2.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/AbstractActionAddModelElement2.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/AbstractActionAddModelElement2.java	2007-12-11 09:41:48-0800
@@ -34,7 +34,7 @@
 import javax.swing.JOptionPane;

 

 import org.argouml.i18n.Translator;

-import org.argouml.ui.ArgoFrame;

+import org.argouml.util.ArgoFrame;

 import org.tigris.gef.undo.UndoableAction;

 

 /**


Modified: trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java&p2=trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java	2007-12-11 09:41:48-0800
@@ -42,13 +42,13 @@
 import org.argouml.kernel.ProjectManager;
 import org.argouml.model.InvalidElementException;
 import org.argouml.model.Model;
-import org.argouml.ui.ArgoFrame;
 import org.argouml.ui.targetmanager.TargetEvent;
 import org.argouml.ui.targetmanager.TargetListener;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.CommentEdge;
 import org.argouml.uml.diagram.ArgoDiagram;
 import org.argouml.uml.diagram.ui.ActionDeleteConcurrentRegion;
+import org.argouml.util.ArgoFrame;
 import org.tigris.gef.base.Editor;
 import org.tigris.gef.base.Globals;
 import org.tigris.gef.presentation.Fig;

Modified: trunk/src_new/org/argouml/uml/ui/ActionImportFromSources.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionImportFromSources.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/uml/ui/ActionImportFromSources.java&p2=trunk/src_new/org/argouml/uml/ui/ActionImportFromSources.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionImportFromSources.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/ActionImportFromSources.java	2007-12-11 09:41:48-0800
@@ -31,8 +31,8 @@
 
 import org.argouml.application.helpers.ResourceLoaderWrapper;
 import org.argouml.i18n.Translator;
-import org.argouml.ui.ArgoFrame;
 import org.argouml.uml.reveng.Import;
+import org.argouml.util.ArgoFrame;
 import org.tigris.gef.undo.UndoableAction;
 
 

Modified: trunk/src_new/org/argouml/uml/ui/ActionOpenProject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionOpenProject.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/uml/ui/ActionOpenProject.java&p2=trunk/src_new/org/argouml/uml/ui/ActionOpenProject.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionOpenProject.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/ActionOpenProject.java	2007-12-11 09:41:48-0800
@@ -39,9 +39,9 @@
 import org.argouml.kernel.ProjectManager;
 import org.argouml.persistence.AbstractFilePersister;
 import org.argouml.persistence.PersistenceManager;
-import org.argouml.ui.ArgoFrame;
 import org.argouml.ui.ProjectBrowser;
 import org.argouml.ui.UndoableAction;
+import org.argouml.util.ArgoFrame;
 
 /**
  * Action that loads the project.

Modified: trunk/src_new/org/argouml/uml/ui/ActionRevertToSaved.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionRevertToSaved.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/uml/ui/ActionRevertToSaved.java&p2=trunk/src_new/org/argouml/uml/ui/ActionRevertToSaved.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionRevertToSaved.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/ActionRevertToSaved.java	2007-12-11 09:41:48-0800
@@ -34,8 +34,8 @@
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
-import org.argouml.ui.ArgoFrame;
 import org.argouml.ui.ProjectBrowser;
+import org.argouml.util.ArgoFrame;
 
 /**
  * Action that reverts to the previously saved version of the project.

Modified: trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java&p2=trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java	2007-12-11 09:41:48-0800
@@ -43,9 +43,9 @@
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
-import org.argouml.ui.ArgoFrame;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.util.ArgoFrame;
 import org.tigris.gef.base.Diagram;
 import org.tigris.gef.base.SaveGraphicsAction;
 import org.tigris.gef.undo.UndoableAction;

Modified: trunk/src_new/org/argouml/uml/ui/ActionSaveGraphics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionSaveGraphics.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/uml/ui/ActionSaveGraphics.java&p2=trunk/src_new/org/argouml/uml/ui/ActionSaveGraphics.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionSaveGraphics.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/ActionSaveGraphics.java	2007-12-11 09:41:48-0800
@@ -41,9 +41,9 @@
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
-import org.argouml.ui.ArgoFrame;
 import org.argouml.ui.ExceptionDialog;
 import org.argouml.ui.ProjectBrowser;
+import org.argouml.util.ArgoFrame;
 import org.argouml.util.SuffixFilter;
 import org.tigris.gef.base.SaveGraphicsAction;
 import org.tigris.gef.base.Diagram;

Modified: trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java&p2=trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java	2007-12-11 09:41:48-0800
@@ -32,9 +32,9 @@
 
 import org.argouml.i18n.Translator;
 import org.argouml.model.Model;
-import org.argouml.ui.ArgoFrame;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.reveng.ImportInterface;
+import org.argouml.util.ArgoFrame;
 import org.tigris.gef.undo.UndoableAction;
 
 

Modified: trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java?view=diff&rev=13904&p1=trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java&p2=trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java&r1=13903&r2=13904
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java	2007-12-11 09:41:48-0800
@@ -38,7 +38,6 @@
 import org.argouml.application.helpers.ResourceLoaderWrapper;
 import org.argouml.i18n.Translator;
 import org.argouml.model.Model;
-import org.argouml.ui.ArgoFrame;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.ui.ActionNavigateNamespace;
 import org.argouml.uml.ui.UMLAddDialog;
@@ -55,6 +54,7 @@
 import org.argouml.uml.ui.foundation.core.UMLGeneralizableElementSpecializationListModel;
 import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
 import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewTagDefinition;
+import org.argouml.util.ArgoFrame;
 import org.tigris.gef.undo.UndoableAction;
 import org.tigris.swidgets.Orientation;
 

Copied: trunk/src_new/org/argouml/util/ArgoFrame.java (from r13896, /branches/work_issue4925_mvw/org/argouml/ui/ArgoFrame.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/util/ArgoFrame.java?view=diff&rev=13904&p1=/branches/work_issue4925_mvw/org/argouml/ui/ArgoFrame.java&p2=trunk/src_new/org/argouml/util/ArgoFrame.java&r1=13896&r2=13904
==============================================================================
--- /branches/work_issue4925_mvw/org/argouml/ui/ArgoFrame.java	(original)
+++ trunk/src_new/org/argouml/util/ArgoFrame.java	2007-12-11 09:41:48-0800
@@ -22,7 +22,7 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.argouml.ui;
+package org.argouml.util;
 
 import java.awt.Frame;
 
@@ -30,7 +30,6 @@
 import javax.swing.JOptionPane;
 
 import org.apache.log4j.Logger;
-import org.argouml.util.ArgoDialog;
 
 /**
  * Helper class to store/find a top level application frame.