Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptessier2014-04-03 11:51:33 -0400
committerptessier2014-04-03 11:51:33 -0400
commit547d06d12d2b7a70fb595e13cc3520b1bea9fa34 (patch)
tree8938e860397fb7d9f11592d29539f99d80c5ed53 /plugins
parent5fd07e9f732256b72115a9ae91f24c7626f58e01 (diff)
parentd4d720ebc554b9f7b46b19d6a4e89ef39b177f9b (diff)
downloadorg.eclipse.papyrus-547d06d12d2b7a70fb595e13cc3520b1bea9fa34.tar.gz
org.eclipse.papyrus-547d06d12d2b7a70fb595e13cc3520b1bea9fa34.tar.xz
org.eclipse.papyrus-547d06d12d2b7a70fb595e13cc3520b1bea9fa34.zip
Merge branch 'master' of ssh://ptessier@git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git
Diffstat (limited to 'plugins')
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.classpath (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.classpath)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.project)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF)20
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/about.html (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/about.html)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/build.properties)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/config_sample.png (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/config_sample.png)bin12893 -> 12893 bytes
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_filtered.png (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_filtered.png)bin8668 -> 8668 bytes
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_normal.png (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_normal.png)bin28682 -> 28682 bytes
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png)bin13523 -> 13523 bytes
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png)bin19650 -> 19650 bytes
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki)0
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.classpath7
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.project28
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.core.prefs369
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.ui.prefs118
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.pde.prefs25
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/META-INF/MANIFEST.MF32
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/about.html28
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/build.properties7
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/plugin.xml11
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/Activator.java72
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/PopupEditorConfiguration.java151
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/ConcurrentModificationObserver.java91
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/EditingDomainAdapter.java256
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/SimpleDirtyResource.java65
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CompletionProposalUtils.java152
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CustomCompletionProposal.java132
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/AntlrParserWrapper.java123
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/DefaultXtextSemanticValidator.java32
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXTextSemanticValidator.java33
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXtextEMFReconciler.java36
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorHelper.java477
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorKeyListener.java98
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/StringUtil.java41
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/ChangeAggregatorAdapter.java163
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/SemanticRootUnloadListener.java95
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/UpdateXtextResourceTextCommand.java107
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/XtextNodeModelReconciler.java135
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/CustomXtextSourceViewer.java63
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingHelper.java161
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingReconciler.java291
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IActionContributor.java47
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IPartialContentAssistParser.java24
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/ISyntheticResourceProvider.java24
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/OperationHistoryListener.java44
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialContentAssistContextFactory.java34
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialModelEditor.java163
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandle.java131
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandleFactory.java130
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SyntheticResourceProvider.java56
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java14
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.classpath7
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project28
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF23
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/about.html28
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/build.properties8
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Duration.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_DurationInterval.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Expression.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_InstanceValue.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Interval.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralBoolean.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralInteger.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralNull.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralString.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralUnlimitedNatural.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_OpaqueExpression.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_StringExpression.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeExpression.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeInterval.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ConstantParameterValue.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ListParameterValue.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ParameterValue.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_QueryExecutionValue.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Duration.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_DurationInterval.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Expression.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_InstanceValue.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Interval.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralBoolean.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralInteger.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralNull.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralString.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralUnlimitedNatural.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_OpaqueExpression.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_StringExpression.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeExpression.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeInterval.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ConstantParameterValue.gifbin129 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ListParameterValue.gifbin129 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ModiscoQueryConfiguration.gifbin129 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ParameterValue.gifbin129 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/QueryExecutionValue.gifbin129 -> 0 bytes
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.properties42
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.xml25
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationEditPlugin.java97
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationItemProviderAdapterFactory.java275
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConstantParameterValueItemProvider.java223
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ListParameterValueItemProvider.java135
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ModiscoQueryConfigurationItemProvider.java194
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ParameterValueItemProvider.java138
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryConfigurationItemProvider.java150
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryExecutionValueItemProvider.java135
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.classpath7
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.project28
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.core.resources.prefs4
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF22
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/about.html28
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/build.properties8
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore29
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecorediag328
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel41
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.properties12
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.xml26
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationFactory.java73
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationPackage.java553
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConstantParameterValue.java54
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ListParameterValue.java44
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ModiscoQueryConfiguration.java72
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ParameterValue.java55
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryConfiguration.java54
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryExecutionValue.java53
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationFactoryImpl.java134
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationPackageImpl.java371
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConstantParameterValueImpl.java176
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ListParameterValueImpl.java133
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ModiscoQueryConfigurationImpl.java213
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ParameterValueImpl.java158
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryConfigurationImpl.java164
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryExecutionValueImpl.java157
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/plugin/Activator.java90
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationAdapterFactory.java217
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceFactoryImpl.java53
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceImpl.java31
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationSwitch.java227
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationXMLProcessor.java51
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.classpath7
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.project28
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.core.resources.prefs4
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF21
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/about.html28
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/build.properties7
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/plugin.properties16
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecore23
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecorediag173
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/Activator.java69
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterNotfoundException.java70
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterRegistry.java163
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToBooleanConverter.java49
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToIntegerConverter.java48
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToBooleanConverter.java37
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToIntegerConverter.java36
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToStringConverter.java37
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQueryNotFoundException.java40
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQuerySetNotFoundException.java40
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/QueryUtil.java420
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/src/org/eclipse/papyrus/uml/alf/ui/contentassist/AlfProposalProvider.java182
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF1
169 files changed, 106 insertions, 10677 deletions
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.classpath b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.classpath
index f6e5811e42c..f6e5811e42c 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.classpath
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.classpath
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project
index 149c81a950e..149c81a950e 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs
index bcaa1b4d07e..bcaa1b4d07e 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..44217f8c068 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
index 27761ab2403..a49de7681be 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help
-Bundle-Vendor: %providerName
-Bundle-Version: 1.0.0.qualifier
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.doc;singleto
- n:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.help
+Bundle-Vendor: %providerName
+Bundle-Version: 1.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.doc;singleto
+ n:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Localization: plugin
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/about.html b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/about.html
index dd02e0be168..dd02e0be168 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/about.html
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/about.html
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
index 655978a2bc6..655978a2bc6 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties
index 1ffd68f5ccb..1ffd68f5ccb 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml
index 2fba0cfd74f..2fba0cfd74f 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/config_sample.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/config_sample.png
index bb9214c7737..bb9214c7737 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/config_sample.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/config_sample.png
Binary files differ
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_filtered.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_filtered.png
index b0ff70d7be2..b0ff70d7be2 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_filtered.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_filtered.png
Binary files differ
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_normal.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_normal.png
index 6a2ab29f149..6a2ab29f149 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_normal.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_normal.png
Binary files differ
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png
index a37393eb942..a37393eb942 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png
Binary files differ
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png
index 1912f7f2f9e..1912f7f2f9e 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png
Binary files differ
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml
index ae66f735f36..ae66f735f36 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html
index dacce45f8f6..dacce45f8f6 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki
index ed0d4705d75..ed0d4705d75 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.classpath
deleted file mode 100644
index 64c5e31b7a2..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.project
deleted file mode 100644
index a0496ee9a76..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.xtext.glue</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.core.resources.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 52164b21347..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 18:37:57 CEST 2009
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 74df85c62f7..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,369 +0,0 @@
-#Tue Jun 29 13:20:15 CEST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=error
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.launching.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index cd7271ff61d..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Aug 12 21:10:17 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index f6caf599885..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,118 +0,0 @@
-#Wed Oct 14 22:36:24 CEST 2009
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=true
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=false
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_Xtext
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_'Xtext'
-formatter_settings_version=11
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"></template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"></template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"></template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} itemis AG (http\://www.itemis.eu) and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user} - Initial contribution and API\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"></template><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"></template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"></template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-JSDoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=false
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.pde.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 2bd5814c381..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,25 +0,0 @@
-#Wed Aug 12 21:14:13 CEST 2009
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=2
-compilers.p.missing-version-export-package=2
-compilers.p.missing-version-import-package=2
-compilers.p.missing-version-require-bundle=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/META-INF/MANIFEST.MF
deleted file mode 100644
index 321050a31b5..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.common;bundle-version="2.5.0",
- org.eclipse.xtext;bundle-version="1.0.1",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.2.1",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui;bundle-version="0.8.0",
- org.eclipse.core.expressions;bundle-version="3.4.100",
- org.eclipse.xtext.ui.shared;bundle-version="1.0.1",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.0"
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.xtext.glue,
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue.concurrency,
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue.contentassist,
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part,
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue.editingdomain,
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.0.qualifier
-Bundle-Name: XText GMF Glue (Incubation)
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.xtext.glue.Activat
- or
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.xtext.glue;sing
- leton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/build.properties
deleted file mode 100644
index e5a949cc43c..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- about.html
-src.includes = about.html
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/plugin.xml
deleted file mode 100644
index 30f1ff73ff3..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.ui.startup">
- <startup
- class="org.eclipse.papyrus.infra.gmfdiag.xtext.glue.concurrency.ConcurrentModificationObserver$Initializer">
- </startup>
- </extension>
-
-</plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/Activator.java
deleted file mode 100644
index b22de38760d..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/Activator.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- *
- * @author koehnlein
- */
-public class Activator extends AbstractUIPlugin {
-
- /**
- * The plug-in ID
- */
- public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.xtext.glue";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @param t
- */
- public static void logError(Throwable t) {
- getDefault().getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, t.getMessage(), t));
- }
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/PopupEditorConfiguration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/PopupEditorConfiguration.java
deleted file mode 100644
index 3cff16ceb76..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/PopupEditorConfiguration.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.IXTextSemanticValidator;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.IXtextEMFReconciler;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.PopupXtextEditorHelper;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-
-import com.google.inject.Injector;
-
-
-/**
- * @author CEA LIST - Initial contribution and API
- * This class is provided as a basis for contribution to the extension point directEditors of Papyrus,
- * for the case of popup editors.
- * Clients must simply override the method createPopupEditorHelper(Object editPart)
- *
- * This class is deprecated, use DefaultDirectEditorConfiguration instead
- */
-@Deprecated
-public abstract class PopupEditorConfiguration implements IPopupEditorConfiguration {
-
- private String language = "";
-
- /**
- * Default constructor
- */
- public PopupEditorConfiguration() {
- // Auto-generated constructor stub
- }
-
- /**
- * This abstract method must be implemented for the integration of each specific textual editor.
- * Implementation usually consist in calling createPopupEditorHelper.
- * The implementation must simply determine the values to be passed as parameters of this method call.
- *
- * @param editPart The edit part on which a direct edit has been performed. The type of this element
- * is Object, in order to avoid direct dependencies with GMF (see the direct editors extension point of
- * Papyrus). It is however expected that editPart is instanceof IGraphicalEditPart.
- */
- public abstract IPopupEditorHelper createPopupEditorHelper(Object editPart) ;
-
- /**
- * Basic implementation which simply consists in returning a new PopupXtextEditorHelper
- * @param editPart The editPart on which a direct edit has been performed.
- * @param xtextInjector The xtextInjector.
- * @param xtextEditorContextUpdater The IXtextEditorContextUpdater, to update the currently select xtext editor
- * @param modelReconciler The IXtextEMFReconciler, to update the context UML model with changes textually specified in the popup xtext editor
- * @param textToEdit the initialization text, used as the initial textual content for the popup xtext editor
- * @param fileExtension the extension for the temporary textual file (underlying the editor)
- * @param semanticValidator the semantic validator used to semantically validate the model before saving
- * @return IPopupEditorHelper
- */
- public IPopupEditorHelper createPopupEditorHelper(IGraphicalEditPart editPart,
- Injector xtextInjector,
- IXtextEMFReconciler modelReconciler,
- String textToEdit,
- String fileExtension,
- IXTextSemanticValidator semanticValidator) {
-
- return new PopupXtextEditorHelper(editPart,
- xtextInjector,
- modelReconciler,
- textToEdit,
- fileExtension,
- semanticValidator);
- }
-
- ////
-
- public int getStyle() {
- // Auto-generated method stub
- return 0;
- }
-
- public Point getPreferedSize() {
- // Auto-generated method stub
- return null;
- }
-
- public SourceViewerConfiguration getSourceViewerConfiguration() {
- // Auto-generated method stub
- return null;
- }
-
- public String getTextToEdit(Object editedObject) {
- // Auto-generated method stub
- return null;
- }
-
- public Object preEditAction(Object editedObject) {
- // Auto-generated method stub
- return null;
- }
-
- public Object postEditAction(Object editedObject, String newText) {
- // Auto-generated method stub
- return null;
- }
-
- public Composite createExtendedDialogArea(Composite parent) {
- // Auto-generated method stub
- return null;
- }
-
- public String getLanguage() {
- return language;
- }
-
- public void setLanguage(String language) {
- this.language = "" + language ;
- }
-
-
- public IInputValidator getInputValidator() {
- // Auto-generated method stub
- return null;
- }
-
- public void setInputValidator(IInputValidator validator) {
- // Auto-generated method stub
-
- }
-
- public Selection getTextSelection(String value, Object editedObject) {
- // Auto-generated method stub
- return null;
- }
-
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/ConcurrentModificationObserver.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/ConcurrentModificationObserver.java
deleted file mode 100644
index a4a7936d051..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/ConcurrentModificationObserver.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.concurrency;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IStartup;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Detects concurrent modifications of GMF and Xtext editors based on Xtext's dirty state management.
- *
- * @author koehnlein
- */
-public class ConcurrentModificationObserver implements IPartListener {
-
- private EditingDomainAdapter.Factory factory;
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @param activePage
- */
- public ConcurrentModificationObserver(IWorkbenchPage activePage) {
- factory = new EditingDomainAdapter.Factory();
- for (IEditorReference editorRef : activePage.getEditorReferences()) {
- IEditorPart editor = editorRef.getEditor(false);
- if (editor != null) {
- partOpened(editor);
- }
- }
- }
-
- public void partOpened(IWorkbenchPart part) {
- if (part instanceof DiagramEditor) {
- TransactionalEditingDomain editingDomain = ((DiagramEditor) part).getEditingDomain();
- factory.adapt(editingDomain, EditingDomainAdapter.class);
- }
- }
-
- public void partClosed(IWorkbenchPart part) {
- if (part instanceof DiagramEditor) {
- // as long as bug 299920 is not fixed, we have to dispose the adapter manually
- TransactionalEditingDomain editingDomain = ((DiagramEditor) part).getEditingDomain();
- if (editingDomain != null) {
- EditingDomainAdapter adapter = (EditingDomainAdapter) factory.adapt(editingDomain,
- EditingDomainAdapter.class);
- if (adapter != null) {
- adapter.dispose();
- }
- }
- }
- }
-
- public void partActivated(IWorkbenchPart part) {
- // do nothing
- }
-
- public void partDeactivated(IWorkbenchPart part) {
- // do nothing
- }
-
- public void partBroughtToTop(IWorkbenchPart part) {
- // do nothing
- }
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- */
- public static class Initializer implements IStartup {
- public void earlyStartup() {
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- activePage.addPartListener(new ConcurrentModificationObserver(activePage));
- }
- });
- }
- }
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/EditingDomainAdapter.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/EditingDomainAdapter.java
deleted file mode 100644
index cb51de74209..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/EditingDomainAdapter.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.concurrency;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.ResourceSetChangeEvent;
-import org.eclipse.emf.transaction.ResourceSetListener;
-import org.eclipse.emf.transaction.RollbackException;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.TransactionalEditingDomain.Lifecycle;
-import org.eclipse.emf.transaction.TransactionalEditingDomainEvent;
-import org.eclipse.emf.transaction.TransactionalEditingDomainListener;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.Activator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.xtext.resource.IResourceServiceProvider;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.ui.editor.IDirtyResource;
-import org.eclipse.xtext.ui.editor.IDirtyStateManager;
-import org.eclipse.xtext.ui.shared.Access;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-/**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- */
-public class EditingDomainAdapter extends AdapterImpl implements ResourceSetListener,
- TransactionalEditingDomainListener {
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- */
- public static class Factory extends AdapterFactoryImpl {
- @Override
- public boolean isFactoryForType(Object type) {
- return super.isFactoryForType(type == EditingDomainAdapter.class);
- }
-
- @Override
- protected Object resolve(Object object, Object type) {
- if (object instanceof TransactionalEditingDomain) {
- return adapt(((TransactionalEditingDomain) object).getResourceSet(), type);
- }
- return super.resolve(object, type);
- }
-
- @Override
- protected Adapter createAdapter(Notifier target) {
- if (target instanceof ResourceSet) {
- return new EditingDomainAdapter(TransactionUtil.getEditingDomain(target));
- } else {
- return null;
- }
- }
- }
-
- private final TransactionalEditingDomain editingDomain;
-
- private IDirtyStateManager dirtyStateManager;
-
- private Map<URI, IDirtyResource> uri2dirtyResource;
-
- private static final Logger LOG = Logger.getLogger(EditingDomainAdapter.class);
-
- protected EditingDomainAdapter(TransactionalEditingDomain editingDomain) {
- this.editingDomain = editingDomain;
- editingDomain.addResourceSetListener(this);
- dirtyStateManager = Access.getIDirtyStateManager().get();
- uri2dirtyResource = Maps.newHashMap();
- Lifecycle lifecycle = TransactionUtil.getAdapter(editingDomain, Lifecycle.class);
- lifecycle.addTransactionalEditingDomainListener(this);
- }
-
- public NotificationFilter getFilter() {
- return null;
- }
-
- public boolean isAggregatePrecommitListener() {
- return true;
- }
-
- public boolean isPostcommitOnly() {
- return false;
- }
-
- public boolean isPrecommitOnly() {
- return false;
- }
-
- public void resourceSetChanged(ResourceSetChangeEvent event) {
- List<URI> remainingURIs = Lists.newArrayList(uri2dirtyResource.keySet());
- for (Resource resource : editingDomain.getResourceSet().getResources()) {
- if (resource instanceof XtextResource) {
- XtextResource xtextResource = (XtextResource) resource;
- remainingURIs.remove(xtextResource.getURI());
- IDirtyResource dirtyResource = uri2dirtyResource.get(xtextResource.getURI());
- if (xtextResource.isModified()) {
- if (dirtyResource == null) {
- createAndRegisterDirtyState(xtextResource);
- }
- } else {
- if (dirtyResource != null) {
- uri2dirtyResource.remove(xtextResource.getURI());
- dirtyStateManager.discardDirtyState(dirtyResource);
- }
- }
- }
- }
- // removed resources
- for (URI remainingURI : remainingURIs) {
- IDirtyResource dirtyResource = uri2dirtyResource.get(remainingURI);
- dirtyStateManager.discardDirtyState(dirtyResource);
- uri2dirtyResource.remove(remainingURI);
- }
- }
-
- public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
- List<XtextResource> resourcesWithConflicts = null;
- for (Resource resource : editingDomain.getResourceSet().getResources()) {
- if (resource instanceof XtextResource && resource.isModified()) {
- XtextResource xtextResource = (XtextResource) resource;
- IDirtyResource dirtyResource = uri2dirtyResource.get(xtextResource.getURI());
- if (dirtyResource == null) {
- if (!createAndRegisterDirtyState(xtextResource)) {
- if (resourcesWithConflicts == null) {
- resourcesWithConflicts = Lists.newArrayList();
- }
- resourcesWithConflicts.add(xtextResource);
- }
- }
- }
- }
- if (resourcesWithConflicts != null) {
- if (queryApplyChanges()) {
- for (XtextResource resourceWithConflicts : resourcesWithConflicts) {
- try {
- IDirtyResource dirtyResource = createDirtyResource(resourceWithConflicts);
- // assert resource is serializable
- dirtyResource.getContents();
- dirtyStateManager.announceDirtyStateChanged(dirtyResource);
- } catch (Exception exc) {
- LOG.error("Error serializing resource", exc);
- }
- }
- } else {
- throw new RollbackException(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- "Transaction aborted by user"));
- }
- }
- return null;
- }
-
- protected boolean createAndRegisterDirtyState(XtextResource xtextResource) {
- IDirtyResource dirtyResource = createDirtyResource(xtextResource);
- if (dirtyResource == null) {
- return true;
- } else {
- boolean isSuccess = dirtyStateManager.manageDirtyState(dirtyResource);
- if (isSuccess) {
- uri2dirtyResource.put(xtextResource.getURI(), dirtyResource);
- }
- return isSuccess;
- }
- }
-
- protected IDirtyResource createDirtyResource(XtextResource xtextResource) {
- IResourceServiceProvider resourceServiceProvider = IResourceServiceProvider.Registry.INSTANCE
- .getResourceServiceProvider(xtextResource.getURI());
- if (resourceServiceProvider == null) {
- return null;
- }
- return new SimpleDirtyResource(xtextResource, resourceServiceProvider);
- }
-
- public void editingDomainDisposing(TransactionalEditingDomainEvent event) {
- dispose();
- }
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- */
- public void dispose() {
- if (uri2dirtyResource != null) {
- for (IDirtyResource dirtyResource : uri2dirtyResource.values()) {
- dirtyStateManager.discardDirtyState(dirtyResource);
- }
- uri2dirtyResource = null;
- }
- Lifecycle lifecycle = TransactionUtil.getAdapter(editingDomain, Lifecycle.class);
- if (lifecycle != null) {
- lifecycle.removeTransactionalEditingDomainListener(this);
- }
- editingDomain.removeResourceSetListener(this);
- }
-
- protected boolean queryApplyChanges() {
- DialogPrompter dialogPrompter = new DialogPrompter();
- Display.getDefault().syncExec(dialogPrompter);
- boolean yesResult = dialogPrompter.isYesResult();
- return yesResult;
- }
-
- protected class DialogPrompter implements Runnable {
-
- private boolean isYesResult;
-
- public boolean isYesResult() {
- return isYesResult;
- }
-
- public void run() {
- Shell shell = Display.getDefault().getActiveShell();
- isYesResult = MessageDialog.open(MessageDialog.QUESTION, shell, "Concurrent Modification",
- "Other editors have a modified version of models you are going to change.\n"
- + "If apply your changes you are loosing the possibility to save the others.\n"
- + "Apply changes anyway?", SWT.NONE);
- }
- }
-
- public void transactionClosed(TransactionalEditingDomainEvent event) {
- // do nothing
- }
-
- public void transactionClosing(TransactionalEditingDomainEvent event) {
- // do nothing
- }
-
- public void transactionInterrupted(TransactionalEditingDomainEvent event) {
- // do nothing
- }
-
- public void transactionStarted(TransactionalEditingDomainEvent event) {
- // do nothing
- }
-
- public void transactionStarting(TransactionalEditingDomainEvent event) {
- // do nothing
- }
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/SimpleDirtyResource.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/SimpleDirtyResource.java
deleted file mode 100644
index 1108a6dbf91..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/SimpleDirtyResource.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.concurrency;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.resource.IResourceDescription;
-import org.eclipse.xtext.resource.IResourceDescription.Manager;
-import org.eclipse.xtext.resource.IResourceServiceProvider;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.ui.editor.IDirtyResource;
-
-/**
- * An implementation of {@link IDirtyResource} for resources without an underlying document.
- *
- * @author koehnlein - Initial contribution and API
- */
-public class SimpleDirtyResource implements IDirtyResource {
-
- private XtextResource resource;
-
- private Manager resourceDescriptionManager;
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @param resource
- * @param resourceServiceProvider
- */
- public SimpleDirtyResource(XtextResource resource, IResourceServiceProvider resourceServiceProvider) {
- this.resource = resource;
- this.resourceDescriptionManager = resourceServiceProvider.getResourceDescriptionManager();
- }
-
- public String getContents() {
- return resource.getSerializer().serialize(resource.getContents().get(0));
- }
-
- public String getActualContents() {
- return getContents();
- }
-
- public IResourceDescription getDescription() {
- return resourceDescriptionManager.getResourceDescription(resource);
- }
-
- public URI getURI() {
- return resource.getURI();
- }
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @return Resource
- */
- public Resource getResource() {
- return resource;
- }
-
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CompletionProposalUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CompletionProposalUtils.java
deleted file mode 100644
index 0e46b3393f8..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CompletionProposalUtils.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.contentassist;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.papyrus.infra.core.utils.DisplayUtils;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
-
-/**
- * @author CEA LIST - Initial contribution and API
- */
-public class CompletionProposalUtils {
-
- protected final static ILabelProvider labelProvider = DisplayUtils.getLabelProvider() ;
-
- /**
- * Public Utility method for creating a completion proposal
- *
- * @param namedElement The named element for which completion proposal must be created
- * @param completionString The actual completion string
- * @param displayString The way the completion is displayed in the completion list
- * @param context Some information related to the context of the completion
- * @return completion proposal
- */
- public static CustomCompletionProposal createCompletionProposal(NamedElement namedElement,
- String completionString,
- String displayString,
- ContentAssistContext context) {
- String additionalProposalInfo = "" + namedElement.getQualifiedName() + "\n" + '(' + namedElement.eClass().getName() + ')' ;
-
- CustomCompletionProposal completionProposal = new CustomCompletionProposal(completionString, // String to be inserted
- context.getOffset(), // Offset
- context.getSelectedText().length(), // Replacement length
- completionString.length(), // cursorPosition
- labelProvider.getImage(namedElement) , // image
- " " + displayString, // displayString
- null , // contextInformation
- additionalProposalInfo, // additionalProposalInfo
- context);
- return completionProposal ;
- }
-
- /**
- * Public Utility method for creating a completion proposal with replacement of prefix
- *
- * @param namedElement The named element for which completion proposal must be created
- * @param completionString The actual completion string
- * @param displayString The way the completion is displayed in the completion list
- * @param context Some information related to the context of the completion
- * @return completion proposal
- */
- public static CustomCompletionProposal createCompletionProposalWithReplacementOfPrefix(NamedElement namedElement,
- String completionString,
- String displayString,
- ContentAssistContext context) {
- String additionalProposalInfo = "" + namedElement.getQualifiedName() + "\n" + '(' + namedElement.eClass().getName() + ')' ;
-
- CustomCompletionProposal completionProposal = new CustomCompletionProposal(completionString, // String to be inserted
- context.getOffset() - context.getPrefix().length(), // Offset
- context.getPrefix().length(), // Replacement length
- completionString.length(), // cursorPosition
- labelProvider.getImage(namedElement) , // image
- " " + displayString, // displayString
- null , // contextInformation
- additionalProposalInfo, // additionalProposalInfo
- context);
- return completionProposal ;
- }
-
- /**
- * Public Utility method for creating a completion proposal
- *
- * @param completionString The actual completion string
- * @param displayString The way the completion is displayed in the completion list
- * @param context Some information related to the context of the completion
- * @return completion proposal
- */
- public static CustomCompletionProposal createCompletionProposal(String completionString,
- String displayString,
- ContentAssistContext context) {
-
- CustomCompletionProposal completionProposal = new CustomCompletionProposal(completionString, // String to be inserted
- context.getOffset(), // Offset
- context.getSelectedText().length(), // Replacement length
- completionString.length(), // cursorPosition
- null , // image
- " " + displayString, // displayString
- null , // contextInformation
- null, // additionalProposalInfo
- context);
- return completionProposal ;
- }
-
- /**
- * Public utility method that computes a qualified name, taking into account packages imported by the namespace model
- *
- * @param namedElement
- * @param model
- * @return the qualified name label
- */
- public static String getQualifiedNameLabelWithSufficientDepth(NamedElement namedElement, Namespace model) {
- String label = "" ;
-
- List<Package> importedPackages = new ArrayList<Package>(model.getImportedPackages()) ;
-
- List<Namespace> visitedNamespaces = new ArrayList<Namespace>() ;
- Namespace currentNamespace = namedElement.getNamespace() ;
-
- boolean rootFound = false ;
- boolean modelIsTheRoot = false ;
-
- while (currentNamespace != null && !rootFound) {
- visitedNamespaces.add(currentNamespace) ;
- if (importedPackages.contains(currentNamespace) || currentNamespace == model) {
- rootFound = true ;
- if (currentNamespace == model)
- modelIsTheRoot = true ;
- }
- Element owner = currentNamespace.getOwner() ;
- while (owner != null && !(owner instanceof Namespace))
- owner = owner.getOwner() ;
-
- currentNamespace = owner != null ? (Namespace)owner : null ;
- }
-
- for (int i = visitedNamespaces.size() - 1 - (modelIsTheRoot ? 1 : 0) ; i >= 0 ; i--) {
- label += visitedNamespaces.get(i).getName() + "::" ;
- }
-
- return label + namedElement.getName() ;
- }
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CustomCompletionProposal.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CustomCompletionProposal.java
deleted file mode 100644
index 31f79f3e1a5..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CustomCompletionProposal.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.contentassist;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
-
-/**
- * @author CEA LIST - Initial contribution and API
- */
-public class CustomCompletionProposal implements ICompletionProposal, ICompletionProposalExtension {
-
- private CompletionProposal completionProposal ;
- private int fReplacementOffset ;
- private ContentAssistContext fContentAssistContext ;
- private String fReplacementString ;
-
- /**
- * @param replacementString
- * @param replacementOffset
- * @param replacementLength
- * @param cursorPosition
- * @param image
- * @param displayString
- * @param contextInformation
- * @param additionalProposalInfo
- * @param contentAssistContext
- *
- */
- public CustomCompletionProposal (String replacementString,
- int replacementOffset,
- int replacementLength,
- int cursorPosition,
- Image image,
- String displayString,
- IContextInformation contextInformation,
- String additionalProposalInfo,
- ContentAssistContext contentAssistContext) {
- completionProposal = new CompletionProposal(replacementString,
- replacementOffset,
- replacementLength,
- cursorPosition,
- image,
- displayString,
- contextInformation,
- additionalProposalInfo) ;
- fReplacementOffset = replacementOffset ;
- fReplacementString = replacementString ;
- fContentAssistContext = contentAssistContext ;
- }
-
- public void apply(IDocument document, char trigger, int offset) {
- try {
- int length = 0 ;
- if (offset != fReplacementOffset)
- length = offset - fReplacementOffset ;
- else
- length = fContentAssistContext.getSelectedText().length() ;
- document.replace(fReplacementOffset ,
- length,
- fReplacementString) ;
- }
- catch (BadLocationException e) {
- // ignore
- }
- }
-
- public boolean isValidFor(IDocument document, int offset) {
- try {
- int length = offset - fReplacementOffset ;
- return completionProposal.getDisplayString().toLowerCase().contains(document.get(fReplacementOffset, length).toLowerCase()) ;
- }
- catch (BadLocationException e) {
- // ignore
- }
- return false;
- }
-
- public char[] getTriggerCharacters() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public int getContextInformationPosition() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public void apply(IDocument document) {
- // TODO Auto-generated method stub
-
- }
-
- public Point getSelection(IDocument document) {
- return completionProposal.getSelection(document);
- }
-
- public String getAdditionalProposalInfo() {
- return completionProposal.getAdditionalProposalInfo();
- }
-
- public String getDisplayString() {
- return completionProposal.getDisplayString();
- }
-
- public Image getImage() {
- return completionProposal.getImage();
- }
-
- public IContextInformation getContextInformation() {
- return completionProposal.getContextInformation();
- }
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/AntlrParserWrapper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/AntlrParserWrapper.java
deleted file mode 100644
index 2b61fd571cd..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/AntlrParserWrapper.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.xtext.parser.IParseResult;
-import org.eclipse.xtext.ui.editor.contentassist.XtextContentAssistProcessor;
-
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-//import org.eclipse.xtext.parser.antlr.IAntlrParser;
-//import org.eclipse.xtext.parsetree.CompositeNode;
-//import org.eclipse.xtext.parsetree.NodeAdapter;
-//import org.eclipse.xtext.parsetree.NodeUtil;
-//import org.eclipse.xtext.parsetree.SyntaxError;
-
-/**
- * Wraps a (partial) Xtext parser in a GMF {@link IParser}.
- *
- * @author koehnlein
- */
-public class AntlrParserWrapper implements IParser {
-
- @Inject
- private XtextContentAssistProcessor xtextContentAssistProcessor;
-
- @Inject
- private org.eclipse.xtext.parser.IParser xtextParser;
-
- private final String parserRuleName;
-
- private final IParser originalParser;
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @param parserRuleName
- * @param originalParser
- * @param xtextInjector
- */
- public AntlrParserWrapper(String parserRuleName, IParser originalParser, Injector xtextInjector) {
- this.parserRuleName = parserRuleName;
- this.originalParser = originalParser;
- xtextInjector.injectMembers(this);
- }
-
- public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {
- // TODO does not work. need to fake an XtextDocument
- return xtextContentAssistProcessor;
- }
-
- public String getEditString(IAdaptable element, int flags) {
-// EObject semanticElement = (EObject) element.getAdapter(EObject.class);
-// if (semanticElement != null) {
-// NodeAdapter nodeAdapter = NodeUtil.getNodeAdapter(semanticElement);
-// if (nodeAdapter != null) {
-// return nodeAdapter.getParserNode().serialize().trim();
-// }
-// }
- return "invalid";
- }
-
- public ICommand getParseCommand(IAdaptable element, final String newString, int flags) {
-// EObject semanticElement = (EObject) element.getAdapter(EObject.class);
-// if (semanticElement != null) {
-// IParseResult parseResult = xtextParser.parse(parserRuleName, new StringInputStream(newString));
-// if (isValidParseResult(parseResult, semanticElement)) {
-// NodeAdapter nodeAdapter = NodeUtil.getNodeAdapter(semanticElement);
-// if (nodeAdapter != null) {
-// final ICompositeNode parserNode = nodeAdapter.getParserNode();
-// final XtextResource semanticResource = (XtextResource) semanticElement.eResource();
-// ICommand reparseCommand = UpdateXtextResourceTextCommand.createUpdateCommand(semanticResource,
-// parserNode.getOffset(), parserNode.getLength(), newString);
-// return reparseCommand;
-// }
-// }
-// }
-// return UnexecutableCommand.INSTANCE;
- return null ;
- }
-
- public String getPrintString(IAdaptable element, int flags) {
- return originalParser.getPrintString(element, flags);
- }
-
- public boolean isAffectingEvent(Object event, int flags) {
- return false;
- }
-
- public IParserEditStatus isValidEditString(IAdaptable element, String editString) {
-// try {
-// IParseResult parseResult = xtextParser.parse(parserRuleName, new StringInputStream(editString));
-// if (isValidParseResult(parseResult, (EObject) element.getAdapter(EObject.class))) {
-// return new ParserEditStatus(IStatus.OK, Activator.PLUGIN_ID, IParserEditStatus.EDITABLE, "OK", null);
-// } else {
-// SyntaxError syntaxError = parseResult.getParseErrors().get(0);
-// return new ParserEditStatus(IStatus.INFO, Activator.PLUGIN_ID, IParserEditStatus.UNEDITABLE,
-// syntaxError.getMessage(), null);
-// }
-// } catch (Exception exc) {
-// return new ParserEditStatus(IStatus.INFO, Activator.PLUGIN_ID, IParserEditStatus.UNEDITABLE, exc
-// .getMessage(), exc);
-// }
- return null ;
- }
-
- private boolean isValidParseResult(IParseResult parseResult, EObject semanticElement) {
-// EObject rootASTElement = parseResult.getRootASTElement();
-// return parseResult.getParseErrors().isEmpty() && rootASTElement != null && semanticElement != null
-// && semanticElement.eClass() == rootASTElement.eClass();
- return false ;
- }
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/DefaultXtextSemanticValidator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/DefaultXtextSemanticValidator.java
deleted file mode 100644
index 64f0219be9c..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/DefaultXtextSemanticValidator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part;
-
-/**
- * Default implementation for IXtextSemanticValidator.
- *
- * @author CEA LIST - Initial contribution and API
- */
-public class DefaultXtextSemanticValidator implements IXTextSemanticValidator {
-
- /**
- * Default implementation. Always returns true.
- * @return always returns true.
- */
- public boolean validate() {
- return true;
- }
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXTextSemanticValidator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXTextSemanticValidator.java
deleted file mode 100644
index 274ca08acec..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXTextSemanticValidator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part;
-
-/**
- * Optional interface to be implemented by each client plug-in. The validation is taken into account before
- * closing a textual editor, in order to determine if the model contains semantic errors. If it contains
- * semantic errors, modifications are not saved in order to avoid corrupting the context UML model.
- *
- * @author CEA LIST - Initial contribution and API
- */
-public interface IXTextSemanticValidator {
-
-
- /**
- *
- * @return Implementations must return true if the xtext model is semantically valid
- */
- public boolean validate() ;
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXtextEMFReconciler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXtextEMFReconciler.java
deleted file mode 100644
index 137c58a0462..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXtextEMFReconciler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * This interface is used for the reconciliation of the context UML model with respect to the textual
- * specification obtained via edition from a popup xtext editor, in the case where this edition implies
- * changes in the original model.
- *
- * @author CEA LIST - Initial contribution and API
- */
-public interface IXtextEMFReconciler {
-
- /**
- * This method is called for performing the reconciliation, in the case where the popup xtext editor is
- * closed with request for saving (i.e., by pressing ctrl + enter).
- * @param modelObject The context UML model element
- * @param xtextObject The xtext object resulting from the textual specification
- */
- void reconcile (EObject modelObject, EObject xtextObject) ;
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorHelper.java
deleted file mode 100644
index 475ec38eee0..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorHelper.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part;
-
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.expressions.Expression;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.commands.ActionHandler;
-import org.eclipse.jface.text.ITextOperationTarget;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.templates.TemplateException;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.papyrus.commands.CheckedOperationHistory;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.Activator;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing.CustomXtextSourceViewer;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing.ISyntheticResourceProvider;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing.OperationHistoryListener;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing.PartialModelEditor;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing.SourceViewerHandle;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing.SourceViewerHandleFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.text.undo.DocumentUndoManagerRegistry;
-import org.eclipse.text.undo.IDocumentUndoManager;
-import org.eclipse.ui.ActiveShellExpression;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchCommandConstants;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.console.actions.TextViewerAction;
-import org.eclipse.ui.handlers.IHandlerActivation;
-import org.eclipse.ui.handlers.IHandlerService;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
-import org.eclipse.ui.texteditor.IUpdate;
-import org.eclipse.xtext.parser.IParseResult;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.ui.editor.model.IXtextDocument;
-import org.eclipse.xtext.util.concurrent.IUnitOfWork;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.inject.Injector;
-
-/**
- * Base class to handle a small in-diagram XtextEditor.
- *
- * Override the generated <code>performDirectEdit</code> methods in the EditPart of the label to be directly edited, and
- * call {@link #showEditor()} instead of opening the default {@link TextCellEditor}.
- *
- * @author koehnlein
- * @author CEA LIST (A. Cuccuru, A. Radermacher): Modifications for the integration into Papyrus
- * Changes:
- * - Added "implements" relationship towards IPopupEditorHelper,
- * related to the DirectEditor extension point of Papyrus
- * - Signature of the constructor modified
- * - Method showEditor modified, with the creation of a temporary file, underlying the popup xtext editor
- * - Method closeEditor modified, with new statements for managing the reconciliation between the original
- * UML model and the textual specification resulting from the edition in the popup xtext editor. The
- * temporary text file created by showEditor is also deleted.
- * - Method createXTextEditor modified. Now uses the Papyrus IEditorSite, and also adds a focus listener for
- * managing the context eobject and current xtext editor.
- * - Method setEditorRegin modified (needs some work...)
- * - Method setEditorBounds modified (needs some work...)
- * - Method activateServices and deactivateServices, for managing the key binding of the context diagram
- * editor.
- */
-
-public class PopupXtextEditorHelper implements IPopupEditorHelper {
-
- private static IGraphicalEditPart hostEditPart;
- private IEditorPart diagramEditor;
- private int editorOffset;
- private int initialEditorSize;
- private int initialDocumentSize;
- private Composite xtextEditorComposite;
- private final Injector xtextInjector;
- private XtextResource xtextResource;
- private String semanticElementFragment;
- private EObject semanticElement ;
- private String textToEdit ;
- /** prevent the reconciliation from being applied twice (See Bug 395439) */
- private boolean closing = false;
-
- /**
- * get the host editpart
- * @return the editpart
- */
- public static IGraphicalEditPart getHostEditPart() {
- return hostEditPart;
- }
-
- /**
- * The file extension used to dynamically select the appropriate xtext editor
- */
- public static String fileExtension ;
- private IXtextEMFReconciler modelReconciler;
- private ISyntheticResourceProvider resourceProvider ;
- private SourceViewerHandle sourceViewerHandle ;
-
- /**
- * @return The source viewer handle for this PopupXtextEditorHelper
- *
- */
- public SourceViewerHandle getSourceViewerHandle() {
- return sourceViewerHandle;
- }
-
- private PartialModelEditor partialEditor ;
- private Shell diagramShell ;
- private OperationHistoryListener operationHistoryListener;
- private IXTextSemanticValidator semanticValidator ;
- /**
- * The context EObject for this editor. It can be used for content assist, verification, etc.
- */
- public static EObject context ;
-
- /**
- *
- */
- public static boolean ignoreFocusLost = false ;
-
- /**
- * This element was originally undocumented in the XText/GMF integration example
- *
- * Modifications performed by CEA LIST
- * - Signature changed: was public PopupXtextEditorHelper(IGraphicalEditPart editPart, Injector xtextInjector)
- * @param editPart The editPart on which a direct edit has been performed.
- * @param xtextInjector The xtextInjector.
- * @param modelReconciler The IXtextEMFReconciler, to update the context UML model with changes textually specified in the popup xtext editor
- * @param textToEdit the initialization text, used as the initial textual content for the popup xtext editor
- * @param fileExtension the extension for the temporary textual file (underlying the editor)
- * @param semanticValidator the semantic validator used to semantically validate the xtext model before saving
- */
- public PopupXtextEditorHelper(IGraphicalEditPart editPart,
- Injector xtextInjector,
- IXtextEMFReconciler modelReconciler,
- String textToEdit,
- String fileExtension,
- IXTextSemanticValidator semanticValidator) {
- this.hostEditPart = editPart;
- this.xtextInjector = xtextInjector ;
- this.textToEdit = "" + textToEdit ;
- this.modelReconciler = modelReconciler ;
- PopupXtextEditorHelper.fileExtension = "" + fileExtension ;
- this.semanticValidator = semanticValidator ;
- ignoreFocusLost = false ;
- }
-
- /**
- * This element was originally not documented in the XText / GMF integration example.
- *
- */
- public void showEditor() {
- try {
- semanticElement = hostEditPart.resolveSemanticElement();
- if (semanticElement == null) {
- return;
- }
- context = semanticElement ;
- Resource semanticResource = semanticElement.eResource();
-
- semanticElementFragment = semanticResource.getURIFragment(semanticElement);
- if (semanticElementFragment == null || "".equals(semanticElementFragment)) {
- return;
- }
- IDiagramEditDomain diagramEditDomain = hostEditPart.getDiagramEditDomain();
-
- diagramEditor = ((DiagramEditDomain) diagramEditDomain).getEditorPart();
-
- createXtextEditor(null) ;
-
- } catch (Exception e) {
- Activator.logError(e);
- }
- }
-
- /**
- * This element was originally not documented in the XText/GMF integration example.
- *
- * Changes performed by CEA LIST:
- * - new statements for managing the reconciliation between the original UML model and
- * the textual specification resulting from the edition in the popup xtext editor.
- * @param isReconcile Determines whether a reconciliation must be performed or not
- */
- public void closeEditor(boolean isReconcile) {
- if (sourceViewerHandle != null) {
- if (!closing) {
- if (isReconcile && this.semanticValidator.validate()) {
- try {
- final IXtextDocument xtextDocument = sourceViewerHandle.getDocument();
- if (!isDocumentHasErrors(xtextDocument)) {
- int documentGrowth = xtextDocument.getLength() - initialDocumentSize;
- String newText = xtextDocument.get(editorOffset, initialEditorSize + documentGrowth);
- xtextResource = partialEditor.createResource(newText);
- if (xtextResource.getAllContents().hasNext())
- modelReconciler.reconcile(semanticElement, xtextResource.getAllContents().next());
- }
- } catch (Exception exc) {
- Activator.logError(exc);
- }
- }
- }
- try {
- closing = true;
- xtextEditorComposite.setVisible(false);
- xtextEditorComposite.dispose();
- } finally {
- closing = false;
- }
- }
- SourceViewerHandle.bindPartialModelEditorClass(null) ;
- }
-
- /**
- * This element was originally not documented in the XText/GMF integration example
- *
- * Changes performed by CEA LIST:
- * - adds a focus listener for managing the context eobject and current xtext editor.
- *
- * @param editorInput
- */
- private void createXtextEditor(IEditorInput editorInput) throws Exception {
- diagramShell = diagramEditor.getSite().getShell();
- xtextEditorComposite = new Shell(SWT.RESIZE) ;
- xtextEditorComposite.setLayout(new FillLayout());
-
-
- resourceProvider = xtextInjector.getInstance(ISyntheticResourceProvider.class) ;
- SourceViewerHandleFactory factory = xtextInjector.getInstance(SourceViewerHandleFactory.class) ;
- sourceViewerHandle = factory.create(xtextEditorComposite, resourceProvider) ;
- partialEditor = sourceViewerHandle.createPartialEditor("", textToEdit, "", semanticElement, modelReconciler) ;
- registerKeyListener();
- setEditorBounds();
-
- initializeActions();
- installUndoRedoSupport(sourceViewerHandle.getViewer());
-
- sourceViewerHandle.getViewer().getTextWidget().addFocusListener(new FocusListener() {
-
- public void focusLost(FocusEvent e) {
- checkedClose();
- }
-
- public void focusGained(FocusEvent e) {
- context = semanticElement ;
- }
- }) ;
-
- xtextEditorComposite.setVisible(true);
- sourceViewerHandle.getViewer().showAnnotationsOverview(true) ;
- sourceViewerHandle.getViewer().getTextWidget().setFocus() ;
-
- // This last statement is used to trigger initial validation
- sourceViewerHandle.getViewer().getTextWidget().append("") ;
- }
-
- /**
- * Perform additional checks before close
- * (added by CEA LIST)
- */
- private void checkedClose() {
- context = semanticElement ;
- if (! keyListener.isContentAssistActive()) {
- // additional sanity check: on X11 systems, the focus is already lost during resize.
- // An unwanted closing can be prevented by verifying if the activeShell still points
- // to the xtextEditorComposite
- if (xtextEditorComposite.getDisplay().getActiveShell() != xtextEditorComposite) {
- if (!ignoreFocusLost) {
- closeEditor(true) ;
- }
- else
- closeEditor(false) ;
- }
- }
- }
-
-
- private PopupXtextEditorKeyListener keyListener ;
-
- private void registerKeyListener() {
- //XtextSourceViewer sourceViewer = (XtextSourceViewer) xtextEditor.getInternalSourceViewer();
- final StyledText xtextTextWidget = sourceViewerHandle.getViewer().getTextWidget();
- CustomXtextSourceViewer viewer = (CustomXtextSourceViewer)sourceViewerHandle.getViewer() ;
- keyListener =
- new PopupXtextEditorKeyListener
- (this, (ContentAssistant) viewer.getContentAssistant());
- //keyListener.installUndoRedoSupport(sourceViewerHandle.getViewer()) ;
- xtextTextWidget.addVerifyKeyListener(keyListener);
- xtextTextWidget.addKeyListener(keyListener);
- }
-
- /**
- * This element was originally not documented in the XText/GMF integration example
- *
- * Modifications from CEA LIST:
- * - modifications to rules for computing the initial location and size of the popup editor.
- * This still needs some work...
- */
- private void setEditorBounds() {
-
- String editString = "" + textToEdit ;
- int[] numLinesNumColums = StringUtil.getNumLinesNumColumns(editString) ;
- int numLines = numLinesNumColums[0] ;
- int numColumns = numLinesNumColums[1];
- // ninimal sizes
- if (numLines < 5) {
- numLines = 5;
- }
- if (numColumns < 60) {
- numColumns = 60;
- }
-
- IFigure figure = hostEditPart.getFigure() ;
- Rectangle bounds = figure.getBounds().getCopy();
- figure.translateToAbsolute(bounds) ;
- Point newCoord = diagramShell.getDisplay().map(hostEditPart.getViewer().getControl(), null, new Point(bounds.x, bounds.y)) ;
- bounds.x = newCoord.x ;
- bounds.y = newCoord.y ;
-
- // not used, delivers wrong results
- // FontData fontData = figure.getFont().getFontData()[0];
- // int fontHeightInPixel = fontData.getHeight();
-
- GC gc = new GC (xtextEditorComposite);
- FontMetrics fm = gc.getFontMetrics ();
- int width = numColumns * fm.getAverageCharWidth () + 40;
- int height = numLines * fm.getHeight();
- gc.dispose ();
-
- // xtextEditorComposite contains a composite which in turn contains the text widget and an area for markers.
- // Take difference between client area and size into account. Cannot set size of text widget directly,
- // since suitable packing is not supported by the layout of the text widget's parent.
- org.eclipse.swt.graphics.Rectangle clientArea = xtextEditorComposite.getClientArea();
- // only correct height, since width is estimated anyway.
- height += xtextEditorComposite.getSize().y - clientArea.height;
- xtextEditorComposite.setBounds(bounds.x, bounds.y, width, height);
- }
-
-
-
-
- private boolean isDocumentHasErrors(final IXtextDocument xtextDocument) {
- return (xtextDocument.readOnly(new IUnitOfWork<Boolean, XtextResource>() {
- public Boolean exec(XtextResource state) throws Exception {
- IParseResult parseResult = state.getParseResult();
- return !state.getErrors().isEmpty() || parseResult == null || parseResult.hasSyntaxErrors();
- }
- }));
- }
-
- protected Status createErrorStatus(String message, TemplateException e) {
- return new Status(IStatus.ERROR,
- "org.eclipse.papyrus.property.editor.xtext",message, e);
-
- }
-
-
- protected void installUndoRedoSupport(SourceViewer viewer) {
- IDocumentUndoManager undoManager = DocumentUndoManagerRegistry.getDocumentUndoManager(viewer.getDocument());
- final IUndoContext context = undoManager.getUndoContext();
- IOperationHistory operationHistory = CheckedOperationHistory.getInstance();
- operationHistoryListener = new OperationHistoryListener(context, new IUpdate() {
- public void update() {
- updateAction(ITextEditorActionConstants.REDO);
- updateAction(ITextEditorActionConstants.UNDO);
- }
- });
- operationHistory.addOperationHistoryListener(operationHistoryListener);
- }
-
- private Map<String, org.eclipse.ui.console.actions.TextViewerAction> fGlobalActions= Maps.newHashMapWithExpectedSize(10);
- private List<String> fSelectionActions = Lists.newArrayListWithExpectedSize(3);
-
- protected void updateAction(String actionId) {
- IAction action= fGlobalActions.get(actionId);
- if (action instanceof IUpdate)
- ((IUpdate) action).update();
- }
-
- protected void uninstallUndoRedoSupport() {
- IOperationHistory operationHistory = PlatformUI.getWorkbench().getOperationSupport().getOperationHistory();
- operationHistory.removeOperationHistoryListener(operationHistoryListener);
- operationHistoryListener = null;
- }
-
- private void initializeActions() {
- final List<IHandlerActivation> handlerActivations= Lists.newArrayListWithExpectedSize(3);
- final IHandlerService handlerService= (IHandlerService) PlatformUI.getWorkbench().getAdapter(IHandlerService.class);
- final Expression expression= new ActiveShellExpression(sourceViewerHandle.getViewer().getControl().getShell());
-
- diagramShell.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- handlerService.deactivateHandlers(handlerActivations);
- }
- });
-
- TextViewerAction action= new TextViewerAction(sourceViewerHandle.getViewer(), ITextOperationTarget.UNDO);
- action.setText("UNDO");
- fGlobalActions.put(ITextEditorActionConstants.UNDO, action);
-
- action= new TextViewerAction(sourceViewerHandle.getViewer(), ITextOperationTarget.REDO);
- action.setText("REDO");
- fGlobalActions.put(ITextEditorActionConstants.REDO, action);
-
- action= new TextViewerAction(sourceViewerHandle.getViewer(), ITextOperationTarget.CUT);
- action.setText("CUT");
- fGlobalActions.put(ITextEditorActionConstants.CUT, action);
-
- action= new TextViewerAction(sourceViewerHandle.getViewer(), ITextOperationTarget.COPY);
- action.setText("COPY");
- fGlobalActions.put(ITextEditorActionConstants.COPY, action);
-
- action= new TextViewerAction(sourceViewerHandle.getViewer(), ITextOperationTarget.PASTE);
- action.setText("PASTE");
- fGlobalActions.put(ITextEditorActionConstants.PASTE, action);
-
- action= new TextViewerAction(sourceViewerHandle.getViewer(), ITextOperationTarget.SELECT_ALL);
- action.setText("SELECT_ALL");
- fGlobalActions.put(ITextEditorActionConstants.SELECT_ALL, action);
-
- action= new TextViewerAction(sourceViewerHandle.getViewer(), ISourceViewer.CONTENTASSIST_PROPOSALS);
- action.setText("CONTENTASSIST_PROPOSALS");
- fGlobalActions.put(ITextEditorActionConstants.CONTENT_ASSIST, action);
-
- fSelectionActions.add(ITextEditorActionConstants.CUT);
- fSelectionActions.add(ITextEditorActionConstants.COPY);
- fSelectionActions.add(ITextEditorActionConstants.PASTE);
-
- sourceViewerHandle.getViewer().getTextWidget().addFocusListener(new FocusListener() {
- public void focusLost(FocusEvent e) {
- handlerService.deactivateHandlers(handlerActivations);
- }
- public void focusGained(FocusEvent e) {
- IAction action= fGlobalActions.get(ITextEditorActionConstants.REDO);
- handlerActivations.add(handlerService.activateHandler(IWorkbenchCommandConstants.EDIT_REDO, new ActionHandler(action), expression));
- action= fGlobalActions.get(ITextEditorActionConstants.UNDO);
- handlerActivations.add(handlerService.activateHandler(IWorkbenchCommandConstants.EDIT_UNDO, new ActionHandler(action), expression));
- action= fGlobalActions.get(ITextEditorActionConstants.CONTENT_ASSIST);
- handlerActivations.add(handlerService.activateHandler(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS, new ActionHandler(action), expression));
- }
- });
-
- }
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorKeyListener.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorKeyListener.java
deleted file mode 100644
index 0cc682bb923..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorKeyListener.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part;
-
-import org.eclipse.jface.text.contentassist.ContentAssistEvent;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.ICompletionListener;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.VerifyKeyListener;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.VerifyEvent;
-
-/**
- * @author koehnlein
- */
-public class PopupXtextEditorKeyListener extends KeyAdapter implements VerifyKeyListener {
-
- private final PopupXtextEditorHelper popupXtextEditorHelper;
-
- private ContentAssistant contentAssistant;
-
- private boolean isIgnoreNextESC;
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @param popupXtextEditorHelper
- * @param contentAssistant
- */
- public PopupXtextEditorKeyListener(PopupXtextEditorHelper popupXtextEditorHelper, ContentAssistant contentAssistant) {
- this.popupXtextEditorHelper = popupXtextEditorHelper;
- this.contentAssistant = contentAssistant;
- isIgnoreNextESC = false;
- }
-
- @Override
- public void keyPressed(KeyEvent e) {
- int keyCode = e.keyCode;
- if ((e.stateMask & SWT.CTRL) != 0 && ((keyCode == SWT.KEYPAD_CR) || (keyCode == SWT.CR))) {
- this.popupXtextEditorHelper.closeEditor(true);
- }
- if (keyCode == SWT.ESC) {
- if (isIgnoreNextESC) {
- isIgnoreNextESC = false;
- } else {
- PopupXtextEditorHelper.ignoreFocusLost = true ;
- this.popupXtextEditorHelper.closeEditor(false);
- }
- }
- if ((e.stateMask & SWT.CTRL) != 0 && (keyCode == ' ')) {
- this.contentAssistant.setRepeatedInvocationMode(true) ;
- this.contentAssistant.showPossibleCompletions() ;
-
- this.isIgnoreNextESC = true ;
- contentAssistant.addCompletionListener(new ICompletionListener() {
-
- public void selectionChanged(ICompletionProposal proposal, boolean smartToggle) {
- }
-
- public void assistSessionStarted(ContentAssistEvent event) {
- }
-
- public void assistSessionEnded(ContentAssistEvent event) {
- try {
- popupXtextEditorHelper.getSourceViewerHandle().getViewer().getTextWidget().setFocus() ;
- }
- catch (Exception e) {
- //ignore
- }
- }
- }) ;
- }
- }
-
- public void verifyKey(VerifyEvent e) {
- if (e.keyCode == SWT.ESC && isContentAssistActive()) {
- isIgnoreNextESC = true;
- }
- if ((e.stateMask & SWT.CTRL) != 0 && ((e.keyCode == SWT.KEYPAD_CR) || (e.keyCode == SWT.CR))) {
- e.doit = false;
- }
- }
-
- /**
- * @return true if the proposal popup has focus
- *
- */
- public boolean isContentAssistActive() {
- return contentAssistant != null && contentAssistant.hasProposalPopupFocus();
- }
-
-} \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/StringUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/StringUtil.java
deleted file mode 100644
index e15dc5553f6..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/StringUtil.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part;
-
-/**
- * @author koehnlein
- */
-public class StringUtil {
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @param s
- * @return int
- */
- public static int[] getNumLinesNumColumns(String s) {
- int numLines = 1;
- int numColumns = 0;
- int[] dimensions = new int[2] ;
- dimensions[0] = numLines ;
- dimensions[1] = 0 ;
- for (char c : s.toCharArray()) {
- if (c == '\n') {
- ++numLines;
- dimensions[1] = Math.max(dimensions[1], numColumns) ;
- numColumns = 0 ;
- }
- else {
- ++numColumns;
- }
- }
- dimensions[0] = numLines ;
- dimensions[1] = Math.max(dimensions[1], numColumns) ;
- return dimensions;
- }
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/ChangeAggregatorAdapter.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/ChangeAggregatorAdapter.java
deleted file mode 100644
index d3a9fdc516f..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/ChangeAggregatorAdapter.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.editingdomain;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.xtext.resource.XtextResource;
-
-import com.google.common.collect.Lists;
-
-/**
- * @author Knut Wannheden - Initial contribution and API
- * @author Jan Koehnlein
- */
-public class ChangeAggregatorAdapter extends EContentAdapter {
-
- private Collection<EObject> modifiedObjects = new LinkedHashSet<EObject>();
-
- private boolean isRecording = false;
-
- private boolean isSuspended = false;
-
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
-
- if (!doRecord(notification))
- return;
-
- if (notification.getNotifier() instanceof EObject) {
- recordObjectModification((EObject) notification.getNotifier());
- }
- }
-
- protected void recordObjectModification(EObject obj) {
- if (obj.eResource() == null || false == obj.eResource() instanceof XtextResource)
- modifiedObjects.remove(obj);
- else
- modifiedObjects.add(obj);
- }
-
- protected boolean doRecord(Notification notification) {
- if (!isRecording || isSuspended || notification.isTouch())
- return false;
-
- switch (notification.getEventType()) {
- case Notification.ADD:
- case Notification.ADD_MANY:
- case Notification.MOVE:
- case Notification.REMOVE:
- case Notification.REMOVE_MANY:
- case Notification.SET:
- case Notification.UNSET:
- return true;
- default:
- return false;
- }
- }
-
- private void reset() {
- modifiedObjects.clear();
- }
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- */
- public void beginRecording() {
- reset();
- isRecording = true;
- }
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- */
- public void endRecording() {
- isRecording = false;
- }
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @param isSuspended
- */
- public void setSuspended(boolean isSuspended) {
- this.isSuspended = isSuspended;
- }
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @return List<EOject>
- */
- public List<EObject> getModificationRoots() {
- Map<Resource, List<EObject>> resource2ChangePathMap = new HashMap<Resource, List<EObject>>();
- for (EObject eObject : modifiedObjects) {
- if (!eObject.eIsProxy()) {
- Resource resource = eObject.eResource();
- List<EObject> resourceChangePath = resource2ChangePathMap.get(resource);
- if (resourceChangePath == null) {
- resourceChangePath = allContainers(eObject);
- resource2ChangePathMap.put(resource, resourceChangePath);
- } else {
- resourceChangePath.retainAll(allContainers(eObject));
- }
- }
- }
- List<EObject> modificationRoots = new ArrayList<EObject>(resource2ChangePathMap.size());
- for (List<EObject> changePath : resource2ChangePathMap.values()) {
- if (!changePath.isEmpty()) {
- modificationRoots.add(changePath.get(changePath.size() - 1));
- }
- }
- return modificationRoots;
- }
-
- private LinkedList<EObject> allContainers(EObject eObject) {
- final LinkedList<EObject> allContainers = Lists.newLinkedList();
- allContainers.add(eObject);
- EObject currentContainer = eObject.eContainer();
- final Resource resource = eObject.eResource();
- while (currentContainer != null && resource == currentContainer.eResource()) {
- allContainers.addFirst(currentContainer);
- currentContainer = currentContainer.eContainer();
- }
- return allContainers;
- }
-
- /**
- * Only attach to XtextResources
- */
- @Override
- protected void setTarget(Resource target) {
- if (target instanceof XtextResource) {
- super.setTarget(target);
- }
- }
-
- @Override
- protected void setTarget(EObject target) {
- if (target.eResource() instanceof XtextResource) {
- super.setTarget(target);
- }
- }
-
- @Override
- public boolean isAdapterForType(Object type) {
- return type == ChangeAggregatorAdapter.class;
- }
-
-} \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/SemanticRootUnloadListener.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/SemanticRootUnloadListener.java
deleted file mode 100644
index 6fb03239ea9..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/SemanticRootUnloadListener.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.editingdomain;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.ResourceSetChangeEvent;
-import org.eclipse.emf.transaction.ResourceSetListener;
-import org.eclipse.emf.transaction.RollbackException;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.xtext.resource.XtextResource;
-
-/**
- * Reloads the semantic root element (the element of the diagram) on changes and refreshes the diagram. GMF does by
- * default not listen to such events which can occur in an {@link XtextResource}, if the document changes close to the
- * root element.
- *
- * Activate an instance of this in the {@link EditPart#activate()} method of the {@link DiagramEditPart}.
- *
- * @author koehnlein
- */
-public class SemanticRootUnloadListener implements ResourceSetListener {
-
- private DiagramEditPart rootEditPart;
- private EObject semanticRootElement;
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @param rootEditPart
- *
- */
- public SemanticRootUnloadListener(DiagramEditPart rootEditPart) {
- this.rootEditPart = rootEditPart;
- this.semanticRootElement = rootEditPart.resolveSemanticElement();
- }
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- */
- public void activate() {
- rootEditPart.getEditingDomain().addResourceSetListener(this);
- }
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- */
- public void deactivate() {
- rootEditPart.getEditingDomain().removeResourceSetListener(this);
- }
-
- public NotificationFilter getFilter() {
- return new NotificationFilter.Custom() {
- @Override
- public boolean matches(Notification notification) {
- int featureID = notification.getFeatureID(Resource.class);
- Object notifier = notification.getNotifier();
- int eventType = notification.getEventType();
- return notification.getOldValue() == semanticRootElement && featureID == Resource.RESOURCE__CONTENTS
- && (eventType == Notification.REMOVE || eventType == Notification.SET)
- && notifier instanceof Resource;
- }
- };
- }
-
- public boolean isAggregatePrecommitListener() {
- return false;
- }
-
- public boolean isPostcommitOnly() {
- return true;
- }
-
- public boolean isPrecommitOnly() {
- return false;
- }
-
- public void resourceSetChanged(ResourceSetChangeEvent event) {
- semanticRootElement = rootEditPart.resolveSemanticElement();
- rootEditPart.refresh();
- }
-
- public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
- return null;
- }
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/UpdateXtextResourceTextCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/UpdateXtextResourceTextCommand.java
deleted file mode 100644
index a1f4a622e05..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/UpdateXtextResourceTextCommand.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.editingdomain;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.xtext.resource.XtextResource;
-
-/**
- * A Command that deactivates the {@link ChangeAggregatorAdapter} and updates a textual section of an Xtext model in an
- * Xtext resource. Used to avoid cycles in the change aggregation.
- *
- * @author koehnlein
- */
-public class UpdateXtextResourceTextCommand {
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @param xtextResource
- * @param offset
- * @param length
- * @param newText
- * @return Command
- */
- public static Command createEMFCommand(final XtextResource xtextResource, final int offset, final int length,
- final String newText) {
- final TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(xtextResource);
- if (editingDomain == null) {
- return null;
- }
- ResourceSet resourceSet = editingDomain.getResourceSet();
- final ChangeAggregatorAdapter changeAggregator = (ChangeAggregatorAdapter) EcoreUtil.getAdapter(resourceSet
- .eAdapters(), ChangeAggregatorAdapter.class);
- return new RecordingCommand(editingDomain, "update xtext resource") {
- @Override
- protected void doExecute() {
- try {
- if (changeAggregator != null) {
- changeAggregator.setSuspended(true);
- }
- xtextResource.update(offset, length, newText);
- xtextResource.setModified(true);
- } finally {
- if (changeAggregator != null) {
- changeAggregator.setSuspended(false);
- }
- }
-
- }
- };
- }
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @param xtextResource
- * @param offset
- * @param length
- * @param newText
- * @return ICommand
- */
- public static ICommand createUpdateCommand(final XtextResource xtextResource, final int offset, final int length,
- final String newText) {
- final TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(xtextResource);
- if (editingDomain == null) {
- return null;
- }
- ResourceSet resourceSet = editingDomain.getResourceSet();
- final ChangeAggregatorAdapter changeAggregator = (ChangeAggregatorAdapter) EcoreUtil.getAdapter(resourceSet
- .eAdapters(), ChangeAggregatorAdapter.class);
- return new AbstractTransactionalCommand(editingDomain, "update xtext resource", null) {
- @Override
- protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
- throws ExecutionException {
- try {
- if (changeAggregator != null) {
- changeAggregator.setSuspended(true);
- }
- xtextResource.update(offset, length, newText);
- xtextResource.setModified(true);
- return CommandResult.newOKCommandResult();
- } catch (Exception exc) {
- return CommandResult.newErrorCommandResult(exc);
- } finally {
- if (changeAggregator != null) {
- changeAggregator.setSuspended(false);
- }
- }
- }
- };
- }
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/XtextNodeModelReconciler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/XtextNodeModelReconciler.java
deleted file mode 100644
index 4605d2a1a5c..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/XtextNodeModelReconciler.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.editingdomain;
-
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IOperationHistoryListener;
-import org.eclipse.core.commands.operations.OperationHistoryEvent;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.TransactionalEditingDomain.Lifecycle;
-import org.eclipse.emf.transaction.TransactionalEditingDomainEvent;
-import org.eclipse.emf.transaction.TransactionalEditingDomainListener;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.emf.workspace.IWorkspaceCommandStack;
-//import org.eclipse.xtext.parsetree.CompositeNode;
-//import org.eclipse.xtext.parsetree.NodeAdapter;
-//import org.eclipse.xtext.parsetree.NodeUtil;
-
-/**
- * Reconciles the node models of all XtextResources in a TransactionalEditingDomain with semantic changes.
- *
- * @author koehnlein
- */
-public class XtextNodeModelReconciler extends AdapterImpl implements TransactionalEditingDomainListener,
- IOperationHistoryListener {
-
- private TransactionalEditingDomain editingDomain;
-
- private ChangeAggregatorAdapter changeAggregator;
-
- private XtextNodeModelReconciler(TransactionalEditingDomain editingDomain) {
- this.editingDomain = editingDomain;
- Lifecycle lifecycle = TransactionUtil.getAdapter(editingDomain, Lifecycle.class);
- lifecycle.addTransactionalEditingDomainListener(this);
- changeAggregator = new ChangeAggregatorAdapter();
- editingDomain.getResourceSet().eAdapters().add(changeAggregator);
- CommandStack commandStack = editingDomain.getCommandStack();
- if (commandStack instanceof IWorkspaceCommandStack) {
- IOperationHistory operationHistory = ((IWorkspaceCommandStack) commandStack).getOperationHistory();
- operationHistory.addOperationHistoryListener(this);
- }
- changeAggregator.beginRecording();
- }
-
- public void editingDomainDisposing(TransactionalEditingDomainEvent event) {
- changeAggregator.endRecording();
- CommandStack commandStack = editingDomain.getCommandStack();
- if (commandStack instanceof IWorkspaceCommandStack) {
- IOperationHistory operationHistory = ((IWorkspaceCommandStack) commandStack).getOperationHistory();
- operationHistory.removeOperationHistoryListener(this);
- }
- editingDomain.getResourceSet().eAdapters().remove(changeAggregator);
- Lifecycle lifecycle = TransactionUtil.getAdapter(editingDomain, Lifecycle.class);
- lifecycle.removeTransactionalEditingDomainListener(XtextNodeModelReconciler.this);
- }
-
- public void transactionClosed(TransactionalEditingDomainEvent event) {
- // ignore
- }
-
- public void transactionClosing(TransactionalEditingDomainEvent event) {
- // ignore
- }
-
- public void transactionInterrupted(TransactionalEditingDomainEvent event) {
- // ignore
- }
-
- public void transactionStarted(TransactionalEditingDomainEvent event) {
- // ignore
- }
-
- public void transactionStarting(TransactionalEditingDomainEvent event) {
- // ignore
- }
-
- /**
- * This element comes from the XText/GMF integration example, and was not originally documented.
- * @param editingDomain
- * @return XtextNodeModelReconciler
- *
- */
- public static XtextNodeModelReconciler adapt(TransactionalEditingDomain editingDomain) {
- XtextNodeModelReconciler adapter = (XtextNodeModelReconciler) EcoreUtil.getAdapter(editingDomain
- .getResourceSet().eAdapters(), XtextNodeModelReconciler.class);
- if (adapter == null) {
- adapter = new XtextNodeModelReconciler(editingDomain);
- }
- return adapter;
- }
-
- public void historyNotification(OperationHistoryEvent event) {
- int eventType = event.getEventType();
-// switch (eventType) {
-// case OperationHistoryEvent.DONE:
-// case OperationHistoryEvent.UNDONE:
-// case OperationHistoryEvent.REDONE:
-// changeAggregator.endRecording();
-// ICommand updateXtextResourceTextCommand = null;
-// for (EObject modificationRoot : changeAggregator.getModificationRoots()) {
-// XtextResource xtextResource = (XtextResource) modificationRoot.eResource();
-// NodeAdapter nodeAdapter = NodeUtil.getNodeAdapter(modificationRoot);
-// CompositeNode parserNode = nodeAdapter.getParserNode();
-// Serializer serializer = xtextResource.getSerializer();
-// String newText = serializer.serialize(modificationRoot);
-// ICommand newCommand = UpdateXtextResourceTextCommand.createUpdateCommand(xtextResource, parserNode
-// .getOffset(), parserNode.getLength(), newText);
-// if (updateXtextResourceTextCommand == null) {
-// updateXtextResourceTextCommand = newCommand;
-// } else {
-// updateXtextResourceTextCommand.compose(newCommand);
-// }
-// }
-// try {
-// if (updateXtextResourceTextCommand != null) {
-// updateXtextResourceTextCommand.execute(null, null);
-// }
-// } catch (ExecutionException exc) {
-// Activator.logError(exc);
-// }
-// changeAggregator.beginRecording();
-// break;
-// default:
-// // ignore
-// }
-
- }
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/CustomXtextSourceViewer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/CustomXtextSourceViewer.java
deleted file mode 100644
index 577dcd58091..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/CustomXtextSourceViewer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- *
- * 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
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing;
-
-import org.eclipse.jface.text.DocumentCommand;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.source.IOverviewRuler;
-import org.eclipse.jface.text.source.IVerticalRuler;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.xtext.ui.editor.XtextSourceViewer;
-
-/**
- * This class extends XtextSourceViewer with the method getContentAssistant()
- * This method was available on XtextSourceViewer in Xtext 1.0, and used
- * for integration in Papyrus.
- *
- * @author CEA LIST - Initial contribution and API
- */
-public class CustomXtextSourceViewer extends XtextSourceViewer {
-
- /**
- * @param parent
- * @param ruler
- * @param overviewRuler
- * @param showsAnnotationOverview
- * @param styles
- *
- */
- public CustomXtextSourceViewer(Composite parent, IVerticalRuler ruler, IOverviewRuler overviewRuler,
- boolean showsAnnotationOverview, int styles) {
- super(parent, ruler, overviewRuler, showsAnnotationOverview, styles);
- }
-
- /**
- * Used in papyrus integration for managing content assist in popup editors.
- * @return the content assistant
- *
- */
- public IContentAssistant getContentAssistant() {
- return fContentAssistant;
- }
-
- @Override
- protected void customizeDocumentCommand(DocumentCommand command) {
- // TODO: TextViewer.customizeDocumentCommand generates exceptions. Why?
- //super.customizeDocumentCommand(command);
- }
-
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingHelper.java
deleted file mode 100644
index 0f0e7114282..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingHelper.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing;
-
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.xtext.ui.editor.XtextPresentationReconciler;
-import org.eclipse.xtext.ui.editor.XtextSourceViewer;
-import org.eclipse.xtext.ui.editor.XtextSourceViewerConfiguration;
-import org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreAccess;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.HighlightingPresenter;
-
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
- */
-public class HighlightingHelper implements IPropertyChangeListener {
-
- @Inject
- private Provider<HighlightingReconciler> reconcilerProvider;
-
- @Inject
- private Provider<HighlightingPresenter> presenterProvider;
-
- @Inject
- private IPreferenceStoreAccess preferenceStoreAccessor;
-
- /** Highlighting presenter */
- private HighlightingPresenter fPresenter;
- /** Highlighting reconciler */
- private HighlightingReconciler fReconciler;
-
- /** The source viewer */
- private XtextSourceViewer fSourceViewer;
- /** The source viewer configuration */
- private XtextSourceViewerConfiguration fConfiguration;
- /** The presentation reconciler */
- private XtextPresentationReconciler fPresentationReconciler;
-
- /**
- * @param configuration
- * @param sourceViewer
- *
- */
- public void install(XtextSourceViewerConfiguration configuration, XtextSourceViewer sourceViewer) {
- fSourceViewer= sourceViewer;
- fConfiguration= configuration;
- fPresentationReconciler= (XtextPresentationReconciler) fConfiguration.getPresentationReconciler(sourceViewer);
- preferenceStoreAccessor.getPreferenceStore().addPropertyChangeListener(this);
- enable();
- }
-
- /**
- * Enable advanced highlighting.
- */
- private void enable() {
- fPresenter= getPresenterProvider().get();
- fPresenter.install(fSourceViewer, fPresentationReconciler);
-
- if (fSourceViewer.getDocument() != null) {
- fReconciler= reconcilerProvider.get();
- fReconciler.install(fSourceViewer, fPresenter);
- }
- }
-
- /**
- *
- */
- public void uninstall() {
- disable();
- preferenceStoreAccessor.getPreferenceStore().removePropertyChangeListener(this);
- fSourceViewer= null;
- fConfiguration= null;
- fPresentationReconciler= null;
- }
-
- /**
- * Disable advanced highlighting.
- */
- private void disable() {
- if (fReconciler != null) {
- fReconciler.uninstall();
- fReconciler= null;
- }
-
- if (fPresenter != null) {
- fPresenter.uninstall();
- fPresenter= null;
- }
- }
-
- /**
- * Returns this hightlighter's reconciler.
- *
- * @return the highlighter reconciler or <code>null</code> if none
- */
- public HighlightingReconciler getReconciler() {
- return fReconciler;
- }
-
- /**
- * @param reconcilerProvider
- *
- */
- public void setReconcilerProvider(Provider<HighlightingReconciler> reconcilerProvider) {
- this.reconcilerProvider = reconcilerProvider;
- }
-
- /**
- * @return Provider<HightlightingReconciler>
- *
- */
- public Provider<HighlightingReconciler> getReconcilerProvider() {
- return reconcilerProvider;
- }
-
- /**
- * @param presenterProvider
- *
- */
-
- public void setPresenterProvider(Provider<HighlightingPresenter> presenterProvider) {
- this.presenterProvider = presenterProvider;
- }
-
- /**
- * @return Provider<HightlightingPresented>
- */
- public Provider<HighlightingPresenter> getPresenterProvider() {
- return presenterProvider;
- }
-
- /**
- * @param preferenceStoreAccessor
- *
- */
- public void setPreferenceStoreAccessor(IPreferenceStoreAccess preferenceStoreAccessor) {
- this.preferenceStoreAccessor = preferenceStoreAccessor;
- }
-
- /**
- * @return IPreferenceStoreAccessor
- *
- */
- public IPreferenceStoreAccess getPreferenceStoreAccessor() {
- return preferenceStoreAccessor;
- }
-
- public void propertyChange(PropertyChangeEvent event) {
- if (fReconciler != null && event.getProperty().contains(".syntaxColorer.tokenStyles"))
- fReconciler.refresh();
- }
-}
-
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingReconciler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingReconciler.java
deleted file mode 100644
index bce3698527e..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingReconciler.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextInputListener;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.ui.editor.XtextSourceViewer;
-import org.eclipse.xtext.ui.editor.model.IXtextDocument;
-import org.eclipse.xtext.ui.editor.model.IXtextModelListener;
-import org.eclipse.xtext.ui.editor.model.XtextDocument;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.AttributedPosition;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.HighlightingPresenter;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightedPositionAcceptor;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.ITextAttributeProvider;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.MergingHighlightedPositionAcceptor;
-import org.eclipse.xtext.util.concurrent.IUnitOfWork;
-
-import com.google.inject.Inject;
-
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
- */
-public class HighlightingReconciler implements ITextInputListener, IXtextModelListener, IHighlightedPositionAcceptor {
-
- @Inject(optional=true)
- private ISemanticHighlightingCalculator calculator;
-
- @Inject
- private ITextAttributeProvider attributeProvider;
-
- /** The source viewer this highlighting reconciler is installed on */
- private XtextSourceViewer sourceViewer;
- /** The highlighting presenter */
- private HighlightingPresenter presenter;
-
- /** Background job's added highlighted positions */
- private final List<AttributedPosition> addedPositions = new ArrayList<AttributedPosition>();
- /** Background job's removed highlighted positions */
- private List<AttributedPosition> removedPositions = new ArrayList<AttributedPosition>();
- /** Number of removed positions */
- private int removedPositionCount;
-
- /**
- * Reconcile operation lock.
- *
- * @since 3.2
- */
- private final Object fReconcileLock = new Object();
- /**
- * <code>true</code> if any thread is executing <code>reconcile</code>, <code>false</code> otherwise.
- *
- * @since 3.2
- */
- private boolean reconciling = false;
-
- /**
- * Start reconciling positions.
- */
- private void startReconcilingPositions() {
- presenter.addAllPositions(removedPositions);
- removedPositionCount = removedPositions.size();
- }
-
- /**
- * Reconcile positions based on the AST subtrees
- *
- * @param subtrees
- * the AST subtrees
- */
- private void reconcilePositions(XtextResource resource) {
- // for (int i= 0, n= subtrees.length; i < n; i++)
- // subtrees[i].accept(fCollector);
- MergingHighlightedPositionAcceptor acceptor = new MergingHighlightedPositionAcceptor(calculator);
- acceptor.provideHighlightingFor(resource, this);
-// calculator.provideHighlightingFor(resource, this);
- List<AttributedPosition> oldPositions = removedPositions;
- List<AttributedPosition> newPositions = new ArrayList<AttributedPosition>(removedPositionCount);
- for (int i = 0, n = oldPositions.size(); i < n; i++) {
- AttributedPosition current = oldPositions.get(i);
- if (current != null)
- newPositions.add(current);
- }
- removedPositions = newPositions;
- }
-
- /**
- * Add a position with the given range and highlighting if it does not exist already.
- * @param offset The range offset
- * @param length The range length
- * @param highlighting The highlighting
- */
- public void addPosition(int offset, int length, String... ids) {
- TextAttribute highlighting = ids.length == 1 ?
- attributeProvider.getAttribute(ids[0])
- : attributeProvider.getMergedAttributes(ids);
- boolean isExisting= false;
- // TODO: use binary search
- for (int i= 0, n= removedPositions.size(); i < n; i++) {
- AttributedPosition position= removedPositions.get(i);
- if (position == null)
- continue;
- if (position.isEqual(offset, length, highlighting)) {
- isExisting= true;
- removedPositions.set(i, null);
- removedPositionCount--;
- break;
- }
- }
-
- if (!isExisting) {
- AttributedPosition position= presenter.createHighlightedPosition(offset, length, highlighting);
- addedPositions.add(position);
- }
- }
-
- /**
- * Update the presentation.
- *
- * @param textPresentation
- * the text presentation
- * @param addedPositions
- * the added positions
- * @param removedPositions
- * the removed positions
- */
- private void updatePresentation(TextPresentation textPresentation, List<AttributedPosition> addedPositions,
- List<AttributedPosition> removedPositions) {
- Runnable runnable = presenter.createUpdateRunnable(textPresentation, addedPositions, removedPositions);
- if (runnable == null)
- return;
-
- Display display = getDisplay();
- display.asyncExec(runnable);
- }
-
- private Display getDisplay() {
- return this.sourceViewer.getControl().getDisplay();
- }
-
- /**
- * Stop reconciling positions.
- */
- private void stopReconcilingPositions() {
- removedPositions.clear();
- removedPositionCount = 0;
- addedPositions.clear();
- }
-
- /**
- * Install this reconciler on the given editor and presenter.
- *
- * @param editor
- * the editor
- * @param sourceViewer
- * the source viewer
- * @param presenter
- * the highlighting presenter
- */
- public void install(XtextSourceViewer sourceViewer, HighlightingPresenter presenter) {
- this.presenter = presenter;
- this.sourceViewer = sourceViewer;
- if (calculator != null) {
- ((IXtextDocument) sourceViewer.getDocument()).addModelListener(this);
- sourceViewer.addTextInputListener(this);
- }
- refresh();
- }
-
- /**
- * Uninstall this reconciler from the editor
- */
- public void uninstall() {
- if (presenter != null)
- presenter.setCanceled(true);
-
- if (sourceViewer.getDocument() != null) {
- if (calculator != null) {
- XtextDocument document = (XtextDocument) sourceViewer.getDocument();
- document.removeModelListener(this);
- sourceViewer.removeTextInputListener(this);
- }
- }
-
- sourceViewer = null;
- presenter = null;
- }
-
- /*
- * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
- */
- public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
- if (oldInput != null)
- ((IXtextDocument) oldInput).removeModelListener(this);
- }
-
- /*
- * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
- */
- public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
- if (newInput != null) {
- refresh();
- ((IXtextDocument) newInput).addModelListener(this);
- }
- }
-
- /**
- * Refreshes the highlighting.
- */
- public void refresh() {
- if (calculator != null) {
- ((XtextDocument) sourceViewer.getDocument()).readOnly(new IUnitOfWork.Void<XtextResource>() {
- @Override
- public void process(XtextResource state) throws Exception {
- modelChanged(state);
- }
- });
- } else {
- Display display = getDisplay();
- display.asyncExec(presenter.createSimpleUpdateRunnable());
- }
- }
-
- public void modelChanged(XtextResource resource) {
- // ensure at most one thread can be reconciling at any time
- synchronized (fReconcileLock) {
- if (reconciling)
- return;
- reconciling = true;
- }
- final HighlightingPresenter highlightingPresenter = presenter;
- try {
- if (highlightingPresenter == null)
- return;
-
- highlightingPresenter.setCanceled(false);
-
- if (highlightingPresenter.isCanceled())
- return;
-
- startReconcilingPositions();
-
- if (!highlightingPresenter.isCanceled()) {
- reconcilePositions(resource);
- }
-
- final TextPresentation[] textPresentation = new TextPresentation[1];
- if (!highlightingPresenter.isCanceled()) {
- textPresentation[0] = highlightingPresenter.createPresentation(addedPositions, removedPositions);
- }
-
- if (!highlightingPresenter.isCanceled())
- updatePresentation(textPresentation[0], addedPositions, removedPositions);
-
- stopReconcilingPositions();
- }
- finally {
- synchronized (fReconcileLock) {
- reconciling = false;
- }
- }
- }
-
- /**
- * @param calculator
- *
- */
- public void setCalculator(ISemanticHighlightingCalculator calculator) {
- this.calculator = calculator;
- }
-
- /**
- * @return ISemanticHighlightingCalculator
- *
- */
- public ISemanticHighlightingCalculator getCalculator() {
- return calculator;
- }
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IActionContributor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IActionContributor.java
deleted file mode 100644
index 1805f2bfcc9..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IActionContributor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing;
-
-import java.util.List;
-
-import com.google.inject.Binding;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Singleton;
-import com.google.inject.TypeLiteral;
-
-/**
- *
- */
-public interface IActionContributor {
- /**
- * hook used to contribute any actions on editor start up.
- * @param editor
- */
- public void contributeActions(PartialModelEditor editor);
-
-
- /**
- * composite action contributor delegating call to all registered {@link IActionContributor}
- */
- @Singleton
- public class CompositeImpl implements IActionContributor {
-
- @Inject
- private Injector injector;
-
- public void contributeActions(PartialModelEditor editor) {
- List<Binding<IActionContributor>> bindingsByType = injector.findBindingsByType(TypeLiteral.get(IActionContributor.class));
- for (Binding<IActionContributor> binding : bindingsByType) {
- IActionContributor actionContributor = injector.getInstance(binding.getKey());
- actionContributor.contributeActions(editor);
- }
- }
-
- }
-} \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IPartialContentAssistParser.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IPartialContentAssistParser.java
deleted file mode 100644
index 95133155d81..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IPartialContentAssistParser.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing;
-
-import org.eclipse.xtext.AbstractRule;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.IContentAssistParser;
-
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
- */
-public interface IPartialContentAssistParser extends IContentAssistParser {
-
- /**
- * @param rule
- *
- */
- void initializeFor(AbstractRule rule);
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/ISyntheticResourceProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/ISyntheticResourceProvider.java
deleted file mode 100644
index 50d9eab79d1..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/ISyntheticResourceProvider.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing;
-
-import org.eclipse.xtext.resource.XtextResource;
-
-import com.google.inject.ImplementedBy;
-
-/**
- *
- */
-@ImplementedBy(SyntheticResourceProvider.class)
-public interface ISyntheticResourceProvider {
- /**
- * @return XtextResource
- *
- */
- XtextResource createResource();
-} \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/OperationHistoryListener.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/OperationHistoryListener.java
deleted file mode 100644
index 9db63acc890..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/OperationHistoryListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing;
-
-import org.eclipse.core.commands.operations.IOperationHistoryListener;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.OperationHistoryEvent;
-import org.eclipse.ui.texteditor.IUpdate;
-
-/**
- *
- */
-public class OperationHistoryListener implements IOperationHistoryListener {
- private final IUndoContext context;
- private final IUpdate update;
-
- /**
- * @param context
- * @param update
- *
- */
- public OperationHistoryListener(IUndoContext context, IUpdate update) {
- this.context = context;
- this.update = update;
- }
-
- public void historyNotification(OperationHistoryEvent event) {
- final int type= event.getEventType();
- switch (type) {
- case OperationHistoryEvent.UNDONE:
- case OperationHistoryEvent.REDONE:
- case OperationHistoryEvent.OPERATION_NOT_OK:
- // if this is one of our operations
- if (event.getOperation().hasContext(context)) {
- update.update();
- }
- }
- }
-} \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialContentAssistContextFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialContentAssistContextFactory.java
deleted file mode 100644
index c6baf0199e1..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialContentAssistContextFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing;
-
-import org.eclipse.xtext.ui.editor.contentassist.antlr.ParserBasedContentAssistContextFactory;
-
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
- */
-public class PartialContentAssistContextFactory extends ParserBasedContentAssistContextFactory {
-
-// /**
-// * @param partialContentAssistParser
-// *
-// */
-// @Inject
-// public void setPartialParser(IPartialContentAssistParser partialContentAssistParser) {
-// super.setParser(partialContentAssistParser);
-// }
-//
-// /**
-// * @param rule
-// *
-// */
-// public void initializeFor(AbstractRule rule) {
-// ((IPartialContentAssistParser) getParser()).initializeFor(rule);
-// }
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialModelEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialModelEditor.java
deleted file mode 100644
index 79d3cbb2d32..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialModelEditor.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing;
-
-import java.util.Collections;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ISynchronizable;
-import org.eclipse.jface.text.source.AnnotationModel;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.IXtextEMFReconciler;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.ui.editor.model.XtextDocument;
-import org.eclipse.xtext.util.StringInputStream;
-
-/**
- *
- */
-public class PartialModelEditor {
-
- protected final SourceViewer viewer;
- protected final boolean insertLineBreaks;
- protected final ISyntheticResourceProvider resourceProvider;
- protected EObject semanticElement ;
- protected IXtextEMFReconciler modelReconciler ;
- //private final Injector xtextInjector ;
-
- /**
- * @param viewer
- * @param resourceProvider
- * @param insertLineBreaks
- * @param semanticElement
- * @param modelReconciler
- *
- */
- public PartialModelEditor(SourceViewer viewer,
- ISyntheticResourceProvider resourceProvider,
- boolean insertLineBreaks,
- EObject semanticElement,
- IXtextEMFReconciler modelReconciler) {
- //this.xtextInjector = xtextInjector ;
- this.viewer = viewer;
- this.resourceProvider = resourceProvider;
- this.insertLineBreaks = insertLineBreaks;
- this.semanticElement = semanticElement ;
- this.modelReconciler = modelReconciler ;
- }
-
- /**
- * @param document
- * @param prefix
- * @param editablePart
- * @param suffix
- *
- */
- public void setModel(XtextDocument document, String prefix, String editablePart, String suffix) {
- if (insertLineBreaks) {
- String delimiter = document.getLegalLineDelimiters()[0];
- prefix = prefix + delimiter;
- suffix = delimiter + suffix;
- }
- String model = prefix + editablePart + suffix;
- document.set(model);
- XtextResource resource = createResource(model);
- document.setInput(resource);
- AnnotationModel annotationModel = new AnnotationModel();
- if (document instanceof ISynchronizable) {
- Object lock= ((ISynchronizable)document).getLockObject();
- if (lock == null) {
- lock= new Object();
- ((ISynchronizable)document).setLockObject(lock);
- }
- ((ISynchronizable) annotationModel).setLockObject(lock);
- }
- viewer.setDocument(document, annotationModel, prefix.length(), editablePart.length());
- viewer.getUndoManager().reset();
- }
-
- /**
- * @param content
- * @return XtextResource
- *
- */
- public XtextResource createResource(String content) {
- XtextResource result = resourceProvider.createResource();
- try {
- result.load(new StringInputStream(content, result.getEncoding()), Collections.emptyMap());
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- return result;
- }
-
- /**
- * @param prefix
- * @param editablePart
- * @param suffix
- *
- */
- public void updateModel(String prefix, String editablePart, String suffix) {
- IDocument document= viewer.getDocument();
- if (insertLineBreaks) {
- String delimiter = document.getLegalLineDelimiters()[0];
- prefix = prefix + delimiter;
- suffix = delimiter + suffix;
- }
- String model = prefix + editablePart + suffix;
- viewer.setRedraw(false);
- viewer.getUndoManager().disconnect();
- document.set(model);
- viewer.setVisibleRegion(prefix.length(), editablePart.length());
- viewer.getUndoManager().connect(viewer);
- viewer.setRedraw(true);
- }
-
- /**
- * @param prefix
- *
- */
- public void updatePrefix(String prefix) {
- try {
- IDocument document= viewer.getDocument();
- IRegion visibleRegion = viewer.getVisibleRegion();
- String editablePart = document.get(visibleRegion.getOffset(), visibleRegion.getLength());
- int suffixOffset = visibleRegion.getOffset() + visibleRegion.getLength();
- String suffix = "";
- if (document.getLength() - suffixOffset > 0) {
- suffix = document.get(suffixOffset, document.getLength() - suffixOffset);
- if (insertLineBreaks) {
- String delimiter = document.getLegalLineDelimiters()[0];
- suffix = suffix.substring(delimiter.length());
- }
- }
- updateModel(prefix, editablePart, suffix);
- } catch(BadLocationException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * @return String
- *
- */
- public String getEditablePart() {
- IDocument doc= viewer.getDocument();
- IRegion visible= viewer.getVisibleRegion();
- try {
- return doc.get(visible.getOffset(), visible.getLength());
- } catch (BadLocationException e) {
- return ""; //$NON-NLS-1$
- }
- }
-
- /**
- * @return String
- *
- */
- public String getSerializedModel() {
- return viewer.getDocument().get();
- }
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandle.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandle.java
deleted file mode 100644
index 52fe8a87962..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandle.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing;
-
-import java.lang.reflect.Constructor;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.IXtextEMFReconciler;
-import org.eclipse.xtext.ui.editor.XtextSourceViewer;
-import org.eclipse.xtext.ui.editor.XtextSourceViewerConfiguration;
-import org.eclipse.xtext.ui.editor.model.XtextDocument;
-import org.eclipse.xtext.ui.editor.validation.IValidationIssueProcessor;
-
-import com.google.inject.Injector;
-
-/**
- *
- */
-public class SourceViewerHandle {
- protected IValidationIssueProcessor issueProcessor;
- protected final XtextSourceViewer viewer;
- protected final ISyntheticResourceProvider resourceProvider;
- protected final XtextDocument document;
- protected final XtextSourceViewerConfiguration configuration;
- protected static Class partialModelEditorClass = null ;
- private Class defaultModelEditorClass = PartialModelEditor.class ;
- protected EObject semanticElement ;
- protected IXtextEMFReconciler modelReconciler ;
-
- SourceViewerHandle(XtextDocument document, XtextSourceViewer viewer, XtextSourceViewerConfiguration configuration, ISyntheticResourceProvider resourceProvider, Injector xtextInjector) {
- this.document = document;
- this.viewer = viewer;
- this.configuration = configuration;
- this.resourceProvider = resourceProvider;
- }
-
- /**
- * @param issueProcessor
- *
- */
- public void setIssueProcessor(IValidationIssueProcessor issueProcessor) {
- this.issueProcessor = issueProcessor;
- }
-
- /**
- * @return IValidationIssueProcessor
- *
- */
- public IValidationIssueProcessor getIssueProcessor() {
- return issueProcessor;
- }
-
- /**
- * @return XtextSourceViewer
- *
- */
- public XtextSourceViewer getViewer() {
- return viewer;
- }
-
- /**
- * @return XtextDocument
- *
- */
- public XtextDocument getDocument() {
- return document;
- }
-
- /**
- * @return XtextSourceViewerConfiguration
- *
- */
- public XtextSourceViewerConfiguration getConfiguration() {
- return configuration;
- }
-
- /**
- * @param prefix
- * @param editablePart
- * @param suffix
- * @param semanticElement
- * @param modelReconciler
- * @return PartialModelEditor
- *
- */
- public PartialModelEditor createPartialEditor(String prefix, String editablePart, String suffix, EObject semanticElement, IXtextEMFReconciler modelReconciler) {
- //PartialModelEditor result = new PartialModelEditor(viewer, resourceProvider, false);
- PartialModelEditor result = null;
- try {
- if (partialModelEditorClass == null)
- partialModelEditorClass = defaultModelEditorClass ;
- Constructor c = partialModelEditorClass.getConstructor(SourceViewer.class,
- ISyntheticResourceProvider.class,
- boolean.class,
- EObject.class,
- IXtextEMFReconciler.class
- ) ;
- this.semanticElement = semanticElement ;
- this.modelReconciler = modelReconciler ;
- result = (PartialModelEditor)c.newInstance(viewer, resourceProvider, false, semanticElement, modelReconciler) ;
- result.setModel(getDocument(), prefix, editablePart, suffix);
- }
- catch (Exception e) {
- e.printStackTrace() ;
- }
- // result.setModel(getDocument(), prefix, editablePart, suffix);
- return result;
- }
-
- /**
- * @param modelEditorClass
- *
- */
- public static void bindPartialModelEditorClass(Class modelEditorClass) {
- partialModelEditorClass = modelEditorClass ;
- }
-
- /**
- * @return PartialModelEditor
- *
- */
- public PartialModelEditor createPartialEditor() {
- return createPartialEditor("", "", "", null, null);
- }
-} \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandleFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandleFactory.java
deleted file mode 100644
index c4b05c671f5..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandleFactory.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.text.source.IOverviewRuler;
-import org.eclipse.jface.text.source.ISharedTextColors;
-import org.eclipse.jface.text.source.IVerticalRuler;
-import org.eclipse.jface.text.source.OverviewRuler;
-import org.eclipse.jface.text.source.VerticalRuler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.ui.texteditor.AnnotationPreference;
-import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess;
-import org.eclipse.ui.texteditor.MarkerAnnotationPreferences;
-import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
-import org.eclipse.xtext.ui.editor.XtextSourceViewer;
-import org.eclipse.xtext.ui.editor.XtextSourceViewerConfiguration;
-import org.eclipse.xtext.ui.editor.model.XtextDocument;
-import org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreAccess;
-import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionProvider;
-import org.eclipse.xtext.ui.editor.validation.AnnotationIssueProcessor;
-import org.eclipse.xtext.ui.editor.validation.IValidationIssueProcessor;
-import org.eclipse.xtext.ui.editor.validation.ValidationJob;
-import org.eclipse.xtext.validation.CheckMode;
-import org.eclipse.xtext.validation.IResourceValidator;
-import org.eclipse.xtext.validation.Issue;
-
-import com.google.common.collect.Iterators;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Provider;
-
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
- */
-public class SourceViewerHandleFactory {
-
- @Inject
- private XtextSourceViewer.Factory sourceViewerFactory;
-
- @Inject
- private Provider<XtextSourceViewerConfiguration> sourceViewerConfigurationProvider;
-
- @Inject
- private Provider<XtextDocument> documentProvider;
-
- @Inject
- private IResourceValidator resourceValidator;
-
- @Inject
- private IPreferenceStoreAccess preferenceStoreAccess;
-
- private Injector xtextInjector ;
-
- protected static final int VERTICAL_RULER_WIDTH= 12;
-
- /**
- * @param parent
- * @param resourceProvider
- * @return SourceViewerHandle
- *
- */
- public SourceViewerHandle create(Composite parent, ISyntheticResourceProvider resourceProvider) {
- final IVerticalRuler ruler = new VerticalRuler(VERTICAL_RULER_WIDTH, new DefaultMarkerAnnotationAccess());
- final IOverviewRuler oRuler = new OverviewRuler(new DefaultMarkerAnnotationAccess(), VERTICAL_RULER_WIDTH, getSharedColors());
- //final XtextSourceViewer viewer = sourceViewerFactory.createSourceViewer(parent, ruler, oRuler, true, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- final XtextSourceViewer viewer = new CustomXtextSourceViewer(parent, ruler, oRuler, false, SWT.V_SCROLL | SWT.H_SCROLL);
- /*
- * final IVerticalRuler ruler = new VerticalRuler(VERTICAL_RULER_WIDTH, null) ;
- final XtextSourceViewer viewer = new CustomXtextSourceViewer(parent, ruler, null, true, SWT.None);
- */
-
-
- XtextSourceViewerConfiguration viewerConfiguration = sourceViewerConfigurationProvider.get();
- viewer.configure(viewerConfiguration);
-
- final SourceViewerDecorationSupport viewerDecorationSupport = new SourceViewerDecorationSupport(viewer, null, new DefaultMarkerAnnotationAccess(), getSharedColors());
- MarkerAnnotationPreferences annotationPreferences = new MarkerAnnotationPreferences();
- Iterator<AnnotationPreference> e= Iterators.filter(annotationPreferences.getAnnotationPreferences().iterator(), AnnotationPreference.class);
- while (e.hasNext())
- viewerDecorationSupport.setAnnotationPreference(e.next());
- viewerDecorationSupport.install(preferenceStoreAccess.getPreferenceStore());
- parent.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- viewerDecorationSupport.dispose();
- }
- });
- final XtextDocument document = documentProvider.get();
- final SourceViewerHandle result = new SourceViewerHandle(document, viewer, viewerConfiguration, resourceProvider, xtextInjector);
- ValidationJob job = new ValidationJob(resourceValidator, document,
- new IValidationIssueProcessor() {
- private AnnotationIssueProcessor annotationIssueProcessor;
-
- public void processIssues(List<Issue> issues, IProgressMonitor monitor) {
- if(viewer.getTextWidget() == null) {
- // the text widget is disposed => don't try displaying errors in this widget
- return;
- }
- IValidationIssueProcessor issueProcessor = result.getIssueProcessor();
- if (issueProcessor != null)
- issueProcessor.processIssues(issues, monitor);
- if (annotationIssueProcessor == null) {
- annotationIssueProcessor = new AnnotationIssueProcessor(document,
- viewer.getAnnotationModel(),
- new IssueResolutionProvider.NullImpl());
- }
- if (annotationIssueProcessor != null)
- annotationIssueProcessor.processIssues(issues, monitor);
- }
- }, CheckMode.FAST_ONLY);
- document.setValidationJob(job);
- return result;
- }
-
- protected ISharedTextColors getSharedColors() {
- return EditorsUI.getSharedTextColors();
- }
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SyntheticResourceProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SyntheticResourceProvider.java
deleted file mode 100644
index 616ce3a3dc0..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SyntheticResourceProvider.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 itemis AG (http://www.itemis.eu) and others.
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.xtext.glue.partialEditing;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.PopupXtextEditorHelper;
-import org.eclipse.xtext.IGrammarAccess;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.resource.XtextResourceSet;
-
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
- */
-public class SyntheticResourceProvider implements ISyntheticResourceProvider {
-
- /**
- *
- */
- public static final String SYNTHETIC_SCHEME = "synthetic";
-
- //@Inject
- //private IResourceSetProvider resourceSetProvider;
- @Inject
- private Provider<XtextResourceSet> resourceSetProvider;
-
- @Inject
- private IGrammarAccess grammarAccess;
-
-
-
- public XtextResource createResource() {
- ResourceSet resourceSet = resourceSetProvider.get();
-// EObject context = PopupXtextEditorHelper.context ;
-// ResourceSet resourceSet = context.eResource().getResourceSet() ;
- Resource grammarResource = resourceSet.createResource(
- URI.createURI(SYNTHETIC_SCHEME + ":/" + grammarAccess.getGrammar().getName() + ".xtext"));
- grammarResource.getContents().add(EcoreUtil.copy(grammarAccess.getGrammar()));
- XtextResource result = (XtextResource) resourceSet.createResource(
- URI.createURI(SYNTHETIC_SCHEME + ":/" + grammarAccess.getGrammar().getName() + "." + PopupXtextEditorHelper.fileExtension));
- resourceSet.getResources().add(result);
- return result ;
-
- }
-
-}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
index f7f18c4dede..ae4e19e6f0a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
@@ -21,6 +21,7 @@ import java.util.List;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.util.URI;
@@ -36,6 +37,7 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.infra.core.editor.BackboneException;
import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.resource.NotFoundException;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
import org.eclipse.papyrus.infra.core.services.ServiceException;
@@ -184,12 +186,13 @@ public abstract class AbstractCreateNattableEditorHandler extends AbstractHandle
* The model where to save the TableInstance is not found.
*/
protected Table createEditorModel(final ServicesRegistry serviceRegistry, String name, String description) throws ServiceException, NotFoundException {
- final TableConfiguration configuration = getDefaultTableEditorConfiguration();
- assert configuration != null;
+ final ModelSet modelSet = ServiceUtils.getInstance().getModelSet(serviceRegistry);
+ final TableConfiguration configuration = getDefaultTableEditorConfiguration(modelSet);
+ Assert.isNotNull(configuration);
final Table table = TableHelper.createTable(configuration, null, name, description); //context null here, see bug 410357
// Save the model in the associated resource
- final PapyrusNattableModel model = (PapyrusNattableModel)ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(PapyrusNattableModel.MODEL_ID);
+ final PapyrusNattableModel model = (PapyrusNattableModel)modelSet.getModelChecked(PapyrusNattableModel.MODEL_ID);
model.addPapyrusTable(table);
table.setContext(getTableContext());
return table;
@@ -198,12 +201,11 @@ public abstract class AbstractCreateNattableEditorHandler extends AbstractHandle
/**
*
+ * @param resourceSet TODO
* @return
* the configuration to use for the new table
*/
- protected TableConfiguration getDefaultTableEditorConfiguration() {
- final EObject current = getSelection().get(0);
- final ResourceSet resourceSet = current.eResource().getResourceSet();
+ protected TableConfiguration getDefaultTableEditorConfiguration(ResourceSet resourceSet) {
final Resource resource = resourceSet.getResource(getTableEditorConfigurationURI(), true);
TableConfiguration tableConfiguration = null;
if(resource.getContents().get(0) instanceof TableConfiguration) {
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.classpath b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.classpath
deleted file mode 100644
index cedf0d0d0b5..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src-gen"/>
- <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="output" path="bin"/>
-</classpath>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project
deleted file mode 100644
index d784407f2ea..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.queries.core.configuration.edit</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 13e26e08855..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="1.0.0",
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.uml2.uml,
- org.eclipse.uml2.uml.edit
-Export-Package: org.eclipse.papyrus.infra.queries.core.configuration.p
- rovider
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.queries.core.configuration
- .provider.ConfigurationEditPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.queries.core.configurat
- ion.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/about.html b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/build.properties b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/build.properties
deleted file mode 100644
index f465f5d7485..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#Mon Sep 12 09:29:39 CEST 2011
-output..=bin/
-bin.includes=.,icons/,META-INF/,plugin.xml,plugin.properties,about.html
-jars.compile.order=.
-src.includes = about.html
-source..=src-gen/
-bin..=bin/
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Duration.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Duration.gif
deleted file mode 100644
index 7839cb59536..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Duration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_DurationInterval.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_DurationInterval.gif
deleted file mode 100644
index bbdaa350889..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_DurationInterval.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Expression.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Expression.gif
deleted file mode 100644
index b94380bd871..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Expression.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_InstanceValue.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_InstanceValue.gif
deleted file mode 100644
index 1bca29e3795..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_InstanceValue.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Interval.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Interval.gif
deleted file mode 100644
index 7d35c8972d1..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Interval.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralBoolean.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralBoolean.gif
deleted file mode 100644
index 7f2d45eb492..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralBoolean.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralInteger.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralInteger.gif
deleted file mode 100644
index 58e344bde6e..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralInteger.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralNull.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralNull.gif
deleted file mode 100644
index e3cf235bb60..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralNull.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralString.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralString.gif
deleted file mode 100644
index ebe3a4888bb..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralString.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralUnlimitedNatural.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralUnlimitedNatural.gif
deleted file mode 100644
index dfe51cfa69b..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralUnlimitedNatural.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_OpaqueExpression.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_OpaqueExpression.gif
deleted file mode 100644
index b94380bd871..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_OpaqueExpression.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_StringExpression.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_StringExpression.gif
deleted file mode 100644
index 7d35c8972d1..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_StringExpression.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeExpression.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeExpression.gif
deleted file mode 100644
index 24c57a05b7e..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeExpression.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeInterval.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeInterval.gif
deleted file mode 100644
index a674b69c271..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeInterval.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ConstantParameterValue.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ConstantParameterValue.gif
deleted file mode 100644
index f213cc393ad..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ConstantParameterValue.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ListParameterValue.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ListParameterValue.gif
deleted file mode 100644
index 888a2c1bacc..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ListParameterValue.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ParameterValue.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ParameterValue.gif
deleted file mode 100644
index 79a0a45b269..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ParameterValue.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_QueryExecutionValue.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_QueryExecutionValue.gif
deleted file mode 100644
index 523057cd5d9..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_QueryExecutionValue.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Duration.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Duration.gif
deleted file mode 100644
index 7f7c51a1f20..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Duration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_DurationInterval.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_DurationInterval.gif
deleted file mode 100644
index 2769bc64647..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_DurationInterval.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Expression.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Expression.gif
deleted file mode 100644
index de6af47e2ec..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Expression.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_InstanceValue.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_InstanceValue.gif
deleted file mode 100644
index cc2ef529556..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_InstanceValue.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Interval.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Interval.gif
deleted file mode 100644
index 0c1ee4c917e..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Interval.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralBoolean.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralBoolean.gif
deleted file mode 100644
index a382f74844b..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralBoolean.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralInteger.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralInteger.gif
deleted file mode 100644
index b72b5e57a83..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralInteger.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralNull.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralNull.gif
deleted file mode 100644
index b32e049d4a4..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralNull.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralString.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralString.gif
deleted file mode 100644
index a89d0ec24fe..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralString.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralUnlimitedNatural.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralUnlimitedNatural.gif
deleted file mode 100644
index 52baab8f56e..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralUnlimitedNatural.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_OpaqueExpression.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_OpaqueExpression.gif
deleted file mode 100644
index de6af47e2ec..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_OpaqueExpression.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_StringExpression.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_StringExpression.gif
deleted file mode 100644
index 0c1ee4c917e..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_StringExpression.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeExpression.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeExpression.gif
deleted file mode 100644
index e8233067cc9..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeExpression.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeInterval.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeInterval.gif
deleted file mode 100644
index bc7b7f9c860..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeInterval.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ConstantParameterValue.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ConstantParameterValue.gif
deleted file mode 100644
index 134551bff7e..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ConstantParameterValue.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ListParameterValue.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ListParameterValue.gif
deleted file mode 100644
index 4365960a04b..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ListParameterValue.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ModiscoQueryConfiguration.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ModiscoQueryConfiguration.gif
deleted file mode 100644
index 134551bff7e..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ModiscoQueryConfiguration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ParameterValue.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ParameterValue.gif
deleted file mode 100644
index 2b692560297..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ParameterValue.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/QueryExecutionValue.gif b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/QueryExecutionValue.gif
deleted file mode 100644
index ed874747401..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/QueryExecutionValue.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.properties b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.properties
deleted file mode 100644
index 69cc28400be..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-################################################################################
-# Copyright (c) 2008 CEA LIST.
-# 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
-#
-# Contributors:
-# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
-################################################################################
-pluginName=Configuration Edit Support (Incubation)
-providerName=Eclipse Modeling Project
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_QueryConfiguration_type = Query Configuration
-_UI_ModiscoQueryConfiguration_type = Modisco Query Configuration
-_UI_ParameterValue_type = Parameter Value
-_UI_Unknown_type = Object
-
-_UI_Unknown_datatype= Value
-
-_UI_ModiscoQueryConfiguration_query_feature = Query
-_UI_ModiscoQueryConfiguration_parameterValues_feature = Parameter Values
-_UI_ParameterValue_parameter_feature = Parameter
-_UI_ParameterValue_valueInstance_feature = Value Instance
-_UI_Unknown_feature = Unspecified
-
-_UI_QueryExecutionValue_type = Query Execution Value
-_UI_ConstantParameterValue_type = Constant Parameter Value
-_UI_QueryExecutionValue_configuration_feature = Configuration
-_UI_ConstantParameterValue_valueInstance_feature = Value Instance
-_UI_QueryConfiguration_name_feature = Name
-_UI_ListParameterValue_type = List Parameter Value
-_UI_ListParameterValue_values_feature = Values
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.xml b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.xml
deleted file mode 100644
index 4296ad2fa25..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
- <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
- <factory
- uri="http://www.eclipse.org/papyrus/core/queries/0.7"
- class="org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationItemProviderAdapterFactory"
- supportedTypes=
- "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
- org.eclipse.emf.edit.provider.IStructuredItemContentProvider
- org.eclipse.emf.edit.provider.ITreeItemContentProvider
- org.eclipse.emf.edit.provider.IItemLabelProvider
- org.eclipse.emf.edit.provider.IItemPropertySource"/>
- </extension>
-
-</plugin>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationEditPlugin.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationEditPlugin.java
deleted file mode 100644
index f8205917100..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationEditPlugin.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-import org.eclipse.uml2.uml.edit.UMLEditPlugin;
-
-/**
- * This is the central singleton for the Configuration edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class ConfigurationEditPlugin extends EMFPlugin {
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final ConfigurationEditPlugin INSTANCE = new ConfigurationEditPlugin();
-
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static Implementation plugin;
-
- /**
- * Create the instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConfigurationEditPlugin() {
- super
- (new ResourceLocator [] {
- EcoreEditPlugin.INSTANCE,
- // QueryEditPlugin.INSTANCE,
- UMLEditPlugin.INSTANCE,
- });
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- @Override
- public ResourceLocator getPluginResourceLocator() {
- return plugin;
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- public static Implementation getPlugin() {
- return plugin;
- }
-
- /**
- * The actual implementation of the Eclipse <b>Plugin</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static class Implementation extends EclipsePlugin {
- /**
- * Creates an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Implementation() {
- super();
-
- // Remember the static instance.
- //
- plugin = this;
- }
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationItemProviderAdapterFactory.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationItemProviderAdapterFactory.java
deleted file mode 100644
index 7615aff1dcc..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.papyrus.infra.queries.core.configuration.util.ConfigurationAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConfigurationItemProviderAdapterFactory extends ConfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
- /**
- * This constructs an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConfigurationItemProviderAdapterFactory() {
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ModiscoQueryConfigurationItemProvider modiscoQueryConfigurationItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createModiscoQueryConfigurationAdapter() {
- if (modiscoQueryConfigurationItemProvider == null) {
- modiscoQueryConfigurationItemProvider = new ModiscoQueryConfigurationItemProvider(this);
- }
-
- return modiscoQueryConfigurationItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected QueryExecutionValueItemProvider queryExecutionValueItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createQueryExecutionValueAdapter() {
- if (queryExecutionValueItemProvider == null) {
- queryExecutionValueItemProvider = new QueryExecutionValueItemProvider(this);
- }
-
- return queryExecutionValueItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ConstantParameterValueItemProvider constantParameterValueItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createConstantParameterValueAdapter() {
- if (constantParameterValueItemProvider == null) {
- constantParameterValueItemProvider = new ConstantParameterValueItemProvider(this);
- }
-
- return constantParameterValueItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ListParameterValueItemProvider listParameterValueItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createListParameterValueAdapter() {
- if (listParameterValueItemProvider == null) {
- listParameterValueItemProvider = new ListParameterValueItemProvider(this);
- }
-
- return listParameterValueItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This disposes all of the item providers created by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void dispose() {
- if (modiscoQueryConfigurationItemProvider != null) modiscoQueryConfigurationItemProvider.dispose();
- if (queryExecutionValueItemProvider != null) queryExecutionValueItemProvider.dispose();
- if (constantParameterValueItemProvider != null) constantParameterValueItemProvider.dispose();
- if (listParameterValueItemProvider != null) listParameterValueItemProvider.dispose();
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConstantParameterValueItemProvider.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConstantParameterValueItemProvider.java
deleted file mode 100644
index de2560858ea..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConstantParameterValueItemProvider.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue;
-
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConstantParameterValueItemProvider
- extends ParameterValueItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConstantParameterValueItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
- * This returns ConstantParameterValue.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/ConstantParameterValue"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- return getString("_UI_ConstantParameterValue_type");
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(ConstantParameterValue.class)) {
- case ConfigurationPackage.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createOpaqueExpression()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createExpression()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createStringExpression()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createLiteralInteger()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createLiteralString()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createLiteralBoolean()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createLiteralNull()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createInstanceValue()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createLiteralUnlimitedNatural()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createTimeExpression()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createDuration()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createInterval()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createDurationInterval()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE,
- UMLFactory.eINSTANCE.createTimeInterval()));
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ListParameterValueItemProvider.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ListParameterValueItemProvider.java
deleted file mode 100644
index b476a6f00c5..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ListParameterValueItemProvider.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ListParameterValueItemProvider
- extends ParameterValueItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ListParameterValueItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addValuesPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Values feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addValuesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ListParameterValue_values_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_ListParameterValue_values_feature", "_UI_ListParameterValue_type"),
- ConfigurationPackage.Literals.LIST_PARAMETER_VALUE__VALUES,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This returns ListParameterValue.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/ListParameterValue"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- return getString("_UI_ListParameterValue_type");
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ModiscoQueryConfigurationItemProvider.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ModiscoQueryConfigurationItemProvider.java
deleted file mode 100644
index c0ec3dbd806..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ModiscoQueryConfigurationItemProvider.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ModiscoQueryConfigurationItemProvider
- extends QueryConfigurationItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ModiscoQueryConfigurationItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addQueryPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Query feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addQueryPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ModiscoQueryConfiguration_query_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_ModiscoQueryConfiguration_query_feature", "_UI_ModiscoQueryConfiguration_type"),
- ConfigurationPackage.Literals.MODISCO_QUERY_CONFIGURATION__QUERY,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(ConfigurationPackage.Literals.MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
- * This returns ModiscoQueryConfiguration.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/ModiscoQueryConfiguration"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((ModiscoQueryConfiguration)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_ModiscoQueryConfiguration_type") :
- getString("_UI_ModiscoQueryConfiguration_type") + " " + label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(ModiscoQueryConfiguration.class)) {
- case ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES,
- ConfigurationFactory.eINSTANCE.createQueryExecutionValue()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES,
- ConfigurationFactory.eINSTANCE.createConstantParameterValue()));
-
- newChildDescriptors.add
- (createChildParameter
- (ConfigurationPackage.Literals.MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES,
- ConfigurationFactory.eINSTANCE.createListParameterValue()));
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ParameterValueItemProvider.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ParameterValueItemProvider.java
deleted file mode 100644
index a88d5c2f912..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ParameterValueItemProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ParameterValueItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ParameterValueItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addParameterPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Parameter feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addParameterPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ParameterValue_parameter_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_ParameterValue_parameter_feature", "_UI_ParameterValue_type"),
- ConfigurationPackage.Literals.PARAMETER_VALUE__PARAMETER,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- return getString("_UI_ParameterValue_type");
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return ConfigurationEditPlugin.INSTANCE;
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryConfigurationItemProvider.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryConfigurationItemProvider.java
deleted file mode 100644
index 964c9c87be8..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryConfigurationItemProvider.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class QueryConfigurationItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public QueryConfigurationItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_QueryConfiguration_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_QueryConfiguration_name_feature", "_UI_QueryConfiguration_type"),
- ConfigurationPackage.Literals.QUERY_CONFIGURATION__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((QueryConfiguration)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_QueryConfiguration_type") :
- getString("_UI_QueryConfiguration_type") + " " + label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(QueryConfiguration.class)) {
- case ConfigurationPackage.QUERY_CONFIGURATION__NAME:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return ConfigurationEditPlugin.INSTANCE;
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryExecutionValueItemProvider.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryExecutionValueItemProvider.java
deleted file mode 100644
index 2b3050ce093..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryExecutionValueItemProvider.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class QueryExecutionValueItemProvider
- extends ParameterValueItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public QueryExecutionValueItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addConfigurationPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Configuration feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addConfigurationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_QueryExecutionValue_configuration_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_QueryExecutionValue_configuration_feature", "_UI_QueryExecutionValue_type"),
- ConfigurationPackage.Literals.QUERY_EXECUTION_VALUE__CONFIGURATION,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This returns QueryExecutionValue.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/QueryExecutionValue"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- return getString("_UI_QueryExecutionValue_type");
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.classpath b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.classpath
deleted file mode 100644
index cedf0d0d0b5..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src-gen"/>
- <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="output" path="bin"/>
-</classpath>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.project b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.project
deleted file mode 100644
index 19b48341fa2..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.queries.core.configuration</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.core.resources.prefs b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 7cceaebc432..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Oct 07 19:29:54 CEST 2010
-eclipse.preferences.version=1
-encoding//model/Configuration.ecore=UTF-8
-encoding//model/Configuration.ecorediag=UTF-8
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2010cb0a8ba..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Oct 06 16:11:35 CEST 2010
-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/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF
deleted file mode 100644
index af3264a0829..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.uml2.uml
-Export-Package: org.eclipse.papyrus.infra.queries.core.configuration,
- org.eclipse.papyrus.infra.queries.core.configuration.impl,
- org.eclipse.papyrus.infra.queries.core.configuration.plugin,
- org.eclipse.papyrus.infra.queries.core.configuration.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.queries.core.configuration
- .plugin.Activator$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.queries.core.configurat
- ion;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/about.html b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/build.properties b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/build.properties
deleted file mode 100644
index e05d6efaf6a..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#Mon Sep 12 09:29:39 CEST 2011
-output..=bin/
-bin.includes=.,model/,META-INF/,plugin.xml,plugin.properties,about.html
-jars.compile.order=.
-src.includes = about.html
-source..=src-gen/
-bin..=bin/
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore
deleted file mode 100644
index 5e4046fa300..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="configuration" nsURI="http://www.eclipse.org/papyrus/core/queries/0.7"
- nsPrefix="configuration">
- <eClassifiers xsi:type="ecore:EClass" name="QueryConfiguration" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ModiscoQueryConfiguration" eSuperTypes="#//QueryConfiguration">
- <eStructuralFeatures xsi:type="ecore:EReference" name="query" lowerBound="1" eType="ecore:EClass ../../org.eclipse.emf.facet.infra.query/model/query.ecore#//ModelQuery"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="parameterValues" upperBound="-1"
- eType="#//ParameterValue" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ParameterValue" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.emf.facet.infra.query/model/query.ecore#//ModelQueryParameter"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//ParameterValue">
- <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" lowerBound="1"
- eType="#//QueryConfiguration"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ConstantParameterValue" eSuperTypes="#//ParameterValue">
- <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ListParameterValue" eSuperTypes="#//ParameterValue">
- <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
- eType="#//ParameterValue"/>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecorediag b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecorediag
deleted file mode 100644
index 7b7dc6485ef..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecorediag
+++ /dev/null
@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_yhu7MdFTEd-fOo9it8hYhw" type="EcoreTools" name="QueryConfiguration" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_7kfVINFTEd-fOo9it8hYhw" type="1001">
- <children xmi:type="notation:Node" xmi:id="_7kfVI9FTEd-fOo9it8hYhw" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_7kfVJNFTEd-fOo9it8hYhw" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_7kfVJdFTEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_7kfVJtFTEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7kfVJ9FTEd-fOo9it8hYhw"/>
- <layoutConstraint xmi:type="notation:Ratio" xmi:id="_8dHmQNFTEd-fOo9it8hYhw" value="0.3"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_7kfVKNFTEd-fOo9it8hYhw" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_7kfVKdFTEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_7kfVKtFTEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7kfVK9FTEd-fOo9it8hYhw"/>
- <layoutConstraint xmi:type="notation:Ratio" xmi:id="_8dHmQdFTEd-fOo9it8hYhw" value="0.3"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_7kfVIdFTEd-fOo9it8hYhw" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="Configuration.ecore#//ModiscoQueryConfiguration"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7kfVItFTEd-fOo9it8hYhw" x="90" y="185" width="193" height="178"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_NUtOcNFUEd-fOo9it8hYhw" type="1001">
- <children xmi:type="notation:Node" xmi:id="_NUtOc9FUEd-fOo9it8hYhw" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_NUtOdNFUEd-fOo9it8hYhw" type="5001">
- <children xmi:type="notation:Node" xmi:id="_vMb9wdVNEd-eSfFwd2KHyw" type="2001">
- <element xmi:type="ecore:EAttribute" href="Configuration.ecore#//QueryConfiguration/name"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_vMb9wtVNEd-eSfFwd2KHyw"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_NUtOddFUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_NUtOdtFUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_NUtOd9FUEd-fOo9it8hYhw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_NUtOeNFUEd-fOo9it8hYhw" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_NUtOedFUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_NUtOetFUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_NUtOe9FUEd-fOo9it8hYhw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_NUtOcdFUEd-fOo9it8hYhw" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="Configuration.ecore#//QueryConfiguration"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NUtOctFUEd-fOo9it8hYhw" x="125" y="100"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_PeY3wNFUEd-fOo9it8hYhw" type="1001">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Pe_UuNFUEd-fOo9it8hYhw" source="Shortcut">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Pe_UudFUEd-fOo9it8hYhw" key="modelID" value="EcoreTools"/>
- </eAnnotations>
- <children xmi:type="notation:Node" xmi:id="_PeiowNFUEd-fOo9it8hYhw" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_PeiowdFUEd-fOo9it8hYhw" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_PeiowtFUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Peiow9FUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PeioxNFUEd-fOo9it8hYhw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_PeioxdFUEd-fOo9it8hYhw" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_PeioxtFUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Peiox9FUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PeioyNFUEd-fOo9it8hYhw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_PeY3wdFUEd-fOo9it8hYhw" fontColor="4210752" fontHeight="10" fillColor="14599595"/>
- <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.ecore#//ModelQuery"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PeY3wtFUEd-fOo9it8hYhw" x="400" y="155" width="258"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_SV-I4NFUEd-fOo9it8hYhw" type="1001">
- <children xmi:type="notation:Node" xmi:id="_SWH54NFUEd-fOo9it8hYhw" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_SWH54dFUEd-fOo9it8hYhw" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_SWH54tFUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_SWH549FUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_SWH55NFUEd-fOo9it8hYhw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_SWH55dFUEd-fOo9it8hYhw" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_SWH55tFUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_SWH559FUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_SWH56NFUEd-fOo9it8hYhw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_SV-I4dFUEd-fOo9it8hYhw" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="Configuration.ecore#//ParameterValue"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SV-I4tFUEd-fOo9it8hYhw" x="400" y="295" width="258" height="108"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_brgU4NFUEd-fOo9it8hYhw" type="1001">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_brqF6NFUEd-fOo9it8hYhw" source="Shortcut">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_brqF6dFUEd-fOo9it8hYhw" key="modelID" value="EcoreTools"/>
- </eAnnotations>
- <children xmi:type="notation:Node" xmi:id="_brgU49FUEd-fOo9it8hYhw" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_brgU5NFUEd-fOo9it8hYhw" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_brgU5dFUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_brgU5tFUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_brgU59FUEd-fOo9it8hYhw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_brgU6NFUEd-fOo9it8hYhw" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_brgU6dFUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_brgU6tFUEd-fOo9it8hYhw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_brgU69FUEd-fOo9it8hYhw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_brgU4dFUEd-fOo9it8hYhw" fontColor="4210752" fontHeight="10" fillColor="14599595"/>
- <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.ecore#//ModelQueryParameter"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_brgU4tFUEd-fOo9it8hYhw" x="785" y="190" width="218" height="158"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_EyyiUNK1Ed-6Cr0DOh7rhg" type="1001">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E0ucANK1Ed-6Cr0DOh7rhg" source="Shortcut">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_E0ucAdK1Ed-6Cr0DOh7rhg" key="modelID" value="EcoreTools"/>
- </eAnnotations>
- <children xmi:type="notation:Node" xmi:id="_EyyiU9K1Ed-6Cr0DOh7rhg" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_EyyiVNK1Ed-6Cr0DOh7rhg" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_EyyiVdK1Ed-6Cr0DOh7rhg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_EyyiVtK1Ed-6Cr0DOh7rhg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_EyyiV9K1Ed-6Cr0DOh7rhg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_EyyiWNK1Ed-6Cr0DOh7rhg" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_EyyiWdK1Ed-6Cr0DOh7rhg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_EyyiWtK1Ed-6Cr0DOh7rhg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_EyyiW9K1Ed-6Cr0DOh7rhg"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_EyyiUdK1Ed-6Cr0DOh7rhg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EyyiUtK1Ed-6Cr0DOh7rhg" x="405" y="560" width="218" height="73"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_qTpOYdVDEd--sr5_k25cmA" type="1001">
- <children xmi:type="notation:Node" xmi:id="_qTpOZNVDEd--sr5_k25cmA" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_qTpOZdVDEd--sr5_k25cmA" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_qTpOZtVDEd--sr5_k25cmA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qTpOZ9VDEd--sr5_k25cmA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qTpOaNVDEd--sr5_k25cmA"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_qTpOadVDEd--sr5_k25cmA" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_qTpOatVDEd--sr5_k25cmA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qTpOa9VDEd--sr5_k25cmA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qTpObNVDEd--sr5_k25cmA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_qTpOYtVDEd--sr5_k25cmA" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="Configuration.ecore#//QueryExecutionValue"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qTpOY9VDEd--sr5_k25cmA" x="215" y="450" width="162" height="63"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_PD5qINVEEd--sr5_k25cmA" type="1001">
- <children xmi:type="notation:Node" xmi:id="_PD5qI9VEEd--sr5_k25cmA" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_PD5qJNVEEd--sr5_k25cmA" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_PD5qJdVEEd--sr5_k25cmA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_PD5qJtVEEd--sr5_k25cmA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PD5qJ9VEEd--sr5_k25cmA"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_PD5qKNVEEd--sr5_k25cmA" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_PD5qKdVEEd--sr5_k25cmA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_PD5qKtVEEd--sr5_k25cmA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PD5qK9VEEd--sr5_k25cmA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_PD5qIdVEEd--sr5_k25cmA" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="Configuration.ecore#//ConstantParameterValue"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PD5qItVEEd--sr5_k25cmA" x="435" y="450" height="63"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_5MnHINXaEd-0J-FKW8HdHA" type="1001">
- <children xmi:type="notation:Node" xmi:id="_5Mw4INXaEd-0J-FKW8HdHA" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_5Mw4IdXaEd-0J-FKW8HdHA" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_5Mw4ItXaEd-0J-FKW8HdHA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_5Mw4I9XaEd-0J-FKW8HdHA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_5Mw4JNXaEd-0J-FKW8HdHA"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_5Mw4JdXaEd-0J-FKW8HdHA" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_5Mw4JtXaEd-0J-FKW8HdHA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_5Mw4J9XaEd-0J-FKW8HdHA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_5Mw4KNXaEd-0J-FKW8HdHA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_5MnHIdXaEd-0J-FKW8HdHA" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="Configuration.ecore#//ListParameterValue"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5MnHItXaEd-0J-FKW8HdHA" x="655" y="450" width="152" height="63"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_QyE1MNXeEd-0J-FKW8HdHA" type="Note" description="Can return a single element or a collection of elements" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
- <children xmi:type="notation:BasicDecorationNode" xmi:id="_QyE1NNXeEd-0J-FKW8HdHA" type="DiagramName">
- <element xsi:nil="true"/>
- </children>
- <children xmi:type="notation:BasicDecorationNode" xmi:id="_QyE1NdXeEd-0J-FKW8HdHA" type="Description">
- <element xsi:nil="true"/>
- </children>
- <styles xmi:type="notation:TextStyle" xmi:id="_QyE1MdXeEd-0J-FKW8HdHA"/>
- <styles xmi:type="notation:LineTypeStyle" xmi:id="_QyE1MtXeEd-0J-FKW8HdHA"/>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QyE1M9XeEd-0J-FKW8HdHA" x="35" y="550" width="211" height="46"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_VuRpcNXeEd-0J-FKW8HdHA" type="Note" description="Returns only one element" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
- <children xmi:type="notation:BasicDecorationNode" xmi:id="_VuRpdNXeEd-0J-FKW8HdHA" type="DiagramName">
- <element xsi:nil="true"/>
- </children>
- <children xmi:type="notation:BasicDecorationNode" xmi:id="_VuRpddXeEd-0J-FKW8HdHA" type="Description">
- <element xsi:nil="true"/>
- </children>
- <styles xmi:type="notation:TextStyle" xmi:id="_VuRpcdXeEd-0J-FKW8HdHA"/>
- <styles xmi:type="notation:LineTypeStyle" xmi:id="_VuRpctXeEd-0J-FKW8HdHA"/>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VuRpc9XeEd-0J-FKW8HdHA" x="656" y="547" width="165" height="34"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_yhu7MtFTEd-fOo9it8hYhw"/>
- <element xmi:type="ecore:EPackage" href="Configuration.ecore#/"/>
- <edges xmi:type="notation:Edge" xmi:id="_NU2YaNFUEd-fOo9it8hYhw" type="3003" source="_7kfVINFTEd-fOo9it8hYhw" target="_NUtOcNFUEd-fOo9it8hYhw">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_NU2YadFUEd-fOo9it8hYhw" routing="Rectilinear" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_NU2YatFUEd-fOo9it8hYhw"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NU2Ya9FUEd-fOo9it8hYhw" points="[-6, -20, 113, 381]$[-119, -400, 0, 1]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_Pe_UsNFUEd-fOo9it8hYhw" type="3002" source="_7kfVINFTEd-fOo9it8hYhw" target="_PeY3wNFUEd-fOo9it8hYhw">
- <children xmi:type="notation:Node" xmi:id="_Pe_UtNFUEd-fOo9it8hYhw" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Pe_UtdFUEd-fOo9it8hYhw" x="-10" y="-10"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Pe_UttFUEd-fOo9it8hYhw" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Pe_Ut9FUEd-fOo9it8hYhw" x="10" y="10"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_Pe_UsdFUEd-fOo9it8hYhw" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Pe_UstFUEd-fOo9it8hYhw" fontColor="4210752" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="Configuration.ecore#//ModiscoQueryConfiguration/query"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Pe_Us9FUEd-fOo9it8hYhw" points="[-11, -20, 137, 256]$[-148, -275, 0, 1]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P-IHwNFUEd-fOo9it8hYhw" id="(0.9481865284974094,0.1853932584269663)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_XPWSoNFUEd-fOo9it8hYhw" type="3002" source="_7kfVINFTEd-fOo9it8hYhw" target="_SV-I4NFUEd-fOo9it8hYhw">
- <children xmi:type="notation:Node" xmi:id="_XPWSpNFUEd-fOo9it8hYhw" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XPWSpdFUEd-fOo9it8hYhw" x="-40" y="21"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_XPWSptFUEd-fOo9it8hYhw" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XPWSp9FUEd-fOo9it8hYhw" x="1" y="-12"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_XPWSodFUEd-fOo9it8hYhw" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_XPWSotFUEd-fOo9it8hYhw" fontColor="4210752" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="Configuration.ecore#//ModiscoQueryConfiguration/parameterValues"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XPWSo9FUEd-fOo9it8hYhw" points="[9, 20, -45, -101]$[55, 120, 1, -1]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7GVAMNFYEd-fOo9it8hYhw" id="(0.9378238341968912,0.7358490566037735)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XPWSqNFUEd-fOo9it8hYhw" id="(0.04435483870967742,0.2037037037037037)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_brqF4NFUEd-fOo9it8hYhw" type="3002" source="_PeY3wNFUEd-fOo9it8hYhw" target="_brgU4NFUEd-fOo9it8hYhw">
- <children xmi:type="notation:Node" xmi:id="_brqF5NFUEd-fOo9it8hYhw" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_brqF5dFUEd-fOo9it8hYhw" x="-18" y="-12"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_brqF5tFUEd-fOo9it8hYhw" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_brqF59FUEd-fOo9it8hYhw" x="10" y="10"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_brqF4dFUEd-fOo9it8hYhw" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_brqF4tFUEd-fOo9it8hYhw" fontColor="4210752" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.ecore#//ModelQuery/parameters"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_brqF49FUEd-fOo9it8hYhw" points="[-90, -63, 373, 266]$[-462, -328, 1, 1]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5mVVUNVDEd--sr5_k25cmA" id="(0.03211009174311927,0.1962025316455696)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_ddpn8NFUEd-fOo9it8hYhw" type="3002" source="_SV-I4NFUEd-fOo9it8hYhw" target="_brgU4NFUEd-fOo9it8hYhw">
- <children xmi:type="notation:Node" xmi:id="_ddpn9NFUEd-fOo9it8hYhw" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ddpn9dFUEd-fOo9it8hYhw" x="-21" y="-10"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_ddpn9tFUEd-fOo9it8hYhw" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ddpn99FUEd-fOo9it8hYhw" x="10" y="10"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_ddpn8dFUEd-fOo9it8hYhw" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_ddpn8tFUEd-fOo9it8hYhw" fontColor="4210752" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="Configuration.ecore#//ParameterValue/parameter"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ddpn89FUEd-fOo9it8hYhw" points="[12, -1, -237, 32]$[141, -19, -108, 14]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ddpn-NFUEd-fOo9it8hYhw" id="(0.9516129032258065,0.08974358974358974)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_79uqgNVDEd--sr5_k25cmA" id="(0.0779816513761468,0.7278481012658228)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_Ezr6MNK1Ed-6Cr0DOh7rhg" type="3002" source="_PD5qINVEEd--sr5_k25cmA" target="_EyyiUNK1Ed-6Cr0DOh7rhg">
- <children xmi:type="notation:Node" xmi:id="_Ezr6NNK1Ed-6Cr0DOh7rhg" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Ezr6NdK1Ed-6Cr0DOh7rhg" x="-3" y="-46"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Ezr6NtK1Ed-6Cr0DOh7rhg" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Ezr6N9K1Ed-6Cr0DOh7rhg" x="-3" y="17"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ezr6MdK1Ed-6Cr0DOh7rhg" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Ezr6MtK1Ed-6Cr0DOh7rhg" fontColor="4210752" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="Configuration.ecore#//ConstantParameterValue/valueInstance"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ezr6M9K1Ed-6Cr0DOh7rhg" points="[-38, -38, 421, 421]$[-458, -458, 1, 1]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GRG6cNK1Ed-6Cr0DOh7rhg" id="(0.4785276073619632,0.9523809523809523)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_tF3eYNVDEd--sr5_k25cmA" type="3003" source="_qTpOYdVDEd--sr5_k25cmA" target="_SV-I4NFUEd-fOo9it8hYhw">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_tF3eYdVDEd--sr5_k25cmA" routing="Rectilinear" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_tF3eYtVDEd--sr5_k25cmA"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tF3eY9VDEd--sr5_k25cmA" points="[50, -14, -205, 57]$[50, -39, -205, 32]$[240, -39, -15, 32]$[240, -63, -15, 8]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tGAoUNVDEd--sr5_k25cmA" id="(0.4074074074074074,0.22950819672131148)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kh7TwNVEEd--sr5_k25cmA" id="(0.5310077519379846,0.9259259259259259)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_vMRKMNVDEd--sr5_k25cmA" type="3002" source="_qTpOYdVDEd--sr5_k25cmA" target="_NUtOcNFUEd-fOo9it8hYhw">
- <children xmi:type="notation:Node" xmi:id="_vMRKNNVDEd--sr5_k25cmA" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_vMRKNdVDEd--sr5_k25cmA" x="57" y="-12"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_vMRKNtVDEd--sr5_k25cmA" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_vMRKN9VDEd--sr5_k25cmA" x="89" y="13"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_vMRKMdVDEd--sr5_k25cmA" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_vMRKMtVDEd--sr5_k25cmA" fontColor="4210752" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="Configuration.ecore#//QueryExecutionValue/configuration"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vMRKM9VDEd--sr5_k25cmA" points="[-9, -1, 24, 361]$[-211, -4, -178, 358]$[-211, -360, -178, 2]$[-99, -360, -66, 2]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vMRKONVDEd--sr5_k25cmA" id="(0.06172839506172839,0.5737704918032787)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_XtUXANVEEd--sr5_k25cmA" type="3003" source="_PD5qINVEEd--sr5_k25cmA" target="_SV-I4NFUEd-fOo9it8hYhw">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_XtUXAdVEEd--sr5_k25cmA" routing="Rectilinear" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_XtUXAtVEEd--sr5_k25cmA"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XtUXA9VEEd--sr5_k25cmA" points="[-31, -4, -26, 59]$[-31, -29, -26, 34]$[-2, -29, 3, 34]$[-2, -53, 3, 10]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtUXBNVEEd--sr5_k25cmA" id="(0.5398773006134969,0.07936507936507936)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtUXBdVEEd--sr5_k25cmA" id="(0.4573643410852713,0.9166666666666666)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_9AY6wNXaEd-0J-FKW8HdHA" type="3003" source="_5MnHINXaEd-0J-FKW8HdHA" target="_SV-I4NFUEd-fOo9it8hYhw">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_9AY6wdXaEd-0J-FKW8HdHA" routing="Rectilinear" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_9AY6wtXaEd-0J-FKW8HdHA"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9AY6w9XaEd-0J-FKW8HdHA" points="[-41, -4, 194, 61]$[-41, -29, 194, 36]$[-203, -29, 32, 36]$[-203, -53, 32, 12]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9AY6xNXaEd-0J-FKW8HdHA" id="(0.45394736842105265,0.07936507936507936)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9AY6xdXaEd-0J-FKW8HdHA" id="(0.3467741935483871,0.8888888888888888)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_BLQ_wNXbEd-0J-FKW8HdHA" type="3002" source="_5MnHINXaEd-0J-FKW8HdHA" target="_SV-I4NFUEd-fOo9it8hYhw">
- <children xmi:type="notation:Node" xmi:id="_BLQ_xNXbEd-0J-FKW8HdHA" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_BLQ_xdXbEd-0J-FKW8HdHA" x="5" y="14"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_BLQ_xtXbEd-0J-FKW8HdHA" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_BLQ_x9XbEd-0J-FKW8HdHA" x="12" y="-11"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_BLQ_wdXbEd-0J-FKW8HdHA" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_BLQ_wtXbEd-0J-FKW8HdHA" fontColor="4210752" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="Configuration.ecore#//ListParameterValue/values"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BLQ_w9XbEd-0J-FKW8HdHA" points="[0, -14, 121, 73]$[0, -87, 121, 0]$[-106, -87, 15, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BLQ_yNXbEd-0J-FKW8HdHA" id="(0.7171052631578947,0.23809523809523808)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BLQ_ydXbEd-0J-FKW8HdHA" id="(0.9395161290322581,0.7777777777777778)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_Uh-1cNXeEd-0J-FKW8HdHA" type="NoteAttachment" source="_QyE1MNXeEd-0J-FKW8HdHA" target="_qTpOYdVDEd--sr5_k25cmA" lineWidth="1">
- <styles xmi:type="notation:ArrowStyle" xmi:id="_Uh-1cdXeEd-0J-FKW8HdHA"/>
- <styles xmi:type="notation:LineTypeStyle" xmi:id="_Uh-1ctXeEd-0J-FKW8HdHA"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Uh-1c9XeEd-0J-FKW8HdHA" points="[6, -12, -29, 55]$[36, -51, 1, 16]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UiImcNXeEd-0J-FKW8HdHA" id="(0.7582938388625592,0.2608695652173913)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UiImcdXeEd-0J-FKW8HdHA" id="(0.09876543209876543,0.746031746031746)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_YSfSoNXeEd-0J-FKW8HdHA" type="NoteAttachment" source="_VuRpcNXeEd-0J-FKW8HdHA" target="_PD5qINVEEd--sr5_k25cmA" lineWidth="1">
- <styles xmi:type="notation:ArrowStyle" xmi:id="_YSfSodXeEd-0J-FKW8HdHA"/>
- <styles xmi:type="notation:LineTypeStyle" xmi:id="_YSfSotXeEd-0J-FKW8HdHA"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YSfSo9XeEd-0J-FKW8HdHA" points="[-13, -8, 90, 60]$[-101, -44, 2, 24]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YSfSpNXeEd-0J-FKW8HdHA" id="(0.10909090909090909,0.23529411764705882)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YSfSpdXeEd-0J-FKW8HdHA" id="(0.8466257668711656,0.6190476190476191)"/>
- </edges>
-</notation:Diagram>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel
deleted file mode 100644
index e1ab6b1384f..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.queries.core.configuration/src-gen"
- editDirectory="/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen"
- editorDirectory="/org.eclipse.papyrus.infra.queries.core.configuration.editor/src-gen"
- modelPluginID="org.eclipse.papyrus.infra.queries.core.configuration" modelName="Configuration"
- modelPluginClass="org.eclipse.papyrus.infra.queries.core.configuration.plugin.Activator"
- testsDirectory="/org.eclipse.papyrus.infra.queries.core.configuration.tests/src-gen"
- importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
- usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
- <foreignModel>Configuration.ecore</foreignModel>
- <genPackages prefix="Configuration" basePackage="org.eclipse.papyrus.infra.queries.core"
- resource="XML" disposableProviderFactory="true" ecorePackage="Configuration.ecore#/">
- <genClasses image="false" ecoreClass="Configuration.ecore#//QueryConfiguration">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Configuration.ecore#//QueryConfiguration/name"/>
- </genClasses>
- <genClasses ecoreClass="Configuration.ecore#//ModiscoQueryConfiguration">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Configuration.ecore#//ModiscoQueryConfiguration/query"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Configuration.ecore#//ModiscoQueryConfiguration/parameterValues"/>
- </genClasses>
- <genClasses image="false" ecoreClass="Configuration.ecore#//ParameterValue">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Configuration.ecore#//ParameterValue/parameter"/>
- </genClasses>
- <genClasses ecoreClass="Configuration.ecore#//QueryExecutionValue">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Configuration.ecore#//QueryExecutionValue/configuration"/>
- </genClasses>
- <genClasses ecoreClass="Configuration.ecore#//ConstantParameterValue">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Configuration.ecore#//ConstantParameterValue/valueInstance"/>
- </genClasses>
- <genClasses ecoreClass="Configuration.ecore#//ListParameterValue">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Configuration.ecore#//ListParameterValue/values"/>
- </genClasses>
- </genPackages>
- <genPackages prefix="Types" ecorePackage="http://www.eclipse.org/uml2/5.0.0/Types#/">
- <genDataTypes ecoreDataType="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
- <genDataTypes ecoreDataType="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
- <genDataTypes ecoreDataType="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
- <genDataTypes ecoreDataType="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
- <genDataTypes ecoreDataType="http://www.eclipse.org/uml2/5.0.0/Types#//UnlimitedNatural"/>
- </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.properties b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.properties
deleted file mode 100644
index 27eac336a7e..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-# Copyright (c) 2008 CEA LIST.
-# 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
-#
-# Contributors:
-# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
-################################################################################
-pluginName=Configuration Model for queries (Incubation)
-providerName=Eclipse Modeling Project
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.xml b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.xml
deleted file mode 100644
index 52cff66df0a..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.eclipse.org/papyrus/core/queries/0.7"
- class="org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage"
- genModel="model/Configuration.genmodel"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.extension_parser">
- <parser
- type="configuration"
- class="org.eclipse.papyrus.infra.queries.core.configuration.util.ConfigurationResourceFactoryImpl"/>
- </extension>
-
-</plugin>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationFactory.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationFactory.java
deleted file mode 100644
index a41797e0838..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage
- * @generated
- */
-public interface ConfigurationFactory extends EFactory {
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- ConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Modisco Query Configuration</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Modisco Query Configuration</em>'.
- * @generated
- */
- ModiscoQueryConfiguration createModiscoQueryConfiguration();
-
- /**
- * Returns a new object of class '<em>Query Execution Value</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Query Execution Value</em>'.
- * @generated
- */
- QueryExecutionValue createQueryExecutionValue();
-
- /**
- * Returns a new object of class '<em>Constant Parameter Value</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Constant Parameter Value</em>'.
- * @generated
- */
- ConstantParameterValue createConstantParameterValue();
-
- /**
- * Returns a new object of class '<em>List Parameter Value</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>List Parameter Value</em>'.
- * @generated
- */
- ListParameterValue createListParameterValue();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- ConfigurationPackage getConfigurationPackage();
-
-} //ConfigurationFactory
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationPackage.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationPackage.java
deleted file mode 100644
index 5560e67ef85..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationPackage.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationFactory
- * @model kind="package"
- * @generated
- */
-public interface ConfigurationPackage extends EPackage {
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "configuration";
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http://www.eclipse.org/papyrus/core/queries/0.7";
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "configuration";
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- ConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.QueryConfigurationImpl <em>Query Configuration</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.QueryConfigurationImpl
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl#getQueryConfiguration()
- * @generated
- */
- int QUERY_CONFIGURATION = 0;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int QUERY_CONFIGURATION__NAME = 0;
-
- /**
- * The number of structural features of the '<em>Query Configuration</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int QUERY_CONFIGURATION_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ModiscoQueryConfigurationImpl <em>Modisco Query Configuration</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ModiscoQueryConfigurationImpl
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl#getModiscoQueryConfiguration()
- * @generated
- */
- int MODISCO_QUERY_CONFIGURATION = 1;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODISCO_QUERY_CONFIGURATION__NAME = QUERY_CONFIGURATION__NAME;
-
- /**
- * The feature id for the '<em><b>Query</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODISCO_QUERY_CONFIGURATION__QUERY = QUERY_CONFIGURATION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Parameter Values</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES = QUERY_CONFIGURATION_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>Modisco Query Configuration</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODISCO_QUERY_CONFIGURATION_FEATURE_COUNT = QUERY_CONFIGURATION_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ParameterValueImpl <em>Parameter Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ParameterValueImpl
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl#getParameterValue()
- * @generated
- */
- int PARAMETER_VALUE = 2;
-
- /**
- * The feature id for the '<em><b>Parameter</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_VALUE__PARAMETER = 0;
-
- /**
- * The number of structural features of the '<em>Parameter Value</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_VALUE_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.QueryExecutionValueImpl
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl#getQueryExecutionValue()
- * @generated
- */
- int QUERY_EXECUTION_VALUE = 3;
-
- /**
- * The feature id for the '<em><b>Parameter</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int QUERY_EXECUTION_VALUE__PARAMETER = PARAMETER_VALUE__PARAMETER;
-
- /**
- * The feature id for the '<em><b>Configuration</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int QUERY_EXECUTION_VALUE__CONFIGURATION = PARAMETER_VALUE_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Query Execution Value</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int QUERY_EXECUTION_VALUE_FEATURE_COUNT = PARAMETER_VALUE_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ConstantParameterValueImpl <em>Constant Parameter Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConstantParameterValueImpl
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl#getConstantParameterValue()
- * @generated
- */
- int CONSTANT_PARAMETER_VALUE = 4;
-
- /**
- * The feature id for the '<em><b>Parameter</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CONSTANT_PARAMETER_VALUE__PARAMETER = PARAMETER_VALUE__PARAMETER;
-
- /**
- * The feature id for the '<em><b>Value Instance</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE = PARAMETER_VALUE_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Constant Parameter Value</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CONSTANT_PARAMETER_VALUE_FEATURE_COUNT = PARAMETER_VALUE_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ListParameterValueImpl <em>List Parameter Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ListParameterValueImpl
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl#getListParameterValue()
- * @generated
- */
- int LIST_PARAMETER_VALUE = 5;
-
- /**
- * The feature id for the '<em><b>Parameter</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int LIST_PARAMETER_VALUE__PARAMETER = PARAMETER_VALUE__PARAMETER;
-
- /**
- * The feature id for the '<em><b>Values</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int LIST_PARAMETER_VALUE__VALUES = PARAMETER_VALUE_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>List Parameter Value</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int LIST_PARAMETER_VALUE_FEATURE_COUNT = PARAMETER_VALUE_FEATURE_COUNT + 1;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration <em>Query Configuration</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Query Configuration</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration
- * @generated
- */
- EClass getQueryConfiguration();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration#getName()
- * @see #getQueryConfiguration()
- * @generated
- */
- EAttribute getQueryConfiguration_Name();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration <em>Modisco Query Configuration</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Modisco Query Configuration</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration
- * @generated
- */
- EClass getModiscoQueryConfiguration();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration#getQuery <em>Query</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Query</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration#getQuery()
- * @see #getModiscoQueryConfiguration()
- * @generated
- */
- EReference getModiscoQueryConfiguration_Query();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration#getParameterValues <em>Parameter Values</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Parameter Values</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration#getParameterValues()
- * @see #getModiscoQueryConfiguration()
- * @generated
- */
- EReference getModiscoQueryConfiguration_ParameterValues();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue <em>Parameter Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Parameter Value</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue
- * @generated
- */
- EClass getParameterValue();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue#getParameter <em>Parameter</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Parameter</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue#getParameter()
- * @see #getParameterValue()
- * @generated
- */
- EReference getParameterValue_Parameter();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue <em>Query Execution Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Query Execution Value</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue
- * @generated
- */
- EClass getQueryExecutionValue();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue#getConfiguration <em>Configuration</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Configuration</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue#getConfiguration()
- * @see #getQueryExecutionValue()
- * @generated
- */
- EReference getQueryExecutionValue_Configuration();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue <em>Constant Parameter Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Constant Parameter Value</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue
- * @generated
- */
- EClass getConstantParameterValue();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue#getValueInstance <em>Value Instance</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Value Instance</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue#getValueInstance()
- * @see #getConstantParameterValue()
- * @generated
- */
- EReference getConstantParameterValue_ValueInstance();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue <em>List Parameter Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>List Parameter Value</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue
- * @generated
- */
- EClass getListParameterValue();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue#getValues <em>Values</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Values</em>'.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue#getValues()
- * @see #getListParameterValue()
- * @generated
- */
- EReference getListParameterValue_Values();
-
- /**
- * Returns the factory that creates the instances of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the factory that creates the instances of the model.
- * @generated
- */
- ConfigurationFactory getConfigurationFactory();
-
- /**
- * <!-- begin-user-doc -->
- * Defines literals for the meta objects that represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @generated
- */
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.QueryConfigurationImpl <em>Query Configuration</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.QueryConfigurationImpl
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl#getQueryConfiguration()
- * @generated
- */
- EClass QUERY_CONFIGURATION = eINSTANCE.getQueryConfiguration();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute QUERY_CONFIGURATION__NAME = eINSTANCE.getQueryConfiguration_Name();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ModiscoQueryConfigurationImpl <em>Modisco Query Configuration</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ModiscoQueryConfigurationImpl
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl#getModiscoQueryConfiguration()
- * @generated
- */
- EClass MODISCO_QUERY_CONFIGURATION = eINSTANCE.getModiscoQueryConfiguration();
-
- /**
- * The meta object literal for the '<em><b>Query</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference MODISCO_QUERY_CONFIGURATION__QUERY = eINSTANCE.getModiscoQueryConfiguration_Query();
-
- /**
- * The meta object literal for the '<em><b>Parameter Values</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES = eINSTANCE.getModiscoQueryConfiguration_ParameterValues();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ParameterValueImpl <em>Parameter Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ParameterValueImpl
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl#getParameterValue()
- * @generated
- */
- EClass PARAMETER_VALUE = eINSTANCE.getParameterValue();
-
- /**
- * The meta object literal for the '<em><b>Parameter</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference PARAMETER_VALUE__PARAMETER = eINSTANCE.getParameterValue_Parameter();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.QueryExecutionValueImpl
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl#getQueryExecutionValue()
- * @generated
- */
- EClass QUERY_EXECUTION_VALUE = eINSTANCE.getQueryExecutionValue();
-
- /**
- * The meta object literal for the '<em><b>Configuration</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference QUERY_EXECUTION_VALUE__CONFIGURATION = eINSTANCE.getQueryExecutionValue_Configuration();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ConstantParameterValueImpl <em>Constant Parameter Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConstantParameterValueImpl
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl#getConstantParameterValue()
- * @generated
- */
- EClass CONSTANT_PARAMETER_VALUE = eINSTANCE.getConstantParameterValue();
-
- /**
- * The meta object literal for the '<em><b>Value Instance</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE = eINSTANCE.getConstantParameterValue_ValueInstance();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ListParameterValueImpl <em>List Parameter Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ListParameterValueImpl
- * @see org.eclipse.papyrus.infra.queries.core.configuration.impl.ConfigurationPackageImpl#getListParameterValue()
- * @generated
- */
- EClass LIST_PARAMETER_VALUE = eINSTANCE.getListParameterValue();
-
- /**
- * The meta object literal for the '<em><b>Values</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference LIST_PARAMETER_VALUE__VALUES = eINSTANCE.getListParameterValue_Values();
-
- }
-
-} //ConfigurationPackage
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConstantParameterValue.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConstantParameterValue.java
deleted file mode 100644
index c7a98e250b4..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConstantParameterValue.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration;
-
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constant Parameter Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue#getValueInstance <em>Value Instance</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getConstantParameterValue()
- * @model
- * @generated
- */
-public interface ConstantParameterValue extends ParameterValue {
- /**
- * Returns the value of the '<em><b>Value Instance</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Value Instance</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Value Instance</em>' containment reference.
- * @see #setValueInstance(ValueSpecification)
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getConstantParameterValue_ValueInstance()
- * @model containment="true"
- * @generated
- */
- ValueSpecification getValueInstance();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue#getValueInstance <em>Value Instance</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Value Instance</em>' containment reference.
- * @see #getValueInstance()
- * @generated
- */
- void setValueInstance(ValueSpecification value);
-
-} // ConstantParameterValue
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ListParameterValue.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ListParameterValue.java
deleted file mode 100644
index a15a622ece5..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ListParameterValue.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>List Parameter Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue#getValues <em>Values</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getListParameterValue()
- * @model
- * @generated
- */
-public interface ListParameterValue extends ParameterValue {
- /**
- * Returns the value of the '<em><b>Values</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Values</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Values</em>' reference list.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getListParameterValue_Values()
- * @model
- * @generated
- */
- EList<ParameterValue> getValues();
-
-} // ListParameterValue
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ModiscoQueryConfiguration.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ModiscoQueryConfiguration.java
deleted file mode 100644
index e6316e5443c..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ModiscoQueryConfiguration.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.facet.infra.query.ModelQuery;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Modisco Query Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration#getQuery <em>Query</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration#getParameterValues <em>Parameter Values</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getModiscoQueryConfiguration()
- * @model
- * @generated
- */
-public interface ModiscoQueryConfiguration extends QueryConfiguration {
- /**
- * Returns the value of the '<em><b>Query</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Query</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Query</em>' reference.
- * @see #setQuery(ModelQuery)
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getModiscoQueryConfiguration_Query()
- * @model required="true"
- * @generated
- */
- ModelQuery getQuery();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration#getQuery <em>Query</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Query</em>' reference.
- * @see #getQuery()
- * @generated
- */
- void setQuery(ModelQuery value);
-
- /**
- * Returns the value of the '<em><b>Parameter Values</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Parameter Values</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Parameter Values</em>' containment reference list.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getModiscoQueryConfiguration_ParameterValues()
- * @model containment="true"
- * @generated
- */
- EList<ParameterValue> getParameterValues();
-
-} // ModiscoQueryConfiguration
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ParameterValue.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ParameterValue.java
deleted file mode 100644
index 2f82772c2c2..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ParameterValue.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.facet.infra.query.ModelQueryParameter;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parameter Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue#getParameter <em>Parameter</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getParameterValue()
- * @model abstract="true"
- * @generated
- */
-public interface ParameterValue extends EObject {
- /**
- * Returns the value of the '<em><b>Parameter</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Parameter</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Parameter</em>' reference.
- * @see #setParameter(ModelQueryParameter)
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getParameterValue_Parameter()
- * @model required="true"
- * @generated
- */
- ModelQueryParameter getParameter();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue#getParameter <em>Parameter</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Parameter</em>' reference.
- * @see #getParameter()
- * @generated
- */
- void setParameter(ModelQueryParameter value);
-
-} // ParameterValue
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryConfiguration.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryConfiguration.java
deleted file mode 100644
index a97e1cc6261..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryConfiguration.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Query Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getQueryConfiguration()
- * @model abstract="true"
- * @generated
- */
-public interface QueryConfiguration extends EObject {
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getQueryConfiguration_Name()
- * @model required="true"
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
-} // QueryConfiguration
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryExecutionValue.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryExecutionValue.java
deleted file mode 100644
index 768f82c46da..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryExecutionValue.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Query Execution Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue#getConfiguration <em>Configuration</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getQueryExecutionValue()
- * @model
- * @generated
- */
-public interface QueryExecutionValue extends ParameterValue {
- /**
- * Returns the value of the '<em><b>Configuration</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Configuration</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Configuration</em>' reference.
- * @see #setConfiguration(QueryConfiguration)
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#getQueryExecutionValue_Configuration()
- * @model required="true"
- * @generated
- */
- QueryConfiguration getConfiguration();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue#getConfiguration <em>Configuration</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Configuration</em>' reference.
- * @see #getConfiguration()
- * @generated
- */
- void setConfiguration(QueryConfiguration value);
-
-} // QueryExecutionValue
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationFactoryImpl.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationFactoryImpl.java
deleted file mode 100644
index c08ed885209..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConfigurationFactoryImpl extends EFactoryImpl implements ConfigurationFactory {
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static ConfigurationFactory init() {
- try {
- ConfigurationFactory theConfigurationFactory = (ConfigurationFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/core/queries/0.7");
- if (theConfigurationFactory != null) {
- return theConfigurationFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new ConfigurationFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConfigurationFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case ConfigurationPackage.MODISCO_QUERY_CONFIGURATION: return createModiscoQueryConfiguration();
- case ConfigurationPackage.QUERY_EXECUTION_VALUE: return createQueryExecutionValue();
- case ConfigurationPackage.CONSTANT_PARAMETER_VALUE: return createConstantParameterValue();
- case ConfigurationPackage.LIST_PARAMETER_VALUE: return createListParameterValue();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ModiscoQueryConfiguration createModiscoQueryConfiguration() {
- ModiscoQueryConfigurationImpl modiscoQueryConfiguration = new ModiscoQueryConfigurationImpl();
- return modiscoQueryConfiguration;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public QueryExecutionValue createQueryExecutionValue() {
- QueryExecutionValueImpl queryExecutionValue = new QueryExecutionValueImpl();
- return queryExecutionValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConstantParameterValue createConstantParameterValue() {
- ConstantParameterValueImpl constantParameterValue = new ConstantParameterValueImpl();
- return constantParameterValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ListParameterValue createListParameterValue() {
- ListParameterValueImpl listParameterValue = new ListParameterValueImpl();
- return listParameterValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConfigurationPackage getConfigurationPackage() {
- return (ConfigurationPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- @Deprecated
- public static ConfigurationPackage getPackage() {
- return ConfigurationPackage.eINSTANCE;
- }
-
-} //ConfigurationFactoryImpl
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationPackageImpl.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationPackageImpl.java
deleted file mode 100644
index 93081f21411..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationPackageImpl.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
-import org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue;
-import org.eclipse.uml2.types.TypesPackage;
-import org.eclipse.uml2.types.internal.impl.TypesPackageImpl;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConfigurationPackageImpl extends EPackageImpl implements ConfigurationPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass queryConfigurationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass modiscoQueryConfigurationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass parameterValueEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass queryExecutionValueEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass constantParameterValueEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass listParameterValueEClass = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
- * package URI value.
- * <p>Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private ConfigurationPackageImpl() {
- super(eNS_URI, ConfigurationFactory.eINSTANCE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
- * <p>This method is used to initialize {@link ConfigurationPackage#eINSTANCE} when that field is accessed.
- * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static ConfigurationPackage init() {
- if (isInited) return (ConfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(ConfigurationPackage.eNS_URI);
-
- // Obtain or create and register package
- ConfigurationPackageImpl theConfigurationPackage = (ConfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ConfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ConfigurationPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- //QueryPackage.eINSTANCE.eClass();
- UMLPackage.eINSTANCE.eClass();
-
- // Obtain or create and register interdependencies
- TypesPackageImpl theTypesPackage = (TypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI) instanceof TypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI) : TypesPackage.eINSTANCE);
-
- // Create package meta-data objects
- theConfigurationPackage.createPackageContents();
- theTypesPackage.createPackageContents();
-
- // Initialize created meta-data
- theConfigurationPackage.initializePackageContents();
- theTypesPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theConfigurationPackage.freeze();
-
-
- // Update the registry and return the package
- EPackage.Registry.INSTANCE.put(ConfigurationPackage.eNS_URI, theConfigurationPackage);
- return theConfigurationPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getQueryConfiguration() {
- return queryConfigurationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getQueryConfiguration_Name() {
- return (EAttribute)queryConfigurationEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getModiscoQueryConfiguration() {
- return modiscoQueryConfigurationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getModiscoQueryConfiguration_Query() {
- return (EReference)modiscoQueryConfigurationEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getModiscoQueryConfiguration_ParameterValues() {
- return (EReference)modiscoQueryConfigurationEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getParameterValue() {
- return parameterValueEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getParameterValue_Parameter() {
- return (EReference)parameterValueEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getQueryExecutionValue() {
- return queryExecutionValueEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getQueryExecutionValue_Configuration() {
- return (EReference)queryExecutionValueEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getConstantParameterValue() {
- return constantParameterValueEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getConstantParameterValue_ValueInstance() {
- return (EReference)constantParameterValueEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getListParameterValue() {
- return listParameterValueEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getListParameterValue_Values() {
- return (EReference)listParameterValueEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConfigurationFactory getConfigurationFactory() {
- return (ConfigurationFactory)getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void createPackageContents() {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- queryConfigurationEClass = createEClass(QUERY_CONFIGURATION);
- createEAttribute(queryConfigurationEClass, QUERY_CONFIGURATION__NAME);
-
- modiscoQueryConfigurationEClass = createEClass(MODISCO_QUERY_CONFIGURATION);
- createEReference(modiscoQueryConfigurationEClass, MODISCO_QUERY_CONFIGURATION__QUERY);
- createEReference(modiscoQueryConfigurationEClass, MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES);
-
- parameterValueEClass = createEClass(PARAMETER_VALUE);
- createEReference(parameterValueEClass, PARAMETER_VALUE__PARAMETER);
-
- queryExecutionValueEClass = createEClass(QUERY_EXECUTION_VALUE);
- createEReference(queryExecutionValueEClass, QUERY_EXECUTION_VALUE__CONFIGURATION);
-
- constantParameterValueEClass = createEClass(CONSTANT_PARAMETER_VALUE);
- createEReference(constantParameterValueEClass, CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE);
-
- listParameterValueEClass = createEClass(LIST_PARAMETER_VALUE);
- createEReference(listParameterValueEClass, LIST_PARAMETER_VALUE__VALUES);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Obtain other dependent packages
- //QueryPackage theQueryPackage = (QueryPackage)EPackage.Registry.INSTANCE.getEPackage(QueryPackage.eNS_URI);
- UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
-
- // Create type parameters
-
- // Set bounds for type parameters
-
- // Add supertypes to classes
- modiscoQueryConfigurationEClass.getESuperTypes().add(this.getQueryConfiguration());
- queryExecutionValueEClass.getESuperTypes().add(this.getParameterValue());
- constantParameterValueEClass.getESuperTypes().add(this.getParameterValue());
- listParameterValueEClass.getESuperTypes().add(this.getParameterValue());
-
- // Initialize classes and features; add operations and parameters
- initEClass(queryConfigurationEClass, QueryConfiguration.class, "QueryConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getQueryConfiguration_Name(), ecorePackage.getEString(), "name", null, 1, 1, QueryConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(modiscoQueryConfigurationEClass, ModiscoQueryConfiguration.class, "ModiscoQueryConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- //initEReference(getModiscoQueryConfiguration_Query(), theQueryPackage.getModelQuery(), null, "query", null, 1, 1, ModiscoQueryConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getModiscoQueryConfiguration_ParameterValues(), this.getParameterValue(), null, "parameterValues", null, 0, -1, ModiscoQueryConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(parameterValueEClass, ParameterValue.class, "ParameterValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- //initEReference(getParameterValue_Parameter(), theQueryPackage.getModelQueryParameter(), null, "parameter", null, 1, 1, ParameterValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(queryExecutionValueEClass, QueryExecutionValue.class, "QueryExecutionValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getQueryExecutionValue_Configuration(), this.getQueryConfiguration(), null, "configuration", null, 1, 1, QueryExecutionValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(constantParameterValueEClass, ConstantParameterValue.class, "ConstantParameterValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getConstantParameterValue_ValueInstance(), theUMLPackage.getValueSpecification(), null, "valueInstance", null, 0, 1, ConstantParameterValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(listParameterValueEClass, ListParameterValue.class, "ListParameterValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getListParameterValue_Values(), this.getParameterValue(), null, "values", null, 0, -1, ListParameterValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Create resource
- createResource(eNS_URI);
- }
-
-} //ConfigurationPackageImpl
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConstantParameterValueImpl.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConstantParameterValueImpl.java
deleted file mode 100644
index dde0ce6ecd6..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConstantParameterValueImpl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Constant Parameter Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ConstantParameterValueImpl#getValueInstance <em>Value Instance</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConstantParameterValueImpl extends ParameterValueImpl implements ConstantParameterValue {
- /**
- * The cached value of the '{@link #getValueInstance() <em>Value Instance</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValueInstance()
- * @generated
- * @ordered
- */
- protected ValueSpecification valueInstance;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ConstantParameterValueImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return ConfigurationPackage.Literals.CONSTANT_PARAMETER_VALUE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ValueSpecification getValueInstance() {
- return valueInstance;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetValueInstance(ValueSpecification newValueInstance, NotificationChain msgs) {
- ValueSpecification oldValueInstance = valueInstance;
- valueInstance = newValueInstance;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ConfigurationPackage.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE, oldValueInstance, newValueInstance);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValueInstance(ValueSpecification newValueInstance) {
- if (newValueInstance != valueInstance) {
- NotificationChain msgs = null;
- if (valueInstance != null)
- msgs = ((InternalEObject)valueInstance).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ConfigurationPackage.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE, null, msgs);
- if (newValueInstance != null)
- msgs = ((InternalEObject)newValueInstance).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ConfigurationPackage.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE, null, msgs);
- msgs = basicSetValueInstance(newValueInstance, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE, newValueInstance, newValueInstance));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case ConfigurationPackage.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE:
- return basicSetValueInstance(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case ConfigurationPackage.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE:
- return getValueInstance();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case ConfigurationPackage.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE:
- setValueInstance((ValueSpecification)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case ConfigurationPackage.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE:
- setValueInstance((ValueSpecification)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case ConfigurationPackage.CONSTANT_PARAMETER_VALUE__VALUE_INSTANCE:
- return valueInstance != null;
- }
- return super.eIsSet(featureID);
- }
-
-} //ConstantParameterValueImpl
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ListParameterValueImpl.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ListParameterValueImpl.java
deleted file mode 100644
index a99d8db56bc..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ListParameterValueImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>List Parameter Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ListParameterValueImpl#getValues <em>Values</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ListParameterValueImpl extends ParameterValueImpl implements ListParameterValue {
- /**
- * The cached value of the '{@link #getValues() <em>Values</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValues()
- * @generated
- * @ordered
- */
- protected EList<ParameterValue> values;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ListParameterValueImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return ConfigurationPackage.Literals.LIST_PARAMETER_VALUE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<ParameterValue> getValues() {
- if (values == null) {
- values = new EObjectResolvingEList<ParameterValue>(ParameterValue.class, this, ConfigurationPackage.LIST_PARAMETER_VALUE__VALUES);
- }
- return values;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case ConfigurationPackage.LIST_PARAMETER_VALUE__VALUES:
- return getValues();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case ConfigurationPackage.LIST_PARAMETER_VALUE__VALUES:
- getValues().clear();
- getValues().addAll((Collection<? extends ParameterValue>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case ConfigurationPackage.LIST_PARAMETER_VALUE__VALUES:
- getValues().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case ConfigurationPackage.LIST_PARAMETER_VALUE__VALUES:
- return values != null && !values.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //ListParameterValueImpl
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ModiscoQueryConfigurationImpl.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ModiscoQueryConfigurationImpl.java
deleted file mode 100644
index d68c0622dca..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ModiscoQueryConfigurationImpl.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.facet.infra.query.ModelQuery;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
-import org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Modisco Query Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ModiscoQueryConfigurationImpl#getQuery <em>Query</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ModiscoQueryConfigurationImpl#getParameterValues <em>Parameter Values</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ModiscoQueryConfigurationImpl extends QueryConfigurationImpl implements ModiscoQueryConfiguration {
- /**
- * The cached value of the '{@link #getQuery() <em>Query</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getQuery()
- * @generated
- * @ordered
- */
- protected ModelQuery query;
-
- /**
- * The cached value of the '{@link #getParameterValues() <em>Parameter Values</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getParameterValues()
- * @generated
- * @ordered
- */
- protected EList<ParameterValue> parameterValues;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ModiscoQueryConfigurationImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return ConfigurationPackage.Literals.MODISCO_QUERY_CONFIGURATION;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ModelQuery getQuery() {
- if (query != null && query.eIsProxy()) {
- InternalEObject oldQuery = (InternalEObject)query;
- query = (ModelQuery)eResolveProxy(oldQuery);
- if (query != oldQuery) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__QUERY, oldQuery, query));
- }
- }
- return query;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ModelQuery basicGetQuery() {
- return query;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setQuery(ModelQuery newQuery) {
- ModelQuery oldQuery = query;
- query = newQuery;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__QUERY, oldQuery, query));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<ParameterValue> getParameterValues() {
- if (parameterValues == null) {
- parameterValues = new EObjectContainmentEList<ParameterValue>(ParameterValue.class, this, ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES);
- }
- return parameterValues;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES:
- return ((InternalEList<?>)getParameterValues()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__QUERY:
- if (resolve) return getQuery();
- return basicGetQuery();
- case ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES:
- return getParameterValues();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__QUERY:
- setQuery((ModelQuery)newValue);
- return;
- case ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES:
- getParameterValues().clear();
- getParameterValues().addAll((Collection<? extends ParameterValue>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__QUERY:
- setQuery((ModelQuery)null);
- return;
- case ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES:
- getParameterValues().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__QUERY:
- return query != null;
- case ConfigurationPackage.MODISCO_QUERY_CONFIGURATION__PARAMETER_VALUES:
- return parameterValues != null && !parameterValues.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //ModiscoQueryConfigurationImpl
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ParameterValueImpl.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ParameterValueImpl.java
deleted file mode 100644
index 6b2f1f9f252..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ParameterValueImpl.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.facet.infra.query.ModelQueryParameter;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Parameter Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.ParameterValueImpl#getParameter <em>Parameter</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ParameterValueImpl extends EObjectImpl implements ParameterValue {
- /**
- * The cached value of the '{@link #getParameter() <em>Parameter</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getParameter()
- * @generated
- * @ordered
- */
- protected ModelQueryParameter parameter;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ParameterValueImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return ConfigurationPackage.Literals.PARAMETER_VALUE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ModelQueryParameter getParameter() {
- if (parameter != null && parameter.eIsProxy()) {
- InternalEObject oldParameter = (InternalEObject)parameter;
- parameter = (ModelQueryParameter)eResolveProxy(oldParameter);
- if (parameter != oldParameter) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.PARAMETER_VALUE__PARAMETER, oldParameter, parameter));
- }
- }
- return parameter;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ModelQueryParameter basicGetParameter() {
- return parameter;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParameter(ModelQueryParameter newParameter) {
- ModelQueryParameter oldParameter = parameter;
- parameter = newParameter;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PARAMETER_VALUE__PARAMETER, oldParameter, parameter));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case ConfigurationPackage.PARAMETER_VALUE__PARAMETER:
- if (resolve) return getParameter();
- return basicGetParameter();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case ConfigurationPackage.PARAMETER_VALUE__PARAMETER:
- setParameter((ModelQueryParameter)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case ConfigurationPackage.PARAMETER_VALUE__PARAMETER:
- setParameter((ModelQueryParameter)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case ConfigurationPackage.PARAMETER_VALUE__PARAMETER:
- return parameter != null;
- }
- return super.eIsSet(featureID);
- }
-
-} //ParameterValueImpl
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryConfigurationImpl.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryConfigurationImpl.java
deleted file mode 100644
index 95bbfb9e23c..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryConfigurationImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Query Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.QueryConfigurationImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class QueryConfigurationImpl extends EObjectImpl implements QueryConfiguration {
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected QueryConfigurationImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return ConfigurationPackage.Literals.QUERY_CONFIGURATION;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.QUERY_CONFIGURATION__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case ConfigurationPackage.QUERY_CONFIGURATION__NAME:
- return getName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case ConfigurationPackage.QUERY_CONFIGURATION__NAME:
- setName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case ConfigurationPackage.QUERY_CONFIGURATION__NAME:
- setName(NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case ConfigurationPackage.QUERY_CONFIGURATION__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: ");
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
-} //QueryConfigurationImpl
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryExecutionValueImpl.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryExecutionValueImpl.java
deleted file mode 100644
index 767a4719dc3..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryExecutionValueImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Query Execution Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.queries.core.configuration.impl.QueryExecutionValueImpl#getConfiguration <em>Configuration</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class QueryExecutionValueImpl extends ParameterValueImpl implements QueryExecutionValue {
- /**
- * The cached value of the '{@link #getConfiguration() <em>Configuration</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfiguration()
- * @generated
- * @ordered
- */
- protected QueryConfiguration configuration;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected QueryExecutionValueImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return ConfigurationPackage.Literals.QUERY_EXECUTION_VALUE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public QueryConfiguration getConfiguration() {
- if (configuration != null && configuration.eIsProxy()) {
- InternalEObject oldConfiguration = (InternalEObject)configuration;
- configuration = (QueryConfiguration)eResolveProxy(oldConfiguration);
- if (configuration != oldConfiguration) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.QUERY_EXECUTION_VALUE__CONFIGURATION, oldConfiguration, configuration));
- }
- }
- return configuration;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public QueryConfiguration basicGetConfiguration() {
- return configuration;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConfiguration(QueryConfiguration newConfiguration) {
- QueryConfiguration oldConfiguration = configuration;
- configuration = newConfiguration;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.QUERY_EXECUTION_VALUE__CONFIGURATION, oldConfiguration, configuration));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case ConfigurationPackage.QUERY_EXECUTION_VALUE__CONFIGURATION:
- if (resolve) return getConfiguration();
- return basicGetConfiguration();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case ConfigurationPackage.QUERY_EXECUTION_VALUE__CONFIGURATION:
- setConfiguration((QueryConfiguration)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case ConfigurationPackage.QUERY_EXECUTION_VALUE__CONFIGURATION:
- setConfiguration((QueryConfiguration)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case ConfigurationPackage.QUERY_EXECUTION_VALUE__CONFIGURATION:
- return configuration != null;
- }
- return super.eIsSet(featureID);
- }
-
-} //QueryExecutionValueImpl
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/plugin/Activator.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/plugin/Activator.java
deleted file mode 100644
index 3f795c4cb92..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/plugin/Activator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.plugin;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Configuration model plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class Activator extends EMFPlugin {
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final Activator INSTANCE = new Activator();
-
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static Implementation plugin;
-
- /**
- * Create the instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Activator() {
- super(new ResourceLocator [] {});
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- @Override
- public ResourceLocator getPluginResourceLocator() {
- return plugin;
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- public static Implementation getPlugin() {
- return plugin;
- }
-
- /**
- * The actual implementation of the Eclipse <b>Plugin</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static class Implementation extends EclipsePlugin {
- /**
- * Creates an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Implementation() {
- super();
-
- // Remember the static instance.
- //
- plugin = this;
- }
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationAdapterFactory.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationAdapterFactory.java
deleted file mode 100644
index 7222535c6d5..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
-import org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage
- * @generated
- */
-public class ConfigurationAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static ConfigurationPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConfigurationAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = ConfigurationPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc -->
- * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
- * <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch that delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ConfigurationSwitch<Adapter> modelSwitch =
- new ConfigurationSwitch<Adapter>() {
- @Override
- public Adapter caseQueryConfiguration(QueryConfiguration object) {
- return createQueryConfigurationAdapter();
- }
- @Override
- public Adapter caseModiscoQueryConfiguration(ModiscoQueryConfiguration object) {
- return createModiscoQueryConfigurationAdapter();
- }
- @Override
- public Adapter caseParameterValue(ParameterValue object) {
- return createParameterValueAdapter();
- }
- @Override
- public Adapter caseQueryExecutionValue(QueryExecutionValue object) {
- return createQueryExecutionValueAdapter();
- }
- @Override
- public Adapter caseConstantParameterValue(ConstantParameterValue object) {
- return createConstantParameterValueAdapter();
- }
- @Override
- public Adapter caseListParameterValue(ListParameterValue object) {
- return createListParameterValueAdapter();
- }
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
-
- /**
- * Creates an adapter for the <code>target</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param target the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
- */
- @Override
- public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration <em>Query Configuration</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration
- * @generated
- */
- public Adapter createQueryConfigurationAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration <em>Modisco Query Configuration</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration
- * @generated
- */
- public Adapter createModiscoQueryConfigurationAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue <em>Parameter Value</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue
- * @generated
- */
- public Adapter createParameterValueAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue <em>Query Execution Value</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue
- * @generated
- */
- public Adapter createQueryExecutionValueAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue <em>Constant Parameter Value</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue
- * @generated
- */
- public Adapter createConstantParameterValueAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue <em>List Parameter Value</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue
- * @generated
- */
- public Adapter createListParameterValueAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
- * <!-- begin-user-doc -->
- * This default implementation returns null.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
-} //ConfigurationAdapterFactory
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceFactoryImpl.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceFactoryImpl.java
deleted file mode 100644
index cf45077cb5e..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceFactoryImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.util.ConfigurationResourceImpl
- * @generated
- */
-public class ConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
- /**
- * Creates an instance of the resource factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConfigurationResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Resource createResource(URI uri) {
- XMLResource result = new ConfigurationResourceImpl(uri);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
- result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
- return result;
- }
-
-} //ConfigurationResourceFactoryImpl
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceImpl.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceImpl.java
deleted file mode 100644
index 6f579e7873e..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.util.ConfigurationResourceFactoryImpl
- * @generated
- */
-public class ConfigurationResourceImpl extends XMLResourceImpl {
- /**
- * Creates an instance of the resource.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param uri the URI of the new resource.
- * @generated
- */
- public ConfigurationResourceImpl(URI uri) {
- super(uri);
- }
-
-} //ConfigurationResourceImpl
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationSwitch.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationSwitch.java
deleted file mode 100644
index 726b23f70ab..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationSwitch.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
-import org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage
- * @generated
- */
-public class ConfigurationSwitch<T> extends Switch<T> {
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static ConfigurationPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConfigurationSwitch() {
- if (modelPackage == null) {
- modelPackage = ConfigurationPackage.eINSTANCE;
- }
- }
-
- /**
- * Checks whether this is a switch for the given package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @parameter ePackage the package in question.
- * @return whether this is a switch for the given package.
- * @generated
- */
- @Override
- protected boolean isSwitchFor(EPackage ePackage) {
- return ePackage == modelPackage;
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- @Override
- protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case ConfigurationPackage.QUERY_CONFIGURATION: {
- QueryConfiguration queryConfiguration = (QueryConfiguration)theEObject;
- T result = caseQueryConfiguration(queryConfiguration);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ConfigurationPackage.MODISCO_QUERY_CONFIGURATION: {
- ModiscoQueryConfiguration modiscoQueryConfiguration = (ModiscoQueryConfiguration)theEObject;
- T result = caseModiscoQueryConfiguration(modiscoQueryConfiguration);
- if (result == null) result = caseQueryConfiguration(modiscoQueryConfiguration);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ConfigurationPackage.PARAMETER_VALUE: {
- ParameterValue parameterValue = (ParameterValue)theEObject;
- T result = caseParameterValue(parameterValue);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ConfigurationPackage.QUERY_EXECUTION_VALUE: {
- QueryExecutionValue queryExecutionValue = (QueryExecutionValue)theEObject;
- T result = caseQueryExecutionValue(queryExecutionValue);
- if (result == null) result = caseParameterValue(queryExecutionValue);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ConfigurationPackage.CONSTANT_PARAMETER_VALUE: {
- ConstantParameterValue constantParameterValue = (ConstantParameterValue)theEObject;
- T result = caseConstantParameterValue(constantParameterValue);
- if (result == null) result = caseParameterValue(constantParameterValue);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ConfigurationPackage.LIST_PARAMETER_VALUE: {
- ListParameterValue listParameterValue = (ListParameterValue)theEObject;
- T result = caseListParameterValue(listParameterValue);
- if (result == null) result = caseParameterValue(listParameterValue);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Query Configuration</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Query Configuration</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseQueryConfiguration(QueryConfiguration object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Modisco Query Configuration</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Modisco Query Configuration</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseModiscoQueryConfiguration(ModiscoQueryConfiguration object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Parameter Value</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Parameter Value</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseParameterValue(ParameterValue object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Query Execution Value</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Query Execution Value</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseQueryExecutionValue(QueryExecutionValue object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Constant Parameter Value</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Constant Parameter Value</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseConstantParameterValue(ConstantParameterValue object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>List Parameter Value</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>List Parameter Value</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseListParameterValue(ListParameterValue object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- @Override
- public T defaultCase(EObject object) {
- return null;
- }
-
-} //ConfigurationSwitch
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationXMLProcessor.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationXMLProcessor.java
deleted file mode 100644
index e1d7197cc16..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationXMLProcessor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.infra.queries.core.configuration.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConfigurationXMLProcessor extends XMLProcessor {
-
- /**
- * Public constructor to instantiate the helper.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConfigurationXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- ConfigurationPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the ConfigurationResourceFactoryImpl factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected Map<String, Resource.Factory> getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new ConfigurationResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new ConfigurationResourceFactoryImpl());
- }
- return registrations;
- }
-
-} //ConfigurationXMLProcessor
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.classpath b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/infra/queries/org.eclipse.papyrus.infra.queries.core/.project b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.project
deleted file mode 100644
index 35970c3736b..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.queries.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.core.resources.prefs b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index a960e953d11..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Wed Oct 06 13:30:31 CEST 2010
-eclipse.preferences.version=1
-encoding//resources/ToolConfiguration.ecore=UTF-8
-encoding//resources/ToolConfiguration.ecorediag=UTF-8
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3b447f78043..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Thu Sep 30 07:35:59 CEST 2010
-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/infra/queries/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF
deleted file mode 100644
index d9cee11dc74..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.queries.core,
- org.eclipse.papyrus.infra.queries.core.converter,
- org.eclipse.papyrus.infra.queries.core.modisco
-Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",
- org.eclipse.core.databinding;bundle-version="1.3.100",
- org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="1.0.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.infra.queries.core.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.queries.core;singleton:
- =true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/about.html b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/build.properties b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/build.properties
deleted file mode 100644
index bfc183478ca..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#Mon Sep 12 09:29:38 CEST 2011
-bin.includes=META-INF/,.,about.html,plugin.properties,resources/
-output..=bin/
-src.includes = about.html
-source..=src/
-bin..=bin/
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/plugin.properties b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/plugin.properties
deleted file mode 100644
index fe4e8ecaa6a..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#################################################################################
-# Copyright (c) 2010 CEA LIST.
-# 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
-#
-# Contributors:
-# Remi Schnekenburger remi.schnekenburger@cea.fr - Initial API and implementation
-##################################################################################
-pluginName=Papyrus Core Queries Plugin (Incubation)
-providerName=Eclipse Modeling Project
-
-
-
-
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecore b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecore
deleted file mode 100644
index 9d21ce6e9db..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecore
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="toolconfiguration"
- nsURI="http://toolconfiguration/1.0" nsPrefix="toolconfiguration">
- <eClassifiers xsi:type="ecore:EClass" name="ToolConfigurationSet">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="Name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" upperBound="-1"
- eType="#//ToolConfiguration" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ToolConfiguration">
- <eStructuralFeatures xsi:type="ecore:EReference" name="preValidation" upperBound="-1"
- eType="#//ValidationQuery" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ValidationQuery" abstract="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="ModiscoQuery" eSuperTypes="#//ValidationQuery">
- <eStructuralFeatures xsi:type="ecore:EReference" name="query" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.ecore#//ModelQuery"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="parameterValue" upperBound="-1"
- eType="ecore:EClass platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.ecore#//runtime/ModelQueryParameterValue"
- containment="true"/>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecorediag b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecorediag
deleted file mode 100644
index 88be98ad0bd..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecorediag
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_ILDrgNE9Ed-U3ZF7RVMhSQ" type="EcoreTools" name="ToolConfiguration" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_J0aO8NE9Ed-U3ZF7RVMhSQ" type="1001">
- <children xmi:type="notation:Node" xmi:id="_J0aO89E9Ed-U3ZF7RVMhSQ" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_J0aO9NE9Ed-U3ZF7RVMhSQ" type="5001">
- <children xmi:type="notation:Node" xmi:id="_LfssENE9Ed-U3ZF7RVMhSQ" type="2001">
- <element xmi:type="ecore:EAttribute" href="ToolConfiguration.ecore#//ToolConfigurationSet/Name"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LfssEdE9Ed-U3ZF7RVMhSQ"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_J0aO9dE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_J0aO9tE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_J0aO99E9Ed-U3ZF7RVMhSQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_J0aO-NE9Ed-U3ZF7RVMhSQ" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_J0aO-dE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_J0aO-tE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_J0aO-9E9Ed-U3ZF7RVMhSQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_J0aO8dE9Ed-U3ZF7RVMhSQ" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="ToolConfiguration.ecore#//ToolConfigurationSet"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J0aO8tE9Ed-U3ZF7RVMhSQ" x="25" y="75"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_PyUX0NE9Ed-U3ZF7RVMhSQ" type="1001">
- <children xmi:type="notation:Node" xmi:id="_PyeI0NE9Ed-U3ZF7RVMhSQ" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_PyeI0dE9Ed-U3ZF7RVMhSQ" type="5001">
- <children xmi:type="notation:Node" xmi:id="_Un8NgNE-Ed-U3ZF7RVMhSQ" type="2001">
- <element xmi:type="ecore:EAttribute" href="ToolConfiguration.ecore#//ToolConfiguration/name"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Un8NgdE-Ed-U3ZF7RVMhSQ"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_PyeI0tE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_PyeI09E9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PyeI1NE9Ed-U3ZF7RVMhSQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_PyeI1dE9Ed-U3ZF7RVMhSQ" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_PyeI1tE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_PyeI19E9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PyeI2NE9Ed-U3ZF7RVMhSQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_PyUX0dE9Ed-U3ZF7RVMhSQ" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="ToolConfiguration.ecore#//ToolConfiguration"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PyUX0tE9Ed-U3ZF7RVMhSQ" x="230" y="75"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_ZWv7cNE9Ed-U3ZF7RVMhSQ" type="1001">
- <children xmi:type="notation:Node" xmi:id="_ZWv7c9E9Ed-U3ZF7RVMhSQ" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_ZWv7dNE9Ed-U3ZF7RVMhSQ" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_ZWv7ddE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_ZWv7dtE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_ZWv7d9E9Ed-U3ZF7RVMhSQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_ZWv7eNE9Ed-U3ZF7RVMhSQ" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_ZWv7edE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_ZWv7etE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_ZWv7e9E9Ed-U3ZF7RVMhSQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_ZWv7cdE9Ed-U3ZF7RVMhSQ" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="ToolConfiguration.ecore#//ValidationQuery"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZWv7ctE9Ed-U3ZF7RVMhSQ" x="450" y="80"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_olbFENE9Ed-U3ZF7RVMhSQ" type="1001">
- <children xmi:type="notation:Node" xmi:id="_olbFE9E9Ed-U3ZF7RVMhSQ" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_olbFFNE9Ed-U3ZF7RVMhSQ" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_olbFFdE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_olbFFtE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_olbFF9E9Ed-U3ZF7RVMhSQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_olbFGNE9Ed-U3ZF7RVMhSQ" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_olbFGdE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_olbFGtE9Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_olbFG9E9Ed-U3ZF7RVMhSQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_olbFEdE9Ed-U3ZF7RVMhSQ" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="ToolConfiguration.ecore#//ModiscoQuery"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olbFEtE9Ed-U3ZF7RVMhSQ" x="420" y="190" width="128" height="103"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Ie270NE-Ed-U3ZF7RVMhSQ" type="1001">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IfvsoNE-Ed-U3ZF7RVMhSQ" source="Shortcut">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IfvsodE-Ed-U3ZF7RVMhSQ" key="modelID" value="EcoreTools"/>
- </eAnnotations>
- <children xmi:type="notation:Node" xmi:id="_IfAFwNE-Ed-U3ZF7RVMhSQ" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_IfAFwdE-Ed-U3ZF7RVMhSQ" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_IfAFwtE-Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_IfAFw9E-Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_IfAFxNE-Ed-U3ZF7RVMhSQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_IfAFxdE-Ed-U3ZF7RVMhSQ" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_IfAFxtE-Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_IfAFx9E-Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_IfAFyNE-Ed-U3ZF7RVMhSQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Ie270dE-Ed-U3ZF7RVMhSQ" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.ecore#//ModelQuery"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ie270tE-Ed-U3ZF7RVMhSQ" x="30" y="185"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_N9LlsNE-Ed-U3ZF7RVMhSQ" type="1001">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_N9xbkNE-Ed-U3ZF7RVMhSQ" source="Shortcut">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_N9xbkdE-Ed-U3ZF7RVMhSQ" key="modelID" value="EcoreTools"/>
- </eAnnotations>
- <children xmi:type="notation:Node" xmi:id="_N9UvoNE-Ed-U3ZF7RVMhSQ" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_N9UvodE-Ed-U3ZF7RVMhSQ" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_N9UvotE-Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_N9Uvo9E-Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_N9UvpNE-Ed-U3ZF7RVMhSQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_N9UvpdE-Ed-U3ZF7RVMhSQ" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_N9UvptE-Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_N9Uvp9E-Ed-U3ZF7RVMhSQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_N9UvqNE-Ed-U3ZF7RVMhSQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_N9LlsdE-Ed-U3ZF7RVMhSQ" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.ecore#//runtime/ModelQueryParameterValue"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N9LlstE-Ed-U3ZF7RVMhSQ" x="234" y="435"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_ILDrgdE9Ed-U3ZF7RVMhSQ"/>
- <element xmi:type="ecore:EPackage" href="ToolConfiguration.ecore#/"/>
- <edges xmi:type="notation:Edge" xmi:id="_R-ZN0NE9Ed-U3ZF7RVMhSQ" type="3002" source="_J0aO8NE9Ed-U3ZF7RVMhSQ" target="_PyUX0NE9Ed-U3ZF7RVMhSQ">
- <children xmi:type="notation:Node" xmi:id="_R-ZN1NE9Ed-U3ZF7RVMhSQ" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_R-ZN1dE9Ed-U3ZF7RVMhSQ" x="-9" y="-20"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_R-ZN1tE9Ed-U3ZF7RVMhSQ" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_R-ZN19E9Ed-U3ZF7RVMhSQ" x="10" y="10"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_R-ZN0dE9Ed-U3ZF7RVMhSQ" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_R-ZN0tE9Ed-U3ZF7RVMhSQ" fontColor="4210752" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="ToolConfiguration.ecore#//ToolConfigurationSet/configuration"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R-ZN09E9Ed-U3ZF7RVMhSQ" points="[32, 2, -186, -17]$[138, -16, -80, -35]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R_uqkNE9Ed-U3ZF7RVMhSQ" id="(0.8614718614718615,0.5311203319502075)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_aluQANE9Ed-U3ZF7RVMhSQ" type="3002" source="_PyUX0NE9Ed-U3ZF7RVMhSQ" target="_ZWv7cNE9Ed-U3ZF7RVMhSQ">
- <children xmi:type="notation:Node" xmi:id="_aluQBNE9Ed-U3ZF7RVMhSQ" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_aluQBdE9Ed-U3ZF7RVMhSQ" x="-22" y="-8"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_aluQBtE9Ed-U3ZF7RVMhSQ" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_aluQB9E9Ed-U3ZF7RVMhSQ" x="10" y="10"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_aluQAdE9Ed-U3ZF7RVMhSQ" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_aluQAtE9Ed-U3ZF7RVMhSQ" fontColor="4210752" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="ToolConfiguration.ecore#//ToolConfiguration/preValidation"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aluQA9E9Ed-U3ZF7RVMhSQ" points="[20, 20, -64, -62]$[85, 66, 1, -16]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_al4BANE9Ed-U3ZF7RVMhSQ" id="(0.03571428571428571,0.40476190476190477)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_pp0hUNE9Ed-U3ZF7RVMhSQ" type="3003" source="_olbFENE9Ed-U3ZF7RVMhSQ" target="_ZWv7cNE9Ed-U3ZF7RVMhSQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_pp0hUdE9Ed-U3ZF7RVMhSQ" routing="Rectilinear" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_pp0hUtE9Ed-U3ZF7RVMhSQ"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pp0hU9E9Ed-U3ZF7RVMhSQ" points="[1, -7, -6, 74]$[9, -61, 2, 20]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pp9rQNE9Ed-U3ZF7RVMhSQ" id="(0.6568627450980392,0.19047619047619047)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_IfcxsNE-Ed-U3ZF7RVMhSQ" type="3002" source="_olbFENE9Ed-U3ZF7RVMhSQ" target="_Ie270NE-Ed-U3ZF7RVMhSQ">
- <children xmi:type="notation:Node" xmi:id="_IfcxtNE-Ed-U3ZF7RVMhSQ" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IfcxtdE-Ed-U3ZF7RVMhSQ" x="-10" y="-10"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_IfcxttE-Ed-U3ZF7RVMhSQ" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Ifcxt9E-Ed-U3ZF7RVMhSQ" x="10" y="10"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_IfcxsdE-Ed-U3ZF7RVMhSQ" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_IfcxstE-Ed-U3ZF7RVMhSQ" fontColor="4210752" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="ToolConfiguration.ecore#//ModiscoQuery/query"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ifcxs9E-Ed-U3ZF7RVMhSQ" points="[-63, -33, 366, 188]$[-428, -221, 1, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_O6HvENE-Ed-U3ZF7RVMhSQ" type="3002" source="_olbFENE9Ed-U3ZF7RVMhSQ" target="_N9LlsNE-Ed-U3ZF7RVMhSQ">
- <children xmi:type="notation:Node" xmi:id="_O6HvFNE-Ed-U3ZF7RVMhSQ" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_O6HvFdE-Ed-U3ZF7RVMhSQ" x="-12" y="-32"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_O6HvFtE-Ed-U3ZF7RVMhSQ" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_O6HvF9E-Ed-U3ZF7RVMhSQ" x="10" y="10"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_O6HvEdE-Ed-U3ZF7RVMhSQ" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_O6HvEtE-Ed-U3ZF7RVMhSQ" fontColor="4210752" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="ToolConfiguration.ecore#//ModiscoQuery/parameterValue"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O6HvE9E-Ed-U3ZF7RVMhSQ" points="[-10, 20, 95, -195]$[-102, 184, 3, -31]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O6HvGNE-Ed-U3ZF7RVMhSQ" id="(0.5,0.8058252427184466)"/>
- </edges>
-</notation:Diagram>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/Activator.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/Activator.java
deleted file mode 100644
index 33bc5c2b73d..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/Activator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * 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
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.queries.core;
-
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- /** The plug-in ID */
- public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.queries.core"; //$NON-NLS-1$
-
- /** The shared instance */
- private static Activator plugin;
-
- /** Logging helper */
- public static LogHelper log;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
-
- // register the login helper
- log = new LogHelper(plugin);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- log = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterNotfoundException.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterNotfoundException.java
deleted file mode 100644
index ce3c5be4356..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterNotfoundException.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * 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
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.queries.core.converter;
-
-import org.eclipse.uml2.uml.ValueSpecification;
-
-
-/**
- * Exception thrown when no converter was found
- */
-public class ConverterNotfoundException extends Exception {
-
- /** serialization id */
- private static final long serialVersionUID = -8863603362830475612L;
-
- /** target parameter type */
- private final Class<?> parameterType;
-
- /** source value instance */
- private final ValueSpecification valueInstance;
-
- /**
- * Creates a new {@link ConverterNotfoundException}.
- *
- * @param parameterType
- * the target type of the value
- * @param valueInstance
- * the value specification defining the entering value and type
- */
- public ConverterNotfoundException(Class<?> parameterType, ValueSpecification valueInstance) {
- this.parameterType = parameterType;
- this.valueInstance = valueInstance;
- }
-
- /**
- * Returns the target parameter type
- *
- * @return the target parameter type
- */
- public Class<?> getParameterType() {
- return parameterType;
- }
-
- /**
- * Returns the value specification defining the entering value and type
- *
- * @return the value specification defining the entering value and type
- */
- public ValueSpecification getValueInstance() {
- return valueInstance;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getMessage() {
- return "Converter not found for target type: " + getParameterType() + " and for initial value: " + getValueInstance();
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterRegistry.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterRegistry.java
deleted file mode 100644
index fed4d51e1e6..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterRegistry.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * 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
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.queries.core.converter;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.databinding.conversion.IConverter;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.queries.core.Activator;
-import org.eclipse.papyrus.infra.queries.core.configuration.ConstantParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.ListParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.ModiscoQueryConfiguration;
-import org.eclipse.papyrus.infra.queries.core.configuration.ParameterValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;
-import org.eclipse.papyrus.infra.queries.core.configuration.QueryExecutionValue;
-import org.eclipse.papyrus.infra.queries.core.configuration.util.ConfigurationSwitch;
-import org.eclipse.papyrus.infra.queries.core.modisco.QueryUtil;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * Registry to store converters.
- */
-public class ConverterRegistry {
-
- /** singleton instance */
- private static ConverterRegistry instance;
-
- /** map to store converters, identified by their class */
- private Map<Class<?>, IConverter> converterMaps = new HashMap<Class<?>, IConverter>();
-
- /**
- * Constructor (not visible: singleton pattern)
- */
- private ConverterRegistry() {
- }
-
- /**
- * Returns the single instance of this registry
- *
- * @return the single instance of this registry
- */
- public static synchronized ConverterRegistry getSingleton() {
- if(instance == null) {
- instance = new ConverterRegistry();
- instance.initializeRegistry();
- }
- return instance;
- }
-
- /**
- * Initialize the registry
- */
- protected void initializeRegistry() {
- converterMaps.put(String.class, new ValueSpecificationToStringConverter());
- converterMaps.put(int.class, new ValueSpecificationToIntegerConverter());
- converterMaps.put(boolean.class, new ValueSpecificationToBooleanConverter());
- }
-
- /**
- * Returns the converter for the convenient type, from an {@link Object}
- *
- * @param toType
- * the class into which the element should be transformed
- *
- * @return the converter for the convenient type
- */
- public IConverter getConverter(Class<?> toType) {
- return converterMaps.get(toType);
- }
-
- public Object convert(Class<?> parameterType, ValueSpecification valueInstance) throws ConverterNotfoundException {
- // retrieve the converter
- IConverter converter = getConverter(parameterType);
-
- if(converter != null) {
- return converter.convert(valueInstance);
- } else {
- throw new ConverterNotfoundException(parameterType, valueInstance);
- }
- }
-
- /**
- * Converts a parameter value into a list of values
- *
- * @param context
- * the context of the evaluation of the query
- * @param parameterType
- * the type of the list
- * @param parameterValue
- * the parameter value to transform into a list
- * @return the list of values contained by the parameter value
- */
- public List<?> convertToList(final EObject context, final Class<?> parameterType, final ParameterValue parameterValue) {
- return new ConfigurationSwitch<List<?>>() {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public java.util.List<?> caseConstantParameterValue(ConstantParameterValue constantParameterValue) {
- IConverter converter = getConverter(parameterType);
-
- if(converter != null) {
- return Arrays.asList(converter.convert(constantParameterValue.getValueInstance()));
- } else {
- Activator.log.error("Impossible to find a converter for type: " + parameterType, null);
- return Collections.emptyList();
- }
- };
-
- /**
- * {@inheritDoc}
- */
- @Override
- public java.util.List<?> caseQueryExecutionValue(QueryExecutionValue queryExecutionValue) {
- // if query returns a list, returns it, else creates an array of one element
- QueryConfiguration queryConfiguration = queryExecutionValue.getConfiguration();
- if(!(queryConfiguration instanceof ModiscoQueryConfiguration)) {
- throw new RuntimeException("List conversion not implemented for this type of configuration. " + queryConfiguration.eClass().getName());
- }
- Object executionResult = null;
-// try {
-// executionResult = QueryUtil.evaluateBooleanQuery(context, queryConfiguration);
-// } catch (Exception e) {
-// Activator.log.error(e);
-// }
-// int upperBound = ((ModiscoQueryConfiguration)queryConfiguration).getQuery().getUpperBound();
-// if(upperBound == 1) {
-// return Arrays.asList(executionResult);
-// } else {
- return (List<?>)executionResult;
-// }
- };
-
- /**
- * {@inheritDoc}
- */
- @Override
- public java.util.List<?> caseListParameterValue(ListParameterValue listParameterValue) {
- List<Object> values = new ArrayList<Object>();
- for(ParameterValue parameterValue : listParameterValue.getValues()) {
- values.addAll(convertToList(context, parameterType, parameterValue));
- }
- return values;
- };
-
- }.doSwitch(parameterValue);
- }
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToBooleanConverter.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToBooleanConverter.java
deleted file mode 100644
index facfdeb5920..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToBooleanConverter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * 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
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.queries.core.converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.conversion.IConverter;
-
-
-/**
- * Converter for Objects to Boolean value
- */
-public class ObjectToBooleanConverter extends Converter implements IConverter {
-
- /**
- * Creates a new ObjectToBooleanConverter
- */
- public ObjectToBooleanConverter() {
- super(Object.class, Boolean.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public Boolean convert(Object fromObject) {
- if(fromObject == null) {
- return null;
- }
-
- if(fromObject instanceof Boolean) {
- return ((Boolean)fromObject);
- }
-
- if(fromObject instanceof String) {
- return Boolean.valueOf((String)fromObject);
- }
-
- return null;
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToIntegerConverter.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToIntegerConverter.java
deleted file mode 100644
index c6a8735690d..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToIntegerConverter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * 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
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.queries.core.converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.conversion.IConverter;
-
-/**
- * Converter from an object to an integer
- */
-public class ObjectToIntegerConverter extends Converter implements IConverter {
-
- /**
- * Default constructor.
- */
- public ObjectToIntegerConverter() {
- super(Object.class, Integer.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public Integer convert(Object fromObject) {
- if(fromObject == null) {
- return null;
- }
-
- if(fromObject instanceof Integer) {
- return (Integer)fromObject;
- }
-
- if(fromObject instanceof String) {
- return Integer.parseInt((String)fromObject);
- }
-
- return null;
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToBooleanConverter.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToBooleanConverter.java
deleted file mode 100644
index fe244a435bb..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToBooleanConverter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * 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
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.queries.core.converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.conversion.IConverter;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * Converter from a {@link ValueSpecification} to a {@link Boolean} value
- */
-public class ValueSpecificationToBooleanConverter extends Converter implements IConverter {
-
- /**
- * Creates a new ValueSpecificationToBooleanConverter.
- */
- public ValueSpecificationToBooleanConverter() {
- super(ValueSpecification.class, boolean.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public Object convert(Object fromObject) {
- return ((ValueSpecification)fromObject).booleanValue();
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToIntegerConverter.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToIntegerConverter.java
deleted file mode 100644
index b7393eace12..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToIntegerConverter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * 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
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.queries.core.converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.conversion.IConverter;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * Converter from a {@link ValueSpecification} to an {@link Integer}.
- */
-public class ValueSpecificationToIntegerConverter extends Converter implements IConverter {
-
- /**
- * Creates a new {@link ValueSpecificationToIntegerConverter}.
- */
- public ValueSpecificationToIntegerConverter() {
- super(ValueSpecification.class, int.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public Object convert(Object fromObject) {
- return ((ValueSpecification)fromObject).integerValue();
- }
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToStringConverter.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToStringConverter.java
deleted file mode 100644
index b2987996f4f..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToStringConverter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * 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
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.queries.core.converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.conversion.IConverter;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * Converter from a {@link ValueSpecification} to an {@link String}.
- */
-public class ValueSpecificationToStringConverter extends Converter implements IConverter {
-
- /**
- * Creates a new {@link ValueSpecificationToStringConverter}.
- */
- public ValueSpecificationToStringConverter() {
- super(ValueSpecification.class, String.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public Object convert(Object fromObject) {
- return ((ValueSpecification)fromObject).stringValue();
- }
-
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQueryNotFoundException.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQueryNotFoundException.java
deleted file mode 100644
index b6b5a445a07..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQueryNotFoundException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * 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
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.queries.core.modisco;
-
-/**
- * Exception thrown when the query set can not be found
- */
-public class ModelQueryNotFoundException extends RuntimeException {
-
- /** serial version UID */
- private static final long serialVersionUID = 7224687861468142052L;
-
- /** name of the model query to find */
- private final String modelQueryName;
-
- /**
- * Creates a new {@link ModelQueryNotFoundException}.
- * @param modelQueryName the name of the query to find
- */
- public ModelQueryNotFoundException(String modelQueryName) {
- this.modelQueryName = modelQueryName;
- }
-
- /**
- * Returns the name of the model query to find
- * @return the name of the model query to find
- */
- public String getModelQueryName() {
- return modelQueryName;
- }
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQuerySetNotFoundException.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQuerySetNotFoundException.java
deleted file mode 100644
index efe014c6678..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQuerySetNotFoundException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * 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
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.queries.core.modisco;
-
-/**
- * Exception thrown when the query set can not be found
- */
-public class ModelQuerySetNotFoundException extends RuntimeException {
-
- /** serial version UID */
- private static final long serialVersionUID = -3189129139020152378L;
-
- /** name of the model query set to find */
- private final String modelQuerySetName;
-
- /**
- * Creates a new {@link ModelQuerySetNotFoundException}.
- * @param modelQuerySetName the name of the model query set not found
- */
- public ModelQuerySetNotFoundException(String modelQuerySetName) {
- this.modelQuerySetName = modelQuerySetName;
- }
-
- /**
- * Returns the name of the model query set to find
- * @return the name of the model query set to find
- */
- public String getModelQuerySetName() {
- return modelQuerySetName;
- }
-}
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/QueryUtil.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/QueryUtil.java
deleted file mode 100644
index f87a4810a9a..00000000000
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/QueryUtil.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * 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
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.queries.core.modisco;
-
-
-/**
- * Utility class for modisco queries
- */
-public class QueryUtil {
-
- /** default value in case the query is not valid */
- protected static final boolean defaultReturnValue = false;
-
- /**
- * Constructor.
- * Note: can not be instanciated, as it provides only static methods.
- */
- protected QueryUtil() {
- }
-
-// /**
-// * Evaluates a modisco query, that should only return a boolean value.
-// *
-// * @param query
-// * the query to check and evaluate
-// * @param context
-// * the eobject on which the query is evaluated
-// * @param parameters
-// * a map containing the name of parameters and their values
-// * @return <code>true</code> if the context fills the condition given by the query
-// * @throws Exception
-// * exception thrown when the query could not be correctly evaluated
-// */
-// public static final boolean evaluateBooleanQuery(final ModelQuery query, EObject context, Map<String, Object> parameters) throws Exception {
-// // construct the structure parameterValues if the query is valid
-// IStatus queryStatus = isValidQuery(query);
-// if(!queryStatus.isOK()) {
-// throw new Exception(queryStatus.getMessage());
-// }
-//
-// // if no parameters, evaluate
-// List<ModelQueryParameter> queryParameters = query.getParameters();
-// List<ModelQueryParameterValue> parameterValues = new ArrayList<ModelQueryParameterValue>();
-// if(queryParameters == null || queryParameters.isEmpty()) {
-// return evaluateBooleanQuery(query, context, parameterValues);
-// }
-//
-// // check the parameters given and the set of required parameters
-// IStatus parameterCheck = isValidParameterSet(query, parameters);
-// if(IStatus.CANCEL == parameterCheck.getSeverity() || IStatus.ERROR == parameterCheck.getSeverity()) {
-// Activator.log.error(parameterCheck.getMessage(), null);
-// throw new Exception(parameterCheck.getMessage());
-// } else if(IStatus.WARNING == parameterCheck.getSeverity()) {
-// Activator.log.warn(parameterCheck.getMessage());
-// } else if(IStatus.INFO == parameterCheck.getSeverity()) {
-// Activator.log.info(parameterCheck.getMessage());
-// }
-//
-// // construct parameter structure for Modisco solver
-// for(ModelQueryParameter parameter : queryParameters) {
-// String parametername = parameter.getName();
-// Object value = parameters.get(parametername);
-// ModelQueryParameterValue parameterValue = ParameterValueList.createParameterValue(value, parameter);
-//
-// // should try to bind elements here..
-// parameterValues.add(parameterValue);
-// }
-//
-// // execute the query
-// return evaluateBooleanQuery(query, context, parameterValues);
-// }
-//
-// /**
-// * Evaluates a query.
-// *
-// * @param context
-// * the eobject on which the query is evaluated
-// * @param queryConfiguration
-// * the query configuration, containing all values for the parameters of the query
-// * @return the result of the execution of the query
-// * @throws Exception
-// * exception thrown when the query could not be correctly evaluated
-// */
-// public static final Object evaluateQuery(EObject context, QueryConfiguration queryConfiguration) throws Exception {
-// if(queryConfiguration instanceof ModiscoQueryConfiguration) {
-// return evaluateQuery(context, (ModiscoQueryConfiguration)queryConfiguration);
-// }
-// throw new Exception("Unhandled kind of query");
-// }
-//
-// /**
-// * Evaluates a query, that should only return a boolean value.
-// *
-// * @param context
-// * the eobject on which the query is evaluated
-// * @param queryConfiguration
-// * the query configuration, containing all values for the parameters of the query
-// * @return <code>true</code> if the context fills the condition given by the query
-// * @throws Exception
-// * exception thrown when the query could not be correctly evaluated
-// */
-// public static final boolean evaluateBooleanQuery(EObject context, QueryConfiguration queryConfiguration) throws Exception {
-// if(queryConfiguration instanceof ModiscoQueryConfiguration) {
-// return evaluateBooleanQuery(context, (ModiscoQueryConfiguration)queryConfiguration);
-// }
-// throw new Exception("Unhandled kind of query");
-// }
-//
-// /**
-// * Evaluates a modisco query, that should only return a boolean value.
-// *
-// * @param context
-// * the eobject on which the query is evaluated
-// * @param queryConfiguration
-// * the query configuration, containing all values for the parameters of the query
-// * @return <code>true</code> if the context fills the condition given by the query
-// * @throws Exception
-// * exception thrown when the query could not be correctly evaluated
-// */
-// public static final boolean evaluateBooleanQuery(EObject context, ModiscoQueryConfiguration queryConfiguration) throws Exception {
-// Object result = evaluateQuery(context, queryConfiguration);
-// if(result instanceof Boolean) {
-// return (Boolean)result;
-// }
-// Activator.log.error("Not a boolean result: " + result, null);
-// return defaultReturnValue;
-// }
-//
-// /**
-// * Evaluates a modisco query, that should only return a boolean value.
-// *
-// * @param context
-// * the eobject on which the query is evaluated
-// * @param queryConfiguration
-// * the query configuration, containing all values for the parameters of the query
-// * @return <code>true</code> if the context fills the condition given by the query
-// * @throws Exception
-// * exception thrown when the query could not be correctly evaluated
-// */
-// public static final Object evaluateQuery(EObject context, ModiscoQueryConfiguration queryConfiguration) throws Exception {
-// // retrieve query (problem of bundle loader if not used correctly)
-// ModelQuery query = queryConfiguration.getQuery();
-// String modelQuerySetName = query.getModelQuerySet().getName();
-// String modelQueryName = query.getName();
-//
-// ModelQuery finalModelQuery = retrieveModelQuery(modelQueryName, modelQuerySetName);
-//
-// // construct the structure parameterValues if the query is valid
-// IStatus queryValidation = isValidQuery(finalModelQuery);
-// if(!queryValidation.isOK()) {
-// throw new Exception(queryValidation.getMessage(), queryValidation.getException());
-// }
-//
-// // create the set of parameter values
-// List<ModelQueryParameterValue> parameterValues = createParameterValuesListFromConfiguration(context, queryConfiguration);
-//
-// // execute the query
-// return evaluateQuery(finalModelQuery, context, parameterValues);
-// }
-//
-// /**
-// * Creates the {@link ModelQueryParameterValue} list from a configuration
-// *
-// * @param queryConfiguration
-// * the configuration to check
-// * @return the list of parameter values
-// */
-// private static List<ModelQueryParameterValue> createParameterValuesListFromConfiguration(EObject context, ModiscoQueryConfiguration queryConfiguration) {
-// List<ModelQueryParameterValue> parameterValues = new ArrayList<ModelQueryParameterValue>();
-//
-// List<ModelQueryParameter> parameters = queryConfiguration.getQuery().getParameters();
-// for(ModelQueryParameter parameter : parameters) {
-// Object value = retrieveParameterValue(context, parameter, queryConfiguration);
-// // resolve the value for the parameters
-// ModelQueryParameterValue parameterValue = ParameterValueList.createParameterValue(value, parameter);
-// parameterValues.add(parameterValue);
-// }
-// return parameterValues;
-// }
-//
-// /**
-// * Retrieves the value of a parameter.
-// *
-// * @param parameter
-// * the parameter for which the value is computed
-// * @return the parameter value associated to the parameter
-// */
-// private static Object retrieveParameterValue(final EObject context, final ModelQueryParameter parameter, ModiscoQueryConfiguration configuration) {
-// for(final ParameterValue parameterValue : configuration.getParameterValues()) {
-// if(parameter.equals(parameterValue.getParameter())) {
-// // This is the right parameter. Compute the value, depending on the type of the parameters
-// return new ConfigurationSwitch<Object>() {
-//
-// /**
-// * {@inheritDoc}
-// */
-// @Override
-// public Object caseListParameterValue(ListParameterValue listParameterValue) {
-// ArrayList<Object> values = new ArrayList<Object>();
-// Class<?> parameterType = parameter.getType().getInstanceClass();
-// for(ParameterValue parameterValue : listParameterValue.getValues()) {
-// values.addAll(ConverterRegistry.getSingleton().convertToList(context, parameterType, parameterValue));
-// }
-// return values;
-// };
-//
-// /**
-// * {@inheritDoc}
-// */
-// @Override
-// public Object caseConstantParameterValue(ConstantParameterValue constantParameterValue) {
-// Class<?> parameterType = parameter.getType().getInstanceClass();
-// try {
-// Object convertedValue = ConverterRegistry.getSingleton().convert(parameterType, constantParameterValue.getValueInstance());
-// return convertedValue;
-// } catch (ConverterNotfoundException e) {
-// Activator.log.error(e);
-// }
-// return null;
-// };
-//
-//
-// /**
-// * {@inheritDoc}
-// */
-// @Override
-// public Object caseQueryExecutionValue(QueryExecutionValue queryExecutionValue) {
-// // retrieves the associated configuration and launch it.
-// QueryConfiguration configuration = queryExecutionValue.getConfiguration();
-// try {
-// return QueryUtil.evaluateQuery(context, configuration);
-// } catch (Exception e) {
-// Activator.log.error(e);
-// }
-// return null;
-//
-// };
-// }.doSwitch(parameterValue);
-// }
-// }
-// return null;
-//
-// }
-//
-// /**
-// * Evaluates a modisco query.
-// *
-// * @param query
-// * the query to evaluate
-// * @param context
-// * the context element against which the query is evaluated
-// * @param parameterValues
-// * the list of parameters for the query
-// * @return the result of the query evaluation
-// * @throws Exception
-// * exception thrown in case of problem during evaluation of the query
-// */
-// public static final Object evaluateQuery(final ModelQuery query, EObject context, List<ModelQueryParameterValue> parameterValues) throws Exception {
-// // checks that the query is valid
-// if(isValidQuery(query).isOK()) {
-// AbstractModelQuery myModelQuery;
-// myModelQuery = ModelQuerySetCatalog.getSingleton().getModelQueryImpl(query);
-// //the model query set evaluation
-// ModelQueryResult result = myModelQuery.evaluate(context, parameterValues);
-// if(result.getException() != null) {
-// throw new Exception();
-// }
-// return result.getValue();
-// }
-// throw new Exception("Query was not a valid query: " + query, null);
-// }
-//
-// /**
-// * Evaluates a modisco query, that should only return a boolean value.
-// *
-// * @param query
-// * the query to check and evaluate
-// * @param context
-// * the eobject on which the query is evaluated
-// * @param parameterValues
-// * the list of parameter values for the evaluation
-// * @return <code>true</code> if the context fills the condition given by the query
-// * @throws Exception
-// * exception thrown when the query can not be correctly evaluated
-// */
-// public static final boolean evaluateBooleanQuery(final ModelQuery query, EObject context, List<ModelQueryParameterValue> parameterValues) throws Exception {
-// Object result = evaluateQuery(query, context, parameterValues);
-// if(result instanceof Boolean) {
-// // try to cast into a boolean
-// return (Boolean)result;
-// }
-// Activator.log.error("Query did not return a boolean: " + result, null);
-// return defaultReturnValue;
-// }
-//
-// /**
-// * Retrieves a model query, given its name and its query set.
-// *
-// * @param queryName
-// * the name of the query
-// * @param querySetName
-// * the name of the query set
-// * @return the found model query or <code>null</code>.
-// * @throws ModelQueryNotFoundException
-// * exception thrown when the the query set was found but not the model query was not found.
-// * @throws ModelQuerySetNotFoundException
-// * exception thrown when the the query set was not found.
-// */
-// public static final ModelQuery retrieveModelQuery(String queryName, String querySetName) throws ModelQueryNotFoundException, ModelQuerySetNotFoundException {
-// ModelQuerySet querySet = ModelQuerySetCatalog.getSingleton().getModelQuerySet(querySetName);
-// if(querySet == null) {
-// throw new ModelQuerySetNotFoundException(querySetName);
-// }
-//
-// ModelQuery query = querySet.getQuery(queryName);
-// if(query == null) {
-// throw new ModelQueryNotFoundException(queryName);
-// }
-//
-// return query;
-// }
-//
-// /**
-// * Checks if the query is valid, i.e. not <code>null</code>, returning a boolean value, etc.
-// *
-// * @param query
-// * the query to test
-// * @return <code>true</code> if the query is valid
-// */
-// public static final IStatus isValidQuery(ModelQuery query) {
-// if(query == null) {
-// return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Query should not be null.");
-// }
-// return Status.OK_STATUS;
-// }
-//
-// /**
-// * Checks if the query is valid, i.e. not <code>null</code>, returning a boolean value, etc.
-// * @param query the query to test
-// * @return <code>true</code> if the query is valid
-// */
-// public static final IStatus isValidBooleanQuery(ModelQuery query) {
-// IStatus status = isValidQuery(query);
-// if(status.isOK()) {
-// // check the instance type is compatible with boolean
-// EClassifier returnType = query.getReturnType();
-// if(returnType == null) {
-// return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Query " + query.getName() + " does not have a return value, whereas it should have a boolean return status");
-// } else {
-// Class<?> instanceClass = returnType.getInstanceClass();
-// if(!boolean.class.isAssignableFrom(instanceClass)) {
-// return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Query " + query.getName() + " should return a value that can be cast into Boolean value. Currently: " + returnType.getInstanceClass());
-// }
-// // check return size of the query... should be 0..1 or 1..1 (even 0..1 could be difficult to handle, but we let this possible)
-// if(query.getUpperBound() > 1 || query.getUpperBound() < 0) {
-// return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Query " + query.getName() + " should return only one value. Currently: " + query.getUpperBound());
-// }
-// }
-// }
-// return status;
-// }
-//
-// /**
-// * Check if the set of given parameters is compatible with the query
-// * @param query the query against which the set of parameters is tested
-// * @param parameters the map of parameter names and their value
-// * @return the status corresponding to the validation
-// */
-// public static final IStatus isValidParameterSet(ModelQuery query, Map<String, Object> parameters) {
-// // check size, which should be equal.
-// int querySize = query.getParameters().size();
-// int parameterSize = parameters.keySet().size();
-//
-// if(querySize != parameterSize) {
-// return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The given parameters set do not have the same size (" + parameterSize + ") than the query parameter set (" + querySize + ")");
-// }
-//
-// List<IStatus> status = new ArrayList<IStatus>();
-//
-// // size is ok, checking names, type, multiplicity
-// for(String parameterName : parameters.keySet()) {
-// // retrieve the equivalent parameter in the query
-// ModelQueryParameter queryParameter = retrieveParameterByName(query, parameterName);
-// if(queryParameter == null) {
-// status.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Impossible to find the parameter " + parameterName + " in the query parameters list for query: " + query.getName()));
-// }
-// }
-// if(status.size() > 0) {
-// return new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, status.toArray(new IStatus[status.size()]), "", null);
-// }
-// return Status.OK_STATUS;
-// }
-//
-// /**
-// * Retrieves a parameter, given the query to look into and the name of the parameter
-// *
-// * @param query
-// * the query where the parameter is stored
-// * @param parameterName
-// * the name of the parameter
-// * @return the parameter
-// */
-// private final static ModelQueryParameter retrieveParameterByName(ModelQuery query, String parameterName) {
-// for(ModelQueryParameter queryParameter : query.getParameters()) {
-// if(parameterName.equals(queryParameter.getName())) {
-// return queryParameter;
-// }
-// }
-// return null;
-// }
-}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
index e0d79fd6859..72cc048b816 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.xtext.ui,
org.eclipse.papyrus.uml.alf;bundle-version="1.0.0",
org.apache.log4j;bundle-version="1.2.15",
org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-Version: 1.0.0.qualifier
Bundle-ManifestVersion: 2
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/src/org/eclipse/papyrus/uml/alf/ui/contentassist/AlfProposalProvider.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/src/org/eclipse/papyrus/uml/alf/ui/contentassist/AlfProposalProvider.java
index 0b3cae704cf..d829f2afb80 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/src/org/eclipse/papyrus/uml/alf/ui/contentassist/AlfProposalProvider.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/src/org/eclipse/papyrus/uml/alf/ui/contentassist/AlfProposalProvider.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2011 CEA LIST.
*
- *
+ *
* 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
@@ -19,7 +19,6 @@ import java.util.Map;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.contentassist.CompletionProposalUtils;
import org.eclipse.papyrus.uml.alf.alf.SuffixExpression;
import org.eclipse.papyrus.uml.alf.scoping.AlfPartialScope;
import org.eclipse.papyrus.uml.alf.scoping.AlfScopeProvider;
@@ -28,144 +27,137 @@ import org.eclipse.papyrus.uml.alf.validation.typing.SignatureFacadeFactory;
import org.eclipse.papyrus.uml.alf.validation.typing.TypeExpression;
import org.eclipse.papyrus.uml.alf.validation.typing.TypeFacade;
import org.eclipse.papyrus.uml.alf.validation.typing.TypeUtils;
+import org.eclipse.papyrus.uml.xtext.integration.CompletionProposalUtils;
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.Property;
import org.eclipse.xtext.Assignment;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
+
/**
* see http://www.eclipse.org/Xtext/documentation/latest/xtext.html#contentAssist on how to customize content assistant
*/
public class AlfProposalProvider extends AbstractAlfProposalProvider {
-
-
+
+
@Override
- public void completeLocalNameDeclarationStatement_Type(EObject model,
- Assignment assignment, ContentAssistContext context,
- ICompletionProposalAcceptor acceptor) {
+ public void completeLocalNameDeclarationStatement_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// TODO Auto-generated method stub
- AlfPartialScope scope = AlfScopeProvider.scopingTool.getVisibleClassifiers(model) ;
- new AlfCompletionProposalUtils().classifierProposals(scope, context, acceptor) ;
- super.completeLocalNameDeclarationStatement_Type(model, assignment, context,
- acceptor);
+ AlfPartialScope scope = AlfScopeProvider.scopingTool.getVisibleClassifiers(model);
+ new AlfCompletionProposalUtils().classifierProposals(scope, context, acceptor);
+ super.completeLocalNameDeclarationStatement_Type(model, assignment, context, acceptor);
}
@Override
- public void completeOperationCallExpression_OperationName(EObject model,
- Assignment assignment, ContentAssistContext context,
- ICompletionProposalAcceptor acceptor) {
- TypeExpression typeOfModel = null ;
- if (model instanceof SuffixExpression) {
- if (context.getPrefix().equals(""))
- typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model) ;
- else
- typeOfModel = new TypeUtils((SuffixExpression)model).getTypeOfCandidateExpression(model.eContainer()) ;
- }
- else {
- typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model) ;
+ public void completeOperationCallExpression_OperationName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+ TypeExpression typeOfModel = null;
+ if(model instanceof SuffixExpression) {
+ if(context.getPrefix().equals("")) {
+ typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model);
+ } else {
+ typeOfModel = new TypeUtils((SuffixExpression)model).getTypeOfCandidateExpression(model.eContainer());
+ }
+ } else {
+ typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model);
}
- if (typeOfModel == null || typeOfModel.getTypeFacade() instanceof ErrorTypeFacade)
- super.completeOperationCallExpression_OperationName(model, assignment, context,
- acceptor);
- else {
- new AlfCompletionProposalUtils().operationProposals(typeOfModel.getTypeFacade(), context, acceptor) ;
- super.completeOperationCallExpression_OperationName(model, assignment, context, acceptor);
+ if(typeOfModel == null || typeOfModel.getTypeFacade() instanceof ErrorTypeFacade) {
+ super.completeOperationCallExpression_OperationName(model, assignment, context, acceptor);
+ } else {
+ new AlfCompletionProposalUtils().operationProposals(typeOfModel.getTypeFacade(), context, acceptor);
+ super.completeOperationCallExpression_OperationName(model, assignment, context, acceptor);
}
}
-
+
@Override
- public void completePropertyCallExpression_PropertyName(EObject model,
- Assignment assignment, ContentAssistContext context,
- ICompletionProposalAcceptor acceptor) {
- TypeExpression typeOfModel = null ;
- if (model instanceof SuffixExpression) {
- if (context.getPrefix().equals(""))
- typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model) ;
- else
- typeOfModel = new TypeUtils((SuffixExpression)model).getTypeOfCandidateExpression(model.eContainer()) ;
- }
- else {
- typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model) ;
+ public void completePropertyCallExpression_PropertyName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+ TypeExpression typeOfModel = null;
+ if(model instanceof SuffixExpression) {
+ if(context.getPrefix().equals("")) {
+ typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model);
+ } else {
+ typeOfModel = new TypeUtils((SuffixExpression)model).getTypeOfCandidateExpression(model.eContainer());
+ }
+ } else {
+ typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model);
}
- if (typeOfModel == null || typeOfModel.getTypeFacade() instanceof ErrorTypeFacade)
- super.completePropertyCallExpression_PropertyName(model, assignment, context,
- acceptor);
- else {
- new AlfCompletionProposalUtils().propertyProposals(typeOfModel.getTypeFacade(), context, acceptor) ;
+ if(typeOfModel == null || typeOfModel.getTypeFacade() instanceof ErrorTypeFacade) {
+ super.completePropertyCallExpression_PropertyName(model, assignment, context, acceptor);
+ } else {
+ new AlfCompletionProposalUtils().propertyProposals(typeOfModel.getTypeFacade(), context, acceptor);
super.completePropertyCallExpression_PropertyName(model, assignment, context, acceptor);
}
}
-
+
/**************************
- *
+ *
* Completion proposal utils
*
*/
private class AlfCompletionProposalUtils {
-
+
public void classifierProposals(AlfPartialScope scope, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- for (List<EObject> scopingLevel : scope.getScopeDetails()) {
- String completionString = "" ;
- String displayString = "" ;
- Map<String, ICompletionProposal> completionProposals = new HashMap<String, ICompletionProposal>() ;
- ICompletionProposal proposal = null ;
- for (EObject visibleClassifier : scopingLevel) {
- completionString = scope.getElementName(visibleClassifier) ;
- displayString = "" + completionString ;
- if (completionString.startsWith(context.getPrefix())) {
- completionString = completionString.substring(context.getPrefix().length()) ;
- if (completionProposals.get(displayString)==null) {
- completionProposals.put(displayString, proposal) ;
- proposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ;
- acceptor.accept(proposal) ;
+ for(List<EObject> scopingLevel : scope.getScopeDetails()) {
+ String completionString = "";
+ String displayString = "";
+ Map<String, ICompletionProposal> completionProposals = new HashMap<String, ICompletionProposal>();
+ ICompletionProposal proposal = null;
+ for(EObject visibleClassifier : scopingLevel) {
+ completionString = scope.getElementName(visibleClassifier);
+ displayString = "" + completionString;
+ if(completionString.startsWith(context.getPrefix())) {
+ completionString = completionString.substring(context.getPrefix().length());
+ if(completionProposals.get(displayString) == null) {
+ completionProposals.put(displayString, proposal);
+ proposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context);
+ acceptor.accept(proposal);
}
}
}
}
}
-
+
public void operationProposals(TypeFacade f, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- Classifier c = f.extractActualType() ;
- String completionString = "" ;
- String displayString = "" ;
- Map<String, ICompletionProposal> completionProposals = new HashMap<String, ICompletionProposal>() ;
- ICompletionProposal proposal = null ;
- for (Operation o : c.getAllOperations()) {
- completionString = SignatureFacadeFactory.eInstance.createSignatureFacade(o).getLabel() ;
- displayString = "" + completionString ;
- if (completionString.startsWith(context.getPrefix())) {
- completionString = completionString.substring(context.getPrefix().length()) ;
- if (completionProposals.get(displayString)==null) {
- completionProposals.put(displayString, proposal) ;
- proposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ;
- acceptor.accept(proposal) ;
+ Classifier c = f.extractActualType();
+ String completionString = "";
+ String displayString = "";
+ Map<String, ICompletionProposal> completionProposals = new HashMap<String, ICompletionProposal>();
+ ICompletionProposal proposal = null;
+ for(Operation o : c.getAllOperations()) {
+ completionString = SignatureFacadeFactory.eInstance.createSignatureFacade(o).getLabel();
+ displayString = "" + completionString;
+ if(completionString.startsWith(context.getPrefix())) {
+ completionString = completionString.substring(context.getPrefix().length());
+ if(completionProposals.get(displayString) == null) {
+ completionProposals.put(displayString, proposal);
+ proposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context);
+ acceptor.accept(proposal);
}
}
}
}
-
+
public void propertyProposals(TypeFacade f, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- Classifier c = f.extractActualType() ;
- String completionString = "" ;
- String displayString = "" ;
- Map<String, ICompletionProposal> completionProposals = new HashMap<String, ICompletionProposal>() ;
- ICompletionProposal proposal = null ;
- for (Property p : c.getAllAttributes()) {
- displayString = p.getName() + " : " + (p.getType() == null ? "any" : p.getType().getName()) ;
- completionString = p.getName() ;
- if (completionString.startsWith(context.getPrefix())) {
- completionString = completionString.substring(context.getPrefix().length()) ;
- if (completionProposals.get(displayString)==null) {
- completionProposals.put(displayString, proposal) ;
- proposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ;
- acceptor.accept(proposal) ;
+ Classifier c = f.extractActualType();
+ String completionString = "";
+ String displayString = "";
+ Map<String, ICompletionProposal> completionProposals = new HashMap<String, ICompletionProposal>();
+ ICompletionProposal proposal = null;
+ for(Property p : c.getAllAttributes()) {
+ displayString = p.getName() + " : " + (p.getType() == null ? "any" : p.getType().getName());
+ completionString = p.getName();
+ if(completionString.startsWith(context.getPrefix())) {
+ completionString = completionString.substring(context.getPrefix().length());
+ if(completionProposals.get(displayString) == null) {
+ completionProposals.put(displayString, proposal);
+ proposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context);
+ acceptor.accept(proposal);
}
}
}
}
}
-
+
}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
index cfdd6563180..e0c30586722 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
@@ -26,7 +26,6 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.emf.common,
org.antlr.runtime,
org.eclipse.uml2.uml;bundle-version="3.2.0",
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0",
org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
org.apache.log4j;bundle-version="1.2.15",

Back to the top