diff options
| -rw-r--r-- | sched/src/com/android/sched/vfs/ReadZipFS.java | 13 | ||||
| -rw-r--r-- | sched/src/com/android/sched/vfs/WriteZipFS.java | 13 |
2 files changed, 9 insertions, 17 deletions
diff --git a/sched/src/com/android/sched/vfs/ReadZipFS.java b/sched/src/com/android/sched/vfs/ReadZipFS.java index 3607ae97..0c15f4a9 100644 --- a/sched/src/com/android/sched/vfs/ReadZipFS.java +++ b/sched/src/com/android/sched/vfs/ReadZipFS.java @@ -95,24 +95,19 @@ public class ReadZipFS extends BaseVFS<ZipVDir, ZipVFile> implements VFS { @Nonnull private static final Splitter splitter = Splitter.on(ZipUtils.ZIP_SEPARATOR); @Nonnull + private static final Set<Capabilities> CAPABILITIES = Collections.unmodifiableSet( + EnumSet.of(Capabilities.READ, Capabilities.PARALLEL_READ, Capabilities.CASE_SENSITIVE)); + @Nonnull private final ZipVDir root = new ZipVDir(this, new ZipEntry(""), ""); @Nonnull private final InputZipFile inputZipFile; @Nonnull private final ZipFile zipFile; - @Nonnull - private final Set<Capabilities> capabilities; public ReadZipFS(@Nonnull InputZipFile zipFile) { this.inputZipFile = zipFile; this.zipFile = zipFile.getZipFile(); fillSubElements(); - - Set<Capabilities> capabilities = EnumSet.noneOf(Capabilities.class); - capabilities.add(Capabilities.READ); - capabilities.add(Capabilities.PARALLEL_READ); - capabilities.add(Capabilities.CASE_SENSITIVE); - this.capabilities = Collections.unmodifiableSet(capabilities); } @Override @@ -273,7 +268,7 @@ public class ReadZipFS extends BaseVFS<ZipVDir, ZipVFile> implements VFS { @Override @Nonnull public Set<Capabilities> getCapabilities() { - return capabilities; + return CAPABILITIES; } private void fillSubElements() { diff --git a/sched/src/com/android/sched/vfs/WriteZipFS.java b/sched/src/com/android/sched/vfs/WriteZipFS.java index fe03c274..dc5845b4 100644 --- a/sched/src/com/android/sched/vfs/WriteZipFS.java +++ b/sched/src/com/android/sched/vfs/WriteZipFS.java @@ -91,6 +91,10 @@ public class WriteZipFS extends BaseVFS<ZipVDir, ZipVFile> implements VFS { } @Nonnull + private static final Set<Capabilities> CAPABILITIES = Collections.unmodifiableSet( + EnumSet.of(Capabilities.WRITE, Capabilities.CASE_SENSITIVE)); + + @Nonnull private final ZipVDir root = new ZipVDir(this, new ZipEntry(""), ""); @Nonnull private final AtomicBoolean lastVFileOpen = new AtomicBoolean(false); @@ -98,17 +102,10 @@ public class WriteZipFS extends BaseVFS<ZipVDir, ZipVFile> implements VFS { private final OutputZipFile zipFile; @Nonnull private final ZipOutputStream outputStream; - @Nonnull - private final Set<Capabilities> capabilities; public WriteZipFS(@Nonnull OutputZipFile zipFile) { this.zipFile = zipFile; outputStream = zipFile.getOutputStream(); - - Set<Capabilities> capabilities = EnumSet.noneOf(Capabilities.class); - capabilities.add(Capabilities.WRITE); - capabilities.add(Capabilities.CASE_SENSITIVE); - this.capabilities = Collections.unmodifiableSet(capabilities); } void notifyVFileClosed() { @@ -279,7 +276,7 @@ public class WriteZipFS extends BaseVFS<ZipVDir, ZipVFile> implements VFS { @Override @Nonnull public Set<Capabilities> getCapabilities() { - return capabilities; + return CAPABILITIES; } private static class ZipEntryOutputStream extends FilterOutputStream { |