diff options
Diffstat (limited to 'sched')
8 files changed, 28 insertions, 13 deletions
diff --git a/sched/src/com/android/sched/vfs/AbstractInputOutputVFS.java b/sched/src/com/android/sched/vfs/AbstractInputOutputVFS.java index e0e5ed5..2b95223 100644 --- a/sched/src/com/android/sched/vfs/AbstractInputOutputVFS.java +++ b/sched/src/com/android/sched/vfs/AbstractInputOutputVFS.java @@ -32,7 +32,23 @@ public abstract class AbstractInputOutputVFS extends AbstractVFS implements Inpu @Override @Nonnull - public InputOutputVDir getRootDir() { + public InputOutputVDir getRootInputOutputVDir() { + assert root != null; + + return root; + } + + @Override + @Nonnull + public InputVDir getRootInputVDir() { + assert root != null; + + return root; + } + + @Override + @Nonnull + public OutputVDir getRootOutputVDir() { assert root != null; return root; diff --git a/sched/src/com/android/sched/vfs/AbstractInputVFS.java b/sched/src/com/android/sched/vfs/AbstractInputVFS.java index f490fbe..3ea4aad 100644 --- a/sched/src/com/android/sched/vfs/AbstractInputVFS.java +++ b/sched/src/com/android/sched/vfs/AbstractInputVFS.java @@ -32,7 +32,7 @@ public abstract class AbstractInputVFS extends AbstractVFS implements InputVFS { @Override @Nonnull - public InputVDir getRootDir() { + public InputVDir getRootInputVDir() { assert root != null; return root; diff --git a/sched/src/com/android/sched/vfs/AbstractOutputVFS.java b/sched/src/com/android/sched/vfs/AbstractOutputVFS.java index 6fc672a..8174282 100644 --- a/sched/src/com/android/sched/vfs/AbstractOutputVFS.java +++ b/sched/src/com/android/sched/vfs/AbstractOutputVFS.java @@ -32,7 +32,7 @@ public abstract class AbstractOutputVFS extends AbstractVFS implements OutputVFS @Override @Nonnull - public OutputVDir getRootDir() { + public OutputVDir getRootOutputVDir() { assert root != null; return root; diff --git a/sched/src/com/android/sched/vfs/InputOutputVFS.java b/sched/src/com/android/sched/vfs/InputOutputVFS.java index d28cfa2..59662d2 100644 --- a/sched/src/com/android/sched/vfs/InputOutputVFS.java +++ b/sched/src/com/android/sched/vfs/InputOutputVFS.java @@ -23,7 +23,6 @@ import javax.annotation.Nonnull; * A root of an input/output VFS. */ public interface InputOutputVFS extends InputVFS, OutputVFS { - @Override @Nonnull - InputOutputVDir getRootDir(); + InputOutputVDir getRootInputOutputVDir(); } diff --git a/sched/src/com/android/sched/vfs/InputOutputZipVFS.java b/sched/src/com/android/sched/vfs/InputOutputZipVFS.java index 279f205..c374b5b 100644 --- a/sched/src/com/android/sched/vfs/InputOutputZipVFS.java +++ b/sched/src/com/android/sched/vfs/InputOutputZipVFS.java @@ -55,7 +55,7 @@ public class InputOutputZipVFS extends AbstractInputOutputVFS implements InputOu @Override public void close() throws IOException { try { - addDirToZip(zipOS, getRootDir()); + addDirToZip(zipOS, getRootInputOutputVDir()); } finally { zipOS.close(); FileUtils.deleteDir(dir); @@ -64,8 +64,8 @@ public class InputOutputZipVFS extends AbstractInputOutputVFS implements InputOu @Override @Nonnull - public InputOutputZipVDir getRootDir() { - return (InputOutputZipVDir) super.getRootDir(); + public InputOutputZipVDir getRootInputOutputVDir() { + return (InputOutputZipVDir) super.getRootInputOutputVDir(); } private void addDirToZip(@Nonnull ZipOutputStream zos, @Nonnull InputOutputZipVDir vDir) diff --git a/sched/src/com/android/sched/vfs/InputVFS.java b/sched/src/com/android/sched/vfs/InputVFS.java index 6153ce9..ad8792b 100644 --- a/sched/src/com/android/sched/vfs/InputVFS.java +++ b/sched/src/com/android/sched/vfs/InputVFS.java @@ -23,5 +23,5 @@ import javax.annotation.Nonnull; */ public interface InputVFS extends VFS { @Nonnull - InputVDir getRootDir(); + InputVDir getRootInputVDir(); } diff --git a/sched/src/com/android/sched/vfs/InputZipVFS.java b/sched/src/com/android/sched/vfs/InputZipVFS.java index 7135a00..0c2d3a7 100644 --- a/sched/src/com/android/sched/vfs/InputZipVFS.java +++ b/sched/src/com/android/sched/vfs/InputZipVFS.java @@ -49,7 +49,7 @@ public class InputZipVFS extends AbstractInputVFS { if (!entry.isDirectory()) { String entryName = entry.getName(); Iterator<String> names = splitter.split(entryName).iterator(); - InputZipVDir dir = getRootDir(); + InputZipVDir dir = getRootInputVDir(); StringBuilder inZipPath = new StringBuilder(); String simpleName = null; while (names.hasNext()) { @@ -76,8 +76,8 @@ public class InputZipVFS extends AbstractInputVFS { @Override @Nonnull - public InputZipVDir getRootDir() { - return (InputZipVDir) super.getRootDir(); + public InputZipVDir getRootInputVDir() { + return (InputZipVDir) super.getRootInputVDir(); } @Override diff --git a/sched/src/com/android/sched/vfs/OutputVFS.java b/sched/src/com/android/sched/vfs/OutputVFS.java index fbd2ffc..071c35b 100644 --- a/sched/src/com/android/sched/vfs/OutputVFS.java +++ b/sched/src/com/android/sched/vfs/OutputVFS.java @@ -23,5 +23,5 @@ import javax.annotation.Nonnull; */ public interface OutputVFS extends VFS { @Nonnull - OutputVDir getRootDir(); + OutputVDir getRootOutputVDir(); } |