git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'improvement/JAL-4409_implement_extra_schemes_in_getdown' into develop
[jalview.git]
/
getdown
/
src
/
getdown
/
core
/
src
/
main
/
java
/
com
/
threerings
/
getdown
/
data
/
Resource.java
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
3e2f446
..
d48f1d6
100644
(file)
--- 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
@@
-7,6
+7,8
@@
package com.threerings.getdown.data;
import java.io.*;
import java.net.URL;
import java.io.*;
import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.security.MessageDigest;
import java.util.Collections;
import java.util.Comparator;
import java.security.MessageDigest;
import java.util.Collections;
import java.util.Comparator;
@@
-370,7
+372,7
@@
public class Resource implements Comparable<Resource>
{
return path.endsWith(".jar") || path.endsWith(".jar_new");
}
{
return path.endsWith(".jar") || path.endsWith(".jar_new");
}
-
+
protected static boolean isPacked200Jar (String path)
{
return path.endsWith(".jar.pack") || path.endsWith(".jar.pack_new") ||
protected static boolean isPacked200Jar (String path)
{
return path.endsWith(".jar.pack") || path.endsWith(".jar.pack_new") ||