svn commit: r13912 - trunk/src_new/org/argouml: persistence ui ui/explorer uml/ui

Author: mvw
Date: 2007-12-13 02:57:33-0800
New Revision: 13912

Added:
   trunk/src_new/org/argouml/persistence/ProjectFileView.java   (contents, props changed)
      - copied, changed from r13911, /trunk/src_new/org/argouml/uml/ui/ProjectFileView.java
Removed:
   trunk/src_new/org/argouml/uml/ui/ProjectFileView.java
Modified:
   trunk/src_new/org/argouml/ui/ActionExportXMI.java
   trunk/src_new/org/argouml/ui/ActionImportXMI.java
   trunk/src_new/org/argouml/ui/ProjectBrowser.java
   trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java
   trunk/src_new/org/argouml/uml/ui/ActionOpenProject.java

Log:
Reduce dependency of org.argouml.ui on org.argouml.uml.ui by moving ProjectFileView into the persistence package.

Copied: trunk/src_new/org/argouml/persistence/ProjectFileView.java (from r13911, /trunk/src_new/org/argouml/uml/ui/ProjectFileView.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/ProjectFileView.java?view=diff&rev=13912&p1=/trunk/src_new/org/argouml/uml/ui/ProjectFileView.java&p2=trunk/src_new/org/argouml/persistence/ProjectFileView.java&r1=13911&r2=13912
==============================================================================
--- /trunk/src_new/org/argouml/uml/ui/ProjectFileView.java	(original)
+++ trunk/src_new/org/argouml/persistence/ProjectFileView.java	2007-12-13 02:57:33-0800
@@ -22,7 +22,7 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.argouml.uml.ui;
+package org.argouml.persistence;
 
 import java.io.File;
 
@@ -30,8 +30,6 @@
 import javax.swing.filechooser.FileView;
 
 import org.argouml.application.helpers.ResourceLoaderWrapper;
-import org.argouml.persistence.AbstractFilePersister;
-import org.argouml.persistence.PersistenceManager;
 
 /**
  * Provides an icon for project files. 

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=13912&p1=trunk/src_new/org/argouml/ui/ActionExportXMI.java&p2=trunk/src_new/org/argouml/ui/ActionExportXMI.java&r1=13911&r2=13912
==============================================================================
--- trunk/src_new/org/argouml/ui/ActionExportXMI.java	(original)
+++ trunk/src_new/org/argouml/ui/ActionExportXMI.java	2007-12-13 02:57:33-0800
@@ -33,7 +33,7 @@
 import org.argouml.configuration.Configuration;
 import org.argouml.i18n.Translator;
 import org.argouml.persistence.PersistenceManager;
-import org.argouml.uml.ui.ProjectFileView;
+import org.argouml.persistence.ProjectFileView;
 import org.argouml.util.ArgoFrame;
 
 /**

Modified: trunk/src_new/org/argouml/ui/ActionImportXMI.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ActionImportXMI.java?view=diff&rev=13912&p1=trunk/src_new/org/argouml/ui/ActionImportXMI.java&p2=trunk/src_new/org/argouml/ui/ActionImportXMI.java&r1=13911&r2=13912
==============================================================================
--- trunk/src_new/org/argouml/ui/ActionImportXMI.java	(original)
+++ trunk/src_new/org/argouml/ui/ActionImportXMI.java	2007-12-13 02:57:33-0800
@@ -37,7 +37,7 @@
 import org.argouml.kernel.ProjectManager;
 import org.argouml.persistence.AbstractFilePersister;
 import org.argouml.persistence.PersistenceManager;
-import org.argouml.uml.ui.ProjectFileView;
+import org.argouml.persistence.ProjectFileView;
 
 /**
  * This Action allows import of a XMI file.

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=13912&p1=trunk/src_new/org/argouml/ui/ProjectBrowser.java&p2=trunk/src_new/org/argouml/ui/ProjectBrowser.java&r1=13911&r2=13912
==============================================================================
--- trunk/src_new/org/argouml/ui/ProjectBrowser.java	(original)
+++ trunk/src_new/org/argouml/ui/ProjectBrowser.java	2007-12-13 02:57:33-0800
@@ -79,6 +79,7 @@
 import org.argouml.persistence.OpenException;
 import org.argouml.persistence.PersistenceManager;
 import org.argouml.persistence.ProjectFilePersister;
+import org.argouml.persistence.ProjectFileView;
 import org.argouml.persistence.UmlVersionException;
 import org.argouml.persistence.VersionException;
 import org.argouml.persistence.XmiFormatException;
@@ -92,7 +93,6 @@
 import org.argouml.uml.diagram.UMLMutableGraphSupport;
 import org.argouml.uml.diagram.ui.ActionRemoveFromDiagram;
 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;

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=13912&p1=trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java&p2=trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java&r1=13911&r2=13912
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java	(original)
+++ trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java	2007-12-13 02:57:33-0800
@@ -41,9 +41,9 @@
 import org.argouml.model.UmlException;

 import org.argouml.model.XmiWriter;

 import org.argouml.persistence.PersistenceManager;

+import org.argouml.persistence.ProjectFileView;

 import org.argouml.persistence.UmlFilePersister;

 import org.argouml.profile.Profile;

-import org.argouml.uml.ui.ProjectFileView;

 import org.argouml.util.ArgoFrame;

 

 /**


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=13912&p1=trunk/src_new/org/argouml/uml/ui/ActionOpenProject.java&p2=trunk/src_new/org/argouml/uml/ui/ActionOpenProject.java&r1=13911&r2=13912
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionOpenProject.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/ActionOpenProject.java	2007-12-13 02:57:33-0800
@@ -39,6 +39,7 @@
 import org.argouml.kernel.ProjectManager;
 import org.argouml.persistence.AbstractFilePersister;
 import org.argouml.persistence.PersistenceManager;
+import org.argouml.persistence.ProjectFileView;
 import org.argouml.ui.ProjectBrowser;
 import org.argouml.ui.UndoableAction;
 import org.argouml.util.ArgoFrame;

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