Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskovalsky2013-12-05 11:00:30 -0500
committerGerrit Code Review @ Eclipse.org2014-01-14 05:57:07 -0500
commit1a89e50446cfaac74455cad3f3a8c4a5420589f4 (patch)
tree5ba1860c242e4d4252ea01292c48cb8db7f62c66
parent958323a6c55566d1350d8cc56c70cf2e4d3c427c (diff)
downloadorg.eclipse.gmf-tooling-1a89e50446cfaac74455cad3f3a8c4a5420589f4.tar.gz
org.eclipse.gmf-tooling-1a89e50446cfaac74455cad3f3a8c4a5420589f4.tar.xz
org.eclipse.gmf-tooling-1a89e50446cfaac74455cad3f3a8c4a5420589f4.zip
[419982] - @Singleton for all xtend templates
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/actions/CreateShortcutAction.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/actions/extensions.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/ChildNodeLabelEditPart.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/CompartmentEditPart.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/DiagramEditPart.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkLabelEditPart.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeEditPart.xtend4
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeLabelEditPart.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/TextAware.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/update/CanonicalUpdate.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/parsers/ParserProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/parsers/PredefinedParser.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/plugin/Activator.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/QualifiedClassNameProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/ActionBarAdvisor.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/Application.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/Perspective.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/WorkbenchAdvisor.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/WorkbenchWindowAdvisor.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/extensions.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/edithelpers/BaseEditHelper.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/edithelpers/EditHelperAdvice.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editparts/EditPartFactory.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/OpenDiagram.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextFeedback.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextNonResizableEditPolicy.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextSelectionEditPolicy.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/VisualEffectEditPolicy.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/preferences/PreferenceInitializer.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/updater/DiagramUpdater.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ActionBarContributor.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/CreationWizard.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/CreationWizardPage.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramContentInitializer.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramEditorContextMenuProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramEditorUtil.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DocumentProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/Editor.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ElementChooser.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/InitDiagramFileAction.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ModelElementSelectionPage.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/NewDiagramFileWizard.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ShortcutCreationWizard.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ValidateAction.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/VisualIDRegistry.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/extensions.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/palette/PaletteFactory.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/AbstractExpression.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/OCLExpressionFactory.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/RegexpExpressionFactory.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/DomainNavigatorContentProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/DomainNavigatorLabelProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorActionProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorContentProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorLabelProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorLinkHelper.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorSorter.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/extensions.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/propsheet/LabelProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/propsheet/PropertySection.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/EditPartProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ElementTypes.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/MetricProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ModelingAssistantProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ShortcutsDecoratorProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ValidationDecoratorProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ValidationProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ViewProvider.xtend2
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/extensions.xtend2
75 files changed, 76 insertions, 76 deletions
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/actions/CreateShortcutAction.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/actions/CreateShortcutAction.xtend
index 062535543..7bb70eee0 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/actions/CreateShortcutAction.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/actions/CreateShortcutAction.xtend
@@ -26,7 +26,7 @@ import xpt.editor.ShortcutCreationWizard
import xpt.editor.ElementChooser
import xpt.editor.DiagramEditorUtil
-class CreateShortcutAction {
+@com.google.inject.Singleton class CreateShortcutAction {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension ExternalizerUtils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/actions/extensions.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/actions/extensions.xtend
index 2a4b52033..9a68be424 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/actions/extensions.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/actions/extensions.xtend
@@ -29,7 +29,7 @@ import xpt.Common
import xpt.Common_qvto
import xpt.diagram.editparts.EditPartFactory
-class extensions {
+@com.google.inject.Singleton class extensions {
@Inject extension Common_qvto;
@Inject extension Common;
@Inject extension MenuAction_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/ChildNodeLabelEditPart.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/ChildNodeLabelEditPart.xtend
index f1141234e..768f3ab6b 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/ChildNodeLabelEditPart.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/ChildNodeLabelEditPart.xtend
@@ -22,7 +22,7 @@ import xpt.diagram.editpolicies.TextNonResizableEditPolicy
/**
* Revisit: [MG]: @Inject extension same-named-api-class -> template extends api-class?
*/
-class ChildNodeLabelEditPart {
+@com.google.inject.Singleton class ChildNodeLabelEditPart {
@Inject extension Common;
@Inject extension QualifiedClassNameProvider
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/CompartmentEditPart.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/CompartmentEditPart.xtend
index 4feb75e1f..ba404d872 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/CompartmentEditPart.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/CompartmentEditPart.xtend
@@ -25,7 +25,7 @@ import xpt.Externalizer
import xpt.diagram.editparts.Utils_qvto
import xpt.providers.ElementTypes
-@Singleton class CompartmentEditPart {
+@com.google.inject.Singleton class CompartmentEditPart {
@Inject extension Common;
@Inject extension Common_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/DiagramEditPart.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/DiagramEditPart.xtend
index 8d5311fb8..6b1b6a70f 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/DiagramEditPart.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/DiagramEditPart.xtend
@@ -23,7 +23,7 @@ import xpt.diagram.commands.CreateShortcutDecorationsCommand
/**
* Revisit: [MG]: @Inject extension same-named-api-class -> template extends api-class?
*/
-class DiagramEditPart {
+@com.google.inject.Singleton class DiagramEditPart {
@Inject extension Common;
@Inject extension Utils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend
index 7bd7e2947..b04309ac7 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend
@@ -19,7 +19,7 @@ import xpt.diagram.editparts.Common
import xpt.editor.VisualIDRegistry
import xpt.diagram.editpolicies.TextSelectionEditPolicy
-class ExternalNodeLabelEditPart {
+@com.google.inject.Singleton class ExternalNodeLabelEditPart {
@Inject extension xpt.Common;
@Inject Common xptEditpartsCommon;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend
index 67bc0f361..f529093dc 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend
@@ -29,7 +29,7 @@ import xpt.Common_qvto
/**
* Revisit: [MG]: @Inject extension same-named-api-class -> template extends api-class?
*/
-class LinkEditPart {
+@com.google.inject.Singleton class LinkEditPart {
@Inject extension Common;
@Inject extension Common_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkLabelEditPart.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkLabelEditPart.xtend
index 57469e510..5ca7dee7b 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkLabelEditPart.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkLabelEditPart.xtend
@@ -21,7 +21,7 @@ import xpt.diagram.ViewmapAttributesUtils_qvto
import xpt.editor.VisualIDRegistry
import xpt.diagram.editpolicies.TextSelectionEditPolicy
-class LinkLabelEditPart {
+@com.google.inject.Singleton class LinkLabelEditPart {
@Inject extension Common;
@Inject extension ViewmapAttributesUtils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeEditPart.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeEditPart.xtend
index 91d18d7e1..820ac6adf 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeEditPart.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeEditPart.xtend
@@ -37,7 +37,7 @@ import xpt.diagram.editpolicies.GraphicalNodeEditPolicy
import xpt.diagram.editpolicies.TextSelectionEditPolicy
import xpt.diagram.editparts.EditPartFactory
-class NodeEditPart {
+@com.google.inject.Singleton class NodeEditPart {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension ViewmapAttributesUtils_qvto;
@@ -634,4 +634,4 @@ class NodeEditPart {
}
'''
-} \ No newline at end of file
+}
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeLabelEditPart.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeLabelEditPart.xtend
index e55303179..406b6a05c 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeLabelEditPart.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeLabelEditPart.xtend
@@ -20,7 +20,7 @@ import xpt.Common
import xpt.diagram.editparts.Utils_qvto
import xpt.diagram.editpolicies.TextSelectionEditPolicy
-class NodeLabelEditPart {
+@com.google.inject.Singleton class NodeLabelEditPart {
@Inject extension Common;
@Inject extension Utils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/TextAware.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/TextAware.xtend
index 91268a58f..4c23c00c3 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/TextAware.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/TextAware.xtend
@@ -30,7 +30,7 @@ import xpt.diagram.ViewmapAttributesUtils_qvto
import xpt.diagram.editparts.EditPartFactory
import xpt.providers.ElementTypes
-class TextAware {
+@com.google.inject.Singleton class TextAware {
@Inject extension Common
@Inject extension CodeStyle
@Inject extension ViewmapAttributesUtils_qvto
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/update/CanonicalUpdate.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/update/CanonicalUpdate.xtend
index ab8be76b1..df6cc96d7 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/update/CanonicalUpdate.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/update/CanonicalUpdate.xtend
@@ -30,7 +30,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenDiagramUpdater
import xpt.diagram.updater.NodeDescriptor
import xpt.diagram.updater.LinkDescriptor
-class CanonicalUpdate {
+@com.google.inject.Singleton class CanonicalUpdate {
@Inject extension Common;
@Inject extension Common_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/parsers/ParserProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/parsers/ParserProvider.xtend
index 2e6f6a7e5..b40435a17 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/parsers/ParserProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/parsers/ParserProvider.xtend
@@ -46,7 +46,7 @@ import xpt.providers.ElementTypes
import xpt.providers.ParserUtils_qvto
import plugin.Activator
-class ParserProvider {
+@com.google.inject.Singleton class ParserProvider {
@Inject extension Common
@Inject extension Common_qvto
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/parsers/PredefinedParser.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/parsers/PredefinedParser.xtend
index f2fd2545c..f73988ffd 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/parsers/PredefinedParser.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/parsers/PredefinedParser.xtend
@@ -23,7 +23,7 @@ import xpt.Common
import xpt.Externalizer
import plugin.Activator
-class PredefinedParser {
+@com.google.inject.Singleton class PredefinedParser {
@Inject extension Common;
@Inject Externalizer xptExternalizer;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/plugin/Activator.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/plugin/Activator.xtend
index 14b25da42..91ff14d15 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/plugin/Activator.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/plugin/Activator.xtend
@@ -18,7 +18,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenPlugin
import com.google.inject.Inject
import xpt.plugin.ActivatorImpl
-class Activator {
+@com.google.inject.Singleton class Activator {
@Inject ActivatorImpl activatorImpl;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/QualifiedClassNameProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/QualifiedClassNameProvider.xtend
index ae12d3a12..7a218ecb2 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/QualifiedClassNameProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/QualifiedClassNameProvider.xtend
@@ -13,7 +13,7 @@ import xpt.diagram.editpolicies.NodeItemSemanticEditPolicy
import xpt.diagram.commands.CreateNodeCommand
import xpt.diagram.commands.CreateLinkCommand
-class QualifiedClassNameProvider {
+@com.google.inject.Singleton class QualifiedClassNameProvider {
@Inject CompartmentItemSemanticEditPolicy compItemSemantic;
@Inject DiagramItemSemanticEditPolicy diagramItemSemantic;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/ActionBarAdvisor.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/ActionBarAdvisor.xtend
index c61c01326..854ef85d6 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/ActionBarAdvisor.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/ActionBarAdvisor.xtend
@@ -31,7 +31,7 @@ import xpt.Externalizer
import xpt.ExternalizerUtils_qvto
import xpt.editor.CreationWizard
-class ActionBarAdvisor {
+@com.google.inject.Singleton class ActionBarAdvisor {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension ExternalizerUtils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/Application.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/Application.xtend
index d02c51cf3..0a0b2824f 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/Application.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/Application.xtend
@@ -16,7 +16,7 @@ import com.google.inject.Inject
import org.eclipse.gmf.codegen.gmfgen.GenApplication
import xpt.Common
-class Application {
+@com.google.inject.Singleton class Application {
@Inject extension Common;
@Inject WorkbenchAdvisor xptWorkbenchAdvisor
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/Perspective.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/Perspective.xtend
index bf995f955..746fbdb50 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/Perspective.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/Perspective.xtend
@@ -16,7 +16,7 @@ import com.google.inject.Inject
import org.eclipse.gmf.codegen.gmfgen.GenApplication
import xpt.Common
-class Perspective {
+@com.google.inject.Singleton class Perspective {
@Inject extension Common;
@Inject WorkbenchAdvisor xptWorkbenchAdvisor;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/WorkbenchAdvisor.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/WorkbenchAdvisor.xtend
index 2f175cf3b..42d385dbb 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/WorkbenchAdvisor.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/WorkbenchAdvisor.xtend
@@ -16,7 +16,7 @@ import com.google.inject.Inject
import org.eclipse.gmf.codegen.gmfgen.GenApplication
import xpt.Common
-class WorkbenchAdvisor {
+@com.google.inject.Singleton class WorkbenchAdvisor {
@Inject extension Common;
@Inject WorkbenchWindowAdvisor xptWorkbenchWindowAdvisor
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/WorkbenchWindowAdvisor.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/WorkbenchWindowAdvisor.xtend
index 84a0c00f1..f5474b36f 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/WorkbenchWindowAdvisor.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/WorkbenchWindowAdvisor.xtend
@@ -18,7 +18,7 @@ import org.eclipse.gmf.codegen.xtend.annotations.Localization
import xpt.Common
import xpt.Externalizer
-class WorkbenchWindowAdvisor {
+@com.google.inject.Singleton class WorkbenchWindowAdvisor {
@Inject extension Common;
@Inject Externalizer xptExternalizer;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/extensions.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/extensions.xtend
index a9c44ede8..b32e07f4b 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/extensions.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/application/extensions.xtend
@@ -16,7 +16,7 @@ import com.google.inject.Inject
import org.eclipse.gmf.codegen.gmfgen.GenApplication
import xpt.Common
-class extensions {
+@com.google.inject.Singleton class extensions {
@Inject extension Common;
@Inject Application xptApplication
@Inject Perspective xptPerspective
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/edithelpers/BaseEditHelper.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/edithelpers/BaseEditHelper.xtend
index d802e89d6..e35b46254 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/edithelpers/BaseEditHelper.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/edithelpers/BaseEditHelper.xtend
@@ -17,7 +17,7 @@ import com.google.inject.Inject
import org.eclipse.gmf.codegen.gmfgen.GenDiagram
import xpt.Common
-@com.google.inject.Singleton public class BaseEditHelper {
+public class BaseEditHelper {
@Inject extension Common;
def extendsClause(GenDiagram it) '''extends «superClass(it)»'''
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/edithelpers/EditHelperAdvice.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/edithelpers/EditHelperAdvice.xtend
index 53fc0d594..acbabecdb 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/edithelpers/EditHelperAdvice.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/edithelpers/EditHelperAdvice.xtend
@@ -16,7 +16,7 @@ import com.google.inject.Inject
import org.eclipse.gmf.codegen.gmfgen.SpecializationType
import xpt.Common
-@com.google.inject.Singleton public class EditHelperAdvice {
+public class EditHelperAdvice {
@Inject extension Common;
def className(SpecializationType it) '''«it.editHelperAdviceClassName»'''
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editparts/EditPartFactory.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editparts/EditPartFactory.xtend
index adbac4f84..3f0b1a40c 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editparts/EditPartFactory.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editparts/EditPartFactory.xtend
@@ -33,7 +33,7 @@ import diagram.editparts.CompartmentEditPart
import diagram.editparts.NodeLabelEditPart
import diagram.editparts.DiagramEditPart
-class EditPartFactory {
+@com.google.inject.Singleton class EditPartFactory {
@Inject extension Common;
@Inject ChildNodeLabelEditPart childNodeLabelEditPart;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xtend
index 530adb9ba..a0eb25970 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xtend
@@ -16,7 +16,7 @@ import com.google.inject.Inject
import org.eclipse.gmf.codegen.gmfgen.GenCompartment
import xpt.Common
-class CompartmentItemSemanticEditPolicy {
+@com.google.inject.Singleton class CompartmentItemSemanticEditPolicy {
@Inject extension Common;
@Inject childContainerCreateCommand xptChildContainerCreateCommand;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xtend
index 6ace74163..e6dbd7947 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xtend
@@ -16,7 +16,7 @@ import com.google.inject.Inject
import org.eclipse.gmf.codegen.gmfgen.GenDiagram
import xpt.Common
-class DiagramItemSemanticEditPolicy {
+@com.google.inject.Singleton class DiagramItemSemanticEditPolicy {
@Inject extension Common;
@Inject childContainerCreateCommand xptChildContainerCreateCommand;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xtend
index 1305390bb..81f200a51 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xtend
@@ -17,7 +17,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenNode
import xpt.Common
import xpt.providers.ElementTypes
-class GraphicalNodeEditPolicy {
+@com.google.inject.Singleton class GraphicalNodeEditPolicy {
@Inject extension Common;
@Inject ElementTypes xptElementTypes;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend
index 6f1588bfb..89fb2742e 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend
@@ -22,7 +22,7 @@ import org.eclipse.gmf.codegen.gmfgen.TypeLinkModelFacet
import xpt.Common
import xpt.Common_qvto
-class LinkItemSemanticEditPolicy {
+@com.google.inject.Singleton class LinkItemSemanticEditPolicy {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension LinkUtils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/OpenDiagram.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/OpenDiagram.xtend
index df4c96fe6..70358485b 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/OpenDiagram.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/OpenDiagram.xtend
@@ -24,7 +24,7 @@ import xpt.navigator.getEditorInput
import xpt.editor.Editor
import xpt.editor.DiagramEditorUtil
-class OpenDiagram {
+@com.google.inject.Singleton class OpenDiagram {
@Inject extension Common;
@Inject Externalizer xptExternalizer;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextFeedback.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextFeedback.xtend
index faa4f62be..d0fe0ef63 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextFeedback.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextFeedback.xtend
@@ -12,6 +12,6 @@
*/
package xpt.diagram.editpolicies
-class TextFeedback {
+@com.google.inject.Singleton class TextFeedback {
}
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextNonResizableEditPolicy.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextNonResizableEditPolicy.xtend
index 02f83e2ed..c250319f2 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextNonResizableEditPolicy.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextNonResizableEditPolicy.xtend
@@ -7,7 +7,7 @@ import xpt.Common
/**
* FIXME: [MG] - reverse the calls? call common code from here and TextelectionEP and not vice versa
*/
-class TextNonResizableEditPolicy {
+@com.google.inject.Singleton class TextNonResizableEditPolicy {
@Inject extension Common;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextSelectionEditPolicy.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextSelectionEditPolicy.xtend
index efb5fdda9..bb7e1ae2f 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextSelectionEditPolicy.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/TextSelectionEditPolicy.xtend
@@ -8,7 +8,7 @@ import xpt.CodeStyle
/**
* FIXME: [MG] - reverse the calls? call common code from here and TextelectionEP and not vice versa
*/
-class TextSelectionEditPolicy {
+@com.google.inject.Singleton class TextSelectionEditPolicy {
@Inject extension Common;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/VisualEffectEditPolicy.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/VisualEffectEditPolicy.xtend
index 60be8a99a..eb8d677a5 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/VisualEffectEditPolicy.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/editpolicies/VisualEffectEditPolicy.xtend
@@ -32,7 +32,7 @@ import xpt.Common_qvto
import xpt.expressions.OclTracker_qvto
import xpt.diagram.editparts.EditPartFactory
-class VisualEffectEditPolicy {
+@com.google.inject.Singleton class VisualEffectEditPolicy {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension OclTracker_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/preferences/PreferenceInitializer.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/preferences/PreferenceInitializer.xtend
index 5ba41a40e..b25661c18 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/preferences/PreferenceInitializer.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/preferences/PreferenceInitializer.xtend
@@ -31,7 +31,7 @@ import xpt.Common_qvto
import xpt.diagram.Utils_qvto
import plugin.Activator
-class PreferenceInitializer {
+@com.google.inject.Singleton class PreferenceInitializer {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension Utils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/updater/DiagramUpdater.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/updater/DiagramUpdater.xtend
index 4ee6410a8..8d6288e19 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/updater/DiagramUpdater.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/diagram/updater/DiagramUpdater.xtend
@@ -33,7 +33,7 @@ import xpt.GenModelUtils_qvto
import xpt.editor.VisualIDRegistry
import xpt.providers.ElementTypes
-class DiagramUpdater {
+@com.google.inject.Singleton class DiagramUpdater {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension Utils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ActionBarContributor.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ActionBarContributor.xtend
index 32e029fc9..8771a828c 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ActionBarContributor.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ActionBarContributor.xtend
@@ -19,7 +19,7 @@ import xpt.Common_qvto
import xpt.GenEditorGenerator_qvto
import xpt.providers.MetricProvider
-class ActionBarContributor {
+@com.google.inject.Singleton class ActionBarContributor {
@Inject extension Common;
@Inject extension Common_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/CreationWizard.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/CreationWizard.xtend
index 945e41b32..89d932f0f 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/CreationWizard.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/CreationWizard.xtend
@@ -20,7 +20,7 @@ import xpt.Externalizer
import xpt.ExternalizerUtils_qvto
import plugin.Activator
-class CreationWizard {
+@com.google.inject.Singleton class CreationWizard {
@Inject extension Common;
@Inject extension GenDiagram_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/CreationWizardPage.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/CreationWizardPage.xtend
index fd119e7e5..d0a1f3488 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/CreationWizardPage.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/CreationWizardPage.xtend
@@ -18,7 +18,7 @@ import org.eclipse.gmf.codegen.xtend.annotations.Localization
import xpt.Common
import xpt.Externalizer
-class CreationWizardPage {
+@com.google.inject.Singleton class CreationWizardPage {
@Inject extension Common;
@Inject Externalizer xptExternalizer;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramContentInitializer.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramContentInitializer.xtend
index 1344a5020..d0fc0cb96 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramContentInitializer.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramContentInitializer.xtend
@@ -27,7 +27,7 @@ import xpt.diagram.updater.Utils_qvto
import xpt.diagram.updater.NodeDescriptor
import xpt.diagram.updater.LinkDescriptor
-class DiagramContentInitializer {
+@com.google.inject.Singleton class DiagramContentInitializer {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension Utils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramEditorContextMenuProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramEditorContextMenuProvider.xtend
index db4dc9a1f..80b665726 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramEditorContextMenuProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramEditorContextMenuProvider.xtend
@@ -18,7 +18,7 @@ import org.eclipse.gmf.codegen.xtend.annotations.MetaDef
import xpt.Common
import plugin.Activator
-class DiagramEditorContextMenuProvider {
+@com.google.inject.Singleton class DiagramEditorContextMenuProvider {
@Inject extension Common;
@Inject Activator xptActivator;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramEditorUtil.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramEditorUtil.xtend
index 5819f2bbd..3cc005cad 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramEditorUtil.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DiagramEditorUtil.xtend
@@ -22,7 +22,7 @@ import xpt.Common
import xpt.Externalizer
import xpt.ExternalizerUtils_qvto
-class DiagramEditorUtil {
+@com.google.inject.Singleton class DiagramEditorUtil {
@Inject extension Common;
@Inject extension GenDiagram_qvto;
@Inject extension ExternalizerUtils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DocumentProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DocumentProvider.xtend
index f7f300ae8..eb327ca35 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DocumentProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/DocumentProvider.xtend
@@ -19,7 +19,7 @@ import xpt.Common
import xpt.Externalizer
import plugin.Activator
-class DocumentProvider {
+@com.google.inject.Singleton class DocumentProvider {
@Inject extension Common;
@Inject Activator xptActivator;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/Editor.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/Editor.xtend
index c18a0c307..fbae15ac9 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/Editor.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/Editor.xtend
@@ -27,7 +27,7 @@ import xpt.navigator.NavigatorLinkHelper
import xpt.editor.palette.PaletteFactory
import xpt.navigator.NavigatorItem
-class Editor {
+@com.google.inject.Singleton class Editor {
@Inject extension Common;
@Inject extension Common_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ElementChooser.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ElementChooser.xtend
index 48fc9245a..9f161c5f8 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ElementChooser.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ElementChooser.xtend
@@ -20,7 +20,7 @@ import xpt.Common
import xpt.Externalizer
import xpt.ExternalizerUtils_qvto
-class ElementChooser {
+@com.google.inject.Singleton class ElementChooser {
@Inject extension Common;
@Inject extension ExternalizerUtils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/InitDiagramFileAction.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/InitDiagramFileAction.xtend
index 1c0cf203d..0398cb246 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/InitDiagramFileAction.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/InitDiagramFileAction.xtend
@@ -24,7 +24,7 @@ import xpt.Externalizer
import xpt.ExternalizerUtils_qvto
import plugin.Activator
-class InitDiagramFileAction {
+@com.google.inject.Singleton class InitDiagramFileAction {
@Inject extension Common;
@Inject extension Common_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ModelElementSelectionPage.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ModelElementSelectionPage.xtend
index 3f4a1a713..d1ab3f38d 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ModelElementSelectionPage.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ModelElementSelectionPage.xtend
@@ -21,7 +21,7 @@ import xpt.Externalizer
import xpt.ExternalizerUtils_qvto
import plugin.Activator
-class ModelElementSelectionPage {
+@com.google.inject.Singleton class ModelElementSelectionPage {
@Inject extension Common;
@Inject extension ExternalizerUtils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/NewDiagramFileWizard.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/NewDiagramFileWizard.xtend
index 57a43de91..3dbab2162 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/NewDiagramFileWizard.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/NewDiagramFileWizard.xtend
@@ -20,7 +20,7 @@ import xpt.Common
import xpt.Externalizer
import xpt.ExternalizerUtils_qvto
-class NewDiagramFileWizard {
+@com.google.inject.Singleton class NewDiagramFileWizard {
@Inject extension Common;
@Inject extension ExternalizerUtils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ShortcutCreationWizard.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ShortcutCreationWizard.xtend
index 0d57c7a72..72516e75b 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ShortcutCreationWizard.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ShortcutCreationWizard.xtend
@@ -22,7 +22,7 @@ import xpt.Externalizer
import xpt.ExternalizerUtils_qvto
import xpt.diagram.commands.CreateShortcutDecorationsCommand
-class ShortcutCreationWizard {
+@com.google.inject.Singleton class ShortcutCreationWizard {
@Inject extension Common;
@Inject extension ExternalizerUtils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ValidateAction.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ValidateAction.xtend
index 2fefa7f19..646c7abf2 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ValidateAction.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/ValidateAction.xtend
@@ -25,7 +25,7 @@ import xpt.providers.ValidationProvider
import xpt.providers.MarkerNavigationProvider
import xpt.providers.ValidationDecoratorProvider
-class ValidateAction {
+@com.google.inject.Singleton class ValidateAction {
@Inject extension Common;
@Inject extension GenAuditRoot_qvto;
@Inject extension ExternalizerUtils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/VisualIDRegistry.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/VisualIDRegistry.xtend
index 8417ed1c5..532b422f6 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/VisualIDRegistry.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/VisualIDRegistry.xtend
@@ -36,7 +36,7 @@ import xpt.diagram.editpolicies.LinkUtils_qvto
import plugin.Activator
//XXX: [MG] decide what to do with @MetaDef methods
-class VisualIDRegistry {
+@com.google.inject.Singleton class VisualIDRegistry {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension Utils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/extensions.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/extensions.xtend
index 3ec619696..40110ca30 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/extensions.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/extensions.xtend
@@ -16,7 +16,7 @@ import com.google.inject.Inject
import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator
import xpt.Common
-class extensions {
+@com.google.inject.Singleton class extensions {
@Inject extension Common;
@Inject MatchingStrategy xptMatching;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/palette/PaletteFactory.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/palette/PaletteFactory.xtend
index 5af833ab2..1383b0685 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/palette/PaletteFactory.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/editor/palette/PaletteFactory.xtend
@@ -29,7 +29,7 @@ import xpt.Common_qvto
import xpt.Externalizer
import xpt.providers.ElementTypes
-class PaletteFactory {
+@com.google.inject.Singleton class PaletteFactory {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension Utils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/AbstractExpression.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/AbstractExpression.xtend
index bcecf4c39..dd1c93a07 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/AbstractExpression.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/AbstractExpression.xtend
@@ -17,7 +17,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenDiagram
import xpt.Common
import plugin.Activator
-class AbstractExpression {
+@com.google.inject.Singleton class AbstractExpression {
@Inject extension Common;
@Inject Activator xptActivator;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/OCLExpressionFactory.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/OCLExpressionFactory.xtend
index 246bcb8c1..6ef1e93c8 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/OCLExpressionFactory.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/OCLExpressionFactory.xtend
@@ -17,7 +17,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenExpressionInterpreter
import plugin.Activator
import xpt.Common
-class OCLExpressionFactory {
+@com.google.inject.Singleton class OCLExpressionFactory {
@Inject extension Common;
@Inject Activator xptActivator;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/RegexpExpressionFactory.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/RegexpExpressionFactory.xtend
index 5fc07addf..7b2bf03e9 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/RegexpExpressionFactory.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/expressions/RegexpExpressionFactory.xtend
@@ -17,7 +17,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenExpressionInterpreter
import org.eclipse.gmf.codegen.gmfgen.GenLanguage
import xpt.Common
-class RegexpExpressionFactory {
+@com.google.inject.Singleton class RegexpExpressionFactory {
@Inject extension Common;
@Inject AbstractExpression xptAbstractExpression
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/DomainNavigatorContentProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/DomainNavigatorContentProvider.xtend
index 03e082f1a..8133164d0 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/DomainNavigatorContentProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/DomainNavigatorContentProvider.xtend
@@ -17,7 +17,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenNavigator
import xpt.Common
import plugin.Activator
-class DomainNavigatorContentProvider {
+@com.google.inject.Singleton class DomainNavigatorContentProvider {
@Inject extension Common;
@Inject Activator xptActivator
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/DomainNavigatorLabelProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/DomainNavigatorLabelProvider.xtend
index 82b0657c0..ba0da9695 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/DomainNavigatorLabelProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/DomainNavigatorLabelProvider.xtend
@@ -17,7 +17,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenNavigator
import xpt.Common
import plugin.Activator
-class DomainNavigatorLabelProvider {
+@com.google.inject.Singleton class DomainNavigatorLabelProvider {
@Inject extension Common;
@Inject Activator xptActivator
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorActionProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorActionProvider.xtend
index 3f10c6f86..b479e61af 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorActionProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorActionProvider.xtend
@@ -21,7 +21,7 @@ import xpt.editor.VisualIDRegistry
import plugin.Activator
import xpt.editor.Editor
-class NavigatorActionProvider {
+@com.google.inject.Singleton class NavigatorActionProvider {
@Inject extension Common;
@Inject Activator xptActivator;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorContentProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorContentProvider.xtend
index 89c6e406d..3c0dc67fd 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorContentProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorContentProvider.xtend
@@ -26,7 +26,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenLink
import org.eclipse.gmf.codegen.gmfgen.GenNode
import org.eclipse.gmf.codegen.gmfgen.GenNavigatorPathSegment
-class NavigatorContentProvider {
+@com.google.inject.Singleton class NavigatorContentProvider {
@Inject extension xpt.Common;
@Inject extension xpt.Common_qvto;
@Inject extension xpt.navigator.Utils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorLabelProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorLabelProvider.xtend
index aeebd2a93..d229f6019 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorLabelProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorLabelProvider.xtend
@@ -43,7 +43,7 @@ import org.eclipse.gmf.codegen.gmfgen.DesignLabelModelFacet
import org.eclipse.gmf.codegen.gmfgen.GenTopLevelNode
import plugin.Activator
-class NavigatorLabelProvider {
+@com.google.inject.Singleton class NavigatorLabelProvider {
@com.google.inject.Inject extension xpt.Common;
@com.google.inject.Inject extension xpt.Common_qvto;
@com.google.inject.Inject extension xpt.navigator.Utils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorLinkHelper.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorLinkHelper.xtend
index 8811269e5..a10b31089 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorLinkHelper.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorLinkHelper.xtend
@@ -21,7 +21,7 @@ import xpt.Common
import xpt.editor.VisualIDRegistry
import plugin.Activator
-class NavigatorLinkHelper {
+@com.google.inject.Singleton class NavigatorLinkHelper {
@Inject extension Common;
@Inject extension Utils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorSorter.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorSorter.xtend
index 9bd7cb950..3625f57fd 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorSorter.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/NavigatorSorter.xtend
@@ -17,7 +17,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenNavigator
import xpt.Common
import xpt.editor.VisualIDRegistry
-class NavigatorSorter {
+@com.google.inject.Singleton class NavigatorSorter {
@Inject extension Common;
@Inject extension Utils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/extensions.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/extensions.xtend
index 17d601f55..c52b1ee4b 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/extensions.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/navigator/extensions.xtend
@@ -21,7 +21,7 @@ import xpt.editor.ShortcutPropertyTester
/**
* FIXME: [MG]: xptXXX forfields
*/
-class extensions {
+@com.google.inject.Singleton class extensions {
@Inject extension Common;
@Inject UriEditorInputTester uriTester;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/propsheet/LabelProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/propsheet/LabelProvider.xtend
index c37f0ac10..4ffefce6b 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/propsheet/LabelProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/propsheet/LabelProvider.xtend
@@ -19,7 +19,7 @@ import xpt.navigator.NavigatorGroup
import xpt.editor.VisualIDRegistry
import xpt.providers.ElementTypes
-class LabelProvider {
+@com.google.inject.Singleton class LabelProvider {
@Inject extension Common;
@Inject ElementTypes xptElementTypes;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/propsheet/PropertySection.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/propsheet/PropertySection.xtend
index e98398ede..7a6f46495 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/propsheet/PropertySection.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/propsheet/PropertySection.xtend
@@ -75,7 +75,7 @@ import xpt.Common
'''
/**
- * DEFINE's below are not supported anymore (code moved to super@com.google.inject.Singleton class in 3.1).
+ * DEFINE's below are not supported anymore (code moved to superclass in 3.1).
* If your xpt version have them, call it from custom version of additions
* <p>
* def dispatch getPropertySourceMethod(GenCustomPropertyTab it) ''''''
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/EditPartProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/EditPartProvider.xtend
index 641bf89e9..e4b26946a 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/EditPartProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/EditPartProvider.xtend
@@ -18,7 +18,7 @@ import xpt.Common
import xpt.editor.VisualIDRegistry
import xpt.diagram.editparts.EditPartFactory
-class EditPartProvider {
+@com.google.inject.Singleton class EditPartProvider {
@Inject extension Common;
@Inject VisualIDRegistry xptVisualIDRegistry;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ElementTypes.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ElementTypes.xtend
index f6ecc47bf..86aae1d78 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ElementTypes.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ElementTypes.xtend
@@ -28,7 +28,7 @@ import org.eclipse.gmf.codegen.gmfgen.FeatureLinkModelFacet
import plugin.Activator
import xpt.editor.VisualIDRegistry
-class ElementTypes {
+@com.google.inject.Singleton class ElementTypes {
@Inject extension Common;
@Inject extension Common_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/MetricProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/MetricProvider.xtend
index 3105efdf5..cfd995fbc 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/MetricProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/MetricProvider.xtend
@@ -37,7 +37,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenMetricContainer
import plugin.Activator
import xpt.editor.DiagramEditorUtil
-class MetricProvider {
+@com.google.inject.Singleton class MetricProvider {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension Metrics_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ModelingAssistantProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ModelingAssistantProvider.xtend
index de6028bc6..081689c4e 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ModelingAssistantProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ModelingAssistantProvider.xtend
@@ -21,7 +21,7 @@ import xpt.Common
import xpt.Externalizer
import xpt.ExternalizerUtils_qvto
-class ModelingAssistantProvider {
+@com.google.inject.Singleton class ModelingAssistantProvider {
@Inject extension Common;
@Inject extension ExternalizerUtils_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ShortcutsDecoratorProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ShortcutsDecoratorProvider.xtend
index 4a1ced3c1..56ddf2b67 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ShortcutsDecoratorProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ShortcutsDecoratorProvider.xtend
@@ -18,7 +18,7 @@ import xpt.Common
import xpt.editor.VisualIDRegistry
import plugin.Activator
-class ShortcutsDecoratorProvider {
+@com.google.inject.Singleton class ShortcutsDecoratorProvider {
@Inject extension Common;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ValidationDecoratorProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ValidationDecoratorProvider.xtend
index 5be8c2418..65a639944 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ValidationDecoratorProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ValidationDecoratorProvider.xtend
@@ -24,7 +24,7 @@ import xpt.editor.Editor
* FIXME: [MG] monolithic template with most of the code "same-generated".
* Unfortunately, a lot of the logic is based around «IF editorGen.application == null» and we don't have a good ways to deal with taht in GMFT-runtimw
*/
-class ValidationDecoratorProvider {
+@com.google.inject.Singleton class ValidationDecoratorProvider {
@Inject extension Common;
@Inject Activator xptActivator;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ValidationProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ValidationProvider.xtend
index 691363f24..68708c3ac 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ValidationProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ValidationProvider.xtend
@@ -34,7 +34,7 @@ import xpt.editor.VisualIDRegistry
import xpt.expressions.getExpression
import plugin.Activator
-class ValidationProvider {
+@com.google.inject.Singleton class ValidationProvider {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension GenAuditRoot_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ViewProvider.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ViewProvider.xtend
index 8425e3b7d..6f5ded79d 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ViewProvider.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/ViewProvider.xtend
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.LineStyle
import org.eclipse.gmf.runtime.notation.FillStyle
import org.eclipse.gmf.runtime.notation.Style
-class ViewProvider {
+@com.google.inject.Singleton class ViewProvider {
@Inject extension Common;
@Inject extension Common_qvto;
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/extensions.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/extensions.xtend
index 16b12de27..db65aeb35 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/extensions.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/xpt/providers/extensions.xtend
@@ -30,7 +30,7 @@ import org.eclipse.gmf.codegen.xtend.annotations.MetaDef
import org.eclipse.gmf.codegen.gmfgen.GenContainerBase
import org.eclipse.gmf.codegen.gmfgen.GenNode
-class extensions {
+@com.google.inject.Singleton class extensions {
@Inject extension Common;
@Inject extension Common_qvto;
@Inject extension Utils_qvto;

Back to the top