svn commit: r13677 - trunk/src_new/org/argouml: moduleloader persistence uml/profile uml/reveng

Author: tfmorris
Date: 2007-10-11 01:39:08-0700
New Revision: 13677

Modified:
   trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java
   trunk/src_new/org/argouml/persistence/UmlFilePersister.java
   trunk/src_new/org/argouml/persistence/XmiFilePersister.java
   trunk/src_new/org/argouml/persistence/ZipFilePersister.java
   trunk/src_new/org/argouml/uml/profile/ZipModelLoader.java
   trunk/src_new/org/argouml/uml/reveng/Import.java
   trunk/src_new/org/argouml/uml/reveng/ImportClassLoader.java

Log:
Change uses of deprecated File.toURL

Modified: trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java?view=diff&rev=13677&p1=trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java&p2=trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java&r1=13676&r2=13677
==============================================================================
--- trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java	(original)
+++ trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java	2007-10-11 01:39:08-0700
@@ -510,7 +510,7 @@
 		        // classloader than the default here? - - tfm
 	                ClassLoader classloader =
 			    new URLClassLoader(new URL[] {
-				file.toURL(),
+				file.toURI().toURL(),
 			    });
 	                try {
 	                    processJarFile(classloader, file);

Modified: trunk/src_new/org/argouml/persistence/UmlFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/UmlFilePersister.java?view=diff&rev=13677&p1=trunk/src_new/org/argouml/persistence/UmlFilePersister.java&p2=trunk/src_new/org/argouml/persistence/UmlFilePersister.java&r1=13676&r2=13677
==============================================================================
--- trunk/src_new/org/argouml/persistence/UmlFilePersister.java	(original)
+++ trunk/src_new/org/argouml/persistence/UmlFilePersister.java	2007-10-11 01:39:08-0700
@@ -378,7 +378,7 @@
             progressMgr.nextPhase();
 
             inputStream = new XmlInputStream(
-                        file.toURL().openStream(),
+                        file.toURI().toURL().openStream(),
                         "argo",
                         file.length(),
                         100000);
@@ -514,7 +514,7 @@
     private int getPersistenceVersionFromFile(File file) throws OpenException {
         InputStream stream = null;
         try {
-            stream = new BufferedInputStream(file.toURL()
+            stream = new BufferedInputStream(file.toURI().toURL()
                     .openStream());
             int version = getPersistenceVersion(stream);
             stream.close();
@@ -582,7 +582,7 @@
     private String getReleaseVersionFromFile(File file) throws OpenException {
         InputStream stream = null;
         try {
-            stream = new BufferedInputStream(file.toURL().openStream());
+            stream = new BufferedInputStream(file.toURI().toURL().openStream());
             String version = getReleaseVersion(stream);
             stream.close();
             return version;

Modified: trunk/src_new/org/argouml/persistence/XmiFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/XmiFilePersister.java?view=diff&rev=13677&p1=trunk/src_new/org/argouml/persistence/XmiFilePersister.java&p2=trunk/src_new/org/argouml/persistence/XmiFilePersister.java&r1=13676&r2=13677
==============================================================================
--- trunk/src_new/org/argouml/persistence/XmiFilePersister.java	(original)
+++ trunk/src_new/org/argouml/persistence/XmiFilePersister.java	2007-10-11 01:39:08-0700
@@ -237,9 +237,9 @@
             ThreadUtils.checkIfInterrupted();
             
             InputSource source = new InputSource(new XmiInputStream(file
-                    .toURL().openStream(), this, phaseSpace,
+                    .toURI().toURL().openStream(), this, phaseSpace,
                     progressMgr));
-            source.setSystemId(file.toURL().toString());
+            source.setSystemId(file.toURI().toURL().toString());
             
             ModelMemberFilePersister modelPersister =
                 new ModelMemberFilePersister();

Modified: trunk/src_new/org/argouml/persistence/ZipFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/ZipFilePersister.java?view=diff&rev=13677&p1=trunk/src_new/org/argouml/persistence/ZipFilePersister.java&p2=trunk/src_new/org/argouml/persistence/ZipFilePersister.java&r1=13676&r2=13677
==============================================================================
--- trunk/src_new/org/argouml/persistence/ZipFilePersister.java	(original)
+++ trunk/src_new/org/argouml/persistence/ZipFilePersister.java	2007-10-11 01:39:08-0700
@@ -221,14 +221,15 @@
                 fileName.substring(
                         fileName.indexOf('.'),
                         fileName.lastIndexOf('.'));
-            InputStream stream = openZipStreamAt(file.toURL(), extension);
+            InputStream stream = openZipStreamAt(file.toURI().toURL(),
+                    extension);
 
             // TODO: What progressMgr is to be used here? Where does
             //       it come from?
             InputSource is =
                 new InputSource(
                     new XmiInputStream(stream, this, 100000, null));
-            is.setSystemId(file.toURL().toExternalForm());
+            is.setSystemId(file.toURI().toURL().toExternalForm());
 
             ModelMemberFilePersister modelPersister =
                 new ModelMemberFilePersister();

Modified: trunk/src_new/org/argouml/uml/profile/ZipModelLoader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/profile/ZipModelLoader.java?view=diff&rev=13677&p1=trunk/src_new/org/argouml/uml/profile/ZipModelLoader.java&p2=trunk/src_new/org/argouml/uml/profile/ZipModelLoader.java&r1=13676&r2=13677
==============================================================================
--- trunk/src_new/org/argouml/uml/profile/ZipModelLoader.java	(original)
+++ trunk/src_new/org/argouml/uml/profile/ZipModelLoader.java	2007-10-11 01:39:08-0700
@@ -72,7 +72,7 @@
 			path);

 	    }

 	    try {

-		is = openZipStreamAt(modelFile.toURL(), extension);

+		is = openZipStreamAt(modelFile.toURI().toURL(), extension);

 	    } catch (MalformedURLException e) {

 		LOG.error("Exception while loading profile '" + modelFilename

 			+ "'", e);


Modified: trunk/src_new/org/argouml/uml/reveng/Import.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/reveng/Import.java?view=diff&rev=13677&p1=trunk/src_new/org/argouml/uml/reveng/Import.java&p2=trunk/src_new/org/argouml/uml/reveng/Import.java&r1=13676&r2=13677
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/Import.java	(original)
+++ trunk/src_new/org/argouml/uml/reveng/Import.java	2007-10-11 01:39:08-0700
@@ -982,7 +982,8 @@
                 URL[] urls = new URL[pathsModel.size()];
                 for (int i = 0; i < urls.length; i++) {
                     try {
-                        urls[i] = new File((String) pathsModel.get(i)).toURL();
+                        urls[i] = new File((String) pathsModel.get(i)).toURI()
+                                .toURL();
                     } catch (Exception e1) {
                         LOG.warn("could not do ok: could not make"
                                 + "url " + pathsModel.get(i) + ", " + e1,

Modified: trunk/src_new/org/argouml/uml/reveng/ImportClassLoader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/reveng/ImportClassLoader.java?view=diff&rev=13677&p1=trunk/src_new/org/argouml/uml/reveng/ImportClassLoader.java&p2=trunk/src_new/org/argouml/uml/reveng/ImportClassLoader.java&r1=13676&r2=13677
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/ImportClassLoader.java	(original)
+++ trunk/src_new/org/argouml/uml/reveng/ImportClassLoader.java	2007-10-11 01:39:08-0700
@@ -145,7 +145,7 @@
      */
     public void addFile(File f) throws MalformedURLException {
         try {
-            this.addURL(f.toURL());
+            this.addURL(f.toURI().toURL());
         } catch (MalformedURLException e) {
 	    LOG.warn("could not add file ", e);
 	}
@@ -161,7 +161,7 @@
 
         URL url = null;
         try {
-            url = f.toURL();
+            url = f.toURI().toURL();
         } catch (MalformedURLException e) {
 	    LOG.warn("could not remove file ", e);
             return;
@@ -220,7 +220,7 @@
             String token = st.nextToken();
 
             try {
-		urlList.add(new File(token).toURL());
+		urlList.add(new File(token).toURI().toURL());
             } catch (MalformedURLException e) {
 		LOG.error(e);
 	    }