diff options
| author | Stephan Herrmann | 2016-10-06 21:26:27 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2016-10-06 21:26:27 +0000 |
| commit | b21e7bbf62ee1e0ab4c770cc766ba98d47d7da31 (patch) | |
| tree | 597cbf3baf4c2054409e965602f07a4f1018fefb | |
| parent | 60f40d2b92f57686d5fb72222b65cf5831fe2eae (diff) | |
| download | org.eclipse.objectteams-b21e7bbf62ee1e0ab4c770cc766ba98d47d7da31.tar.gz org.eclipse.objectteams-b21e7bbf62ee1e0ab4c770cc766ba98d47d7da31.tar.xz org.eclipse.objectteams-b21e7bbf62ee1e0ab4c770cc766ba98d47d7da31.zip | |
Fix compile errors due to erased ASM binaries.
3 files changed, 8 insertions, 5 deletions
diff --git a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF index d3dd4d650..c606a5888 100644 --- a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF @@ -8,8 +8,8 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.objectteams.runtime;bundle-version="[2.5.0,3.0.0)";visibility:=reexport, - org.eclipse.objectteams.otre;bundle-version="[2.3.0,3.0.0)", - org.eclipse.objectteams.otredyn;bundle-version="[1.2.0,2.0.0)", + org.eclipse.objectteams.otre;bundle-version="[2.5.0,3.0.0)", + org.eclipse.objectteams.otredyn;bundle-version="[1.3.0,2.0.0)", org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)", org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional, org.objectweb.asm;bundle-version="[5.0.1,6.0.0)" diff --git a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF index fc3bc2226..89c3bae5a 100644 --- a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF @@ -17,4 +17,5 @@ Require-Bundle: org.eclipse.objectteams.runtime;bundle-version="[2.5.0,3.0.0)", org.objectweb.asm;bundle-version="5.0.1", org.objectweb.asm.tree;bundle-version="5.0.1", org.objectweb.asm.commons;bundle-version="5.0.1", - org.objectweb.asm.util;bundle-version="5.0.1" + org.objectweb.asm.util;bundle-version="5.0.1", + org.objectweb.asm.analysis;bundle-version="5.0.1" diff --git a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/verify/OTCheckClassAdapter.java b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/verify/OTCheckClassAdapter.java index 2bcea2e0c..87d11c3b7 100644 --- a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/verify/OTCheckClassAdapter.java +++ b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/verify/OTCheckClassAdapter.java @@ -198,7 +198,8 @@ public class OTCheckClassAdapter extends org.objectweb.asm.util.CheckClassAdapte (cn.access & Opcodes.ACC_INTERFACE) != 0, loader); // SH} - Analyzer<BasicValue> a = new Analyzer<BasicValue>(verifier); +// src: Analyzer<BasicValue> a = new Analyzer<BasicValue>(verifier); + Analyzer a = new Analyzer(verifier); if (loader != null) { verifier.setClassLoader(loader); } @@ -216,7 +217,8 @@ public class OTCheckClassAdapter extends org.objectweb.asm.util.CheckClassAdapte } - static void printAnalyzerResult(MethodNode method, Analyzer<BasicValue> a, final PrintWriter pw) { +// src: static void printAnalyzerResult(MethodNode method, Analyzer<BasicValue> a, final PrintWriter pw) { + static void printAnalyzerResult(MethodNode method, Analyzer a, final PrintWriter pw) { try { printAnalyzerResult.invoke(null, method, a, pw); } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { |