Bug 480992 - [1.9] Versioning Changes support - JEP 223Y20160526-1000Y20160519-1000Y20160513-1000Y20160505-1000Y20160428-1430Y20160428-1000Y20160421-1000Y20160414-1000Y20160407-1000Y20160331-1000P20160526-0900P20160519-0900P20160512-0900P20160505-0900P20160428-0800P20160421-0800P20160414-0800P20160407-0800P20160331-0800

Change-Id: Id359b3ea40cbce87bdda3a618f6cae7d80e350b8

1 files changed, 11 insertions, 11 deletions

diff --git a/org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/Jimage.java b/org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/JrtFileSystem.java
index 5a0e3e201a..9c8b866131 100644
--- a/org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/Jimage.java
+++ b/org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/JrtFileSystem.java
@@ -41,11 +41,11 @@ import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader;
 import org.eclipse.jdt.internal.compiler.classfmt.ClassFormatException;
 import org.eclipse.jdt.internal.compiler.env.IModule;
 
-public class Jimage extends Archive {
+public class JrtFileSystem extends Archive {
 
 	private static URI JRT_URI = URI.create("jrt:/"); //$NON-NLS-1$
 	
-	private static final String BOOT_MODULE = "bootmodules.jimage"; //$NON-NLS-1$
+	private static final String BOOT_MODULE = "jrt-fs.jar"; //$NON-NLS-1$
 	
 	private static final String MODULES_SUBDIR = "/modules"; //$NON-NLS-1$
 	
@@ -53,7 +53,7 @@ public class Jimage extends Archive {
 
 	private Set<String> typesCache = null;
 	
-	public Jimage(File file) throws ZipException, IOException {
+	public JrtFileSystem(File file) throws ZipException, IOException {
 		this.file = file;
 		initialize();
 	}
@@ -111,7 +111,7 @@ public class Jimage extends Archive {
 	}
 	
 	public ArchiveFileObject getArchiveFileObject(String fileName, Charset charset) {
-		return new JimageFileObject(this.file, fileName, null, charset);
+		return new JrtFileObject(this.file, fileName, null, charset);
 	}
 	
 	@Override
@@ -150,12 +150,12 @@ public class Jimage extends Archive {
 	
 	@Override
 	public String toString() {
-		return "Jimage: " + (this.file == null ? "UNKNOWN_ARCHIVE" : this.file.getAbsolutePath()); //$NON-NLS-1$ //$NON-NLS-2$
+		return "JRT: " + (this.file == null ? "UNKNOWN_ARCHIVE" : this.file.getAbsolutePath()); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
-	class JimageFileObject extends ArchiveFileObject {
+	class JrtFileObject extends ArchiveFileObject {
 		IModule module = null;
-		private JimageFileObject(File file, String fileName, IModule module, Charset charset) {
+		private JrtFileObject(File file, String fileName, IModule module, Charset charset) {
 			super(file, fileName, charset);
 			this.module = module;
 		}
@@ -169,7 +169,7 @@ public class Jimage extends Archive {
 		protected ClassFileReader getClassReader() {
 			ClassFileReader reader = null;
 			try {
-				reader = ClassFileReader.readFromJimage(this.file, this.entryName, this.module);
+				reader = ClassFileReader.readFromJrt(this.file, this.entryName, this.module);
 			} catch (ClassFormatException e) {
 				e.printStackTrace();
 			} catch (IOException e) {
@@ -186,7 +186,7 @@ public class Jimage extends Archive {
 		public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
 			try {
 				return Util.getCharContents(this, ignoreEncodingErrors,
-						org.eclipse.jdt.internal.compiler.util.JimageUtil.getClassfileContent(this.file, this.entryName, new String(this.module.name())),
+						org.eclipse.jdt.internal.compiler.util.JRTUtil.getClassfileContent(this.file, this.entryName, new String(this.module.name())),
 						this.charset.name());
 			} catch (ClassFormatException e) {
 				e.printStackTrace();
@@ -215,7 +215,7 @@ public class Jimage extends Archive {
 		 */
 		@Override
 		public InputStream openInputStream() throws IOException {
-			return org.eclipse.jdt.internal.compiler.util.JimageUtil.getContentFromJimage(this.file, this.entryName, null);
+			return org.eclipse.jdt.internal.compiler.util.JRTUtil.getContentFromJrt(this.file, this.entryName, null);
 		}
 
 		/* (non-Javadoc)
@@ -248,7 +248,7 @@ public class Jimage extends Archive {
 		@Override
 		public URI toUri() {
 			try {
-				return new URI("jimage:" + this.file.toURI().getPath() + "!" + this.entryName); //$NON-NLS-1$//$NON-NLS-2$
+				return new URI("JRT:" + this.file.toURI().getPath() + "!" + this.entryName); //$NON-NLS-1$//$NON-NLS-2$
 			} catch (URISyntaxException e) {
 				return null;
 			}