Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgolubev2012-10-11 09:04:40 +0000
committermgolubev2012-10-11 09:04:40 +0000
commit5b184d78fa5733b8d43257e5c10d1c5e1c705bad (patch)
treefa6bec85255a7383c33d0a7471a5524aa3f0ebbb
parentdad029d7fd7d2a0295224ec82f89a11f4a48c40c (diff)
downloadorg.eclipse.gmf-tooling-5b184d78fa5733b8d43257e5c10d1c5e1c705bad.tar.gz
org.eclipse.gmf-tooling-5b184d78fa5733b8d43257e5c10d1c5e1c705bad.tar.xz
org.eclipse.gmf-tooling-5b184d78fa5733b8d43257e5c10d1c5e1c705bad.zip
[390396] - Avoid Java 6+ requirement from oe.gmf.tooling.runtime plugin
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/.classpath14
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/.settings/org.eclipse.jdt.core.prefs15
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/edit/policies/effect/AbstractOclVisualEffectEditPolicy.java3
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclDependencyCollectorBase.java1
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclEvaluatorImpl.java2
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclResultImpl.java7
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTracker.java4
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTrackerFactory.java2
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/ocl/tracker/OclTrackerBase.java2
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/ChoiceParserBase.java5
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/ExpressionLabelParserBase.java1
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/OclTrackerChoiceParser.java1
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/update/UpdateDiagramCommand.java6
14 files changed, 15 insertions, 50 deletions
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/.classpath b/plugins/org.eclipse.gmf.tooling.runtime/.classpath
index 8a8f1668c..64c5e31b7 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/.classpath
+++ b/plugins/org.eclipse.gmf.tooling.runtime/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.gmf.tooling.runtime/.settings/org.eclipse.jdt.core.prefs
index 2d2ea11ac..af0f20f97 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.gmf.tooling.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Tue Jan 16 11:57:08 CET 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.tooling.runtime/META-INF/MANIFEST.MF
index c77682abe..5149a86b7 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.tooling.runtime/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ocl.ecore,
org.eclipse.gmf.runtime.notation
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Activator: org.eclipse.gmf.tooling.runtime.GMFToolingRuntimePlugin
Export-Package: org.eclipse.gmf.tooling.runtime,
org.eclipse.gmf.tooling.runtime.directedit,
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/edit/policies/effect/AbstractOclVisualEffectEditPolicy.java b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/edit/policies/effect/AbstractOclVisualEffectEditPolicy.java
index a0fc96f6a..18e69a520 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/edit/policies/effect/AbstractOclVisualEffectEditPolicy.java
+++ b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/edit/policies/effect/AbstractOclVisualEffectEditPolicy.java
@@ -76,7 +76,6 @@ public abstract class AbstractOclVisualEffectEditPolicy extends CanonicalEditPol
getOclTracker().installListeners(getHostImpl().getEditingDomain(), //
new NotificationListener() {
- @Override
public void notifyChanged(Notification notification) {
refreshVisualEffect();
}
@@ -155,12 +154,10 @@ public abstract class AbstractOclVisualEffectEditPolicy extends CanonicalEditPol
if (myOclRegistrator == null) {
myOclRegistrator = new Registrator() {
- @Override
public void registerListener(String filterId, NotificationListener listener, EObject element) {
addListenerFilter(filterId, listener, element);
}
- @Override
public void unregisterListener(String filterId) {
removeListenerFilter(filterId);
}
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclDependencyCollectorBase.java b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclDependencyCollectorBase.java
index 5618352f4..4fad10b02 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclDependencyCollectorBase.java
+++ b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclDependencyCollectorBase.java
@@ -15,7 +15,6 @@ abstract class ActiveOclDependencyCollectorBase<T extends ContextData> implement
myContext2Data = new HashMap<EObject, T>();
}
- @Override
public void registerDependency(EObject context, EStructuralFeature feature) {
T contextData = myContext2Data.get(context);
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclEvaluatorImpl.java b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclEvaluatorImpl.java
index 0e195c02f..78451e1ed 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclEvaluatorImpl.java
+++ b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclEvaluatorImpl.java
@@ -8,12 +8,10 @@ import org.eclipse.ocl.ParserException;
class ActiveOclEvaluatorImpl implements ActiveOclEvaluator {
- @Override
public ActiveOclResult evaluate(EObject context, String oclExp) throws ParserException {
return new ActiveOclResultImpl(context, oclExp);
}
- @Override
public Object evaluate(EObject context, String oclExp, ActiveOclDependencyCollector dependencyCollector) throws ParserException {
return new DependencyEvaluator(context, oclExp, dependencyCollector).evaluate();
}
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclResultImpl.java b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclResultImpl.java
index 2ae5916f0..46b9337b0 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclResultImpl.java
+++ b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclResultImpl.java
@@ -29,7 +29,6 @@ class ActiveOclResultImpl implements ActiveOclResult, ActiveOclListener {
myResult = myDependencyEvaluator.evaluate();
}
- @Override
public void onResultChanged() {
myDependencyCollector.clear();
@@ -45,32 +44,26 @@ class ActiveOclResultImpl implements ActiveOclResult, ActiveOclListener {
}
}
- @Override
public void removeListener(ActiveOclListener listener) {
myListeners.remove(listener);
}
- @Override
public Object getResult() {
return myResult;
}
- @Override
public void dispose() {
myDependencyCollector.clear();
}
- @Override
public boolean canListenForChanges() {
return true;
}
- @Override
public void addListener(ActiveOclListener listener) {
myListeners.add(listener);
}
- @Override
public Notifier adaptToEMFNotifier() {
// TODO Auto-generated method stub
return null;
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTracker.java b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTracker.java
index 420686534..aa9f285f5 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTracker.java
+++ b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTracker.java
@@ -32,7 +32,6 @@ class ActiveOclTracker extends OclTrackerBase {
myDependecyCollector = new SimpleDependencyCollector();
}
- @Override
public void installListeners(TransactionalEditingDomain domain, NotificationListener listener, Registrator registrator) {
myListener = listener;
myRegistrator = registrator;
@@ -40,7 +39,6 @@ class ActiveOclTracker extends OclTrackerBase {
registerListeners();
}
- @Override
public void uninstallListeners() {
unregisterListeners();
}
@@ -64,7 +62,6 @@ class ActiveOclTracker extends OclTrackerBase {
}
}
- @Override
public Object getValue() {
if (!myValueInitialized || !isCached()) {
doInitialize();
@@ -72,7 +69,6 @@ class ActiveOclTracker extends OclTrackerBase {
return myValue;
}
- @Override
public boolean handleNotification(Notification notification) {
ContextData contextData = myDependecyCollector.getContext2Data().get(notification.getNotifier());
boolean affected = contextData != null && contextData.getFeatures().contains(notification.getFeature());
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTrackerFactory.java b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTrackerFactory.java
index bf0bfdafa..562d1c71c 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTrackerFactory.java
+++ b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTrackerFactory.java
@@ -5,12 +5,10 @@ import org.eclipse.gmf.tooling.runtime.ocl.tracker.OclTrackerFactory;
public class ActiveOclTrackerFactory implements OclTrackerFactory {
- @Override
public OclTracker createOclTracker(String expressionBody, boolean cached) {
return new ActiveOclTracker(expressionBody, cached);
}
- @Override
public Type getImplementationType() {
return Type.DEFAULT_GMFT;
}
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/ocl/tracker/OclTrackerBase.java b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/ocl/tracker/OclTrackerBase.java
index 76bbadc65..6a5ed88f7 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/ocl/tracker/OclTrackerBase.java
+++ b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/ocl/tracker/OclTrackerBase.java
@@ -12,12 +12,10 @@ public abstract class OclTrackerBase implements OclTracker {
myExpressionBody = expressionBody;
}
- @Override
public final String getExpressionBody() {
return myExpressionBody;
}
- @Override
public final void initialize(EObject context) {
if (myContext == context) {
return;
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/ChoiceParserBase.java b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/ChoiceParserBase.java
index 3f46c981f..2b58a96e3 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/ChoiceParserBase.java
+++ b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/ChoiceParserBase.java
@@ -24,13 +24,11 @@ public abstract class ChoiceParserBase extends AbstractFeatureParser implements
return getEditableFeatures()[SINGLE_FEATURE_INDEX];
}
- @Override
public String getEditString(IAdaptable adapter, int flags) {
EObject element = (EObject) adapter.getAdapter(EObject.class);
return getEditChoice(element, getEditableValues(element)[SINGLE_FEATURE_INDEX]);
}
- @Override
public IParserEditStatus isValidEditString(IAdaptable adapter, String editString) {
if (getEditChoices(adapter).contains(editString)) {
return ParserEditStatus.EDITABLE_STATUS;
@@ -38,18 +36,15 @@ public abstract class ChoiceParserBase extends AbstractFeatureParser implements
return new ParserEditStatus(GMFToolingRuntimePlugin.ID, IParserEditStatus.UNEDITABLE, editString);
}
- @Override
public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {
EObject element = (EObject) adapter.getAdapter(EObject.class);
return getParseCommand(adapter, new Object[] { findItem(element, newString) }, flags);
}
- @Override
public String getPrintString(IAdaptable adapter, int flags) {
return getEditString(adapter, flags);
}
- @Override
public List<String> getEditChoices(IAdaptable adapter) {
EObject element = (EObject) adapter.getAdapter(EObject.class);
List<String> result = new ArrayList<String>();
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/ExpressionLabelParserBase.java b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/ExpressionLabelParserBase.java
index d3304daa6..5263904cc 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/ExpressionLabelParserBase.java
+++ b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/ExpressionLabelParserBase.java
@@ -29,7 +29,6 @@ public abstract class ExpressionLabelParserBase implements HasOclTracker, IParse
};
}
- @Override
public OclTracker getOclTracker() {
return myDelegate.getOclTracker();
}
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/OclTrackerChoiceParser.java b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/OclTrackerChoiceParser.java
index b7b3de252..b1c3587b7 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/OclTrackerChoiceParser.java
+++ b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/parsers/OclTrackerChoiceParser.java
@@ -49,7 +49,6 @@ public class OclTrackerChoiceParser extends OclChoiceParser implements HasOclTra
return super.getEditString(adapter, flags);
}
- @Override
public OclTracker getOclTracker() {
return myLabelDelegate.getOclTracker();
}
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/update/UpdateDiagramCommand.java b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/update/UpdateDiagramCommand.java
index 0f1e99c21..1fdf8eb48 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/update/UpdateDiagramCommand.java
+++ b/plugins/org.eclipse.gmf.tooling.runtime/src/org/eclipse/gmf/tooling/runtime/update/UpdateDiagramCommand.java
@@ -32,22 +32,18 @@ import org.eclipse.ui.PlatformUI;
*/
public class UpdateDiagramCommand implements IHandler {
- @Override
public void addHandlerListener(IHandlerListener handlerListener) {
//
}
- @Override
public void removeHandlerListener(IHandlerListener handlerListener) {
//
}
- @Override
public void dispose() {
//
}
- @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
if (selection instanceof IStructuredSelection) {
@@ -68,12 +64,10 @@ public class UpdateDiagramCommand implements IHandler {
return null;
}
- @Override
public boolean isEnabled() {
return true;
}
- @Override
public boolean isHandled() {
return true;
}

Back to the top