svn commit: r17959 - trunk/src/argouml-app/src/org/argouml/persistence/ZargoFilePersister.java

Author: thn
Date: 2010-02-04 04:45:05-0800
New Revision: 17959

Modified:
   trunk/src/argouml-app/src/org/argouml/persistence/ZargoFilePersister.java

Log:
turn off project upgrading for UML2 (for issue 5960)

Modified: trunk/src/argouml-app/src/org/argouml/persistence/ZargoFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/ZargoFilePersister.java?view=diff&pathrev=17959&r1=17958&r2=17959
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/ZargoFilePersister.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/ZargoFilePersister.java	2010-02-04 04:45:05-0800
@@ -68,6 +68,7 @@
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectFactory;
 import org.argouml.kernel.ProjectMember;
+import org.argouml.model.Model;
 import org.argouml.util.FileConstants;
 import org.argouml.util.ThreadUtils;
 import org.xml.sax.InputSource;
@@ -246,6 +247,11 @@
         //boolean upgradeRequired = !checkVersion(fileVersion, releaseVersion)
         boolean upgradeRequired = true;
         
+        // Upgrade is in the way for UML2 projects, so we turn it off in that case:
+        if (Model.getFacade().getUmlVersion().charAt(0) == '2') {
+            upgradeRequired = false;
+        }
+        
         LOG.info("Loading zargo file of version " + fileVersion);
         
         final Project p;

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

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