Changeset 13328


Ignore:
Timestamp:
2006-11-24T13:25:42+13:00 (17 years ago)
Author:
mdewsnip
Message:

Moved most of the zip code into the "remote" package, to better indicate where it is used and to simplify the creation of the GLIServer.jar file.

Location:
trunk/gli/src/org/greenstone/gatherer
Files:
3 added
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

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

    r12830 r13328  
    3737import javax.swing.*;
    3838import org.greenstone.gatherer.util.JarTools;
     39import org.greenstone.gatherer.util.UnzipTools;
    3940import org.greenstone.gatherer.util.Utility;
    40 import org.greenstone.gatherer.util.ZipTools;
    4141
    4242
    … …  
    216216
    217217    JarTools.extractFromJar(jar_zip_fname, dst_dir, true);
    218     ZipTools.unzipFile(dst_dir + jar_zip_fname, dst_dir);
     218    UnzipTools.unzipFile(dst_dir + jar_zip_fname, dst_dir);
    219219    }
    220220}

  • trunk/gli/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java

    r12650 r13328  
    4040import org.greenstone.gatherer.collection.CollectionManager;
    4141import org.greenstone.gatherer.shell.GShell;
     42import org.greenstone.gatherer.util.UnzipTools;
    4243import org.greenstone.gatherer.util.Utility;
    43 import org.greenstone.gatherer.util.ZipTools;
    4444
    4545
    … …  
    425425
    426426        // Unzip the collection just downloaded
    427         ZipTools.unzipFile(zip_file_path, Gatherer.getCollectDirectoryPath());
     427        UnzipTools.unzipFile(zip_file_path, Gatherer.getCollectDirectoryPath());
    428428    }
    429429    }
    … …  
    459459
    460460        // Unzip the collection archives just downloaded
    461         ZipTools.unzipFile(zip_file_path, Gatherer.getCollectDirectoryPath());
     461        UnzipTools.unzipFile(zip_file_path, Gatherer.getCollectDirectoryPath());
    462462    }
    463463    }
    … …  
    490490
    491491        // Unzip the collection configurations just downloaded
    492         ZipTools.unzipFile(zip_file_path, Gatherer.getCollectDirectoryPath());
     492        UnzipTools.unzipFile(zip_file_path, Gatherer.getCollectDirectoryPath());
    493493    }
    494494    }
    … …  
    528528
    529529        // Unzip the collection file just downloaded
    530         ZipTools.unzipFile(zip_file_path, collection_directory_path);
     530        UnzipTools.unzipFile(zip_file_path, collection_directory_path);
    531531    }
    532532    }

  • trunk/gli/src/org/greenstone/gatherer/remote/ZipCollectionArchives.java

    r10726 r13328  
    33import java.io.*;
    44import java.util.zip.*;
    5 import org.greenstone.gatherer.util.ZipTools;
    65
    76

  • trunk/gli/src/org/greenstone/gatherer/remote/ZipCollectionConfigurations.java

    r11942 r13328  
    33import java.io.*;
    44import java.util.zip.*;
    5 import org.greenstone.gatherer.util.ZipTools;
    65
    76

  • trunk/gli/src/org/greenstone/gatherer/remote/ZipCollectionShell.java

    r12649 r13328  
    33import java.io.*;
    44import java.util.zip.*;
    5 import org.greenstone.gatherer.util.ZipTools;
    65
    76

  • trunk/gli/src/org/greenstone/gatherer/remote/ZipFiles.java

    r10726 r13328  
    33import java.io.File;
    44import java.util.ArrayList;
    5 import org.greenstone.gatherer.util.ZipTools;
    65
    76
Note: See TracChangeset for help on using the changeset viewer.