svn commit: r14316 - trunk/src/model-mdr/src/org/argouml/model/mdr

Author: euluis
Date: 2008-04-09 16:57:54-0700
New Revision: 14316

Modified:
   trunk/src/model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java

Log:
issue 4946: removing statics in XmiReaderImpl and adding them into ModelImpl, in order to have initialization of model subsystem to work correctly.

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java?view=diff&rev=14316&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java&r1=14315&r2=14316
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/MDRModelImplementation.java	2008-04-09 16:57:54-0700
@@ -28,11 +28,13 @@
 import java.io.OutputStream;
 import java.io.Writer;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -188,6 +190,8 @@
     private Map<String, String> public2SystemIds = 
         Collections.synchronizedMap(new HashMap<String, String>());
 
+    private List<String> searchDirs = new ArrayList<String>();
+
     /**
      * @return Returns the root UML Factory package for user model.
      */
@@ -677,4 +681,16 @@
         return new DefaultCommandStack();
     }
 
+    void addSearchPath(String path) {
+        searchDirs.add(path);
+    }
+
+    void removeSearchPath(String path) {
+        searchDirs.remove(path);
+    }
+
+    List<String> getSearchPath() {
+        return searchDirs;
+    }
+
 }

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java?view=diff&rev=14316&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java&r1=14315&r2=14316
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java	2008-04-09 16:57:54-0700
@@ -110,8 +110,6 @@
      */
     private int ignoredElementCount;
 
-    private static List<String> searchDirs = new ArrayList<String>();
-
     /**
      * Constructor for XMIReader.
      * @param parentModelImplementation The ModelImplementation
@@ -144,7 +142,8 @@
 
             resolver = new XmiReferenceResolverImpl(new RefPackage[] {extent},
                     config, modelImpl.getObjectToId(), 
-                    modelImpl.getPublic2SystemIds(), searchDirs, profile, 
+                    modelImpl.getPublic2SystemIds(), modelImpl.getSearchPath(), 
+                    profile, 
                     inputSource.getPublicId(), inputSource.getSystemId());
             config.setReferenceResolver(resolver);
             
@@ -566,17 +565,16 @@
         return "XMI";
     }
 
-
     public void addSearchPath(String path) {
-        searchDirs.add(path);
+        modelImpl.addSearchPath(path);
     }
 
     public void removeSearchPath(String path) {
-        searchDirs.remove(path);
+        modelImpl.removeSearchPath(path);
     }
 
     public List<String> getSearchPath() {
-        return searchDirs;
+        return modelImpl.getSearchPath();
     }
 
 }