svn commit: r13048 - trunk/src_new/org/argouml/ui/cmd

Author: tfmorris
Date: 2007-07-10 13:34:29-0700
New Revision: 13048

Modified:
   trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java
   trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java

Log:
Back out partial change.

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=13048&p1=trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java&p2=trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java&r1=13047&r2=13048
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java	(original)
+++ trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java	2007-07-10 13:34:29-0700
@@ -46,6 +46,7 @@
 import org.argouml.ui.ActionSettings;
 import org.argouml.ui.ArgoJMenu;
 import org.argouml.ui.ProjectActions;
+import org.argouml.ui.ProjectBrowser;
 import org.argouml.ui.ZoomSliderButton;
 import org.argouml.ui.explorer.ActionPerspectiveConfig;
 import org.argouml.ui.targetmanager.TargetEvent;
@@ -67,7 +68,6 @@
 import org.argouml.uml.ui.ActionRevertToSaved;
 import org.argouml.uml.ui.ActionSaveAllGraphics;
 import org.argouml.uml.ui.ActionSaveGraphics;
-import org.argouml.uml.ui.ActionSaveProject;
 import org.argouml.uml.ui.ActionSaveProjectAs;
 import org.argouml.uml.ui.ActionSequenceDiagram;
 import org.argouml.uml.ui.ActionStateDiagram;
@@ -305,11 +305,12 @@
         fileToolbar.add(new ActionOpenProject());
         file.addSeparator();
 
-        JMenuItem saveProjectItem = file.add(ActionSaveProject.getInstance());
+        JMenuItem saveProjectItem = file.add(ProjectBrowser.getInstance()
+                .getSaveAction());
         setMnemonic(saveProjectItem, "Save");
         ShortcutMgr.assignAccelerator(saveProjectItem,
                 ShortcutMgr.ACTION_SAVE_PROJECT);
-        fileToolbar.add(ActionSaveProject.getInstance());
+        fileToolbar.add((ProjectBrowser.getInstance().getSaveAction()));
         JMenuItem saveProjectAsItem = file.add(new ActionSaveProjectAs());
         setMnemonic(saveProjectAsItem, "SaveAs");
         ShortcutMgr.assignAccelerator(saveProjectAsItem,

Modified: trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java?view=diff&rev=13048&p1=trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java&p2=trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java&r1=13047&r2=13048
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java	(original)
+++ trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java	2007-07-10 13:34:29-0700
@@ -48,6 +48,7 @@
 import org.argouml.ui.ActionProjectSettings;
 import org.argouml.ui.ActionSettings;
 import org.argouml.ui.ProjectActions;
+import org.argouml.ui.ProjectBrowser;
 import org.argouml.ui.explorer.ActionPerspectiveConfig;
 import org.argouml.uml.ui.ActionActivityDiagram;
 import org.argouml.uml.ui.ActionClassDiagram;
@@ -551,7 +552,8 @@
         putDefaultShortcut(ACTION_OPEN_PROJECT, KeyStroke.getKeyStroke(
                 KeyEvent.VK_O, DEFAULT_MASK), new ActionOpenProject());
         putDefaultShortcut(ACTION_SAVE_PROJECT, KeyStroke.getKeyStroke(
-                KeyEvent.VK_S, DEFAULT_MASK), ActionSaveProject.getInstance());
+                KeyEvent.VK_S, DEFAULT_MASK), 
+                ProjectBrowser.getInstance().getSaveAction());
         putDefaultShortcut(ACTION_SAVE_PROJECT_AS, null,
                 new ActionSaveProjectAs());
         putDefaultShortcut(ACTION_REVERT_TO_SAVED, null,