Commit 5bc274ca authored by Phillip Webb's avatar Phillip Webb

Polish

parent 0968d411
...@@ -189,6 +189,7 @@ public class Repackager { ...@@ -189,6 +189,7 @@ public class Repackager {
final List<Library> unpackLibraries = new ArrayList<Library>(); final List<Library> unpackLibraries = new ArrayList<Library>();
final List<Library> standardLibraries = new ArrayList<Library>(); final List<Library> standardLibraries = new ArrayList<Library>();
libraries.doWithLibraries(new LibraryCallback() { libraries.doWithLibraries(new LibraryCallback() {
@Override @Override
public void library(Library library) throws IOException { public void library(Library library) throws IOException {
File file = library.getFile(); File file = library.getFile();
...@@ -201,6 +202,7 @@ public class Repackager { ...@@ -201,6 +202,7 @@ public class Repackager {
} }
} }
} }
}); });
writer.writeManifest(buildManifest(sourceJar)); writer.writeManifest(buildManifest(sourceJar));
Set<String> seen = new HashSet<String>(); Set<String> seen = new HashSet<String>();
......
...@@ -259,6 +259,7 @@ public class JarFile extends java.util.jar.JarFile { ...@@ -259,6 +259,7 @@ public class JarFile extends java.util.jar.JarFile {
private JarFile createJarFileFromDirectoryEntry(JarEntry entry) throws IOException { private JarFile createJarFileFromDirectoryEntry(JarEntry entry) throws IOException {
final AsciiBytes sourceName = new AsciiBytes(entry.getName()); final AsciiBytes sourceName = new AsciiBytes(entry.getName());
JarEntryFilter filter = new JarEntryFilter() { JarEntryFilter filter = new JarEntryFilter() {
@Override @Override
public AsciiBytes apply(AsciiBytes name) { public AsciiBytes apply(AsciiBytes name) {
if (name.startsWith(sourceName) && !name.equals(sourceName)) { if (name.startsWith(sourceName) && !name.equals(sourceName)) {
...@@ -266,6 +267,7 @@ public class JarFile extends java.util.jar.JarFile { ...@@ -266,6 +267,7 @@ public class JarFile extends java.util.jar.JarFile {
} }
return null; return null;
} }
}; };
return new JarFile(this.rootFile, return new JarFile(this.rootFile,
this.pathFromRoot + "!/" this.pathFromRoot + "!/"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment