Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2010-04-02 08:08:59 -0400
committerStephan Herrmann2010-04-02 08:08:59 -0400
commit787ee708e1af7b257179906b6ff8106ffdc55f5b (patch)
tree82cc2ef20bc02dfae48ffd17619442eb2e3f98bc /othersrc/OTRE
parent389b23ae705c6f26e34a0586fa431a29d8640b86 (diff)
downloadorg.eclipse.objectteams-787ee708e1af7b257179906b6ff8106ffdc55f5b.tar.gz
org.eclipse.objectteams-787ee708e1af7b257179906b6ff8106ffdc55f5b.tar.xz
org.eclipse.objectteams-787ee708e1af7b257179906b6ff8106ffdc55f5b.zip
Mark byte code as version "1.5.0" for now. Cleanup pending.
Diffstat (limited to 'othersrc/OTRE')
-rw-r--r--othersrc/OTRE/src/org/eclipse/objectteams/otre/OTConstants.java3
-rw-r--r--othersrc/OTRE/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java12
2 files changed, 14 insertions, 1 deletions
diff --git a/othersrc/OTRE/src/org/eclipse/objectteams/otre/OTConstants.java b/othersrc/OTRE/src/org/eclipse/objectteams/otre/OTConstants.java
index ea291a8a7..fb2acfa9e 100644
--- a/othersrc/OTRE/src/org/eclipse/objectteams/otre/OTConstants.java
+++ b/othersrc/OTRE/src/org/eclipse/objectteams/otre/OTConstants.java
@@ -90,6 +90,9 @@ public interface OTConstants {
// required compiler revision in the 1.4 stream:
public static final int OT14_REVISION = 1;
+ // required compiler revision in the 1.5 stream:
+ public static final int OT15_REVISION = 0;
+
// ------------------------------------------
// ---------- Flags and Modifiers: ----------
// ------------------------------------------
diff --git a/othersrc/OTRE/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java b/othersrc/OTRE/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java
index 7f664c5f9..793c04d7a 100644
--- a/othersrc/OTRE/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java
+++ b/othersrc/OTRE/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java
@@ -1129,8 +1129,18 @@ public abstract class ObjectTeamsTransformation
if(logging) printLogMessage("**** class file was produced by compiler version "
+ major + "." + minor + "." + revision + " ****");
IS_COMPILER_GREATER_123 = false; // reset, may be updated below
+ // 1.5 stream:
+ if (major == 1 && minor == 5) {
+ if (revision < OT15_REVISION) {
+ if (class_name.startsWith(OTConstants.teamClassName))
+ continue; // no specific byte codes in ooTeam and its inner classes.
+ throw new InternalError("OTRE: Class " + class_name + " has unsupported revision " + revision);
+ }
+ IS_COMPILER_GREATER_123 = true;
+ IS_COMPILER_13X_PLUS = true;
+ IS_COMPILER_14X_PLUS = true;
// 1.4 stream:
- if (major == 1 && minor == 4) {
+ } else if (major == 1 && minor == 4) {
if (revision < OT14_REVISION) {
if (class_name.startsWith(OTConstants.teamClassName))
continue; // no specific byte codes in ooTeam and its inner classes.

Back to the top