Changeset 10010

Timestamp:

2005-06-03T14:57:34+12:00 (19 years ago)

Author:

mdewsnip

Message:

Moved Utility.isInJar and Utility.extractFromJar into a new JarTools class (which will eventually blur all the differences between reading files locally and reading them out of the JAR file).

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• GathererApplet.java (modified) (4 diffs)
• util/Utility.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/GathererApplet.java

@@ -41 +41 @@
 import org.greenstone.gatherer.feedback.ActionRecorderDialog;
 import org.greenstone.gatherer.gui.GUIManager;
+import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.shell.GShell;
@@ -154 +155 @@
     if (!col_dir.exists()) {
 
-        if (Utility.isInJar(Utility.COLLECT_ZIP)) {
+        if (JarTools.isInJar(Utility.COLLECT_ZIP)) {
         // Dig out collect.zip from JAR file and unzip it (thereby
         // creating collect directory and descendants.
@@ -182 +183 @@
         }
 
-
     File metadata_directory = new File(Utility.METADATA_DIR);
     if (!metadata_directory.exists()) {
@@ -189 +189 @@
     }
 
-    
     File plug_dat = new File(Utility.BASE_DIR + "plugins.dat");
     if (!plug_dat.exists()) {
-        Utility.extractFromJar("plugins.dat",Utility.BASE_DIR,false);
+        JarTools.extractFromJar("plugins.dat", Utility.BASE_DIR, false);
     }
 
     File class_dat = new File(Utility.BASE_DIR + "classifiers.dat");
     if (!class_dat.exists()) {
-        Utility.extractFromJar("classifiers.dat",Utility.BASE_DIR,false);
+        JarTools.extractFromJar("classifiers.dat", Utility.BASE_DIR, false);
     }
     

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -471 +471 @@
 
 
-    static public boolean isInJar(String filename) 
-    {
-    try {
-        InputStream fis = base.getResourceAsStream("/"+filename);
-            
-        fis.close();
-
-    }
-    catch (Exception error) {
-        System.err.println("**** collect.zip not there!");
-        error.printStackTrace();
-
-
-        return false;
-    }
-    return true;
-    }
-
-
-
-    static public void extractFromJar(String filename, String dst_dir, boolean must_be_present) 
-    {
-    try {
-        // setup input stream for slurping out file
-        InputStream fis = base.getResourceAsStream("/"+filename);
-        BufferedInputStream fbis = new BufferedInputStream(fis); 
-        DataInputStream fdbis = new DataInputStream(fbis);
-            
-        // set up output stream for writing to disk
-        String ofname = dst_dir + filename;
-        FileOutputStream fos = new FileOutputStream(ofname);
-        BufferedOutputStream bfos = new BufferedOutputStream(fos);
-
-        byte[] buf = new byte[1024];
-        int len;
-        int total_bytes = 0;
-        while ((len = fdbis.read(buf)) >= 0) {
-        bfos.write(buf,0,len);
-        total_bytes += len;
-        }
-
-        fdbis.close();
-        bfos.close();
-    }
-    catch (Exception error) {
-        if (must_be_present) {
-        error.printStackTrace();
-        }
-    }
-    }
-
-
     /** Method which unzips a given metadata resoure
      * @param zip_fname The name of the zip file as a <strong>String</strong>.
@@ -535 +483 @@
     }
 
-    extractFromJar(jar_zip_fname,dst_dir,true);
+    JarTools.extractFromJar(jar_zip_fname,dst_dir,true);
 
     String zip_ofname = dst_dir + jar_zip_fname;