Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2010-04-26 18:08:32 -0400
committeratikhomirov2010-04-26 18:08:32 -0400
commit2d2e91d93aa5aa4cf9354066fd099633babe46a0 (patch)
tree108227898cebf6a6db32ea087da571d7a2199e52
parentf33a508780d4280a5a40fc57cc8c98a2ce579b39 (diff)
downloadorg.eclipse.gmf-tooling-2d2e91d93aa5aa4cf9354066fd099633babe46a0.tar.gz
org.eclipse.gmf-tooling-2d2e91d93aa5aa4cf9354066fd099633babe46a0.tar.xz
org.eclipse.gmf-tooling-2d2e91d93aa5aa4cf9354066fd099633babe46a0.zip
[231330] reduce use of static fields - make pure design diagrams compile
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt
index 4e8526608..cdddeab1c 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt
@@ -34,10 +34,12 @@ public class «activatorClassName» extends org.eclipse.ui.plugin.AbstractUIPlug
«EXPAND xpt::Common::generatedMemberComment»
private «editorGen.diagram.getDocumentProviderQualifiedClassName()» documentProvider;
-
+
+«IF editorGen.diagram.links->exists(not sansDomain)-»
«EXPAND xpt::Common::generatedMemberComment»
private «editorGen.diagram.getLinkCreationConstraintsQualifiedClassName()» linkConstraints;
+«ENDIF-»
«EXPAND xpt::Common::generatedMemberComment»
public «activatorClassName»() {
}
@@ -54,7 +56,9 @@ public class «activatorClassName» extends org.eclipse.ui.plugin.AbstractUIPlug
public void stop(org.osgi.framework.BundleContext context) throws Exception {
adapterFactory.dispose();
adapterFactory = null;
+«IF editorGen.diagram.links->exists(not sansDomain)-»
linkConstraints = null;
+«ENDIF-»
instance = null;
super.stop(context);
}
@@ -161,6 +165,7 @@ public class «activatorClassName» extends org.eclipse.ui.plugin.AbstractUIPlug
return documentProvider;
}
+«IF editorGen.diagram.links->exists(not sansDomain) -»
«EXPAND xpt::Common::generatedMemberComment»
public «editorGen.diagram.getLinkCreationConstraintsQualifiedClassName()» getLinkConstraints() {
return linkConstraints;
@@ -171,6 +176,7 @@ public class «activatorClassName» extends org.eclipse.ui.plugin.AbstractUIPlug
this.linkConstraints = lc;
}
+«ENDIF-»
«EXPAND xpt::Common::generatedMemberComment»
public void logError(String error) {
logError(error, null);

Back to the top