svn commit: r18847 - trunk/src/argouml-app/src/org/argouml/application/Main.java

Author: tfmorris
Date: 2010-11-18 07:51:53-0800
New Revision: 18847

Modified:
   trunk/src/argouml-app/src/org/argouml/application/Main.java

Log:
RESOLVED - task 6166: Diagram toolbar does not display on startup - patch from Ion (comp_)
http://argouml.tigris.org/issues/show_bug.cgi?id=6166

Modified: trunk/src/argouml-app/src/org/argouml/application/Main.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/application/Main.java?view=diff&pathrev=18847&r1=18846&r2=18847
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/application/Main.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/application/Main.java	2010-11-18 07:51:53-0800
@@ -509,13 +509,12 @@
             }
         }
 
-        if (project != null) {
-            // Although this looks redundant, it's needed to get all
-            // the initialization state set correctly.  
-            // Too many side effects as part of initialization!
-            ProjectManager.getManager().setCurrentProject(project);
-            ProjectManager.getManager().setSaveEnabled(false);
+        // We MUST have a project open before continuing. Create if necessary
+        if (project == null) {
+            project = ProjectManager.getManager().makeEmptyProject(true);
         }
+        ProjectManager.getManager().setCurrentProject(project);
+        ProjectManager.getManager().setSaveEnabled(false);
 
         st.mark("set project");
         Designer.enableCritiquing();

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

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