Changeset 6245 in josm for trunk/src/org/openstreetmap/josm/io/session

Timestamp:

2013-09-22T16:59:52+02:00 (11 years ago)

Author:

Don-vip

Message:

see #9032, see #4029 - Allow to load session from standard I/O mechanisms (local and remote files) + javadoc

Location:

trunk/src/org/openstreetmap/josm/io/session

Files:

• SessionImporter.java (added)
• SessionReader.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -85 +85 @@
     }
 
-    private File sessionFile;
-    private boolean zip; /* true, if session file is a .joz file; false if it is a .jos file */
+    private URI sessionFileURI;
+    private boolean zip; // true, if session file is a .joz file; false if it is a .jos file
     private ZipFile zipFile;
     private List<Layer> layers = new ArrayList<Layer>();
@@ -208 +208 @@
                                 // relative to session file - "../" step out of the archive
                                 String relPath = uri.getPath().substring(3);
-                                return new File(sessionFile.toURI().resolve(relPath));
+                                return new File(sessionFileURI.resolve(relPath));
                             } else {
                                 // file inside zip archive
@@ -215 +215 @@
                             }
                         } else
-                            return new File(sessionFile.toURI().resolve(uri));
+                            return new File(sessionFileURI.resolve(uri));
                     }
                 } else
@@ -225 +225 @@
 
         /**
-         * Returns true if we are reading from a .joz file.
+         * Determines if we are reading from a .joz file.
+         * @return {@code true} if we are reading from a .joz file, {@code false} otherwise
          */
         public boolean isZip() {
@@ -278 +279 @@
     }
 
-    private void error(String msg) throws IllegalDataException {
+    private static void error(String msg) throws IllegalDataException {
         throw new IllegalDataException(msg);
     }
@@ -530 +531 @@
             progressMonitor = NullProgressMonitor.INSTANCE;
         }
-        this.sessionFile = sessionFile;
-        this.zip = zip;
 
         InputStream josIS = null;
@@ -538 +537 @@
             try {
                 zipFile = new ZipFile(sessionFile);
-                ZipEntry josEntry = null;
-                Enumeration<? extends ZipEntry> entries = zipFile.entries();
-                while (entries.hasMoreElements()) {
-                    ZipEntry entry = entries.nextElement();
-                    if (entry.getName().toLowerCase().endsWith(".jos")) {
-                        josEntry = entry;
-                        break;
-                    }
-                }
-                if (josEntry == null) {
-                    error(tr("expected .jos file inside .joz archive"));
-                }
-                josIS = zipFile.getInputStream(josEntry);
+                josIS = getZipInputStream(zipFile);
             } catch (ZipException ze) {
                 throw new IOException(ze);
@@ -562 +549 @@
         }
 
+        loadSession(josIS, sessionFile.toURI(), zip, progressMonitor);
+    }
+
+    private static InputStream getZipInputStream(ZipFile zipFile) throws ZipException, IOException, IllegalDataException {
+        ZipEntry josEntry = null;
+        Enumeration<? extends ZipEntry> entries = zipFile.entries();
+        while (entries.hasMoreElements()) {
+            ZipEntry entry = entries.nextElement();
+            if (entry.getName().toLowerCase().endsWith(".jos")) {
+                josEntry = entry;
+                break;
+            }
+        }
+        if (josEntry == null) {
+            error(tr("expected .jos file inside .joz archive"));
+        }
+        return zipFile.getInputStream(josEntry);
+    }
+
+    private void loadSession(InputStream josIS, URI sessionFileURI, boolean zip, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
+        
+        this.sessionFileURI = sessionFileURI;
+        this.zip = zip;
+        
         try {
             DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
@@ -581 +592 @@
         return (Element) els.item(0);
     }
-
 }