svn commit: r13104 - trunk/src_new/org/argouml: cognitive/ui swingext ui ui/cmd uml/ui

Author: mvw
Date: 2007-07-21 11:29:31-0700
New Revision: 13104

Added:
   trunk/src_new/org/argouml/ui/ArgoToolbarManager.java
      - copied, changed from r13092, /trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java
Removed:
   trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java
Modified:
   trunk/src_new/org/argouml/cognitive/ui/TabToDo.java
   trunk/src_new/org/argouml/ui/ProjectBrowser.java
   trunk/src_new/org/argouml/ui/TabText.java
   trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java
   trunk/src_new/org/argouml/uml/ui/PropPanel.java
   trunk/src_new/org/argouml/uml/ui/TabConstraints.java
   trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java

Log:
Fix failing unit test for dependencies; made the swingext again a pure low level package.

Modified: trunk/src_new/org/argouml/cognitive/ui/TabToDo.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/TabToDo.java?view=diff&rev=13104&p1=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&p2=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&r1=13103&r2=13104
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/TabToDo.java	(original)
+++ trunk/src_new/org/argouml/cognitive/ui/TabToDo.java	2007-07-21 11:29:31-0700
@@ -35,8 +35,6 @@
 import org.argouml.cognitive.ToDoItem;
 import org.argouml.cognitive.critics.Wizard;
 import org.argouml.configuration.Configuration;
-import org.argouml.i18n.Translator;
-import org.argouml.swingext.ArgoToolbarManager;
 import org.argouml.ui.AbstractArgoJPanel;
 import org.argouml.ui.TabToDoTarget;
 import org.argouml.ui.targetmanager.TargetEvent;

Removed: trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java?view=auto&rev=13103

Copied: trunk/src_new/org/argouml/ui/ArgoToolbarManager.java (from r13092, /trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ArgoToolbarManager.java?view=diff&rev=13104&p1=/trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java&p2=trunk/src_new/org/argouml/ui/ArgoToolbarManager.java&r1=13092&r2=13104
==============================================================================
--- /trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java	(original)
+++ trunk/src_new/org/argouml/ui/ArgoToolbarManager.java	2007-07-21 11:29:31-0700
@@ -22,7 +22,7 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.argouml.swingext;
+package org.argouml.ui;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ComponentAdapter;

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=13104&p1=trunk/src_new/org/argouml/ui/ProjectBrowser.java&p2=trunk/src_new/org/argouml/ui/ProjectBrowser.java&r1=13103&r2=13104
==============================================================================
--- trunk/src_new/org/argouml/ui/ProjectBrowser.java	(original)
+++ trunk/src_new/org/argouml/ui/ProjectBrowser.java	2007-07-21 11:29:31-0700
@@ -80,7 +80,6 @@
 import org.argouml.persistence.UmlVersionException;
 import org.argouml.persistence.VersionException;
 import org.argouml.persistence.XmiFormatException;
-import org.argouml.swingext.ArgoToolbarManager;
 import org.argouml.taskmgmt.ProgressMonitor;
 import org.argouml.ui.cmd.GenericArgoMenuBar;
 import org.argouml.ui.targetmanager.TargetEvent;

Modified: trunk/src_new/org/argouml/ui/TabText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/TabText.java?view=diff&rev=13104&p1=trunk/src_new/org/argouml/ui/TabText.java&p2=trunk/src_new/org/argouml/ui/TabText.java&r1=13103&r2=13104
==============================================================================
--- trunk/src_new/org/argouml/ui/TabText.java	(original)
+++ trunk/src_new/org/argouml/ui/TabText.java	2007-07-21 11:29:31-0700
@@ -35,8 +35,6 @@
 import javax.swing.event.DocumentListener;
 
 import org.apache.log4j.Logger;
-import org.argouml.i18n.Translator;
-import org.argouml.swingext.ArgoToolbarManager;
 import org.argouml.ui.targetmanager.TargetEvent;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.ui.TabModelTarget;

Modified: trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java?view=diff&rev=13104&p1=trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java&p2=trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java&r1=13103&r2=13104
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java	(original)
+++ trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java	2007-07-21 11:29:31-0700
@@ -40,12 +40,12 @@
 
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.UndoEnabler;
-import org.argouml.swingext.ArgoToolbarManager;
 import org.argouml.ui.ActionExportXMI;
 import org.argouml.ui.ActionImportXMI;
 import org.argouml.ui.ActionProjectSettings;
 import org.argouml.ui.ActionSettings;
 import org.argouml.ui.ArgoJMenu;
+import org.argouml.ui.ArgoToolbarManager;
 import org.argouml.ui.ProjectActions;
 import org.argouml.ui.ProjectBrowser;
 import org.argouml.ui.ZoomSliderButton;

Modified: trunk/src_new/org/argouml/uml/ui/PropPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/PropPanel.java?view=diff&rev=13104&p1=trunk/src_new/org/argouml/uml/ui/PropPanel.java&p2=trunk/src_new/org/argouml/uml/ui/PropPanel.java&r1=13103&r2=13104
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/PropPanel.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/PropPanel.java	2007-07-21 11:29:31-0700
@@ -56,7 +56,6 @@
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.ProjectManager;
 import org.argouml.model.Model;
-import org.argouml.swingext.ArgoToolbarManager;
 import org.argouml.ui.AbstractArgoJPanel;
 import org.argouml.ui.LookAndFeelMgr;
 import org.argouml.ui.targetmanager.TargetEvent;

Modified: trunk/src_new/org/argouml/uml/ui/TabConstraints.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabConstraints.java?view=diff&rev=13104&p1=trunk/src_new/org/argouml/uml/ui/TabConstraints.java&p2=trunk/src_new/org/argouml/uml/ui/TabConstraints.java&r1=13103&r2=13104
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabConstraints.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/TabConstraints.java	2007-07-21 11:29:31-0700
@@ -40,7 +40,6 @@
 import org.argouml.model.Model;
 import org.argouml.ocl.ArgoFacade;
 import org.argouml.ocl.OCLUtil;
-import org.argouml.swingext.ArgoToolbarManager;
 import org.argouml.ui.AbstractArgoJPanel;
 import org.argouml.ui.targetmanager.TargetEvent;
 import org.tigris.gef.presentation.Fig;

Modified: trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java?view=diff&rev=13104&p1=trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java&p2=trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java&r1=13103&r2=13104
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java	2007-07-21 11:29:31-0700
@@ -50,7 +50,6 @@
 import org.argouml.i18n.Translator;
 import org.argouml.model.InvalidElementException;
 import org.argouml.model.Model;
-import org.argouml.swingext.ArgoToolbarManager;
 import org.argouml.ui.AbstractArgoJPanel;
 import org.argouml.ui.LookAndFeelMgr;
 import org.argouml.ui.targetmanager.TargetEvent;