Bug 532365 - Update to ASM 6.1.1 - remove workaround for java 10 with
6.0
Change-Id: Ia48139313ee4e2c587078bf4ccb219e3a231692d
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
index 419fa61..d313fbb 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
@@ -1345,12 +1345,7 @@
private Set<Reference> processInnerClass(IApiType type, int refkinds) throws CoreException {
HashSet<Reference> refs = new HashSet<>();
ReferenceExtractor extractor = new ReferenceExtractor(type, refs, refkinds, this.fieldtracker);
- byte[] bytes = ((AbstractApiTypeRoot) type.getTypeRoot()).getContents();
- boolean updated = Util.updateVersionFrom10to9(bytes);
- ClassReader reader = new ClassReader(bytes);
- if (updated) {
- Util.updateVersionFrom9to10(bytes);
- }
+ ClassReader reader = new ClassReader(((AbstractApiTypeRoot) type.getTypeRoot()).getContents());
reader.accept(extractor, ClassReader.SKIP_FRAMES);
return refs;
}
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java
index 7bd6b95..3a9f476 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java
@@ -157,12 +157,7 @@
public List<IReference> extractReferences(int referenceMask, IProgressMonitor monitor) throws CoreException {
HashSet<Reference> references = new HashSet<>();
ReferenceExtractor extractor = new ReferenceExtractor(this, references, referenceMask);
- byte[] bytes = ((AbstractApiTypeRoot) fStorage).getContents();
- boolean updated = Util.updateVersionFrom10to9(bytes);
- ClassReader reader = new ClassReader(bytes);
- if (updated) {
- Util.updateVersionFrom9to10(bytes);
- }
+ ClassReader reader = new ClassReader(((AbstractApiTypeRoot) fStorage).getContents());
reader.accept(extractor, ClassReader.SKIP_FRAMES);
return new LinkedList<>(references);
}
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java
index a97fcff..e9dc97c 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java
@@ -27,7 +27,6 @@
import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiType;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiTypeRoot;
-import org.eclipse.pde.api.tools.internal.util.Util;
import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
@@ -257,11 +256,7 @@
public static IApiType buildTypeStructure(byte[] bytes, IApiComponent component, IApiTypeRoot file) {
TypeStructureBuilder visitor = new TypeStructureBuilder(new ClassNode(), component, file);
try {
- boolean updated = Util.updateVersionFrom10to9(bytes);
ClassReader classReader = new ClassReader(bytes);
- if (updated) {
- Util.updateVersionFrom9to10(bytes);
- }
classReader.accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES);
} catch (ArrayIndexOutOfBoundsException e) {
logAndReturn(file, e);
@@ -288,12 +283,7 @@
AbstractApiTypeRoot abstractApiTypeRoot = (AbstractApiTypeRoot) typeRoot;
EnclosingMethodSetter visitor = new EnclosingMethodSetter(new ClassNode(), currentAnonymousLocalType.getName());
try {
- byte[] bytes = abstractApiTypeRoot.getContents();
- boolean updated = Util.updateVersionFrom10to9(bytes);
- ClassReader classReader = new ClassReader(bytes);
- if (updated) {
- Util.updateVersionFrom9to10(bytes);
- }
+ ClassReader classReader = new ClassReader(abstractApiTypeRoot.getContents());
classReader.accept(visitor, ClassReader.SKIP_FRAMES);
} catch (ArrayIndexOutOfBoundsException e) {
ApiPlugin.log(e);
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java
index 3e3feba..b20def9 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java
@@ -2977,22 +2977,5 @@
return type;
}
- public static boolean updateVersionFrom10to9(byte[] bytes) {
- if (bytes.length >= 8) {
- if (bytes[7] == 54) {
- bytes[7] = 53;
- return true;
- }
- }
- return false;
- }
- public static void updateVersionFrom9to10(byte[] bytes) {
- if (bytes.length >= 8) {
- if (bytes[7] == 53) {
- bytes[7] = 54;
- }
- }
-
- }
}
