Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgolubev2012-09-11 15:48:54 -0400
committermgolubev2012-09-11 16:38:33 -0400
commit389cdc63ce74ae46ba1b3498a54c19fdddcfb0ef (patch)
treef8abd3f2f9c8aaf67743dca9683aa01af053bdd8
parent64811e11ce8a4c08ec34ad27b09c04957e8ac682 (diff)
downloadorg.eclipse.gmf-tooling-389cdc63ce74ae46ba1b3498a54c19fdddcfb0ef.tar.gz
org.eclipse.gmf-tooling-389cdc63ce74ae46ba1b3498a54c19fdddcfb0ef.tar.xz
org.eclipse.gmf-tooling-389cdc63ce74ae46ba1b3498a54c19fdddcfb0ef.zip
[385584] - Don't @Override interface methods for compliance = JDK5
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/CodeStyle.xpt6
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/parsers/ExpressionLabelParser.xpt3
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt5
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/VisualEffectEditPolicy.xpt11
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt8
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt12
7 files changed, 28 insertions, 21 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/templates/CodeStyle.xpt b/plugins/org.eclipse.gmf.codegen/templates/CodeStyle.xpt
index 07bd2bf65..d096faa57 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/CodeStyle.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/CodeStyle.xpt
@@ -83,4 +83,10 @@ java.util.Collections.EMPTY_MAP«ENDIF-»
«IF self.jdkComplianceLevel() > 4-»
@Override
«ENDIF-»
+«ENDDEFINE»
+
+«DEFINE overrideI FOR gmfgen::GenCommonBase-»
+«IF self.jdkComplianceLevel() > 5-»
+@Override
+«ENDIF-»
«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
index c15c5cf71..2ac242818 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
@@ -671,12 +671,12 @@
if (myOclRegistrator == null) {
myOclRegistrator = new org.eclipse.gmf.tooling.runtime.ocl.tracker.OclTracker.Registrator() {
- @Override
+ «EXPAND CodeStyle::overrideI-»
public void registerListener(String filterId, org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener listener, org.eclipse.emf.ecore.EObject element) {
addListenerFilter(filterId, listener, element);
}
- @Override
+ «EXPAND CodeStyle::overrideI-»
public void unregisterListener(String filterId) {
removeListenerFilter(filterId);
}
diff --git a/plugins/org.eclipse.gmf.codegen/templates/parsers/ExpressionLabelParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/parsers/ExpressionLabelParser.xpt
index 71e968c88..134e98640 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/parsers/ExpressionLabelParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/parsers/ExpressionLabelParser.xpt
@@ -11,6 +11,7 @@
*/
«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
+«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
«EXTENSION xpt::StringOperations»
@@ -45,7 +46,7 @@ public class «self.getQualifiedClassName().xpandSplit('\\.')->last()»«EXPAND
«IF isViewExpressionDefinedAndOcl()-»
«EXPAND xpt::Common::generatedMemberComment»
- @Override
+ «EXPAND CodeStyle::override FOR self.oclAsType(ecore::EObject).eContainer().oclAsType(gmfgen::GenCommonBase)»
protected String getExpressionBody() {
return «EXPAND impl::parsers::ExpressionLabelParser::getExpression(self, viewExpression) FOR viewExpression.provider».body();
}
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt
index 8446084ac..a6c94b02f 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt
@@ -258,7 +258,7 @@ public class «textNonResizableEditPolicyClassName» «EXPAND TextNonResizableEd
«DEFINE textFeedback_refreshFeedback FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::generatedMemberComment»
- «EXPAND CodeStyle::override-»
+ «EXPAND CodeStyle::overrideI-»
public void refreshFeedback() {
refreshSelectionFeedback();
refreshFocusFeedback();
@@ -277,5 +277,4 @@ public class «textNonResizableEditPolicyClassName» «EXPAND TextNonResizableEd
}
return hostPositionListener;
}
-«ENDDEFINE»
-
+«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/VisualEffectEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/VisualEffectEditPolicy.xpt
index 2d20fb439..2c3f2857d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/VisualEffectEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/VisualEffectEditPolicy.xpt
@@ -52,9 +52,10 @@ public class «EXPAND xpt::Common::disqualifiedClassName FOR getEditPolicyQualif
«DEFINE setVisualEffectValue FOR gmfgen::GenVisualEffect-»
«EXPAND xpt::Common::generatedMemberComment»
- @Override
+
+ «EXPAND CodeStyle::override FOR self.oclAsType(ecore::EObject).eContainer().oclAsType(gmfgen::GenCommonBase)»
protected void setVisualEffectValue(Object value) {
- «IF pinKind = 'ColorPin'-»
+ «IF pinKind = 'ColorPin'-»
«EXPAND setVisualEffectValueOnColorPin-»
«ELSEIF pinKind = 'VisiblePin'-»
«EXPAND setVisualEffectValueOnCustomPin-»
@@ -68,7 +69,7 @@ public class «EXPAND xpt::Common::disqualifiedClassName FOR getEditPolicyQualif
«DEFINE getHostImpl FOR gmfgen::GenVisualEffect-»
«EXPAND xpt::Common::generatedMemberComment»
- @Override
+ «EXPAND CodeStyle::override FOR self.oclAsType(ecore::EObject).eContainer().oclAsType(gmfgen::GenCommonBase)»
protected «subject.getEditPartQualifiedClassName()» getHostImpl() {
return («subject.getEditPartQualifiedClassName()») super.getHostImpl();
}
@@ -76,7 +77,7 @@ public class «EXPAND xpt::Common::disqualifiedClassName FOR getEditPolicyQualif
«DEFINE getExpressionBody FOR gmfgen::GenVisualEffect-»
«EXPAND xpt::Common::generatedMemberComment»
- @Override
+ «EXPAND CodeStyle::override FOR self.oclAsType(ecore::EObject).eContainer().oclAsType(gmfgen::GenCommonBase)»
protected String getExpressionBody() {
return
«IF subject.oclIsKindOf(gmfgen::GenLink)-»
@@ -169,7 +170,7 @@ getHostImpl().getPrimaryShape().«operationName-»
«DEFINE getContext FOR gmfgen::FeatureLinkModelFacet-»
«EXPAND xpt::Common::generatedMemberComment»
- @Override
+ «EXPAND CodeStyle::override FOR self.oclAsType(ecore::EObject).eContainer().oclAsType(gmfgen::GenCommonBase)»
protected org.eclipse.emf.ecore.EObject getContext() {
«IF metaFeature.ecoreFeature.upperBound = 1-»
«EXPAND getContextBody('source', 'target', getSourceType(), getTargetType(), metaFeature)-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt
index d3c8a8963..9d479a031 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt
@@ -495,25 +495,25 @@ private static «EXPAND CodeStyle::G('java.util.Collection', getDiagram().editor
public static final org.eclipse.gmf.tooling.runtime.update.DiagramUpdater «EXPAND runtimeTypedInstanceName» = new org.eclipse.gmf.tooling.runtime.update.DiagramUpdater() {
«REM»Doesn't make sense to use CodeStyle::G -- interface requires generics anyway, so we checked above for the whole field«ENDREM»«-»
«EXPAND xpt::Common::generatedMemberComment»
- «EXPAND CodeStyle::override FOR editorGen.diagram»
+ «EXPAND CodeStyle::overrideI FOR editorGen.diagram»
public java.util.List<«nodeDescriptorFQN»> getSemanticChildren(org.eclipse.gmf.runtime.notation.View view) {
return «diagramUpdaterClassName».getSemanticChildren(view);
}
«EXPAND xpt::Common::generatedMemberComment»
- «EXPAND CodeStyle::override FOR editorGen.diagram»
+ «EXPAND CodeStyle::overrideI FOR editorGen.diagram»
public java.util.List<«linkDescriptorFQN»> getContainedLinks(org.eclipse.gmf.runtime.notation.View view) {
return «diagramUpdaterClassName».getContainedLinks(view);
}
«EXPAND xpt::Common::generatedMemberComment»
- «EXPAND CodeStyle::override FOR editorGen.diagram»
+ «EXPAND CodeStyle::overrideI FOR editorGen.diagram»
public java.util.List<«linkDescriptorFQN»> getIncomingLinks(org.eclipse.gmf.runtime.notation.View view) {
return «diagramUpdaterClassName».getIncomingLinks(view);
}
«EXPAND xpt::Common::generatedMemberComment»
- «EXPAND CodeStyle::override FOR editorGen.diagram»
+ «EXPAND CodeStyle::overrideI FOR editorGen.diagram»
public java.util.List<«linkDescriptorFQN»> getOutgoingLinks(org.eclipse.gmf.runtime.notation.View view) {
return «diagramUpdaterClassName».getOutgoingLinks(view);
}
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt
index 892be88e3..30f0f5df7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt
@@ -436,37 +436,37 @@ return -1;
«EXPAND xpt::Common::generatedClassComment»
public static final org.eclipse.gmf.tooling.runtime.structure.DiagramStructure «EXPAND runtimeTypedInstanceName» = new org.eclipse.gmf.tooling.runtime.structure.DiagramStructure() {
«EXPAND xpt::Common::generatedMemberComment»
- «EXPAND CodeStyle::override»
+ «EXPAND CodeStyle::overrideI»
public int «EXPAND xpt::editor::VisualIDRegistry::getVisualIdMethodName»(org.eclipse.gmf.runtime.notation.View view) {
return «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(view);
}
«EXPAND xpt::Common::generatedMemberComment»
- «EXPAND CodeStyle::override»
+ «EXPAND CodeStyle::overrideI»
public String «EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodName»(org.eclipse.gmf.runtime.notation.View view) {
return «EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall»(view);
}
«EXPAND xpt::Common::generatedMemberComment»
- «EXPAND CodeStyle::override»
+ «EXPAND CodeStyle::overrideI»
public int «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodName»(org.eclipse.gmf.runtime.notation.View containerView, org.eclipse.emf.ecore.EObject domainElement) {
return «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodCall»(containerView, domainElement);
}
«EXPAND xpt::Common::generatedMemberComment»
- «EXPAND CodeStyle::override»
+ «EXPAND CodeStyle::overrideI»
public boolean «EXPAND checkNodeVisualIDMethodName»(org.eclipse.gmf.runtime.notation.View containerView, org.eclipse.emf.ecore.EObject domainElement, int candidate) {
return «EXPAND checkNodeVisualIDMethodCall»(containerView, domainElement, candidate);
}
«EXPAND xpt::Common::generatedMemberComment»
- «EXPAND CodeStyle::override»
+ «EXPAND CodeStyle::overrideI»
public boolean «EXPAND isCompartmentVisualIDMethodName»(int visualID) {
return «EXPAND isCompartmentVisualIDMethodCall»(visualID);
}
«EXPAND xpt::Common::generatedMemberComment»
- «EXPAND CodeStyle::override»
+ «EXPAND CodeStyle::overrideI»
public boolean «EXPAND isSemanticLeafVisualIDMethodName»(int visualID) {
return «EXPAND isSemanticLeafVisualIDMethodCall»(visualID);
}

Back to the top