svn commit: r17401 - trunk/src/argouml-app/src/org/argouml/ui: . cmd

Author: bobtarling
Date: 2009-10-18 18:19:19-0700
New Revision: 17401

Modified:
   trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java
   trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java

Log:
Remove option to create collaboration diagram in UML2 (that diagram type no longer exists)

Modified: trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java?view=diff&pathrev=17401&r1=17400&r2=17401
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java	2009-10-18 18:19:19-0700
@@ -273,7 +273,7 @@
         createPanels(splash, leftBottomPane);
 
         if (isMainApplication) {
-            menuBar = new GenericArgoMenuBar();
+            menuBar = MenuBarFactory.createApplicationMenuBar();
             getContentPane().setLayout(new BorderLayout());
             this.setJMenuBar(menuBar);
             //getContentPane().add(_menuBar, BorderLayout.NORTH);

Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java?view=diff&pathrev=17401&r1=17400&r2=17401
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java	2009-10-18 18:19:19-0700
@@ -113,6 +113,8 @@
  * </pre>
  * 
  * TODO: Add registration for new menu items.
+ * @deprecated in 0.29.2 by Bob Tarling. This class will be moved and made
+ * private in future. Use MenuBarFactory.createApplicationMenuBar
  */
 public class GenericArgoMenuBar extends JMenuBar implements
         TargetListener {
@@ -589,7 +591,7 @@
      * 
      * The sequence of these items was determined by issue 1821.
      */
-    private void initMenuCreate() {
+    protected void initMenuCreate() {
         Collection<Action> toolbarTools = new ArrayList<Action>();
         createDiagramMenu = add(new JMenu(menuLocalize("Create Diagram")));
         setMnemonic(createDiagramMenu, "Create Diagram");
@@ -970,7 +972,6 @@
         return createDiagramToolbar;
     }
 
-
     /**
      * Get the create diagram menu. Provided to allow plugins
      * to appeand their own actions to this menu.

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2408761

To unsubscribe from this discussion, e-mail: [[email protected]].