X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=getdown%2Fsrc%2Fgetdown%2Fcore%2Fsrc%2Fmain%2Fjava%2Fcom%2Fthreerings%2Fgetdown%2Fdata%2FResource.java;fp=getdown%2Fsrc%2Fgetdown%2Fcore%2Fsrc%2Fmain%2Fjava%2Fcom%2Fthreerings%2Fgetdown%2Fdata%2FResource.java;h=d48f1d6d4e601ae703f4454ba6a90a06c13a47ee;hb=3fade83499e769d08529a9da301b64af33795610;hp=adc2d4f2174e535b510fc4919de95e73bd164523;hpb=91b997599550f62b59629aed53371c2356dcbf36;p=jalview.git

diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Resource.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Resource.java
index adc2d4f..d48f1d6 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Resource.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Resource.java
@@ -18,10 +18,6 @@ import java.util.Locale;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import org.apache.commons.compress.archivers.ArchiveInputStream;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
-
 import com.threerings.getdown.util.FileUtil;
 import com.threerings.getdown.util.ProgressObserver;
 import com.threerings.getdown.util.StringUtil;
@@ -145,14 +141,11 @@ public class Resource implements Comparable<Resource>
         _marker = new File(lpath + "v");
 
         _attrs = attrs;
-        _isTgz = isTgz(lpath);
         _isJar = isJar(lpath);
         _isPacked200Jar = isPacked200Jar(lpath);
         boolean unpack = attrs.contains(Attr.UNPACK);
         if (unpack && _isJar) {
             _unpacked = _local.getParentFile();
-        } else if(unpack && _isTgz) {
-            _unpacked = _local.getParentFile();
         } else if(unpack && _isPacked200Jar) {
             String dotJar = ".jar", lname = _local.getName();
             String uname = lname.substring(0, lname.lastIndexOf(dotJar) + dotJar.length());
@@ -307,20 +300,13 @@ public class Resource implements Comparable<Resource>
     public void unpack () throws IOException
     {
         // sanity check
-        if (!_isJar && !_isPacked200Jar && !_isTgz) {
-            throw new IOException("Requested to unpack non-jar/tgz file '" + _local + "'.");
+        if (!_isJar && !_isPacked200Jar) {
+            throw new IOException("Requested to unpack non-jar file '" + _local + "'.");
         }
         if (_isJar) {
             try (JarFile jar = new JarFile(_local)) {
                 FileUtil.unpackJar(jar, _unpacked, _attrs.contains(Attr.CLEAN));
             }
-        } else if (_isTgz) {
-            try (InputStream fi = Files.newInputStream(_local.toPath());
-                         InputStream bi = new BufferedInputStream(fi);
-                         InputStream gzi = new GzipCompressorInputStream(bi);
-                         TarArchiveInputStream tgz = new TarArchiveInputStream(gzi)) {
-                    FileUtil.unpackTgz(tgz, _unpacked, _attrs.contains(Attr.CLEAN));
-            }
         } else {
             FileUtil.unpackPacked200Jar(_local, _unpacked);
         }
@@ -387,11 +373,6 @@ public class Resource implements Comparable<Resource>
         return path.endsWith(".jar") || path.endsWith(".jar_new");
     }
     
-    protected static boolean isTgz (String path)
-    {
-        return path.endsWith(".tgz") || path.endsWith(".tgz_new");
-    }
-
     protected static boolean isPacked200Jar (String path)
     {
         return path.endsWith(".jar.pack") || path.endsWith(".jar.pack_new") ||
@@ -402,7 +383,7 @@ public class Resource implements Comparable<Resource>
     protected URL _remote;
     protected File _local, _localNew, _marker, _unpacked;
     protected EnumSet<Attr> _attrs;
-    protected boolean _isJar, _isPacked200Jar, _isTgz;
+    protected boolean _isJar, _isPacked200Jar;
 
     /** Used to sort the entries in a jar file. */
     protected static final Comparator<JarEntry> ENTRY_COMP = new Comparator<JarEntry>() {