Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties2
-rw-r--r--othersrc/OTRE/src/org/eclipse/objectteams/otre/BaseCallRedirection.java1
-rw-r--r--othersrc/OTRE/src/org/eclipse/objectteams/otre/BaseMethodTransformation.java50
-rw-r--r--othersrc/OTRE/src/org/eclipse/objectteams/otre/Decapsulation.java20
-rw-r--r--othersrc/OTRE/src/org/eclipse/objectteams/otre/LiftingParticipantTransformation.java2
-rw-r--r--othersrc/OTRE/src/org/eclipse/objectteams/otre/LowerableTransformation.java72
-rw-r--r--othersrc/OTRE/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java5
-rw-r--r--othersrc/OTRE/src/org/eclipse/objectteams/otre/StaticSliceBaseTransformation.java1
-rw-r--r--othersrc/OTRE/src/org/eclipse/objectteams/otre/SubBoundBaseMethodRedefinition.java1
-rw-r--r--othersrc/OTRE/src/org/eclipse/objectteams/otre/TeamInterfaceImplementation.java11
-rw-r--r--othersrc/OTRE/src/org/eclipse/objectteams/otre/jplis/ObjectTeamsTransformer.java8
-rw-r--r--plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/JDTDebugUILaunchingAdaptor.java6
-rw-r--r--plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/JDTLaunchingAdaptor.java6
-rw-r--r--plugins/org.eclipse.objectteams.otdt.debug/src/org/eclipse/objectteams/otdt/debug/OTVMRunnerAdaptor.java12
-rw-r--r--plugins/org.eclipse.objectteams.otdt.ui.help/guide/running.html4
-rw-r--r--plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/ui/OTPluginResources.properties4
16 files changed, 38 insertions, 167 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties
index 2c6911353..7d642047d 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties
@@ -990,7 +990,7 @@
2100023 = Illegally copied default constructor, role {0} is a bound role.
2100024 = Modifier "readonly" is not yet supported.
2100025 = Missing compiler implementation: {0} is not yet supported.
-2100026 = Base class {0} appears to be a system class, which means that load time weaving could fail\nif this class is loaded from rt.jar/the bootstrap classpath.\nIf the runtime throws an UnsupportedFeatureException launching the program in JPLIS mode might help.
+2100026 = Base class {0} appears to be a system class, which means that load time weaving could possibly fail\nif this class is loaded from rt.jar/the bootstrap classpath.
2100027 = Dangerous callin binding: {0} is used internally during lifting, which could create infinite recursion.
2100028 = Compiler limitation: can't copy annotation ''{0}'' for implicitly inherited field ''{1}'': unexpected structure.
2100029 = Class file {0} has incompatible OT/J byte code version {1}, please consider a full build of the declaring project.
diff --git a/othersrc/OTRE/src/org/eclipse/objectteams/otre/BaseCallRedirection.java b/othersrc/OTRE/src/org/eclipse/objectteams/otre/BaseCallRedirection.java
index 709592c4a..65574f39b 100644
--- a/othersrc/OTRE/src/org/eclipse/objectteams/otre/BaseCallRedirection.java
+++ b/othersrc/OTRE/src/org/eclipse/objectteams/otre/BaseCallRedirection.java
@@ -57,7 +57,6 @@ public class BaseCallRedirection extends ObjectTeamsTransformation {
public InstructionHandle snd() {return _ih2; }
}
- public BaseCallRedirection(SharedState state) { this(null, state); }
public BaseCallRedirection(ClassLoader loader, SharedState state) {
super(loader, state);
}
diff --git a/othersrc/OTRE/src/org/eclipse/objectteams/otre/BaseMethodTransformation.java b/othersrc/OTRE/src/org/eclipse/objectteams/otre/BaseMethodTransformation.java
index 89a485450..a5984463b 100644
--- a/othersrc/OTRE/src/org/eclipse/objectteams/otre/BaseMethodTransformation.java
+++ b/othersrc/OTRE/src/org/eclipse/objectteams/otre/BaseMethodTransformation.java
@@ -132,15 +132,12 @@ public class BaseMethodTransformation
private final static int NORESULT = -1;
- // FIXME(SH): once we remove JMangler support, these maps can be reduced to their RHS because then we'll consistently have one transformer per class:
- private HashMap /* class_name -> HashSet(method_name) */<String, HashSet<String>> transformableMethods = new HashMap<String, HashSet<String>>();
- private HashMap /* class_name -> HashSet(method_name) */<String, HashSet<String>> overridableMethods = new HashMap<String, HashSet<String>>();
+ // methods awaiting statements as an initial wrapper:
+ private HashSet<String/*methodName*/> pendingInitialWrappers;
+ // methods awaiting a super call to an existing initial wrapper:
+ private HashSet<String/*methodName*/> pendingSuperDelegationWrappers;
public boolean useReflection = false;
-
- public BaseMethodTransformation(SharedState state) {
- this(null, state);
- }
public BaseMethodTransformation(ClassLoader loader, SharedState state) {
super(loader, state);
@@ -175,11 +172,9 @@ public class BaseMethodTransformation
String method_signature = m.getSignature();
if (state.interfaceTransformedClasses.contains(class_name)) {
- HashSet<String> transformable = transformableMethods.get(class_name);
- HashSet<String> overridable = overridableMethods.get(class_name);
- if (transformable.contains(method_name + '.' + method_signature))
+ if (pendingInitialWrappers.contains(method_name + '.' + method_signature))
cg.replaceMethod(m, m = generateInitialWrapper(m, class_name, cg.getMajor(), cpg));
- else if (overridable.contains(method_name + '.' + method_signature))
+ else if (pendingSuperDelegationWrappers.contains(method_name + '.' + method_signature))
cg.replaceMethod(m, m = generateSuperCall(m, cg, cpg));
Method replacement = checkReplaceWickedSuper(class_name, m, cpg);
@@ -252,16 +247,11 @@ public class BaseMethodTransformation
}
}
- HashSet<String> transformedMethods = transformableMethods.get(class_name);
- if (transformedMethods == null) {
- transformedMethods = new HashSet<String>();
- transformableMethods.put(class_name, transformedMethods);
- }
- HashSet<String> renamedMethods = overridableMethods.get(class_name);
- if (renamedMethods == null) {
- renamedMethods = new HashSet<String>();
- overridableMethods.put(class_name, renamedMethods);
- }
+ if (pendingInitialWrappers == null)
+ pendingInitialWrappers = new HashSet<String>();
+ if (pendingSuperDelegationWrappers == null)
+ pendingSuperDelegationWrappers = new HashSet<String>();
+
checkReadClassAttributes(ce, cg, class_name, cpg);
@@ -352,8 +342,9 @@ public class BaseMethodTransformation
int firstLine = STEP_OVER_LINENUMBER;
String original_signature = method_signature;
/*if (bindingsForMethod != null || containsSign(inheritedSigns, m)*/ /*|| containsSign(interfaceInheritedSigns, m)*/ //) {
- MethodBinding match= matchingBinding(inheritedBindings, m, false);
- if (bindingsForMethod != null || (match!= null && !m.isStatic() && !m.isPrivate())) {
+ MethodBinding inheritedBinding = matchingBinding(inheritedBindings, m, false);
+ String method_key = method_name+'.'+method_signature;
+ if (bindingsForMethod != null || (inheritedBinding != null && !m.isStatic() && !m.isPrivate())) {
mg = newMethodGen(m, class_name, cpg);
Method orig_method;
@@ -377,10 +368,12 @@ public class BaseMethodTransformation
if(logging) printLogMessage("Method " + method_name + " was backuped as " //$NON-NLS-1$ //$NON-NLS-2$
+ name_orig + '.');
- if (match == null || method_signature.equals(match.getBaseMethodSignature()))
- renamedMethods.add(method_name+'.'+method_signature);
- else // override with covariant return: at the VM-level this is a *new* method.
- transformedMethods.add(method_name+'.'+method_signature);
+ if (inheritedBinding != null) {
+ if (method_signature.equals(inheritedBinding.getBaseMethodSignature()))
+ pendingSuperDelegationWrappers.add(method_key);
+ else // override with covariant return: at the VM-level this is a *new* method, need a new initial wrapper
+ pendingInitialWrappers.add(method_key);
+ }
}
/*if (bindingsForMethod != null || (containsSign(inheritedSigns,m) && m.isStatic())*/ /*|| containsSign(interfaceInheritedSigns, m)*/ //) {
@@ -395,7 +388,8 @@ public class BaseMethodTransformation
if (cg.containsMethod(chain.getName(), chain.getSignature()) == null)
ce.addMethod(chain, cg);
- transformedMethods.add(method_name + '.' + method_signature);
+ pendingInitialWrappers.add(method_key);
+ pendingSuperDelegationWrappers.remove(method_key); // might have prematurely added this above
}
if (mg == null)
if (logging) printLogMessage("No method binding (direct or inherited) found for " //$NON-NLS-1$
diff --git a/othersrc/OTRE/src/org/eclipse/objectteams/otre/Decapsulation.java b/othersrc/OTRE/src/org/eclipse/objectteams/otre/Decapsulation.java
index e34f221ce..c7a5c1980 100644
--- a/othersrc/OTRE/src/org/eclipse/objectteams/otre/Decapsulation.java
+++ b/othersrc/OTRE/src/org/eclipse/objectteams/otre/Decapsulation.java
@@ -16,7 +16,6 @@
**********************************************************************/
package org.eclipse.objectteams.otre;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -38,8 +37,7 @@ import org.apache.bcel.generic.Type;
/**
* For each base method that is bound by callout and has
* insufficient visibility, the visibility is set to public.
- * If the corresponding JMangler-patch is installed, check
- * whether the affected base class resides in a sealed package.
+ * Check whether the affected base class resides in a sealed package.
* In that case dissallow decapsulation by throwing an IllegalAccessError.
*
* @version $Id: Decapsulation.java 23408 2010-02-03 18:07:35Z stephan $
@@ -53,19 +51,14 @@ public class Decapsulation
// HashSet modifiedPackages = new HashSet();
public static class SharedState extends ObjectTeamsTransformation.SharedState {
- private HashMap /* class_name -> HashSet(callout accessed fields) */<String, HashSet<String>> generatedFieldCalloutAccessors
- = new HashMap<String, HashSet<String>>();
- private HashMap /* class_name -> HashSet(super-accessed methods (sign))*/<String, HashSet<String>> generatedSuperAccessors
- = new HashMap<String, HashSet<String>>();
+ private HashSet<String/*callout accessed fields*/> generatedFieldCalloutAccessors = new HashSet<String>();
+ private HashSet<String/*super-accessed methods (sign)*/> generatedSuperAccessors = new HashSet<String>();
}
@Override
SharedState state() {
return (SharedState)this.state;
}
- public Decapsulation(SharedState state) {
- this(null, state);
- }
public Decapsulation(ClassLoader loader, SharedState state) {
super(loader, state);
// FIXME(SH): can we ever release this transformer and its state?
@@ -220,7 +213,7 @@ public class Decapsulation
private void generateFieldAccessForCallout(ClassEnhancer ce, ClassGen cg, String class_name, ConstantPoolGen cpg) {
InstructionFactory factory = null;
- HashSet<String> addedAccessMethods = state().generatedFieldCalloutAccessors.get(class_name);
+ HashSet<String> addedAccessMethods = state().generatedFieldCalloutAccessors;
List<FieldDescriptor> getter = CallinBindingManager.getCalloutGetFields(class_name);
if (getter != null) {
@@ -237,7 +230,6 @@ public class Decapsulation
continue; // this getter has already been created
ce.addMethod(generateGetter(cpg, class_name, fd, factory), cg);
addedAccessMethods.add(key);
- state().generatedFieldCalloutAccessors.put(class_name, addedAccessMethods);
}
}
@@ -257,7 +249,6 @@ public class Decapsulation
continue; // this setter has already been created
ce.addMethod(generateSetter(cpg, class_name, fd, factory), cg);
addedAccessMethods.add(key);
- state().generatedFieldCalloutAccessors.put(class_name, addedAccessMethods);
}
}
}
@@ -359,7 +350,7 @@ public class Decapsulation
private void generateSuperAccessors(ClassEnhancer ce, ClassGen cg, String class_name, ConstantPoolGen cpg) {
InstructionFactory factory = null;
- HashSet<String> addedAccessMethods = state().generatedSuperAccessors.get(class_name);
+ HashSet<String> addedAccessMethods = state().generatedSuperAccessors;
List<SuperMethodDescriptor> methods = CallinBindingManager.getSuperAccesses(class_name);
if (methods != null) {
@@ -374,7 +365,6 @@ public class Decapsulation
continue; // this accessor has already been created
ce.addMethod(generateSuperAccessor(cpg, class_name, superMethod, factory), cg);
addedAccessMethods.add(key);
- state().generatedSuperAccessors.put(class_name, addedAccessMethods);
}
}
}
diff --git a/othersrc/OTRE/src/org/eclipse/objectteams/otre/LiftingParticipantTransformation.java b/othersrc/OTRE/src/org/eclipse/objectteams/otre/LiftingParticipantTransformation.java
index 9c10f8194..1adcaeffa 100644
--- a/othersrc/OTRE/src/org/eclipse/objectteams/otre/LiftingParticipantTransformation.java
+++ b/othersrc/OTRE/src/org/eclipse/objectteams/otre/LiftingParticipantTransformation.java
@@ -66,8 +66,6 @@ public class LiftingParticipantTransformation extends ObjectTeamsTransformation
private static final String CREATE_ROLE_METHOD = "createRole";
private static final String LIFTING_PARTICIPANT_FIELD = "_OT$liftingParticipant";
- public LiftingParticipantTransformation(SharedState state) { this(null, state); }
-
public LiftingParticipantTransformation(ClassLoader loader, SharedState state) { super(loader, state); }
public void doTransformCode(ClassGen cg)
diff --git a/othersrc/OTRE/src/org/eclipse/objectteams/otre/LowerableTransformation.java b/othersrc/OTRE/src/org/eclipse/objectteams/otre/LowerableTransformation.java
deleted file mode 100644
index 52c672693..000000000
--- a/othersrc/OTRE/src/org/eclipse/objectteams/otre/LowerableTransformation.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**********************************************************************
- * This file is part of the "Object Teams Runtime Environment"
- *
- * Copyright 2009 Stephan Herrmann
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * $Id: LowerableTransformation.java 23408 2010-02-03 18:07:35Z stephan $
- *
- * Please visit http://www.objectteams.org for updates and contact.
- *
- * Contributors:
- * Stephan Herrmann - Initial API and implementation
- **********************************************************************/
-package org.eclipse.objectteams.otre;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.Type;
-
-/**
- * This transformer helps legacy class files pre 1.3.2 to cope with changes re ILowerable.lower().
- *
- * @author stephan
- * @since 1.3.2
- */
-public class LowerableTransformation extends ObjectTeamsTransformation {
-
- // static because checking is performed without instance context (from scanClassOTAttribrutes)
- // using ClassGen rather than names should, however, avoid conflicts between different class loaders etc.
- static Set<ClassGen> transformationRequests = new HashSet<ClassGen>();
-
- public LowerableTransformation(SharedState state) { this(null, state); }
-
- public LowerableTransformation(ClassLoader loader, SharedState state) {
- super(loader, state);
- }
-
- public void doTransformInterface(ClassEnhancer ce, ClassGen cg) {
- synchronized (transformationRequests) {
- if (!transformationRequests.remove(cg))
- return;
- }
- // yes, a change was requested, add method "public abstract Object lower();"
- MethodGen lower = new MethodGen(Constants.ACC_PUBLIC|Constants.ACC_ABSTRACT, object, new Type[0], new String[0], "lower", cg.getClassName(), null, cg.getConstantPool());
- ce.addMethod(lower.getMethod(), cg);
- }
-
- /** After reading the compiler version of a class file, check if this class is affected by the change. */
- public static void checkRequiresAdaptation(int major, int minor, int revision, ClassGen cg) {
- // only 1.3.1 and below:
- if (major > 1) return;
- if (major == 1 && minor > 3) return;
- if (major == 1 && minor == 3 && revision > 1) return;
- // only interfaces ...
- if (!cg.isInterface()) return;
- // ... implementing ILowerabel:
- for (String superInterface : cg.getInterfaceNames()) {
- if ("org.objectteams.Team$ILowerable".equals(superInterface))
- synchronized(transformationRequests) {
- transformationRequests.add(cg);
- return;
- }
- }
- }
-}
diff --git a/othersrc/OTRE/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java b/othersrc/OTRE/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java
index 121f57c19..7f664c5f9 100644
--- a/othersrc/OTRE/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java
+++ b/othersrc/OTRE/src/org/eclipse/objectteams/otre/ObjectTeamsTransformation.java
@@ -49,7 +49,7 @@ import org.apache.bcel.generic.*;
/**
* Superclass for all transformations in this package.
- * This class and its subclasses depends on neither JMangler nor JPLIS.
+ * This class and its subclasses does not directly depend on JPLIS.
*
* Contains common fields and methods.
*
@@ -109,8 +109,6 @@ public abstract class ObjectTeamsTransformation
/** Which class loader are we working for? */
protected ClassLoader loader;
-
- public ObjectTeamsTransformation(SharedState state) { this(null, state); }
public ObjectTeamsTransformation(ClassLoader loader, SharedState state) {
this.loader = loader;
@@ -1131,7 +1129,6 @@ 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
- LowerableTransformation.checkRequiresAdaptation(major, minor, revision, cg);
// 1.4 stream:
if (major == 1 && minor == 4) {
if (revision < OT14_REVISION) {
diff --git a/othersrc/OTRE/src/org/eclipse/objectteams/otre/StaticSliceBaseTransformation.java b/othersrc/OTRE/src/org/eclipse/objectteams/otre/StaticSliceBaseTransformation.java
index 6ba98aebd..5e5844f04 100644
--- a/othersrc/OTRE/src/org/eclipse/objectteams/otre/StaticSliceBaseTransformation.java
+++ b/othersrc/OTRE/src/org/eclipse/objectteams/otre/StaticSliceBaseTransformation.java
@@ -47,7 +47,6 @@ public class StaticSliceBaseTransformation
static final String _OT_ACTIVE_TEAMS= "_OT$activeTeams"; //$NON-NLS-1$
static final String _OT_ACTIVE_TEAM_IDS= "_OT$activeTeamIDs"; //$NON-NLS-1$
- public StaticSliceBaseTransformation(SharedState state) { this(null, state); }
public StaticSliceBaseTransformation(ClassLoader loader, SharedState state) { super(loader, state); }
public void doTransformCode(ClassGen cg) {
diff --git a/othersrc/OTRE/src/org/eclipse/objectteams/otre/SubBoundBaseMethodRedefinition.java b/othersrc/OTRE/src/org/eclipse/objectteams/otre/SubBoundBaseMethodRedefinition.java
index e107fda04..1a0db28b4 100644
--- a/othersrc/OTRE/src/org/eclipse/objectteams/otre/SubBoundBaseMethodRedefinition.java
+++ b/othersrc/OTRE/src/org/eclipse/objectteams/otre/SubBoundBaseMethodRedefinition.java
@@ -38,7 +38,6 @@ import org.eclipse.objectteams.otre.util.*;
public class SubBoundBaseMethodRedefinition
extends ObjectTeamsTransformation {
- public SubBoundBaseMethodRedefinition(SharedState state) { this(null, state); }
public SubBoundBaseMethodRedefinition(ClassLoader loader, SharedState state) { super(loader, state); }
/**
diff --git a/othersrc/OTRE/src/org/eclipse/objectteams/otre/TeamInterfaceImplementation.java b/othersrc/OTRE/src/org/eclipse/objectteams/otre/TeamInterfaceImplementation.java
index de2c85020..8ce3abac3 100644
--- a/othersrc/OTRE/src/org/eclipse/objectteams/otre/TeamInterfaceImplementation.java
+++ b/othersrc/OTRE/src/org/eclipse/objectteams/otre/TeamInterfaceImplementation.java
@@ -44,16 +44,9 @@ import org.eclipse.objectteams.otre.util.*;
public class TeamInterfaceImplementation
extends ObjectTeamsTransformation {
- private boolean isJPLIS;
-
- public TeamInterfaceImplementation(boolean isJPLIS, SharedState state) {
- this(isJPLIS, null, state);
- }
-
- public TeamInterfaceImplementation(boolean isJPLIS, ClassLoader loader, SharedState state) {
+ public TeamInterfaceImplementation(ClassLoader loader, SharedState state) {
super(loader, state);
- this.isJPLIS = isJPLIS;
}
/**
@@ -416,8 +409,6 @@ public class TeamInterfaceImplementation
private String getErrorMessage(String teamName, String baseName, String action) {
String errorMessage = action+" of team '" + teamName + "' failed! Callins of this team have NOT been WOVEN into base class '" + baseName + "'!\n"
+ "This is probably caused by a loading order problem.";
- if (!isJPLIS)
- errorMessage += "\nIf "+baseName+" is loaded from the bootstrap classpath launching the program in JPLIS mode may perhaps avoid this problem.";
return errorMessage;
}
diff --git a/othersrc/OTRE/src/org/eclipse/objectteams/otre/jplis/ObjectTeamsTransformer.java b/othersrc/OTRE/src/org/eclipse/objectteams/otre/jplis/ObjectTeamsTransformer.java
index d89a3d960..745174715 100644
--- a/othersrc/OTRE/src/org/eclipse/objectteams/otre/jplis/ObjectTeamsTransformer.java
+++ b/othersrc/OTRE/src/org/eclipse/objectteams/otre/jplis/ObjectTeamsTransformer.java
@@ -32,7 +32,6 @@ import org.eclipse.objectteams.otre.BaseMethodTransformation;
import org.eclipse.objectteams.otre.BaseTagInsertion;
import org.eclipse.objectteams.otre.Decapsulation;
import org.eclipse.objectteams.otre.LiftingParticipantTransformation;
-import org.eclipse.objectteams.otre.LowerableTransformation;
import org.eclipse.objectteams.otre.OTConstants;
import org.eclipse.objectteams.otre.ObjectTeamsTransformation;
import org.eclipse.objectteams.otre.RepositoryAccess;
@@ -64,7 +63,6 @@ public class ObjectTeamsTransformer implements ClassFileTransformer {
BaseTagInsertion.class,
Decapsulation.class,
LiftingParticipantTransformation.class,
- LowerableTransformation.class,
StaticSliceBaseTransformation.class,
SubBoundBaseMethodRedefinition.class,
TeamInterfaceImplementation.class,
@@ -80,7 +78,6 @@ public class ObjectTeamsTransformer implements ClassFileTransformer {
BaseTagInsertion.SharedState btiState = new BaseTagInsertion.SharedState();
Decapsulation.SharedState decState = new Decapsulation.SharedState();
ObjectTeamsTransformation.SharedState lptState = new ObjectTeamsTransformation.SharedState();
- ObjectTeamsTransformation.SharedState lowState = new ObjectTeamsTransformation.SharedState();
ObjectTeamsTransformation.SharedState ssbtState = new ObjectTeamsTransformation.SharedState();
ObjectTeamsTransformation.SharedState sbbmrState = new ObjectTeamsTransformation.SharedState();
ObjectTeamsTransformation.SharedState tiiState = new ObjectTeamsTransformation.SharedState();
@@ -141,14 +138,12 @@ public class ObjectTeamsTransformer implements ClassFileTransformer {
= new Decapsulation( loader, states.decState);
LiftingParticipantTransformation liftingParticipantTransformation
= new LiftingParticipantTransformation( loader, states.lptState);
- LowerableTransformation lowerableTransformation
- = new LowerableTransformation( loader, states.lowState);
StaticSliceBaseTransformation staticSliceBaseTransformation
= new StaticSliceBaseTransformation( loader, states.ssbtState);
SubBoundBaseMethodRedefinition subBoundBaseMethodRedefinition
= new SubBoundBaseMethodRedefinition( loader, states.sbbmrState);
TeamInterfaceImplementation teamInterfaceImplementation
- = new TeamInterfaceImplementation(true, loader, states.tiiState);
+ = new TeamInterfaceImplementation( loader, states.tiiState);
ThreadActivation threadActivation
= new ThreadActivation();
@@ -186,7 +181,6 @@ public class ObjectTeamsTransformer implements ClassFileTransformer {
t.printStackTrace();
}
baseTagInsertion.doTransformInterface(jpe, cg);
- lowerableTransformation.doTransformInterface(jpe, cg);
staticSliceBaseTransformation.doTransformInterface(jpe, cg);
teamInterfaceImplementation.doTransformInterface(jpe, cg);
diff --git a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/JDTDebugUILaunchingAdaptor.java b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/JDTDebugUILaunchingAdaptor.java
index fcf39e718..8b0c45a8a 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/JDTDebugUILaunchingAdaptor.java
+++ b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/JDTDebugUILaunchingAdaptor.java
@@ -26,11 +26,7 @@ import base org.eclipse.jdt.debug.ui.launchConfigurations.JavaConnectTab;
import base org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
/**
- * This team adds a new section to the JRE tab containing
- * <ul>
- * <li>a checkbox "Enable OTRE"
- * <li>a checkbox "Use JPLIS (experimental)"
- * </ul>
+ * This team adds a new section to the JRE tab containing a checkbox "Enable OTRE"
* If this box is enabled, launching will happen in OT/J mode, which is
* managed by the {@link JDTLaunchingAdaptor}.
*
diff --git a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/JDTLaunchingAdaptor.java b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/JDTLaunchingAdaptor.java
index e8d3d5d49..a1bee2f6e 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/JDTLaunchingAdaptor.java
+++ b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/JDTLaunchingAdaptor.java
@@ -64,7 +64,7 @@ public team class JDTLaunchingAdaptor {
{
IRuntimeClasspathEntry[] origEntries = base.computeUnresolvedClasspath(config);
- if (!isJPLISOTJLaunch(config))
+ if (!isOTJApplicationLaunch(config))
return origEntries;
// add BCEL and otre_min (classpath / bootclasspath)
@@ -127,7 +127,7 @@ public team class JDTLaunchingAdaptor {
void prepareLaunch(ILaunchConfiguration config, String mode, ILaunch launch) throws CoreException
{
this.fOriginalMain = null; // reset potential left over from previous launching
- if (!isJPLISOTJLaunch(config)) {
+ if (!isOTJApplicationLaunch(config)) {
this.fAdaptor = null;
return;
}
@@ -160,7 +160,7 @@ public team class JDTLaunchingAdaptor {
}
}
- static boolean isJPLISOTJLaunch(ILaunchConfiguration config) {
+ static boolean isOTJApplicationLaunch(ILaunchConfiguration config) {
try {
return config.getAttribute(OTDebugPlugin.OT_LAUNCH, false) // OT/J ?
&& (config.getAttribute(IPDEUIConstants.LAUNCHER_PDE_VERSION, (String)null) == null); // not PDE ?
diff --git a/plugins/org.eclipse.objectteams.otdt.debug/src/org/eclipse/objectteams/otdt/debug/OTVMRunnerAdaptor.java b/plugins/org.eclipse.objectteams.otdt.debug/src/org/eclipse/objectteams/otdt/debug/OTVMRunnerAdaptor.java
index ff489695d..b1f97dbbe 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug/src/org/eclipse/objectteams/otdt/debug/OTVMRunnerAdaptor.java
+++ b/plugins/org.eclipse.objectteams.otdt.debug/src/org/eclipse/objectteams/otdt/debug/OTVMRunnerAdaptor.java
@@ -36,14 +36,12 @@ import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.launching.VMRunnerConfiguration;
-import org.eclipse.objectteams.otdt.core.ext.OTDTPlugin;
import org.eclipse.objectteams.otdt.core.ext.OTREContainer;
import org.eclipse.objectteams.otdt.debug.internal.TempFileManager;
/**
* @author gis
- * @version $Id: OTLaunchConfigurationDelegate.java 11843 2006-05-09 10:36:01Z carp $
*/
@SuppressWarnings("nls")
public class OTVMRunnerAdaptor
@@ -58,7 +56,6 @@ public class OTVMRunnerAdaptor
JPLIS_VMARGS.add("-javaagent:" + "\""+OTREContainer.OTRE_AGENT_JAR_PATH.toOSString()+'"'); // support blanks in path
}
- final static private boolean _useJPLIS = true;
private ILaunchConfiguration _launchConfig;
private String _mode;
private ILaunch _launch;
@@ -70,10 +67,6 @@ public class OTVMRunnerAdaptor
_launch = launch;
}
- public boolean usesJPLIS() {
- return _useJPLIS;
- }
-
public VMRunnerConfiguration adapt(VMRunnerConfiguration vmRunnerConfig) throws CoreException
{
adaptVMArgs(vmRunnerConfig);
@@ -146,9 +139,8 @@ public class OTVMRunnerAdaptor
String sep = " ";
StringBuffer result = new StringBuffer(vmArguments);
- if (_useJPLIS)
- for (String arg : JPLIS_VMARGS)
- result.append(sep).append(arg);
+ for (String arg : JPLIS_VMARGS)
+ result.append(sep).append(arg);
String callinSteppingVMArg = getCallinSteppingVMArg();
if (callinSteppingVMArg != null)
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/guide/running.html b/plugins/org.eclipse.objectteams.otdt.ui.help/guide/running.html
index d9ec72841..10ddbc397 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/guide/running.html
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/guide/running.html
@@ -15,7 +15,7 @@
All this is hidden as to make running Object Teams programs as easy as running Java programs.
</p>
<p style="margin-left:20px;margin-right:40px;font-style:italic;">
- The OT/J specific launch types (<img src="../images/otj_launch.gif" valign="absmiddle"> Object Teams Application, <img src="../images/ote_launch.gif" valign="absmiddle"> Object Teams Eclipse Application <img src="../images/ote_osgi_launch.gif" valign="absmiddle"> OT/Equinox Framework) are no longer needed and are gradually being faded out.
+ Previous versions of the OTDT introduced specific launch types (<img src="../images/otj_launch.gif" valign="absmiddle"> Object Teams Application, <img src="../images/ote_launch.gif" valign="absmiddle"> Object Teams Eclipse Application <img src="../images/ote_osgi_launch.gif" valign="absmiddle"> OT/Equinox Framework) which are no longer supported.
</p>
<p>
For launching OT/J programs use any of the launching techniques offered by Eclipse:
@@ -42,8 +42,6 @@
<li style="margin-bottom:7px;">For OT/J projects this option is enabled by default.</li>
<li style="margin-bottom:7px;">If <span class="ui">Enable OTRE</span> is checked an additional <a href="#activation"><img valing="absmiddle" src="../images/team_obj.gif"><code>Team Activation</code> tab</a> will be shown.<br>
<i>(If a launch configuration was opened while the OTRE was disabled, you need to re-open this configuration (e.g., unselect and select) in order for the new tab to show.)</i></li>
- <li>Additionally, the check box <span class="ui">Java 5 JPLIS Launching</span> lets you select between two technologies (JMangler vs. JPLIS),
- by which the OTRE is hooked into the JVM. The newer option JPLIS has graduated from experimental status and its use is now encouraged.
</ul>
</p>
diff --git a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/ui/OTPluginResources.properties b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/ui/OTPluginResources.properties
index 7e3105da1..0e1a81721 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/ui/OTPluginResources.properties
+++ b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/ui/OTPluginResources.properties
@@ -63,10 +63,6 @@ CallinMarkerCreator2.search_failed_message=Searching for bound base methods fail
CallinMarkerCreator2.search_canceled_message=Searching for bound base methods canceled -- no markers will be shown.
CallinMarkerCreator2.line_number_error_message=Cannot compute line number for callin marker
-## Launching:
-
-OTJavaMainTab.jplis_checkbox_label=Java 5 JPLIS Launching (recommended)
-
#Team activation tab:
TeamConfig.tab_title=Team Activation
TeamConfig.activate_checkbox_description=Instantiate and activate the following teams at program launch

Back to the top