Changeset 5:12144f04801b for core

Timestamp:

07/02/10 21:34:09 (14 years ago)

Author:

lukacu

Branch:

default

Convert:

svn:f819dc9c-ca78-df11-852c-0018fe7759ca/trunk@6

Message:

Bundle import fixes

Location:

core/src/org/webstrips/core

Files:

• ComicManager.java (modified) (2 diffs)
• bundle/ComicBundle.java (modified) (1 diff)

core/src/org/webstrips/core/ComicManager.java

@@ -274 +274 @@
                 } else {
                 
-                    bundle.unpack(StorageManager.getStorageManager().getStorageDirectory());
+                    bundle.unpack(StorageManager.getStorageManager().getStorageDirectory(), installed.getComicIdentifier());
+                    
+                    reloadComic(installed);
                     
                     return true;
@@ -306 +308 @@
                 l.comicRemoved(this, comic);
             } catch (Exception e) {
-                // TODO: log
+                WebStrips.getLogger().report(e);
             }
         }

core/src/org/webstrips/core/bundle/ComicBundle.java

@@ -198 +198 @@
     }
     
+    public String unpack(File destination) throws ComicBundleException {
+        
+        UUID uuid = UUID.randomUUID();
+        
+        String identifier = description.getShortName() + "-" + uuid.toString();
+        
+        return unpack(destination, identifier);
+    }
+    
     /**
      * Unpack.
      * 
-     * @param destination
-     *            the identifier (comic id + "-" + uuid)
+     * @param destination the destination directory
+     * @param identifier the identifier (comic id + "-" + uuid)
      * 
      * @throws ComicBundleException
      *             the comic bundle exception
      */
-    public String unpack(File destination) throws ComicBundleException {
-
-        UUID uuid = UUID.randomUUID();
-        
-        String identifier = description.getShortName() + "-" + uuid.toString();
+    public String unpack(File destination, String identifier) throws ComicBundleException {
+
+
 
         if (!destination.isDirectory())