diff options
19 files changed, 53 insertions, 36 deletions
diff --git a/jack/src/com/android/jack/backend/ResourceWriter.java b/jack/src/com/android/jack/backend/ResourceWriter.java index 2284951..4b9fd7d 100644 --- a/jack/src/com/android/jack/backend/ResourceWriter.java +++ b/jack/src/com/android/jack/backend/ResourceWriter.java @@ -66,7 +66,7 @@ public class ResourceWriter implements RunnableSchedulable<JSession> { for (Resource resource : resources) { InputVFile inputFile = resource.getVFile(); VPath path = resource.getPath(); - OutputVFile outputFile = outputVDir.getRootDir().createOutputVFile(path); + OutputVFile outputFile = outputVDir.getRootOutputVDir().createOutputVFile(path); InputStream is = inputFile.openRead(); OutputStream os = outputFile.openWrite(); try { diff --git a/jack/src/com/android/jack/backend/dex/DexWritingTool.java b/jack/src/com/android/jack/backend/dex/DexWritingTool.java index be9c037..8aa4aa3 100644 --- a/jack/src/com/android/jack/backend/dex/DexWritingTool.java +++ b/jack/src/com/android/jack/backend/dex/DexWritingTool.java @@ -113,7 +113,7 @@ public abstract class DexWritingTool { dexName = DexFileWriter.DEX_PREFIX + dexCount + FileType.DEX.getFileExtension(); } try { - return outputVfs.getRootDir().createOutputVFile(new VPath(dexName, '/')); + return outputVfs.getRootOutputVDir().createOutputVFile(new VPath(dexName, '/')); } catch (CannotCreateFileException e) { throw new DexWritingException(e); } @@ -165,7 +165,8 @@ public abstract class DexWritingTool { inputVFile = jackOutputLibrary.getFile(FileType.DEX, new VPath(BinaryQualifiedNameFormatter.getFormatter().getName(type), '/')); } else { - inputVFile = getIntermediateDexDir().getRootDir().getInputVFile(DexWriter.getFilePath(type)); + inputVFile = + getIntermediateDexDir().getRootInputVDir().getInputVFile(DexWriter.getFilePath(type)); } return inputVFile; diff --git a/jack/src/com/android/jack/backend/dex/IntermediateDexPerTypeWriter.java b/jack/src/com/android/jack/backend/dex/IntermediateDexPerTypeWriter.java index 1794c5a..67ea05f 100644 --- a/jack/src/com/android/jack/backend/dex/IntermediateDexPerTypeWriter.java +++ b/jack/src/com/android/jack/backend/dex/IntermediateDexPerTypeWriter.java @@ -99,7 +99,7 @@ public class IntermediateDexPerTypeWriter extends DexWriter implements new VPath(BinaryQualifiedNameFormatter.getFormatter().getName(type), '/')); } else { assert intermediateDexDir != null; - vFile = intermediateDexDir.getRootDir().createOutputVFile(getFilePath(type)); + vFile = intermediateDexDir.getRootInputOutputVDir().createOutputVFile(getFilePath(type)); } InputStream is = in.openRead(); @@ -134,7 +134,7 @@ public class IntermediateDexPerTypeWriter extends DexWriter implements new VPath(BinaryQualifiedNameFormatter.getFormatter().getName(type), '/')); } else { assert intermediateDexDir != null; - vFile = intermediateDexDir.getRootDir().createOutputVFile(getFilePath(type)); + vFile = intermediateDexDir.getRootInputOutputVDir().createOutputVFile(getFilePath(type)); } } catch (IOException e) { throw new JackIOException("Could not create Dex file in output " diff --git a/jack/src/com/android/jack/backend/dex/SingleDexWritingTool.java b/jack/src/com/android/jack/backend/dex/SingleDexWritingTool.java index d6c6a4a..060750c 100644 --- a/jack/src/com/android/jack/backend/dex/SingleDexWritingTool.java +++ b/jack/src/com/android/jack/backend/dex/SingleDexWritingTool.java @@ -55,7 +55,7 @@ public class SingleDexWritingTool extends DexWritingTool { inputVFileIt = jackOutputLibrary.iterator(FileType.DEX); } else { List<InputVFile> dexList = new ArrayList<InputVFile>(); - getAllDexFilesFromDir(getIntermediateDexDir().getRootDir(), dexList); + getAllDexFilesFromDir(getIntermediateDexDir().getRootInputVDir(), dexList); inputVFileIt = dexList.iterator(); } diff --git a/jack/src/com/android/jack/experimental/incremental/CompilerState.java b/jack/src/com/android/jack/experimental/incremental/CompilerState.java index 3b79d56..eeba8ee 100644 --- a/jack/src/com/android/jack/experimental/incremental/CompilerState.java +++ b/jack/src/com/android/jack/experimental/incremental/CompilerState.java @@ -141,7 +141,7 @@ public final class CompilerState { try { OutputVFile compilerStateFile = - outputVDir.getRootDir().createOutputVFile(new VPath(COMPILER_STATE_FILENAME, '/')); + outputVDir.getRootOutputVDir().createOutputVFile(new VPath(COMPILER_STATE_FILENAME, '/')); StringBuffer sb = new StringBuffer(); writeMap(sb, javaFileToTypeNamePath); diff --git a/jack/src/com/android/jack/library/JackLibraryFactory.java b/jack/src/com/android/jack/library/JackLibraryFactory.java index 7e6d96b..00e7ac5 100644 --- a/jack/src/com/android/jack/library/JackLibraryFactory.java +++ b/jack/src/com/android/jack/library/JackLibraryFactory.java @@ -88,7 +88,8 @@ public abstract class JackLibraryFactory { Properties libraryProperties = new Properties(); try { - InputVFile libProp = vfs.getRootDir().getInputVFile(JackLibrary.LIBRARY_PROPERTIES_VPATH); + InputVFile libProp = + vfs.getRootInputVDir().getInputVFile(JackLibrary.LIBRARY_PROPERTIES_VPATH); libraryProperties.load(libProp.openRead()); } catch (IOException e) { logger.log(Level.SEVERE, "Fails to read " diff --git a/jack/src/com/android/jack/library/v0000/InputJackLibraryImpl.java b/jack/src/com/android/jack/library/v0000/InputJackLibraryImpl.java index 9a568cb..bd0c7df 100644 --- a/jack/src/com/android/jack/library/v0000/InputJackLibraryImpl.java +++ b/jack/src/com/android/jack/library/v0000/InputJackLibraryImpl.java @@ -102,7 +102,7 @@ public class InputJackLibraryImpl extends InputJackLibrary { try { VPath clonedPath = typePath.clone(); clonedPath.addSuffix(fileType.getFileExtension()); - return vfs.getRootDir().getInputVFile(clonedPath); + return vfs.getRootInputVDir().getInputVFile(clonedPath); } catch (NotFileOrDirectoryException e) { throw new FileTypeDoesNotExistException(getLocation(), typePath, fileType); } catch (NoSuchFileException e) { @@ -115,7 +115,7 @@ public class InputJackLibraryImpl extends InputJackLibrary { public InputVDir getDir(@Nonnull FileType fileType, @Nonnull VPath typePath) throws FileTypeDoesNotExistException { try { - return vfs.getRootDir().getInputVDir(typePath); + return vfs.getRootInputVDir().getInputVDir(typePath); } catch (NotFileOrDirectoryException e) { throw new FileTypeDoesNotExistException(getLocation(), typePath, fileType); } catch (NoSuchFileException e) { @@ -131,7 +131,7 @@ public class InputJackLibraryImpl extends InputJackLibrary { } List<InputVFile> inputVFiles = new ArrayList<InputVFile>(); - fillFiles(vfs.getRootDir(), fileType, inputVFiles); + fillFiles(vfs.getRootInputVDir(), fileType, inputVFiles); return inputVFiles.iterator(); } diff --git a/jack/src/com/android/jack/library/v0000/OutputJackLibraryImpl.java b/jack/src/com/android/jack/library/v0000/OutputJackLibraryImpl.java index f7bcffb..e315534 100644 --- a/jack/src/com/android/jack/library/v0000/OutputJackLibraryImpl.java +++ b/jack/src/com/android/jack/library/v0000/OutputJackLibraryImpl.java @@ -91,7 +91,7 @@ public class OutputJackLibraryImpl extends OutputJackLibrary { addFileType(fileType); VPath clonedPath = typePath.clone(); clonedPath.addSuffix(fileType.getFileExtension()); - return vfs.getRootDir().createOutputVFile(clonedPath); + return vfs.getRootInputOutputVDir().createOutputVFile(clonedPath); } @Override @@ -109,7 +109,7 @@ public class OutputJackLibraryImpl extends OutputJackLibrary { public void close() throws LibraryIOException { try { OutputVFile libraryPropertiesOut = - vfs.getRootDir().createOutputVFile(LIBRARY_PROPERTIES_VPATH); + vfs.getRootInputOutputVDir().createOutputVFile(LIBRARY_PROPERTIES_VPATH); libraryProperties.store(libraryPropertiesOut.openWrite(), "Library properties"); } catch (CannotCreateFileException e) { throw new LibraryIOException(getLocation(), e); @@ -132,7 +132,7 @@ public class OutputJackLibraryImpl extends OutputJackLibrary { @Nonnull public Iterator<InputVFile> iterator(@Nonnull FileType fileType) { List<InputVFile> inputVFiles = new ArrayList<InputVFile>(); - fillFiles(vfs.getRootDir(), fileType, inputVFiles); + fillFiles(vfs.getRootInputOutputVDir(), fileType, inputVFiles); return inputVFiles.listIterator(); } @@ -141,7 +141,7 @@ public class OutputJackLibraryImpl extends OutputJackLibrary { public InputVFile getFile(@Nonnull FileType fileType, @Nonnull VPath typePath) throws FileTypeDoesNotExistException { try { - return vfs.getRootDir().getInputVFile(fileType.buildFileVPath(typePath)); + return vfs.getRootInputOutputVDir().getInputVFile(fileType.buildFileVPath(typePath)); } catch (NotFileOrDirectoryException e) { throw new FileTypeDoesNotExistException(getLocation(), typePath, fileType); } catch (NoSuchFileException e) { diff --git a/jack/src/com/android/jack/library/v0001/InputJackLibraryImpl.java b/jack/src/com/android/jack/library/v0001/InputJackLibraryImpl.java index b21e43a..9a25ee7 100644 --- a/jack/src/com/android/jack/library/v0001/InputJackLibraryImpl.java +++ b/jack/src/com/android/jack/library/v0001/InputJackLibraryImpl.java @@ -100,7 +100,7 @@ public class InputJackLibraryImpl extends InputJackLibrary { public InputVFile getFile(@Nonnull FileType fileType, @Nonnull VPath typePath) throws FileTypeDoesNotExistException { try { - return vfs.getRootDir().getInputVFile(fileType.buildFileVPath(typePath)); + return vfs.getRootInputVDir().getInputVFile(fileType.buildFileVPath(typePath)); } catch (NotFileOrDirectoryException e) { throw new FileTypeDoesNotExistException(getLocation(), typePath, fileType); } catch (NoSuchFileException e) { @@ -114,7 +114,7 @@ public class InputJackLibraryImpl extends InputJackLibrary { public InputVDir getDir(@Nonnull FileType fileType, @Nonnull VPath typePath) throws FileTypeDoesNotExistException { try { - return vfs.getRootDir().getInputVDir(fileType.buildDirVPath(typePath)); + return vfs.getRootInputVDir().getInputVDir(fileType.buildDirVPath(typePath)); } catch (NotFileOrDirectoryException e) { throw new FileTypeDoesNotExistException(getLocation(), typePath, fileType); } catch (NoSuchFileException e) { @@ -131,7 +131,7 @@ public class InputJackLibraryImpl extends InputJackLibrary { List<InputVFile> inputVFiles = new ArrayList<InputVFile>(); try { - fillFiles(vfs.getRootDir().getInputVDir(fileType.buildDirVPath(VPath.ROOT)), fileType, + fillFiles(vfs.getRootInputVDir().getInputVDir(fileType.buildDirVPath(VPath.ROOT)), fileType, inputVFiles); } catch (NotFileOrDirectoryException e) { throw new AssertionError( diff --git a/jack/src/com/android/jack/library/v0001/OutputJackLibraryImpl.java b/jack/src/com/android/jack/library/v0001/OutputJackLibraryImpl.java index a84fc01..cbdad89 100644 --- a/jack/src/com/android/jack/library/v0001/OutputJackLibraryImpl.java +++ b/jack/src/com/android/jack/library/v0001/OutputJackLibraryImpl.java @@ -89,7 +89,7 @@ public class OutputJackLibraryImpl extends OutputJackLibrary { throws CannotCreateFileException { putProperty(fileType.buildPropertyName(null /*suffix*/), String.valueOf(true)); addFileType(fileType); - return vfs.getRootDir().createOutputVFile(fileType.buildFileVPath(typePath)); + return vfs.getRootInputOutputVDir().createOutputVFile(fileType.buildFileVPath(typePath)); } @Override @@ -108,7 +108,7 @@ public class OutputJackLibraryImpl extends OutputJackLibrary { OutputStream os = null; try { OutputVFile libraryPropertiesOut = - vfs.getRootDir().createOutputVFile(LIBRARY_PROPERTIES_VPATH); + vfs.getRootInputOutputVDir().createOutputVFile(LIBRARY_PROPERTIES_VPATH); os = libraryPropertiesOut.openWrite(); libraryProperties.store(os, "Library properties"); } catch (CannotCreateFileException e) { @@ -140,7 +140,7 @@ public class OutputJackLibraryImpl extends OutputJackLibrary { @Nonnull public Iterator<InputVFile> iterator(@Nonnull FileType fileType) { List<InputVFile> inputVFiles = new ArrayList<InputVFile>(); - fillFiles(vfs.getRootDir(), fileType, inputVFiles); + fillFiles(vfs.getRootInputOutputVDir(), fileType, inputVFiles); return inputVFiles.listIterator(); } @@ -149,7 +149,7 @@ public class OutputJackLibraryImpl extends OutputJackLibrary { public InputVFile getFile(@Nonnull FileType fileType, @Nonnull VPath typePath) throws FileTypeDoesNotExistException { try { - return vfs.getRootDir().getInputVFile(fileType.buildFileVPath(typePath)); + return vfs.getRootInputOutputVDir().getInputVFile(fileType.buildFileVPath(typePath)); } catch (NotFileOrDirectoryException e) { throw new FileTypeDoesNotExistException(getLocation(), typePath, fileType); } catch (NoSuchFileException e) { diff --git a/jack/src/com/android/jack/resource/ResourceOrMetaImporter.java b/jack/src/com/android/jack/resource/ResourceOrMetaImporter.java index c5c9e04..386190b 100644 --- a/jack/src/com/android/jack/resource/ResourceOrMetaImporter.java +++ b/jack/src/com/android/jack/resource/ResourceOrMetaImporter.java @@ -44,7 +44,7 @@ public abstract class ResourceOrMetaImporter { public void doImport(@Nonnull JSession session) { for (InputVFS resourceDir : resourceDirs) { - importResourceDirElement(resourceDir.getRootDir().list(), session, ""); + importResourceDirElement(resourceDir.getRootInputVDir().list(), session, ""); } } 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(); } |