Bug 521278 - [9] remove
o.e.j.i.compiler.batch.ClasspathLocation.isAutoModule and related code
Change-Id: Ia00ba4b0bdba28c858394dbcbe2562cdcccc82ba
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/BasicModule.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/BasicModule.java
index b504b0b..1dcfc22 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/BasicModule.java
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/BasicModule.java
@@ -95,7 +95,6 @@
return exp;
}
- boolean isAutomodule;
private boolean isOpen = false;
char[] name;
IModule.IModuleReference[] requires;
@@ -154,7 +153,6 @@
} else {
this.opens = new PackageExportImpl[0];
}
- this.isAutomodule = false; // Just to be explicit
this.isOpen = descriptor.isOpen();
}
@Override
@@ -186,10 +184,6 @@
return this.opens;
}
@Override
- public boolean isAutomatic() {
- return this.isAutomodule;
- }
- @Override
public boolean isOpen() {
return this.isOpen;
}
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
index 36afb92..0f05fbd 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
@@ -384,9 +384,6 @@
}
@Override
public IModule getModule() {
- if (this.isAutoModule && this.module == null) {
- return this.module = IModule.createAutomatic(this.path, false, null/*no manifest*/);
- }
return this.module;
}
}
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
index c565187..0f85ef5 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
@@ -25,7 +25,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -330,18 +329,6 @@
@Override
public IModule getModule() {
- if (this.isAutoModule && this.module == null) {
- Manifest manifest = null;
- try {
- initialize();
- ZipEntry entry = this.zipFile.getEntry(TypeConstants.META_INF_MANIFEST_MF);
- if (entry != null)
- manifest = new Manifest(this.zipFile.getInputStream(entry));
- } catch (IOException e) {
- // no usable manifest
- }
- return this.module = IModule.createAutomatic(this.file.getName(), true, manifest);
- }
return this.module;
}
}
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathLocation.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathLocation.java
index 95c1040..125fa61 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathLocation.java
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathLocation.java
@@ -40,7 +40,6 @@
char[] normalizedPath;
public AccessRuleSet accessRuleSet;
IModule module;
- protected boolean isAutoModule;
public String destinationPath;
// destination path for compilation units that are reached through this
@@ -126,11 +125,10 @@
@Override
public void acceptModule(IModule mod) {
this.module = mod;
- this.isAutoModule = mod.isAutomatic();
}
@Override
public boolean isAutomaticModule() {
- return this.isAutoModule;
+ return this.module == null ? false : this.module.isAutomatic();
}
@Override
public Collection<String> getModuleNames(Collection<String> limitModules) {
