Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2011-05-13 09:14:12 +0000
committervlorenzo2011-05-13 09:14:12 +0000
commit3a624f3952c8dd6a221f78f203ca29bc87c8359a (patch)
tree2a3e9d1f310e88c227ee139d05251b5b38bed93d /incoming
parentf562c479206136c9f92940d4d9c3100319acea98 (diff)
downloadorg.eclipse.papyrus-3a624f3952c8dd6a221f78f203ca29bc87c8359a.tar.gz
org.eclipse.papyrus-3a624f3952c8dd6a221f78f203ca29bc87c8359a.tar.xz
org.eclipse.papyrus-3a624f3952c8dd6a221f78f203ca29bc87c8359a.zip
NEW - bug 345698: Add Table Plugins to releng
https://bugs.eclipse.org/bugs/show_bug.cgi?id=345698 NEW - bug 334240: [Enhancement] [TableEditor] Papyrus shall support Tabular Editors https://bugs.eclipse.org/bugs/show_bug.cgi?id=334240
Diffstat (limited to 'incoming')
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/.classpath7
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/.project28
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/META-INF/MANIFEST.MF21
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/build.properties11
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/Environment.xmi4
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/papyrustableinstance.ctx37
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/papyrustableinstanceFieldSelection.xmi12
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/tableinstance.ctx359
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/tableinstance2.ctx148
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/tableinstance2FieldSelection.xmi20
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/tableinstanceFieldSelection.xmi56
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/Description.xwt10
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleAttributeColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleContextColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleDefaultLabelColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleEContainerColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleEObjectQueryRow.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFacetAttributeColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFacetFeatureColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFacetReferenceColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFeatureColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleMetaClassColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultiplePapyrusTableInstance.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultiplePrimitiveTypeQueryRow.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryRow.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryTableInstance.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryTableInstance2.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleReferenceColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleRow.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleTableInstance.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleTableInstance2.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleValueColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleAttributeColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleContextColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleDefaultLabelColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleEContainerColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleEObjectQueryRow.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFacetAttributeColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFacetFeatureColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFacetReferenceColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFeatureColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleMetaClassColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SinglePapyrusTableInstance.xwt68
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SinglePrimitiveTypeQueryRow.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryRow.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryTableInstance.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryTableInstance2.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleReferenceColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleRow.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleTableInstance.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleTableInstance2.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/model/ui/SingleValueColumn.xwt2
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/plugin.properties3
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/plugin.xml26
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/Activator.java69
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/modelelement/PapyrusTableFactory.java51
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/modelelement/PapyrusTableModelElement.java142
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/CustomizationContentProvider.java99
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/CustomizationLabelProvider.java74
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/FacetLabelProvider.java40
-rw-r--r--incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/FillingQueriesContentProvider.java164
-rw-r--r--incoming/org.eclipse.papyrus.table.common/.classpath7
-rw-r--r--incoming/org.eclipse.papyrus.table.common/.project28
-rw-r--r--incoming/org.eclipse.papyrus.table.common/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--incoming/org.eclipse.papyrus.table.common/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--incoming/org.eclipse.papyrus.table.common/META-INF/MANIFEST.MF30
-rw-r--r--incoming/org.eclipse.papyrus.table.common/about.html28
-rw-r--r--incoming/org.eclipse.papyrus.table.common/build.properties12
-rw-r--r--incoming/org.eclipse.papyrus.table.common/icons/table.pngbin515 -> 0 bytes
-rw-r--r--incoming/org.eclipse.papyrus.table.common/icons/table_green.pngbin542 -> 0 bytes
-rw-r--r--incoming/org.eclipse.papyrus.table.common/plugin.properties3
-rw-r--r--incoming/org.eclipse.papyrus.table.common/plugin.xml36
-rw-r--r--incoming/org.eclipse.papyrus.table.common/resources/table_Ecore_hideEAnnotationFeature.uiCustom10
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/Activator.java70
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/dialog/TwoInputDialog.java134
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/editor/AbstractNattableEditor.java219
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/AbstractNattableEditorFactory.java213
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/PapyrusCommandFactory.java300
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/AbstractCreateNattableEditorCommand.java408
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/CreateNewElementContributionItem.java67
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/NatTableEditor.java414
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/TableEditorInput.java77
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/messages/Messages.java42
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/messages/messages.properties7
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/EMFFacetNattableModel.java126
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/PapyrusNattableModel.java127
-rw-r--r--incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/util/QueryRepresentation.java69
-rw-r--r--incoming/org.eclipse.papyrus.table.default/.classpath7
-rw-r--r--incoming/org.eclipse.papyrus.table.default/.project28
-rw-r--r--incoming/org.eclipse.papyrus.table.default/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--incoming/org.eclipse.papyrus.table.default/META-INF/MANIFEST.MF18
-rw-r--r--incoming/org.eclipse.papyrus.table.default/about.html28
-rw-r--r--incoming/org.eclipse.papyrus.table.default/build.properties10
-rw-r--r--incoming/org.eclipse.papyrus.table.default/plugin.properties12
-rw-r--r--incoming/org.eclipse.papyrus.table.default/plugin.xml102
-rw-r--r--incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/Activator.java135
-rw-r--r--incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/editor/DefaultNattableEditor.java48
-rw-r--r--incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/factory/NattableEditorFactory.java39
-rw-r--r--incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/handlers/CreateNattableEditorCommand.java36
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/.classpath7
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/.project28
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/META-INF/MANIFEST.MF23
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/build.properties14
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.ecore37
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.genmodel19
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/plugin.properties2
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/plugin.xml20
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java67
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrusTableInstance.java156
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java46
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstancePackage.java266
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java381
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java99
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java237
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java124
-rw-r--r--incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java114
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/.classpath7
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/.project28
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/META-INF/MANIFEST.MF21
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/about.html28
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/build.properties7
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/icons/empty.pngbin476 -> 0 bytes
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/icons/not_NA.pngbin1150 -> 0 bytes
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/icons/rename.gifbin922 -> 0 bytes
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/icons/select_column_to_hide.pngbin475 -> 0 bytes
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/icons/select_column_to_hide_2.pngbin433 -> 0 bytes
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/plugin.properties3
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/plugin.xml538
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/Activator.java65
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/CommonColumnHandler.java56
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/HideEmptyColumnsHandler.java50
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/AbstractToggleStateProvider.java91
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/HideEmptyColumnState.java55
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/OnlyCommonColumnsState.java56
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/messages/Messages.java32
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/messages/messages.properties2
-rw-r--r--incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/providers/TableTester.java67
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/.classpath7
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/.project28
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/META-INF/MANIFEST.MF21
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/about.html28
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/build.properties6
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/plugin.properties3
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/plugin.xml171
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/Activator.java117
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java57
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DeleteTableHandler.java73
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DuplicateTableHandler.java82
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/RenameTableHandler.java84
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/messages/Messages.java34
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/messages/messages.properties3
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableContentProvider.java95
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableLabelProvider.java56
-rw-r--r--incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/TablePropertyTester.java78
-rw-r--r--incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/.classpath7
-rw-r--r--incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/.project28
-rw-r--r--incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/META-INF/MANIFEST.MF16
-rw-r--r--incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/build.properties7
-rw-r--r--incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/plugin.properties3
-rw-r--r--incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/plugin.xml11
-rw-r--r--incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/resources/umlCellEditors.modelcelleditors9
-rw-r--r--incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/src/org/eclipse/papyrus/widget/celleditors/uml/Activator.java73
-rw-r--r--incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/src/org/eclipse/papyrus/widget/celleditors/uml/editors/BooleanCellEditor.java74
-rw-r--r--incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/src/org/eclipse/papyrus/widget/celleditors/uml/editors/StringMultiCellEditor.java68
174 files changed, 0 insertions, 8467 deletions
diff --git a/incoming/org.eclipse.papyrus.properties.table/.classpath b/incoming/org.eclipse.papyrus.properties.table/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/.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/incoming/org.eclipse.papyrus.properties.table/.project b/incoming/org.eclipse.papyrus.properties.table/.project
deleted file mode 100644
index 03ca67cb112..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.properties.table</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/incoming/org.eclipse.papyrus.properties.table/.settings/org.eclipse.jdt.core.prefs b/incoming/org.eclipse.papyrus.properties.table/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 46f774520ba..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Mar 11 10:04:20 CET 2011
-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/incoming/org.eclipse.papyrus.properties.table/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.properties.table/META-INF/MANIFEST.MF
deleted file mode 100644
index 9404b8352c2..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.properties.table;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.properties.table.Activator
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.properties,
- org.eclipse.papyrus.properties.model;bundle-version="0.8.0",
- org.eclipse.emf.edit,
- org.eclipse.papyrus.widgets;bundle-version="0.8.0",
- org.eclipse.emf.facet.infra.query.core;bundle-version="0.1.0",
- org.eclipse.emf.databinding,
- org.eclipse.papyrus.log,
- org.eclipse.papyrus.table.instance;bundle-version="0.8.0",
- org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
diff --git a/incoming/org.eclipse.papyrus.properties.table/build.properties b/incoming/org.eclipse.papyrus.properties.table/build.properties
deleted file mode 100644
index e2048ef6583..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- plugin.xml,\
- model/
-src.includes = plugin.xml,\
- plugin.properties,\
- model/,\
- META-INF/
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/Environment.xmi b/incoming/org.eclipse.papyrus.properties.table/model/Environment.xmi
deleted file mode 100644
index 2e6c01b7a67..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/Environment.xmi
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<environment:Environment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:environment="http://www.eclipse.org/papyrus/properties/environment">
- <modelElementFactories name="PapyrusTableFactory" factoryClass="org.eclipse.papyrus.properties.table.modelelement.PapyrusTableFactory"/>
-</environment:Environment>
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/papyrustableinstance.ctx b/incoming/org.eclipse.papyrus.properties.table/model/papyrustableinstance.ctx
deleted file mode 100644
index b8d5d0755d2..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/papyrustableinstance.ctx
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts" name="papyrustableinstance">
- <dependencies href="platform:/plugin/org.eclipse.papyrus.properties.table/model/tableinstance2.ctx#/"/>
- <dependencies href="platform:/plugin/org.eclipse.papyrus.properties.table/model/tableinstance.ctx#/"/>
- <tabs label="Default" id="default" category="default">
- <sections name="Single PapyrusTableInstance" sectionFile="ui/SinglePapyrusTableInstance.xwt">
- <widget href="ui/SinglePapyrusTableInstance.xwt#/"/>
- </sections>
- <sections name="Multiple PapyrusTableInstance" sectionFile="ui/MultiplePapyrusTableInstance.xwt">
- <widget href="ui/MultiplePapyrusTableInstance.xwt#/"/>
- </sections>
- </tabs>
- <views name="Single PapyrusTableInstance" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePapyrusTableInstance">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="PapyrusTableInstance"/>
- </constraints>
- </views>
- <views name="Multiple PapyrusTableInstance" sections="//@tabs.0/@sections.1" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePapyrusTableInstance">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="PapyrusTableInstance"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance"/>
- </constraints>
- </views>
- <dataContexts name="papyrustableinstance" label="papyrustableinstance">
- <elements name="PapyrusTableInstance">
- <properties name="name"/>
- <properties name="type"/>
- <properties name="isSynchronized" type="Boolean"/>
- <properties name="table" type="Reference"/>
- <properties name="fillingQueries" type="Reference" multiplicity="-1"/>
- </elements>
- <modelElementFactory href="../../../plugin/org.eclipse.papyrus.properties.table/model/Environment.xmi#//@modelElementFactories.0"/>
- </dataContexts>
-</contexts:Context>
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/papyrustableinstanceFieldSelection.xmi b/incoming/org.eclipse.papyrus.properties.table/model/papyrustableinstanceFieldSelection.xmi
deleted file mode 100644
index 9ffca51ce04..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/papyrustableinstanceFieldSelection.xmi
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<fs:FieldSelection xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:fs="http://www.eclipse.org/papyrus/properties/fieldSelection">
- <contextElements name="papyrustableinstance">
- <elements name="PapyrusTableInstance">
- <properties name="name"/>
- <properties name="type"/>
- <properties name="isSynchronized"/>
- <properties name="table" valueSingle="FALSE"/>
- <properties name="fillingQueries"/>
- </elements>
- </contextElements>
-</fs:FieldSelection>
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/tableinstance.ctx b/incoming/org.eclipse.papyrus.properties.table/model/tableinstance.ctx
deleted file mode 100644
index a8cab49afcf..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/tableinstance.ctx
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts" name="tableinstance">
- <tabs label="Default" id="default" category="default">
- <sections name="Single TableInstance" sectionFile="ui/SingleTableInstance.xwt">
- <widget href="ui/SingleTableInstance.xwt#/"/>
- </sections>
- <sections name="Single QueryTableInstance" sectionFile="ui/SingleQueryTableInstance.xwt">
- <widget href="ui/SingleQueryTableInstance.xwt#/"/>
- </sections>
- <sections name="Single Column" sectionFile="ui/SingleColumn.xwt">
- <widget href="ui/SingleColumn.xwt#/"/>
- </sections>
- <sections name="Single QueryColumn" sectionFile="ui/SingleQueryColumn.xwt">
- <widget href="ui/SingleQueryColumn.xwt#/"/>
- </sections>
- <sections name="Single ReferenceColumn" sectionFile="ui/SingleReferenceColumn.xwt">
- <widget href="ui/SingleReferenceColumn.xwt#/"/>
- </sections>
- <sections name="Single ContextColumn" sectionFile="ui/SingleContextColumn.xwt">
- <widget href="ui/SingleContextColumn.xwt#/"/>
- </sections>
- <sections name="Single MetaClassColumn" sectionFile="ui/SingleMetaClassColumn.xwt">
- <widget href="ui/SingleMetaClassColumn.xwt#/"/>
- </sections>
- <sections name="Single AttributeColumn" sectionFile="ui/SingleAttributeColumn.xwt">
- <widget href="ui/SingleAttributeColumn.xwt#/"/>
- </sections>
- <sections name="Single EContainerColumn" sectionFile="ui/SingleEContainerColumn.xwt">
- <widget href="ui/SingleEContainerColumn.xwt#/"/>
- </sections>
- <sections name="Single DefaultLabelColumn" sectionFile="ui/SingleDefaultLabelColumn.xwt">
- <widget href="ui/SingleDefaultLabelColumn.xwt#/"/>
- </sections>
- <sections name="Single FeatureColumn" sectionFile="ui/SingleFeatureColumn.xwt">
- <widget href="ui/SingleFeatureColumn.xwt#/"/>
- </sections>
- <sections name="Single Row" sectionFile="ui/SingleRow.xwt">
- <widget href="ui/SingleRow.xwt#/"/>
- </sections>
- <sections name="Single FacetAttributeColumn" sectionFile="ui/SingleFacetAttributeColumn.xwt">
- <widget href="ui/SingleFacetAttributeColumn.xwt#/"/>
- </sections>
- <sections name="Single FacetReferenceColumn" sectionFile="ui/SingleFacetReferenceColumn.xwt">
- <widget href="ui/SingleFacetReferenceColumn.xwt#/"/>
- </sections>
- <sections name="Single FacetFeatureColumn" sectionFile="ui/SingleFacetFeatureColumn.xwt">
- <widget href="ui/SingleFacetFeatureColumn.xwt#/"/>
- </sections>
- <sections name="Multiple TableInstance" sectionFile="ui/MultipleTableInstance.xwt">
- <widget href="ui/MultipleTableInstance.xwt#/"/>
- </sections>
- <sections name="Multiple QueryTableInstance" sectionFile="ui/MultipleQueryTableInstance.xwt">
- <widget href="ui/MultipleQueryTableInstance.xwt#/"/>
- </sections>
- <sections name="Multiple Column" sectionFile="ui/MultipleColumn.xwt">
- <widget href="ui/MultipleColumn.xwt#/"/>
- </sections>
- <sections name="Multiple QueryColumn" sectionFile="ui/MultipleQueryColumn.xwt">
- <widget href="ui/MultipleQueryColumn.xwt#/"/>
- </sections>
- <sections name="Multiple ReferenceColumn" sectionFile="ui/MultipleReferenceColumn.xwt">
- <widget href="ui/MultipleReferenceColumn.xwt#/"/>
- </sections>
- <sections name="Multiple ContextColumn" sectionFile="ui/MultipleContextColumn.xwt">
- <widget href="ui/MultipleContextColumn.xwt#/"/>
- </sections>
- <sections name="Multiple MetaClassColumn" sectionFile="ui/MultipleMetaClassColumn.xwt">
- <widget href="ui/MultipleMetaClassColumn.xwt#/"/>
- </sections>
- <sections name="Multiple AttributeColumn" sectionFile="ui/MultipleAttributeColumn.xwt">
- <widget href="ui/MultipleAttributeColumn.xwt#/"/>
- </sections>
- <sections name="Multiple EContainerColumn" sectionFile="ui/MultipleEContainerColumn.xwt">
- <widget href="ui/MultipleEContainerColumn.xwt#/"/>
- </sections>
- <sections name="Multiple DefaultLabelColumn" sectionFile="ui/MultipleDefaultLabelColumn.xwt">
- <widget href="ui/MultipleDefaultLabelColumn.xwt#/"/>
- </sections>
- <sections name="Multiple FeatureColumn" sectionFile="ui/MultipleFeatureColumn.xwt">
- <widget href="ui/MultipleFeatureColumn.xwt#/"/>
- </sections>
- <sections name="Multiple Row" sectionFile="ui/MultipleRow.xwt">
- <widget href="ui/MultipleRow.xwt#/"/>
- </sections>
- <sections name="Multiple FacetAttributeColumn" sectionFile="ui/MultipleFacetAttributeColumn.xwt">
- <widget href="ui/MultipleFacetAttributeColumn.xwt#/"/>
- </sections>
- <sections name="Multiple FacetReferenceColumn" sectionFile="ui/MultipleFacetReferenceColumn.xwt">
- <widget href="ui/MultipleFacetReferenceColumn.xwt#/"/>
- </sections>
- <sections name="Multiple FacetFeatureColumn" sectionFile="ui/MultipleFacetFeatureColumn.xwt">
- <widget href="ui/MultipleFacetFeatureColumn.xwt#/"/>
- </sections>
- </tabs>
- <views name="Single TableInstance" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTableInstance">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="TableInstance"/>
- </constraints>
- </views>
- <views name="Single QueryTableInstance" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleQueryTableInstance">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="QueryTableInstance"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Single Column" sections="//@tabs.0/@sections.2" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="Column"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Single QueryColumn" sections="//@tabs.0/@sections.3" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleQueryColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="QueryColumn"/>
- </constraints>
- </views>
- <views name="Single ReferenceColumn" sections="//@tabs.0/@sections.4" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReferenceColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="ReferenceColumn"/>
- </constraints>
- </views>
- <views name="Single ContextColumn" sections="//@tabs.0/@sections.5" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleContextColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="ContextColumn"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Single MetaClassColumn" sections="//@tabs.0/@sections.6" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleMetaClassColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="MetaClassColumn"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Single AttributeColumn" sections="//@tabs.0/@sections.7" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAttributeColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="AttributeColumn"/>
- </constraints>
- </views>
- <views name="Single EContainerColumn" sections="//@tabs.0/@sections.8" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleEContainerColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="EContainerColumn"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Single DefaultLabelColumn" sections="//@tabs.0/@sections.9" automaticContext="true" datacontexts="//@dataContexts.0/@elements.9">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDefaultLabelColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="DefaultLabelColumn"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Single FeatureColumn" sections="//@tabs.0/@sections.10" automaticContext="true" datacontexts="//@dataContexts.0/@elements.10">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFeatureColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="FeatureColumn"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Single Row" sections="//@tabs.0/@sections.11" automaticContext="true" datacontexts="//@dataContexts.0/@elements.11">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRow">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="Row"/>
- </constraints>
- </views>
- <views name="Single FacetAttributeColumn" sections="//@tabs.0/@sections.12" automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFacetAttributeColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="FacetAttributeColumn"/>
- </constraints>
- </views>
- <views name="Single FacetReferenceColumn" sections="//@tabs.0/@sections.13" automaticContext="true" datacontexts="//@dataContexts.0/@elements.13">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFacetReferenceColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="FacetReferenceColumn"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Single FacetFeatureColumn" sections="//@tabs.0/@sections.14" automaticContext="true" datacontexts="//@dataContexts.0/@elements.14">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFacetFeatureColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="FacetFeatureColumn"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Multiple TableInstance" sections="//@tabs.0/@sections.15" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTableInstance">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="TableInstance"/>
- </constraints>
- </views>
- <views name="Multiple QueryTableInstance" sections="//@tabs.0/@sections.16" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleQueryTableInstance">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="QueryTableInstance"/>
- </constraints>
- </views>
- <views name="Multiple Column" sections="//@tabs.0/@sections.17" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="Column"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Multiple QueryColumn" sections="//@tabs.0/@sections.18" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleQueryColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="QueryColumn"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Multiple ReferenceColumn" sections="//@tabs.0/@sections.19" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReferenceColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="ReferenceColumn"/>
- </constraints>
- </views>
- <views name="Multiple ContextColumn" sections="//@tabs.0/@sections.20" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleContextColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="ContextColumn"/>
- </constraints>
- </views>
- <views name="Multiple MetaClassColumn" sections="//@tabs.0/@sections.21" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleMetaClassColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="MetaClassColumn"/>
- </constraints>
- </views>
- <views name="Multiple AttributeColumn" sections="//@tabs.0/@sections.22" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAttributeColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="AttributeColumn"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Multiple EContainerColumn" sections="//@tabs.0/@sections.23" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleEContainerColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="EContainerColumn"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Multiple DefaultLabelColumn" sections="//@tabs.0/@sections.24" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.9">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDefaultLabelColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="DefaultLabelColumn"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Multiple FeatureColumn" sections="//@tabs.0/@sections.25" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.10">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFeatureColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="FeatureColumn"/>
- </constraints>
- </views>
- <views name="Multiple Row" sections="//@tabs.0/@sections.26" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.11">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRow">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="Row"/>
- </constraints>
- </views>
- <views name="Multiple FacetAttributeColumn" sections="//@tabs.0/@sections.27" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFacetAttributeColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="FacetAttributeColumn"/>
- </constraints>
- </views>
- <views name="Multiple FacetReferenceColumn" sections="//@tabs.0/@sections.28" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.13">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFacetReferenceColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="FacetReferenceColumn"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- </constraints>
- </views>
- <views name="Multiple FacetFeatureColumn" sections="//@tabs.0/@sections.29" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.14">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFacetFeatureColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="FacetFeatureColumn"/>
- </constraints>
- </views>
- <dataContexts name="tableinstance" label="tableinstance">
- <elements name="TableInstance">
- <properties name="tableConfiguration" type="Reference"/>
- <properties name="customizations" type="Reference" multiplicity="-1"/>
- <properties name="facets" type="Reference"/>
- <properties name="context" type="Reference"/>
- <properties name="parameter"/>
- <properties name="hideEmptyColumns" type="Boolean"/>
- <properties name="onlyShowCommonColumns" type="Boolean"/>
- <properties name="description"/>
- <properties name="columns" type="Reference" multiplicity="-1"/>
- <properties name="rows" type="Reference" multiplicity="-1"/>
- <properties name="elements" type="Reference" multiplicity="-1"/>
- <properties name="localCustomization" type="Reference"/>
- </elements>
- <elements name="QueryTableInstance">
- <properties name="queryResults" type="Reference" multiplicity="-1"/>
- </elements>
- <elements name="Column">
- <properties name="isHidden" type="Boolean"/>
- <properties name="width" type="Integer"/>
- </elements>
- <elements name="QueryColumn">
- <properties name="query" type="Reference"/>
- <properties name="queryResult" type="Reference" multiplicity="-1"/>
- </elements>
- <elements name="ReferenceColumn">
- <properties name="reference" type="Reference"/>
- </elements>
- <elements name="ContextColumn"/>
- <elements name="MetaClassColumn"/>
- <elements name="AttributeColumn">
- <properties name="attribute" type="Reference"/>
- </elements>
- <elements name="EContainerColumn"/>
- <elements name="DefaultLabelColumn"/>
- <elements name="FeatureColumn">
- <properties name="feature" type="Reference"/>
- </elements>
- <elements name="Row">
- <properties name="element" type="Reference"/>
- <properties name="height" type="Integer"/>
- </elements>
- <elements name="FacetAttributeColumn">
- <properties name="attribute" type="Reference"/>
- </elements>
- <elements name="FacetReferenceColumn">
- <properties name="reference" type="Reference"/>
- </elements>
- <elements name="FacetFeatureColumn">
- <properties name="facetFeature" type="Reference"/>
- </elements>
- <modelElementFactory href="pathmap://PPEResources/Environment.xmi#//@modelElementFactories.0"/>
- </dataContexts>
-</contexts:Context>
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/tableinstance2.ctx b/incoming/org.eclipse.papyrus.properties.table/model/tableinstance2.ctx
deleted file mode 100644
index 6981c1ddf7f..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/tableinstance2.ctx
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts" name="tableinstance2">
- <dependencies href="tableinstance.ctx#/"/>
- <tabs label="Default" id="default" category="default">
- <sections name="Single TableInstance2" sectionFile="ui/SingleTableInstance2.xwt">
- <widget href="ui/SingleTableInstance2.xwt#/"/>
- </sections>
- <sections name="Single QueryRow" sectionFile="ui/SingleQueryRow.xwt">
- <widget href="ui/SingleQueryRow.xwt#/"/>
- </sections>
- <sections name="Single PrimitiveTypeQueryRow" sectionFile="ui/SinglePrimitiveTypeQueryRow.xwt">
- <widget href="ui/SinglePrimitiveTypeQueryRow.xwt#/"/>
- </sections>
- <sections name="Single EObjectQueryRow" sectionFile="ui/SingleEObjectQueryRow.xwt">
- <widget href="ui/SingleEObjectQueryRow.xwt#/"/>
- </sections>
- <sections name="Single ValueColumn" sectionFile="ui/SingleValueColumn.xwt">
- <widget href="ui/SingleValueColumn.xwt#/"/>
- </sections>
- <sections name="Single QueryTableInstance2" sectionFile="ui/SingleQueryTableInstance2.xwt">
- <widget href="ui/SingleQueryTableInstance2.xwt#/"/>
- </sections>
- <sections name="Multiple TableInstance2" sectionFile="ui/MultipleTableInstance2.xwt">
- <widget href="ui/MultipleTableInstance2.xwt#/"/>
- </sections>
- <sections name="Multiple QueryRow" sectionFile="ui/MultipleQueryRow.xwt">
- <widget href="ui/MultipleQueryRow.xwt#/"/>
- </sections>
- <sections name="Multiple PrimitiveTypeQueryRow" sectionFile="ui/MultiplePrimitiveTypeQueryRow.xwt">
- <widget href="ui/MultiplePrimitiveTypeQueryRow.xwt#/"/>
- </sections>
- <sections name="Multiple EObjectQueryRow" sectionFile="ui/MultipleEObjectQueryRow.xwt">
- <widget href="ui/MultipleEObjectQueryRow.xwt#/"/>
- </sections>
- <sections name="Multiple ValueColumn" sectionFile="ui/MultipleValueColumn.xwt">
- <widget href="ui/MultipleValueColumn.xwt#/"/>
- </sections>
- <sections name="Multiple QueryTableInstance2" sectionFile="ui/MultipleQueryTableInstance2.xwt">
- <widget href="ui/MultipleQueryTableInstance2.xwt#/"/>
- </sections>
- <sections name="Description" sectionFile="ui/Description.xwt">
- <widget href="ui/Description.xwt#/"/>
- </sections>
- </tabs>
- <views name="Single TableInstance2" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTableInstance2">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="TableInstance2"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
- </constraints>
- </views>
- <views name="Single QueryRow" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleQueryRow">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="QueryRow"/>
- </constraints>
- </views>
- <views name="Single PrimitiveTypeQueryRow" sections="//@tabs.0/@sections.2" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePrimitiveTypeQueryRow">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="PrimitiveTypeQueryRow"/>
- </constraints>
- </views>
- <views name="Single EObjectQueryRow" sections="//@tabs.0/@sections.3" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleEObjectQueryRow">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="EObjectQueryRow"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
- </constraints>
- </views>
- <views name="Single ValueColumn" sections="//@tabs.0/@sections.4" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleValueColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="ValueColumn"/>
- </constraints>
- </views>
- <views name="Single QueryTableInstance2" sections="//@tabs.0/@sections.5" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">
- <constraints xsi:type="contexts:SimpleConstraint" name="isSingleQueryTableInstance2">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="QueryTableInstance2"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
- </constraints>
- </views>
- <views name="Multiple TableInstance2" sections="//@tabs.0/@sections.6" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTableInstance2">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="TableInstance2"/>
- </constraints>
- </views>
- <views name="Multiple QueryRow" sections="//@tabs.0/@sections.7" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleQueryRow">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="QueryRow"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
- </constraints>
- </views>
- <views name="Multiple PrimitiveTypeQueryRow" sections="//@tabs.0/@sections.8" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePrimitiveTypeQueryRow">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="PrimitiveTypeQueryRow"/>
- </constraints>
- </views>
- <views name="Multiple EObjectQueryRow" sections="//@tabs.0/@sections.9" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleEObjectQueryRow">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="EObjectQueryRow"/>
- </constraints>
- </views>
- <views name="Multiple ValueColumn" sections="//@tabs.0/@sections.10" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleValueColumn">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="ValueColumn"/>
- </constraints>
- </views>
- <views name="Multiple QueryTableInstance2" sections="//@tabs.0/@sections.11" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">
- <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleQueryTableInstance2">
- <constraintType href="pathmap://PPEResources/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"/>
- <properties xsi:type="contexts:ValueProperty" name="className" value="QueryTableInstance2"/>
- </constraints>
- </views>
- <views name="Description" sections="//@tabs.0/@sections.12"/>
- <dataContexts name="tableinstance2" label="tableinstance2">
- <elements name="TableInstance2">
- <properties name="localCustomizations" type="Reference" multiplicity="-1"/>
- <properties name="facets2" type="Reference" multiplicity="-1"/>
- </elements>
- <elements name="QueryRow">
- <properties name="queryResult" type="Reference"/>
- </elements>
- <elements name="PrimitiveTypeQueryRow">
- <properties name="value"/>
- </elements>
- <elements name="EObjectQueryRow"/>
- <elements name="ValueColumn"/>
- <elements name="QueryTableInstance2">
- <properties name="queryResults2" type="Reference" multiplicity="-1"/>
- </elements>
- <modelElementFactory href="pathmap://PPEResources/Environment.xmi#//@modelElementFactories.0"/>
- </dataContexts>
-</contexts:Context>
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/tableinstance2FieldSelection.xmi b/incoming/org.eclipse.papyrus.properties.table/model/tableinstance2FieldSelection.xmi
deleted file mode 100644
index e9d9acb7c79..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/tableinstance2FieldSelection.xmi
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<fs:FieldSelection xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:fs="http://www.eclipse.org/papyrus/properties/fieldSelection">
- <contextElements name="tableinstance2">
- <elements name="TableInstance2">
- <properties name="localCustomizations" valueSingle="TRUE"/>
- <properties name="facets2"/>
- </elements>
- <elements name="QueryRow">
- <properties name="queryResult" valueSingle="FALSE"/>
- </elements>
- <elements name="PrimitiveTypeQueryRow">
- <properties name="value" valueSingle="FALSE"/>
- </elements>
- <elements name="EObjectQueryRow"/>
- <elements name="ValueColumn"/>
- <elements name="QueryTableInstance2">
- <properties name="queryResults2"/>
- </elements>
- </contextElements>
-</fs:FieldSelection>
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/tableinstanceFieldSelection.xmi b/incoming/org.eclipse.papyrus.properties.table/model/tableinstanceFieldSelection.xmi
deleted file mode 100644
index d3b2c00f81b..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/tableinstanceFieldSelection.xmi
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<fs:FieldSelection xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:fs="http://www.eclipse.org/papyrus/properties/fieldSelection">
- <contextElements name="tableinstance">
- <elements name="TableInstance">
- <properties name="tableConfiguration" valueSingle="FALSE"/>
- <properties name="customizations"/>
- <properties name="facets"/>
- <properties name="context"/>
- <properties name="parameter" valueSingle="FALSE"/>
- <properties name="hideEmptyColumns" valueMultiple="FALSE"/>
- <properties name="onlyShowCommonColumns" valueMultiple="FALSE"/>
- <properties name="description"/>
- <properties name="columns"/>
- <properties name="rows"/>
- <properties name="elements"/>
- <properties name="localCustomization"/>
- </elements>
- <elements name="QueryTableInstance">
- <properties name="queryResults"/>
- </elements>
- <elements name="Column">
- <properties name="isHidden" valueSingle="FALSE"/>
- <properties name="width" valueSingle="FALSE"/>
- </elements>
- <elements name="QueryColumn">
- <properties name="query" valueSingle="FALSE"/>
- <properties name="queryResult" valueSingle="FALSE"/>
- </elements>
- <elements name="ReferenceColumn">
- <properties name="reference" valueSingle="FALSE"/>
- </elements>
- <elements name="ContextColumn"/>
- <elements name="MetaClassColumn"/>
- <elements name="AttributeColumn">
- <properties name="attribute" valueSingle="FALSE"/>
- </elements>
- <elements name="EContainerColumn"/>
- <elements name="DefaultLabelColumn"/>
- <elements name="FeatureColumn">
- <properties name="feature"/>
- </elements>
- <elements name="Row">
- <properties name="element" valueSingle="FALSE"/>
- <properties name="height" valueSingle="FALSE"/>
- </elements>
- <elements name="FacetAttributeColumn">
- <properties name="attribute" valueSingle="FALSE"/>
- </elements>
- <elements name="FacetReferenceColumn">
- <properties name="reference" valueSingle="FALSE"/>
- </elements>
- <elements name="FacetFeatureColumn">
- <properties name="facetFeature"/>
- </elements>
- </contextElements>
-</fs:FieldSelection>
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/Description.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/Description.xwt
deleted file mode 100644
index 534b3d5b68f..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/Description.xwt
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"
- xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">
- <Composite.layout>
- <ppel:PropertiesLayout></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:StringMultiline input="{Binding}"
- property="tableinstance:TableInstance:description"></ppe:StringMultiline>
-</Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleAttributeColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleAttributeColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleAttributeColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleColumn.xwt
deleted file mode 100644
index 166f1fc4446..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="tableinstance:Column:isHidden"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="tableinstance:Column:width"></ppe:IntegerEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleContextColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleContextColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleContextColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleDefaultLabelColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleDefaultLabelColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleDefaultLabelColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleEContainerColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleEContainerColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleEContainerColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleEObjectQueryRow.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleEObjectQueryRow.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleEObjectQueryRow.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFacetAttributeColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFacetAttributeColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFacetAttributeColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFacetFeatureColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFacetFeatureColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFacetFeatureColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFacetReferenceColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFacetReferenceColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFacetReferenceColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFeatureColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFeatureColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleFeatureColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleMetaClassColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleMetaClassColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleMetaClassColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultiplePapyrusTableInstance.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultiplePapyrusTableInstance.xwt
deleted file mode 100644
index 5b1bcbf19f6..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultiplePapyrusTableInstance.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="papyrustableinstance:PapyrusTableInstance:isSynchronized"></ppe:BooleanRadio></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultiplePrimitiveTypeQueryRow.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultiplePrimitiveTypeQueryRow.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultiplePrimitiveTypeQueryRow.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryRow.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryRow.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryRow.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryTableInstance.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryTableInstance.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryTableInstance.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryTableInstance2.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryTableInstance2.xwt
deleted file mode 100644
index b46518daf35..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleQueryTableInstance2.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleReferenceColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleReferenceColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleReferenceColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleRow.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleRow.xwt
deleted file mode 100644
index 8df809ff0c4..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleRow.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="tableinstance:Row:height"></ppe:IntegerEditor></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleTableInstance.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleTableInstance.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleTableInstance.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleTableInstance2.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleTableInstance2.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleTableInstance2.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleValueColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleValueColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/MultipleValueColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleAttributeColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleAttributeColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleAttributeColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleContextColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleContextColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleContextColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleDefaultLabelColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleDefaultLabelColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleDefaultLabelColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleEContainerColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleEContainerColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleEContainerColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleEObjectQueryRow.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleEObjectQueryRow.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleEObjectQueryRow.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFacetAttributeColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFacetAttributeColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFacetAttributeColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFacetFeatureColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFacetFeatureColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFacetFeatureColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFacetReferenceColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFacetReferenceColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFacetReferenceColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFeatureColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFeatureColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleFeatureColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleMetaClassColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleMetaClassColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleMetaClassColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SinglePapyrusTableInstance.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SinglePapyrusTableInstance.xwt
deleted file mode 100644
index 9b65ae3528d..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SinglePapyrusTableInstance.xwt
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"
- xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
- <Composite.layout>
- <ppel:PropertiesLayout></ppel:PropertiesLayout>
- </Composite.layout>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout makeColumnsEqualWidth="true"
- numColumns="2"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:StringEditor input="{Binding}"
- property="papyrustableinstance:PapyrusTableInstance:name"></ppe:StringEditor>
- <ppe:StringEditor input="{Binding}"
- property="papyrustableinstance:PapyrusTableInstance:type" readOnly="true"></ppe:StringEditor>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout makeColumnsEqualWidth="false"
- numColumns="3"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:StringMultiline input="{Binding}"
- property="papyrustableinstance:PapyrusTableInstance:table.description" customLabel="Description"></ppe:StringMultiline>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="3"
- makeColumnsEqualWidth="false"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:ReferenceLabel input="{Binding}"
- property="papyrustableinstance:PapyrusTableInstance:table.context" customLabel="Context"></ppe:ReferenceLabel>
- <ppe:BooleanRadio input="{Binding}"
- property="papyrustableinstance:PapyrusTableInstance:isSynchronized"></ppe:BooleanRadio>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:MultiReference input="{Binding}"
- property="papyrustableinstance:PapyrusTableInstance:fillingQueries"></ppe:MultiReference>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="2"
- makeColumnsEqualWidth="true"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:BooleanRadio input="{Binding}"
- property="papyrustableinstance:PapyrusTableInstance:table.hideEmptyColumns"
- readOnly="true" customLabel="HideEmptyColumns"></ppe:BooleanRadio>
- <ppe:BooleanRadio input="{Binding}"
- property="papyrustableinstance:PapyrusTableInstance:table.onlyShowCommonColumns"
- readOnly="true" customLabel="OnlyCommonColumns"></ppe:BooleanRadio>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="2"
- makeColumnsEqualWidth="true"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:MultiReference input="{Binding}"
- property="papyrustableinstance:PapyrusTableInstance:table.customizations"
- readOnly="true" customLabel="Customizations"></ppe:MultiReference>
- <ppe:MultiReference input="{Binding}"
- property="papyrustableinstance:PapyrusTableInstance:table.facets2"
- readOnly="true" customLabel="Facets"></ppe:MultiReference>
- </Composite>
-</Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SinglePrimitiveTypeQueryRow.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SinglePrimitiveTypeQueryRow.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SinglePrimitiveTypeQueryRow.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryRow.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryRow.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryRow.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryTableInstance.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryTableInstance.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryTableInstance.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryTableInstance2.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryTableInstance2.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleQueryTableInstance2.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleReferenceColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleReferenceColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleReferenceColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleRow.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleRow.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleRow.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleTableInstance.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleTableInstance.xwt
deleted file mode 100644
index d94c6f8d837..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleTableInstance.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="tableinstance:TableInstance:description"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="tableinstance:TableInstance:hideEmptyColumns"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="tableinstance:TableInstance:onlyShowCommonColumns"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:ReferenceDialog input="{Binding}" property="tableinstance:TableInstance:facets"></ppe:ReferenceDialog><ppe:ReferenceDialog input="{Binding}" property="tableinstance:TableInstance:context"></ppe:ReferenceDialog></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="tableinstance:TableInstance:customizations"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleTableInstance2.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleTableInstance2.xwt
deleted file mode 100644
index 7b1bad01412..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleTableInstance2.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiReference input="{Binding}" property="tableinstance2:TableInstance2:localCustomizations"></ppe:MultiReference><ppe:MultiReference input="{Binding}" property="tableinstance2:TableInstance2:facets2"></ppe:MultiReference></Composite></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleValueColumn.xwt b/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleValueColumn.xwt
deleted file mode 100644
index 9f2fd49ad6a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/model/ui/SingleValueColumn.xwt
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite> \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/plugin.properties b/incoming/org.eclipse.papyrus.properties.table/plugin.properties
deleted file mode 100644
index 7fdd9404855..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.properties.table
-providerName = Eclipse Modeling Project (Incubation)
-pluginName = Papyrus Table Property View \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/plugin.xml b/incoming/org.eclipse.papyrus.properties.table/plugin.xml
deleted file mode 100644
index ff4c3326a2f..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
- <extension
- point="org.eclipse.papyrus.properties.context">
- <context
- contextModel="model/papyrustableinstance.ctx"
- loadDefault="true">
- </context>
- <context
- contextModel="model/tableinstance.ctx"
- loadDefault="true">
- </context>
- <context
- contextModel="model/tableinstance2.ctx"
- loadDefault="true">
- </context>
- </extension>
- <extension
- point="org.eclipse.papyrus.properties.environment">
- <environment
- environmentModel="model/Environment.xmi">
- </environment>
- </extension>
-</plugin>
diff --git a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/Activator.java b/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/Activator.java
deleted file mode 100644
index 3f2aa5cd439..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/Activator.java
+++ /dev/null
@@ -1,69 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.properties.table;
-
-import org.eclipse.papyrus.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.properties.table"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /** Logging helper */
- public static LogHelper log;
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(final BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- log = new LogHelper(plugin);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(final BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/modelelement/PapyrusTableFactory.java b/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/modelelement/PapyrusTableFactory.java
deleted file mode 100644
index 796c17e8001..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/modelelement/PapyrusTableFactory.java
+++ /dev/null
@@ -1,51 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.properties.table.modelelement;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.papyrus.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.properties.modelelement.EMFModelElementFactory;
-import org.eclipse.papyrus.properties.modelelement.ModelElement;
-import org.eclipse.papyrus.properties.table.Activator;
-import org.eclipse.papyrus.properties.util.EMFHelper;
-
-/**
- *
- * The factory for the PapyrusTable
- *
- */
-public class PapyrusTableFactory extends EMFModelElementFactory{
-
- /**
- *
- * @see org.eclipse.papyrus.properties.modelelement.EMFModelElementFactory#createFromSource(java.lang.Object, org.eclipse.papyrus.properties.contexts.DataContextElement)
- *
- * @param sourceElement
- * @param context
- * @return
- */
- @Override
- public ModelElement createFromSource(final Object sourceElement, final DataContextElement context) {
- EObject source = EMFHelper.getEObject(sourceElement);
- if(source == null) {
- Activator.log.warn("Unable to resolve the selected element to an EObject"); //$NON-NLS-1$
- return null;
- }
-
- EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(source);
- return new PapyrusTableModelElement(source, domain);
- }
-}
diff --git a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/modelelement/PapyrusTableModelElement.java b/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/modelelement/PapyrusTableModelElement.java
deleted file mode 100644
index b1228331051..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/modelelement/PapyrusTableModelElement.java
+++ /dev/null
@@ -1,142 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.properties.table.modelelement;
-
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.databinding.FeaturePath;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.TableInstance2;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.papyrus.properties.modelelement.EMFModelElement;
-import org.eclipse.papyrus.properties.table.provider.CustomizationContentProvider;
-import org.eclipse.papyrus.properties.table.provider.CustomizationLabelProvider;
-import org.eclipse.papyrus.properties.table.provider.FacetLabelProvider;
-import org.eclipse.papyrus.properties.table.provider.FillingQueriesContentProvider;
-import org.eclipse.papyrus.widgets.creation.ReferenceValueFactory;
-import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
-
-
-
-
-public class PapyrusTableModelElement extends EMFModelElement {
-
- /** these 3 value are used for the preference of the display of the localCustom in the property view */
- /** any local customization is displayed */
- public static final int NO_LOCALS = 0;
-
- /** only one of the local customization is displayed */
- public static final int ONLY_ONE_LOCALS = NO_LOCALS + 1;
-
- /** all local customizations are displayed */
- public static final int ALL_LOCALS = ONLY_ONE_LOCALS + 1;
-
- /** the property path for the customization */
- public static final String TABLE_CUSTOMIZATIONS = "table.customizations"; //$NON-NLS-1$
-
- /** the property path for the customization */
- public static final String TABLE_FACETS2 = "table.facets2"; //$NON-NLS-1$
-
- /** the property path for the customization */
- public static final String TABLE_FILLING_QUERIES = "fillingQueries"; //$NON-NLS-1$
-
- public static final String TABLE_CONTEXT = "table.context"; //$NON-NLS-1$
-
- /** the current value of the preference for the display of the local customization */
- private static int local_preference = ALL_LOCALS;
-
- /**
- *
- * Constructor.
- *
- * @param source
- */
- public PapyrusTableModelElement(final EObject source) {
- super(source);
- }
-
- /**
- *
- * Constructor.
- *
- * @param source
- * @param domain
- */
- public PapyrusTableModelElement(final EObject source, final EditingDomain domain) {
- super(source, domain);
- }
-
- /**
- *
- * @see org.eclipse.papyrus.properties.modelelement.EMFModelElement#getContentProvider(java.lang.String)
- *
- * @param propertyPath
- * @return
- */
- @Override
- public IStaticContentProvider getContentProvider(final String propertyPath) {
- if(TABLE_FILLING_QUERIES.equals(propertyPath)) {
- FeaturePath featurePath = getFeaturePath(TABLE_CONTEXT);
- EObject table = getSource(featurePath);
- Assert.isTrue(table instanceof TableInstance);
- return new FillingQueriesContentProvider((TableInstance)table);
- }
- if(TABLE_CUSTOMIZATIONS.equals(propertyPath)) {
- FeaturePath featurePath = getFeaturePath(TABLE_CUSTOMIZATIONS);
- EStructuralFeature feature = getFeature(featurePath);
- return new CustomizationContentProvider(feature, getSource(featurePath), local_preference);
- }
- return super.getContentProvider(propertyPath);
- }
-
- /**
- *
- * @see org.eclipse.papyrus.properties.modelelement.EMFModelElement#getLabelProvider(java.lang.String)
- *
- * @param propertyPath
- * @return
- */
- @Override
- public ILabelProvider getLabelProvider(final String propertyPath) {
- if(TABLE_CUSTOMIZATIONS.equals(propertyPath)) {
- FeaturePath featurePath = getFeaturePath(TABLE_CUSTOMIZATIONS);
- EObject table = getSource(featurePath);
- Assert.isTrue(table instanceof TableInstance2);
- return new CustomizationLabelProvider((TableInstance2)table, local_preference);
- }
- if(TABLE_FACETS2.equals(propertyPath)) {
- return new FacetLabelProvider();
- }
- return super.getLabelProvider(propertyPath);
- }
-
- /**
- *
- * @see org.eclipse.papyrus.properties.modelelement.EMFModelElement#getValueFactory(java.lang.String)
- *
- * @param propertyPath
- * @return
- */
- @Override
- public ReferenceValueFactory getValueFactory(final String propertyPath) {
- //allow to disabled the edition of the filling queries
- if(TABLE_FILLING_QUERIES.equals(propertyPath)) {
- return null;
- }
- return super.getValueFactory(propertyPath);
- }
-}
diff --git a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/CustomizationContentProvider.java b/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/CustomizationContentProvider.java
deleted file mode 100644
index 110052f1874..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/CustomizationContentProvider.java
+++ /dev/null
@@ -1,99 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.properties.table.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.TableInstance2;
-import org.eclipse.papyrus.properties.providers.EcoreReferenceContentProvider;
-import org.eclipse.papyrus.properties.table.modelelement.PapyrusTableModelElement;
-
-/**
- *
- * The content provider for the MetamodelView
- *
- */
-public class CustomizationContentProvider extends EcoreReferenceContentProvider {
-
- /**
- * the table instance
- */
- private final TableInstance2 source;
-
- /**
- * the preference
- */
- private final int preference;
-
- /**
- *
- * Constructor.
- *
- * @param feature
- * the feature
- * @param eObject
- * the eobject
- * @param pref
- * the preference : it allows to display to choose how to display the local customization :
- * <ul>
- * <li> all customization</li>
- * <li> one customization</li>
- * <li> no customization</li>
- * </ul>
- */
- public CustomizationContentProvider(final EStructuralFeature feature, final EObject eObject, final int pref) {
- super(feature, eObject);
- preference = pref;
- Assert.isTrue(eObject instanceof TableInstance2);
- source = (TableInstance2)eObject;
- }
-
- /**
- *
- * @see org.eclipse.papyrus.properties.providers.EcoreReferenceContentProvider#getElements()
- *
- * @return
- */
- @Override
- public Object[] getElements() {
- Object[] elements = new Object[0];
- List<MetamodelView> allCustom = new ArrayList<MetamodelView>();
- allCustom.addAll(source.getCustomizations());
- List<MetamodelView> allLocalCustom = new ArrayList<MetamodelView>();
- allLocalCustom.addAll(source.getLocalCustomizations());
- switch(preference) {
- case PapyrusTableModelElement.NO_LOCALS:
- allCustom.removeAll(allLocalCustom);
- elements = allCustom.toArray();
- break;
- case PapyrusTableModelElement.ONLY_ONE_LOCALS:
- allLocalCustom.remove(0);
- allCustom.removeAll(allLocalCustom);
- elements = allCustom.toArray();
- break;
- case PapyrusTableModelElement.ALL_LOCALS:
- elements = allCustom.toArray();
- break;
- default:
- break;
- }
- return elements;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/CustomizationLabelProvider.java b/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/CustomizationLabelProvider.java
deleted file mode 100644
index fe970fd380a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/CustomizationLabelProvider.java
+++ /dev/null
@@ -1,74 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.properties.table.provider;
-
-import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.TableInstance2;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.papyrus.properties.table.modelelement.PapyrusTableModelElement;
-
-/**
- *
- * LabelProvider for the MetamodelView
- *
- */
-public class CustomizationLabelProvider extends LabelProvider {
-
- /** the table instance*/
- private final TableInstance2 table;
-
- /** the preference : allows to manage the text displayed to represent the MetamodelView*/
- private final int preference;
-
- /**
- *
- * Constructor.
- *
- * @param table
- * the table instance
- * @param pref
- * the preference
- */
- public CustomizationLabelProvider(final TableInstance2 table, final int pref) {
- preference = pref;
- this.table = table;
- }
-
- /**
- *
- * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
- *
- * @param element
- * @return
- */
- @Override
- public String getText(final Object element) {
- final MetamodelView metamodelView = (MetamodelView) element;
- if(table.getLocalCustomizations().contains(metamodelView)){
- switch(preference){
- case PapyrusTableModelElement.NO_LOCALS :
- //it is not possible
- return ""; //$NON-NLS-1$
- case PapyrusTableModelElement.ONLY_ONE_LOCALS :
- return "localCustomizations"; //$NON-NLS-1$
- case PapyrusTableModelElement.ALL_LOCALS :
- return "localCustomization" + " " + metamodelView.getMetamodelURI(); //$NON-NLS-1$ //$NON-NLS-2$
- default :
- return metamodelView.getName();
- }
- }else{
- return metamodelView.getName();
- }
- }
-} \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/FacetLabelProvider.java b/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/FacetLabelProvider.java
deleted file mode 100644
index d458375464a..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/FacetLabelProvider.java
+++ /dev/null
@@ -1,40 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.properties.table.provider;
-
-import org.eclipse.emf.facet.infra.facet.Facet;
-import org.eclipse.jface.viewers.LabelProvider;
-
-/**
- *
- * The label provider for the facets
- *
- */
-public class FacetLabelProvider extends LabelProvider{
-
- /**
- *
- * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
- *
- * @param element
- * @return
- */
- @Override
- public String getText(final Object element) {
- if(element instanceof Facet){
- return ((Facet)element).getName();
- }
- return super.getText(element);
- }
-} \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/FillingQueriesContentProvider.java b/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/FillingQueriesContentProvider.java
deleted file mode 100644
index dd93158fb23..00000000000
--- a/incoming/org.eclipse.papyrus.properties.table/src/org/eclipse/papyrus/properties/table/provider/FillingQueriesContentProvider.java
+++ /dev/null
@@ -1,164 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.properties.table.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.facet.infra.query.ModelQuery;
-import org.eclipse.emf.facet.infra.query.ModelQuerySet;
-import org.eclipse.emf.facet.infra.query.core.ModelQuerySetCatalog;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.widgets.providers.IHierarchicContentProvider;
-import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;
-
-/**
- *
- * Thi content provider for the FillingQueries editor
- *
- */
-public class FillingQueriesContentProvider implements IHierarchicContentProvider, IStaticContentProvider{
-
- private final TableInstance table;
- public FillingQueriesContentProvider(final TableInstance table) {
- this.table = table;
- }
-
- /**
- *
- * @see org.eclipse.papyrus.widgets.providers.IStaticContentProvider#getElements()
- *
- * @return
- */
- public Object[] getElements() {
- //we return only the querySet with interesting queries
- Collection<ModelQuerySet> allQueriesSet = new ArrayList<ModelQuerySet>();
- Collection<ModelQuerySet> querySetToKeep = new ArrayList<ModelQuerySet>();
- allQueriesSet.addAll(ModelQuerySetCatalog.getSingleton().getAllModelQuerySets());
- for(ModelQuerySet current : allQueriesSet){
- if(getChildren(current).length!=0){
- querySetToKeep.add(current);
- }
- }
- return querySetToKeep.toArray();
- }
-
- /**
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)
- *
- * @param inputElement
- * @return
- */
- public Object[] getElements(final Object inputElement) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
- *
- * @param parentElement
- * @return
- */
- public Object[] getChildren(final Object parentElement) {
- if(parentElement instanceof ModelQuerySet){
- List<ModelQuery> queries = new ArrayList<ModelQuery>();
- queries.addAll(((ModelQuerySet)parentElement).getQueries());
- List<ModelQuery> queriesToKeep = new ArrayList<ModelQuery>();
- EObject context = this.table.getContext();
- EClass eClassContext = context.eClass();
- for(ModelQuery current : queries){
- //TODO we should test the return type, no?
- EList<EClass> scope = current.getScope();
- for(EClass currentEClass : scope){
- if(currentEClass.isSuperTypeOf(eClassContext) || eClassContext.isInstance(current)){
-
- queriesToKeep.add(current);
- }else{
- queriesToKeep.add(current);
- //nothing to do
- }
-
- }
- }
- return queries.toArray();
- }
- return new Object[0];
- }
-
- /**
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
- *
- * @param element
- * @return
- */
- public Object getParent(final Object element) {
- return null;
- }
-
- /**
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
- *
- * @param element
- * @return
- */
- public boolean hasChildren(final Object element) {
- return getChildren(element).length!=0;
- }
-
- /**
- *
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- *
- */
- public void dispose() {
- //nothing to do
- }
-
- /**
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- *
- * @param viewer
- * @param oldInput
- * @param newInput
- */
- public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput) {
- //nothing to do
- }
-
- /**
- *
- * @see org.eclipse.papyrus.widgets.providers.IHierarchicContentProvider#isValidValue(java.lang.Object)
- *
- * @param element
- * @return
- */
- public boolean isValidValue(final Object element) {
- if(element instanceof ModelQuery){
- return true;
- }
- return false;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/.classpath b/incoming/org.eclipse.papyrus.table.common/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/.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/incoming/org.eclipse.papyrus.table.common/.project b/incoming/org.eclipse.papyrus.table.common/.project
deleted file mode 100644
index 5a82e72a65e..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.table.common</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/incoming/org.eclipse.papyrus.table.common/.settings/org.eclipse.core.resources.prefs b/incoming/org.eclipse.papyrus.table.common/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index a9200897c0a..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 24 14:23:44 CET 2011
-eclipse.preferences.version=1
-encoding//src/org/eclipse/papyrus/table/common/messages/messages.properties=ISO-8859-1
diff --git a/incoming/org.eclipse.papyrus.table.common/.settings/org.eclipse.jdt.core.prefs b/incoming/org.eclipse.papyrus.table.common/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 498b15f69f9..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Feb 21 13:41:19 CET 2011
-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/incoming/org.eclipse.papyrus.table.common/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.table.common/META-INF/MANIFEST.MF
deleted file mode 100644
index db7f8d06d12..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.table.common;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.table.common.Activator
-Require-Bundle: org.eclipse.emf.facet.widgets.nattable.instance,
- org.eclipse.emf.facet.widgets.nattable,
- org.eclipse.papyrus.diagram.common;bundle-version="0.8.0",
- org.eclipse.papyrus.widgets,
- org.eclipse.papyrus.properties,
- org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.papyrus.table.instance;bundle-version="0.8.0",
- org.eclipse.emf.facet.infra.query.core;bundle-version="0.1.0",
- org.eclipse.emf.facet.infra.query.editor;bundle-version="0.1.0",
- org.eclipse.emf.facet.query.java;bundle-version="0.1.0",
- org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",
- org.eclipse.papyrus.service.edit;bundle-version="0.8.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %providerName
-Export-Package: org.eclipse.papyrus.table.common,
- org.eclipse.papyrus.table.common.dialog,
- org.eclipse.papyrus.table.common.editor,
- org.eclipse.papyrus.table.common.factory,
- org.eclipse.papyrus.table.common.handlers,
- org.eclipse.papyrus.table.common.messages,
- org.eclipse.papyrus.table.common.modelresource,
- org.eclipse.papyrus.table.common.util
-Bundle-Localization: plugin
diff --git a/incoming/org.eclipse.papyrus.table.common/about.html b/incoming/org.eclipse.papyrus.table.common/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/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/incoming/org.eclipse.papyrus.table.common/build.properties b/incoming/org.eclipse.papyrus.table.common/build.properties
deleted file mode 100644
index b26740e5b04..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- resources/,\
- icons/,\
- about.html
-src.includes = about.html,\
- icons/,\
- resources/
diff --git a/incoming/org.eclipse.papyrus.table.common/icons/table.png b/incoming/org.eclipse.papyrus.table.common/icons/table.png
deleted file mode 100644
index 192c1789e4c..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/icons/table.png
+++ /dev/null
Binary files differ
diff --git a/incoming/org.eclipse.papyrus.table.common/icons/table_green.png b/incoming/org.eclipse.papyrus.table.common/icons/table_green.png
deleted file mode 100644
index 52125d177a2..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/icons/table_green.png
+++ /dev/null
Binary files differ
diff --git a/incoming/org.eclipse.papyrus.table.common/plugin.properties b/incoming/org.eclipse.papyrus.table.common/plugin.properties
deleted file mode 100644
index fb4c3c55ce0..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.table.common
-providerName = Eclipse Modeling Project
-pluginName = Common Plugin for Papyrus Table Editor \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.table.common/plugin.xml b/incoming/org.eclipse.papyrus.table.common/plugin.xml
deleted file mode 100644
index f03f20db7c6..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/plugin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse version="3.4"?>
-
-<plugin>
-
-<!--We declare the model used for the Papyrus Table Editor -->
- <extension point="org.eclipse.papyrus.core.model">
- <model classname="org.eclipse.papyrus.table.common.modelresource.EMFFacetNattableModel" description="Model for Papyrus Table editors">
- </model>
- <model classname="org.eclipse.papyrus.table.common.modelresource.PapyrusNattableModel" description="Model for Papyrus Table editors">
- </model>
- </extension>
- <extension id="papyrus.table.menuspapyrus.table.menu" name="Papyrus Table Menus" point="org.eclipse.ui.menus">
- <menuContribution allPopups="false" locationURI="popup:org.eclipse.papyrus.modelexplorer.modelexplorer.popup?after=org.eclipse.papyrus.modelexplorer.popupmenu.creatediagram">
- <menu icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/table.png" id="org.eclipse.papyrus.modelexplorer.popupmenu.createtable" label="New Table" mnemonic="&amp;T" tooltip="The table menu">
- </menu>
- </menuContribution>
- <menuContribution allPopups="false" locationURI="menu:org.eclipse.papyrus.ui.menu?after=org.eclipse.papyrus.diagram.ui.menu.diagrams">
- <menu icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/table.png" id="org.eclipse.papyrus.table.ui.menu.tables" label="Tables" mnemonic="&amp;T" tooltip="The table menu">
- </menu>
- </menuContribution>
- <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?endof=org.eclipse.papyrus.diagram.ui.toolbar">
- <toolbar id="org.eclipse.papyrus.table.ui.toolbar" label="Papyrus Table Toolbar">
- </toolbar>
- </menuContribution>
- </extension>
- <extension point="org.eclipse.emf.facet.infra.browser.custom.core.registration">
- <browserCustomization file="resources/table_Ecore_hideEAnnotationFeature.uiCustom"/>
- </extension>
- <extension
- point="org.eclipse.emf.facet.widgets.celleditors.commandFactories">
- <commandFactory
- class="org.eclipse.papyrus.table.common.factory.PapyrusCommandFactory">
- </commandFactory>
- </extension>
-</plugin>
diff --git a/incoming/org.eclipse.papyrus.table.common/resources/table_Ecore_hideEAnnotationFeature.uiCustom b/incoming/org.eclipse.papyrus.table.common/resources/table_Ecore_hideEAnnotationFeature.uiCustom
deleted file mode 100644
index 79a0cc69a63..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/resources/table_Ecore_hideEAnnotationFeature.uiCustom
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/emf/2002/Ecore">
- <types metaclassName="ecore.EModelElement">
- <references referenceName="eAnnotations">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
-</uicustom:MetamodelView>
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/Activator.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/Activator.java
deleted file mode 100644
index cb67449a030..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/Activator.java
+++ /dev/null
@@ -1,70 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.common;
-
-import org.eclipse.papyrus.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.table.common"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- public LogHelper helper;
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(final BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- helper = new LogHelper(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(final BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/dialog/TwoInputDialog.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/dialog/TwoInputDialog.java
deleted file mode 100644
index c52bd76b058..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/dialog/TwoInputDialog.java
+++ /dev/null
@@ -1,134 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.common.dialog;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * This Dialog provides 2 texts field. It was created to be used during the table creation.
- * It doesn't provide validator for the second field.
- *
- *
- */
-public class TwoInputDialog extends InputDialog {
-
- /** widget for the second value */
- private Text text_2;
-
- /** the second values */
- private String value_2;
-
- /** the message for the second Text */
- protected String message_2;
-
- /**
- *
- * Constructor.
- *
- * @param parentShell
- * the parent shell
- * @param dialogTitle
- * the dialog title
- * @param message1
- * the first message for the dialog
- * @param message2
- * the second message for the dialog
- * @param initialValue1
- * the first initial value
- * @param initialValue2
- * the second initial value
- * @param validator
- * the validator
- */
- public TwoInputDialog(Shell parentShell, String dialogTitle, String message1, String message2, String initialValue1, String initialValue2, IInputValidator validator) {
- super(parentShell, dialogTitle, message1, initialValue1, validator);
- this.message_2 = message2;
- this.value_2 = initialValue2;
- }
-
- /**
- * Create the second Text Area
- *
- * @see org.eclipse.jface.dialogs.InputDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- *
- * @param parent
- * @return
- */
- @Override
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite)super.createDialogArea(parent);
- if(message_2 != null) {
- Label label = new Label(composite, SWT.WRAP);
- label.setText(message_2);
- GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
- data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
- label.setLayoutData(data);
- label.setFont(parent.getFont());
- }
- text_2 = new Text(composite, getInputTextStyle());
- text_2.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
- applyDialogFont(composite);
- return composite;
- }
-
- /**
- *
- * @see org.eclipse.jface.dialogs.InputDialog#buttonPressed(int)
- *
- * @param buttonId
- */
- @Override
- protected void buttonPressed(int buttonId) {
- if(buttonId == IDialogConstants.OK_ID) {
- this.value_2 = this.text_2.getText();
- } else {
- this.value_2 = null;
- }
- super.buttonPressed(buttonId);
- }
-
- /**
- *
- * @see org.eclipse.jface.dialogs.InputDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
- *
- * @param parent
- */
- @Override
- protected void createButtonsForButtonBar(Composite parent) {
- super.createButtonsForButtonBar(parent);
- if(value_2 != null) {
- text_2.setText(value_2);
- }
- }
-
- /**
- * Getter for {@link #value_2}
- *
- * @return
- * the description for the table
- */
- public String getValue_2() {
- return this.value_2;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/editor/AbstractNattableEditor.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/editor/AbstractNattableEditor.java
deleted file mode 100644
index 8413c3034ba..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/editor/AbstractNattableEditor.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
- *
- * 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:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
- *****************************************************************************/
-package org.eclipse.papyrus.table.common.editor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.domain.EditingDomain;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.Column;
-import org.eclipse.emf.facet.widgets.nattable.internal.NatTableWidgetInternalUtils;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.core.utils.ServiceUtils;
-import org.eclipse.papyrus.table.common.internal.TableEditorInput;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-
-/**
- * Abstract class for TableEditor
- *
- *
- *
- */
-public abstract class AbstractNattableEditor extends org.eclipse.papyrus.table.common.internal.NatTableEditor {
-
- /** the service registry */
- protected ServicesRegistry servicesRegistry;
-
- /** the table instance */
- protected PapyrusTableInstance rawModel;
-
- /**
- * the part name synchronizer
- */
- private final PartNameSynchronizer synchronizer;
-
- /**
- * @param servicesRegistry
- * @param rawModel
- *
- */
- public AbstractNattableEditor(final ServicesRegistry servicesRegistry, final PapyrusTableInstance rawModel) {
- this.servicesRegistry = servicesRegistry;
- this.rawModel = rawModel;
- synchronizer = new PartNameSynchronizer(rawModel);
-
- }
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.nattable.workbench.editor.NatTableEditor#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
- *
- * @param site
- * @param input
- * @throws PartInitException
- */
- @Override
- public void init(final IEditorSite site, final IEditorInput input) throws PartInitException {
- TableEditorInput tableEditorInput = new TableEditorInput(rawModel, getEditingDomain());
- initHiddenColumn(rawModel);
- setSite(site);
- setInput(tableEditorInput);
-
- setPartName(rawModel.getName());
- super.init(site, tableEditorInput);
- }
-
-
-
- private void initHiddenColumn(final PapyrusTableInstance rawModel2) {
- for(Column current : rawModel2.getTable().getColumns()){
- String name = NatTableWidgetInternalUtils.getColumnName(current);
- //TODO add a test to be sure we hide only label, metaclass and eContainer
- if(getInitialHiddenColumns().contains(name)){
-// current.setIsHidden(true);
- }
- }
-
- }
-
- protected List<String> getInitialHiddenColumns(){
- List<String> hiddenColumnName = new ArrayList<String>();
- hiddenColumnName.add("[Label]");
- return hiddenColumnName;
- }
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.nattable.workbench.editor.NatTableEditor#getEditingDomain()
- *
- * @return
- */
- @Override
- public EditingDomain getEditingDomain() {
- try {
- return ServiceUtils.getInstance().getTransactionalEditingDomain(servicesRegistry);
- } catch (ServiceException e) {
- e.printStackTrace();
- return null;
- }
- }
-
- /**
- *
- * @param adapter
- * @return
- */
- @Override
- public Object getAdapter(final Class adapter) {
- return super.getAdapter(adapter);
- }
-
- /**
- * A class taking in charge the synchronization of the partName and the diagram name.
- * When diagram name change, the other is automatically updated.
- *
- * @author vincent lorenzo
- * adapted class from UmlGmfDiagramEditor
- */
- public class PartNameSynchronizer {
-
- /** the papyrus table */
- private PapyrusTableInstance papyrusTable;
-
- /**
- * Listener on diagram name change.
- */
- private final Adapter tableNameListener = new Adapter() {
-
- /**
- *
- * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
- *
- * @param notification
- */
- public void notifyChanged(final Notification notification) {
- if(notification.getFeatureID(PapyrusTableInstance.class) == PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__NAME && notification.getNotifier() == papyrusTable) {
- setPartName(papyrusTable.getName());
- }
- }
-
- /**
- *
- * @see org.eclipse.emf.common.notify.Adapter#getTarget()
- *
- * @return
- */
- public Notifier getTarget() {
- return null;
- }
-
- /**
- *
- * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier)
- *
- * @param newTarget
- */
- public void setTarget(final Notifier newTarget) {
- }
-
- /**
- *
- * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)
- *
- * @param type
- * @return
- */
- public boolean isAdapterForType(final Object type) {
- return false;
- }
-
- };
-
- /**
- *
- * Constructor.
- *
- * @param diagram
- */
- public PartNameSynchronizer(final PapyrusTableInstance papyrusTable) {
- setTable(papyrusTable);
- }
-
- /**
- * Change the associated diagram.
- *
- * @param papyrusTable
- */
- public void setTable(final PapyrusTableInstance papyrusTable) {
- // Remove from old diagram, if any
- if(this.papyrusTable != null) {
- papyrusTable.eAdapters().remove(tableNameListener);
- }
- // Set new table
- this.papyrusTable = papyrusTable;
- // Set editor name
- setPartName(papyrusTable.getName());
- // Listen to name change
- papyrusTable.eAdapters().add(tableNameListener);
- }
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/AbstractNattableEditorFactory.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/AbstractNattableEditorFactory.java
deleted file mode 100644
index 9b91182dae3..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/AbstractNattableEditorFactory.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 LIFL & 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:
- * Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
- * Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
- *****************************************************************************/
-package org.eclipse.papyrus.table.common.factory;
-
-import java.lang.reflect.Constructor;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.core.editor.BackboneException;
-import org.eclipse.papyrus.core.extension.diagrameditor.AbstractEditorFactory;
-import org.eclipse.papyrus.core.multidiagram.actionbarcontributor.ActionBarContributorRegistry;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.EditorActionBarContributor;
-
-/**
- * Abstract factory for the NattableEditor
- *
- *
- *
- */
-public abstract class AbstractNattableEditorFactory extends AbstractEditorFactory {
-
- /**
- *
- * Constructor.
- *
- * @param editorClass
- * the editor class
- * @param editorType
- * the type of editor
- */
- public AbstractNattableEditorFactory(Class<?> editorClass, String editorType) {
- super(editorClass, editorType);
- }
-
- /**
- * Create the IPageModel that is used by the SashWindows to manage the editor.
- *
- * @see org.eclipse.papyrus.core.editorsfactory.IEditorFactory#createIPageModel(java.lang.Object)
- *
- * @param pageIdentifier
- * The model pushed in the sashmodel by the creation command
- * @return A model implementing the IPageModel
- */
- public IPageModel createIPageModel(Object pageIdentifier) {
- return new NattableEditorModel(pageIdentifier, getServiceRegistry());
- }
-
- /**
- * @see org.eclipse.papyrus.core.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)
- *
- * @param pageIdentifier
- * @return
- */
- public boolean isPageModelFactoryFor(Object pageIdentifier) {
- if(pageIdentifier instanceof PapyrusTableInstance) {
- return getExpectedType().equals(((PapyrusTableInstance)pageIdentifier).getType());
- }
- return false;
- }
-
- /**
- * IEditorModel used internally by the SashContainer. This model know how to handle IEditor creation.
- *
- * @author cedric dumoulin
- *
- */
- class NattableEditorModel implements IEditorModel {
-
-
- /**
- * The servicesRegistry provided at creation.
- */
- private ServicesRegistry servicesRegistry;
-
- /**
- * The created editor.
- */
- private IEditorPart editor;
-
- /**
- * The raw model stored in the SashProvider.
- */
- private PapyrusTableInstance rawModel;
-
- /**
- *
- * Constructor.
- */
- public NattableEditorModel(Object pageIdentifier, ServicesRegistry servicesRegistry) {
- rawModel = (PapyrusTableInstance)pageIdentifier;
- this.servicesRegistry = servicesRegistry;
- }
-
- /**
- * Create the IEditor for the diagram.
- *
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel#createIEditorPart()
- * @return
- * @throws PartInitException
- *
- */
- public IEditorPart createIEditorPart() throws PartInitException {
- try {
-
- Constructor<?> c = getDiagramClass().getConstructor(ServicesRegistry.class, PapyrusTableInstance.class);
- IEditorPart newEditor = (IEditorPart)c.newInstance(servicesRegistry, rawModel);
- // IEditorPart newEditor = new DefaultNattableEditor(getServiceRegistry(), rawModel);
- editor = newEditor;
- return editor;
-
- } catch (Exception e) {
- // Lets propagate. This is an implementation problem that should be solved by
- // programmer.
- throw new PartInitException("Can't create TextEditor", e); //$NON-NLS-1$
- }
-
- }
-
- /**
- * Get the action bar requested by the Editor.
- *
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel#getActionBarContributor()
- * @return
- *
- */
- public EditorActionBarContributor getActionBarContributor() {
-
- String actionBarId = editorDescriptor.getActionBarContributorId();
-
- // Do nothing if no EditorActionBarContributor is specify.
- if(actionBarId == null || actionBarId.length() == 0) {
- return null;
- }
-
- // Try to get it.
-
- // Get ServiceRegistry
- // ServicesRegistry serviceRegistry = getServicesRegistry();
- ActionBarContributorRegistry registry;
- try {
- registry = servicesRegistry.getService(ActionBarContributorRegistry.class);
- } catch (ServiceException e) {
- // Service not found
- // TODO Log the error
- e.printStackTrace();
- return null;
- }
-
- try {
- return registry.getActionBarContributor(actionBarId);
- } catch (BackboneException e) {
- // TODO Log the error and throw an exception instead
- e.printStackTrace();
- return null;
- }
- }
-
- /**
- * Get the underlying RawModel. Return the Diagram.
- *
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getRawModel()
- * @return
- *
- */
- public Object getRawModel() {
- return rawModel;
- }
-
- /**
- * Get the icon to be shown by Tabs
- *
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getTabIcon()
- * @return
- *
- */
- public Image getTabIcon() {
- ImageDescriptor imageDescriptor = getEditorDescriptor().getIcon();
- if(imageDescriptor == null)
- return null;
-
- return imageDescriptor.createImage();
- }
-
- /**
- * Get the title of the Diagram.
- *
- * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getTabTitle()
- * @return
- *
- */
- public String getTabTitle() {
- return rawModel.getName();
- }
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/PapyrusCommandFactory.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/PapyrusCommandFactory.java
deleted file mode 100644
index c1d86b6eaab..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/factory/PapyrusCommandFactory.java
+++ /dev/null
@@ -1,300 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.common.factory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.facet.infra.browser.custom.AttributeView;
-import org.eclipse.emf.facet.infra.browser.custom.CustomViewFeature;
-import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;
-import org.eclipse.emf.facet.infra.browser.custom.ReferenceView;
-import org.eclipse.emf.facet.infra.browser.custom.StaticFeatureValue;
-import org.eclipse.emf.facet.infra.browser.custom.TypeView;
-import org.eclipse.emf.facet.infra.facet.Facet;
-import org.eclipse.emf.facet.widgets.celleditors.internal.DefaultCommandFactory;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.Column;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.Row;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
-import org.eclipse.emf.facet.widgets.nattable.internal.painter.Customization;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.core.utils.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.service.edit.service.IElementEditService;
-import org.eclipse.papyrus.table.common.Activator;
-
-/**
- *
- * This factory is used by the Papyrus Table when the editing domain is an instanceof TransactionalEditingDomain
- *
- */
-public class PapyrusCommandFactory extends DefaultCommandFactory {
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.celleditors.internal.DefaultCommandFactory#handles(org.eclipse.emf.edit.domain.EditingDomain)
- *
- * {@inheritDoc}
- */
- @Override
- public boolean handles(final EditingDomain editingDomain) {
- return editingDomain instanceof TransactionalEditingDomain;
- }
-
- /**
- *
- * @param owner
- * the owner object
- * @param feature
- * the feature to edit
- * @return <code>true</code> if object is an {@link EObject} and feature a {@link EStructuralFeature}
- */
- protected boolean testArgs(final Object owner, final Object feature) {
- if(feature != null) {
- if(feature instanceof EStructuralFeature) {
- /*
- * The ElementEditService can be used for UML Element and for view and for... others things,
- * but it doesn't work correctly with the nattable widget elements
- */
- if(isEMFFacetElement(owner)) {
- return false;
- } else if(owner instanceof EObject) {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * The ElementEditService can be used for UML Element and for view and for... others things, but it doesn't work correctly with the nattable widget
- * elements
- *
- * @param owner
- * an object
- * @return
- * <code>true</code> if the object is an EMF-Facet object
- */
- private boolean isEMFFacetElement(final Object owner) {
- if(owner instanceof TableInstance) {
- return true;
- } else if(owner instanceof MetamodelView) {
- return true;
- } else if(owner instanceof Row) {
- return true;
- } else if(owner instanceof Column) {
- return true;
- } else if(owner instanceof Facet) {
- return true;
- } else if(owner instanceof Customization) {
- return true;
- } else if(owner instanceof TypeView){
- return true;
- }else if(owner instanceof ReferenceView){
- return true;
- }else if(owner instanceof AttributeView){
- return true;
- }else if(owner instanceof CustomViewFeature){
- return true;
- }else if(owner instanceof StaticFeatureValue){
- return true;
- }
- //we add this test,because, it is possible that we forget some emf-facet elements
- String className = owner.getClass().getCanonicalName();
- if(className.contains("org.eclipse.emf.facet")) { //$NON-NLS-1$
- String message = "the type " + className + " should be included in the test"; //$NON-NLS-1$ //$NON-NLS-2$
- Activator.getDefault().helper.info(message);
- return true;
- }
- return false;
- }
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.celleditors.internal.DefaultCommandFactory#createAddCommand(org.eclipse.emf.edit.domain.EditingDomain,
- * java.lang.Object, java.lang.Object, java.lang.Object)
- *
- * {@inheritDoc}
- */
- @Override
- public Command createAddCommand(final EditingDomain editingDomain, final Object owner, final Object feature, final Object value) {
- //the ElementEditService doesn't work correctly with nattable elements, so we test the edited element
- if(isEMFFacetElement(owner)) {
- return super.createAddCommand(editingDomain, owner, feature, value);
- }
- IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(owner);
- if(testArgs(owner, feature) && elementEditService != null) {
- EObject current = (EObject)owner;
- Object values = current.eGet((EStructuralFeature)feature);
- if(values instanceof List<?>) {
- ArrayList<Object> newList = new ArrayList<Object>();
- newList.addAll((List<?>)values);
- newList.add(value);
- SetRequest request = new SetRequest((TransactionalEditingDomain)editingDomain, current, (EStructuralFeature)feature, newList);
- ICommand command = elementEditService.getEditCommand(request);
- if(command.canExecute()) {
- return new GMFtoEMFCommandWrapper(command);
- }
- }
- }
- return UnexecutableCommand.INSTANCE;
- }
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.celleditors.internal.DefaultCommandFactory#createDeleteCommand(org.eclipse.emf.edit.domain.EditingDomain,
- * java.lang.Object)
- *
- * {@inheritDoc}
- */
- @Override
- public Command createDeleteCommand(final EditingDomain editingDomain, final Object elementToDestroy) {
- //the ElementEditService doesn't work correctly with nattable elements, so we test the edited element
- if(isEMFFacetElement(elementToDestroy)) {
- return super.createDeleteCommand(editingDomain, elementToDestroy);
- }
- IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(elementToDestroy);
- if(testArgs(elementToDestroy, null) && elementEditService != null) {
- DestroyElementRequest request = new DestroyElementRequest((TransactionalEditingDomain)editingDomain, (EObject)elementToDestroy, false);
- ICommand command = elementEditService.getEditCommand(request);
- if(command.canExecute()) {
- return new GMFtoEMFCommandWrapper(command);
- }
- }
- return UnexecutableCommand.INSTANCE;
- }
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.celleditors.internal.DefaultCommandFactory#createMoveCommand(org.eclipse.emf.edit.domain.EditingDomain,
- * java.lang.Object, java.lang.Object, java.lang.Object, int)
- *
- * {@inheritDoc}
- */
- @Override
- public Command createMoveCommand(final EditingDomain editingDomain, final Object owner, final Object feature, final Object value, final int index) {
- //the ElementEditService doesn't work correctly with nattable elements, so we test the edited element
- if(isEMFFacetElement(owner)) {
- return super.createMoveCommand(editingDomain, owner, feature, value, index);
- }
-
- IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(owner);
- if(testArgs(owner, feature) && elementEditService != null) {
- EObject current = (EObject)owner;
- Object values = current.eGet((EStructuralFeature)feature);
- if(values instanceof List<?>) {
- ArrayList<Object> newList = new ArrayList<Object>();
- newList.addAll((List<?>)values);
- int currentIndex = ((List<?>)values).indexOf(value);
- newList.remove(currentIndex);
- newList.add(index, value);
- SetRequest request = new SetRequest((TransactionalEditingDomain)editingDomain, (EObject)owner, (EStructuralFeature)feature, newList);
- ICommand command = elementEditService.getEditCommand(request);
- if(command.canExecute()) {
- return new GMFtoEMFCommandWrapper(command);
- }
- }
- }
- return UnexecutableCommand.INSTANCE;
- }
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.celleditors.internal.DefaultCommandFactory#createRemoveCommand(org.eclipse.emf.edit.domain.EditingDomain,
- * java.lang.Object, java.lang.Object, java.lang.Object)
- *
- * {@inheritDoc}
- */
- @Override
- public Command createRemoveCommand(final EditingDomain editingDomain, final Object owner, final Object feature, final Object value) {
- //the ElementEditService doesn't work correctly with nattable elements, so we test the edited element
- if(isEMFFacetElement(owner)) {
- return super.createRemoveCommand(editingDomain, owner, feature, value);
- }
- IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(owner);
- if(testArgs(owner, feature) && elementEditService != null) {
- DestroyReferenceRequest request = new DestroyReferenceRequest((TransactionalEditingDomain)editingDomain, (EObject)owner, (EReference)feature, (EObject)value, false);
- ICommand command = elementEditService.getEditCommand(request);
- if(command.canExecute()) {
- return new GMFtoEMFCommandWrapper(command);
- }
- }
- return UnexecutableCommand.INSTANCE;
- }
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.celleditors.internal.DefaultCommandFactory#createSetCommand(org.eclipse.emf.edit.domain.EditingDomain,
- * java.lang.Object, java.lang.Object, java.lang.Object)
- *
- * {@inheritDoc}
- */
- @Override
- public Command createSetCommand(final EditingDomain editingDomain, final Object owner, final Object feature, final Object value) {
- //the ElementEditService doesn't work correctly with nattable elements, so we test the edited element
- if(isEMFFacetElement(owner)) {
- return super.createSetCommand(editingDomain, owner, feature, value);
- }
- IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(owner);
- if(testArgs(owner, feature) && elementEditService != null) {
- SetRequest request = new SetRequest((TransactionalEditingDomain)editingDomain, (EObject)owner, (EStructuralFeature)feature, value);
- ICommand command = elementEditService.getEditCommand(request);
- if(command.canExecute()) {
- return new GMFtoEMFCommandWrapper(command);
- }
- }
- return UnexecutableCommand.INSTANCE;
- }
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.celleditors.internal.DefaultCommandFactory#createSetCommand(org.eclipse.emf.edit.domain.EditingDomain,
- * java.lang.Object, java.lang.Object, java.lang.Object, int)
- *
- * {@inheritDoc}
- */
- @Override
- public Command createSetCommand(final EditingDomain editingDomain, final Object owner, final Object feature, final Object value, final int index) {
- //the ElementEditService doesn't work correctly with nattable elements, so we test the edited element
- if(isEMFFacetElement(owner)) {
- return super.createSetCommand(null, owner, feature, value, index);
- }
- IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(owner);
- if(testArgs(owner, feature) && elementEditService != null) {
- EObject current = (EObject)owner;
- Object values = current.eGet((EStructuralFeature)feature);
- if(values instanceof List<?>) {
- ArrayList<Object> newList = new ArrayList<Object>();
- newList.addAll((List<?>)values);
- newList.set(index, value);
- SetRequest request = new SetRequest((TransactionalEditingDomain)editingDomain, (EObject)owner, (EStructuralFeature)feature, newList);
- ICommand command = elementEditService.getEditCommand(request);
- if(command.canExecute()) {
- return new GMFtoEMFCommandWrapper(command);
- }
- }
- }
- return UnexecutableCommand.INSTANCE;
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/AbstractCreateNattableEditorCommand.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/AbstractCreateNattableEditorCommand.java
deleted file mode 100644
index 472052878e7..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/AbstractCreateNattableEditorCommand.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 LIFL & 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:
- * Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
- * Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
- *****************************************************************************/
-
-package org.eclipse.papyrus.table.common.handlers;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-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.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.facet.infra.query.ModelQuery;
-import org.eclipse.emf.facet.infra.query.ModelQuerySet;
-import org.eclipse.emf.facet.infra.query.core.ModelQuerySetCatalog;
-import org.eclipse.emf.facet.widgets.nattable.NatTableWidgetUtils;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.Column;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.TableInstance2;
-import org.eclipse.emf.facet.widgets.nattable.internal.NatTableWidgetInternalUtils;
-import org.eclipse.emf.facet.widgets.nattable.tableconfiguration.TableConfiguration;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.core.editor.BackboneException;
-import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.core.utils.EditorUtils;
-import org.eclipse.papyrus.core.utils.ServiceUtils;
-import org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers;
-import org.eclipse.papyrus.diagram.common.Activator;
-import org.eclipse.papyrus.resource.AbstractBaseModel;
-import org.eclipse.papyrus.resource.IModel;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.resource.NotFoundException;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.table.common.dialog.TwoInputDialog;
-import org.eclipse.papyrus.table.common.messages.Messages;
-import org.eclipse.papyrus.table.common.modelresource.EMFFacetNattableModel;
-import org.eclipse.papyrus.table.common.modelresource.PapyrusNattableModel;
-import org.eclipse.papyrus.table.common.util.QueryRepresentation;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstanceFactory;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * @author dumoulin
- *
- */
-public abstract class AbstractCreateNattableEditorCommand extends AbstractHandler {
-
-
- /** the default name for the table */
- private final String defaultName;
-
- /** the default description for the table */
- private final String defaultDescription = "Table Description"; //$NON-NLS-1$
-
- /** the description for the table */
- private String description;
-
- /** the name for the table */
- private String name;
-
- /** the editor type */
- private final String editorType;
-
- /**
- *
- * Constructor.
- *
- * @param editorType
- * the type of the editor
- * @param defaultName
- * the default name for this editor
- */
- public AbstractCreateNattableEditorCommand(final String editorType, final String defaultName) {
- Assert.isNotNull(editorType != null);
- this.editorType = editorType;
- this.defaultName = defaultName;
- }
-
- /**
- * Should be overridden in order to restrict creation
- *
- * @see org.eclipse.core.commands.AbstractHandler#isEnabled()
- *
- * @return
- */
- @Override
- public boolean isEnabled() {
- return getTableContext() != null;
- }
-
- /**
- * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
- *
- * @param event
- * @return
- * @throws ExecutionException
- */
- public Object execute(final ExecutionEvent event) throws ExecutionException {
- try {
-
- runAsTransaction();
- } catch (ServiceException e) {
- throw new ExecutionException("Can't create TableEditor", e); //$NON-NLS-1$
- }
- return null;
- }
-
- /**
- * Run the command as a transaction.
- * Create a Transaction and delegate the command to {@link #doExecute(ServicesRegistry)}.
- *
- * @throws ServiceException
- *
- */
- public void runAsTransaction() throws ServiceException {
- //default Value
- name = defaultName;
- description = defaultDescription;
- TwoInputDialog dialog = new TwoInputDialog(Display.getCurrent().getActiveShell(), Messages.AbstractCreateNattableEditorCommand_CreateNewTableDialogTitle, Messages.AbstractCreateNattableEditorCommand_CreateNewTableDialog_TableNameMessage, Messages.AbstractCreateNattableEditorCommand_CreateNewTableDialog_TableDescriptionMessage, defaultName, defaultDescription, null);
- if(dialog.open() == Dialog.OK) {
- //get the name and the description for the table
- name = dialog.getValue();
- description = dialog.getValue_2();
-
- final ServicesRegistry serviceRegistry = ServiceUtilsForActionHandlers.getInstance().getServiceRegistry();
- TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(serviceRegistry);
-
- //Create the transactional command
- AbstractEMFOperation command = new AbstractEMFOperation(domain, "Create Table Editor") { //$NON-NLS-1$
-
- @Override
- protected IStatus doExecute(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- try {
- AbstractCreateNattableEditorCommand.this.doExecute(serviceRegistry);
- } catch (ServiceException e) {
- e.printStackTrace();
- return Status.CANCEL_STATUS;
- } catch (NotFoundException e) {
- e.printStackTrace();
- return Status.CANCEL_STATUS;
- }
- return Status.OK_STATUS;
- }
- };
-
- // Execute the command
- try {
- OperationHistoryFactory.getOperationHistory().execute(command, new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- e.printStackTrace();
- Activator.getDefault().logError("Can't create Table Editor", e); //$NON-NLS-1$
- }
-
- }
- }
-
- /**
- * Do the execution of the command.
- *
- * @param serviceRegistry
- * @throws ServiceException
- * @throws NotFoundException
- */
- public void doExecute(final ServicesRegistry serviceRegistry) throws ServiceException, NotFoundException {
-
- Object editorModel = createEditorModel(serviceRegistry);
- // Get the mngr allowing to add/open new editor.
- IPageMngr pageMngr = ServiceUtils.getInstance().getIPageMngr(serviceRegistry);
- // add the new editor model to the sash.
- pageMngr.openPage(editorModel);
-
- }
-
- /**
- * Create a model identifying the editor. This model will be saved with the sash
- *
- * @return
- * @throws ServiceException
- * @throws NotFoundException
- * The model where to save the TableInstance is not found.
- */
- protected Object createEditorModel(final ServicesRegistry serviceRegistry) throws ServiceException, NotFoundException {
- PapyrusTableInstance papyrusTable = PapyrustableinstanceFactory.eINSTANCE.createPapyrusTableInstance();
- papyrusTable.setName(name);
- papyrusTable.setType(editorType);
- PapyrusNattableModel papyrusModel = (PapyrusNattableModel)ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(PapyrusNattableModel.MODEL_ID);
- papyrusModel.addPapyrusTableInstance(papyrusTable);
-
- //TableInstance tableInstance = TableinstanceFactory.eINSTANCE.createTableInstance();
- TableInstance2 tableInstance = NatTableWidgetUtils.createTableInstance(Collections.EMPTY_LIST, defaultDescription, getTableConfiguration(), getTableContext(), null);
- tableInstance.setDescription(description);
-
- // Save the model in the associated resource
- EMFFacetNattableModel model = (EMFFacetNattableModel)ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(EMFFacetNattableModel.MODEL_ID);
- model.addTableInstance(tableInstance);
- papyrusTable.setTable(tableInstance);
-
- EObject context = getTableContext();
- Assert.isNotNull(context);
- tableInstance.setContext(context);
-
- setHiddenColumns(papyrusTable);
- setFillingQueries(papyrusTable);
- setSynchronization(papyrusTable);
- return papyrusTable;
- }
-
- /**
- * Allows to hide the columns created by default
- *
- * @param papyrusTable
- */
- private void setHiddenColumns(final PapyrusTableInstance papyrusTable) {
- List<String> hiddenColumnsName = getHiddenColumnName();
- if(!hiddenColumnsName.isEmpty()) {
- for(Column column : papyrusTable.getTable().getColumns()) {
- String name = NatTableWidgetInternalUtils.getColumnName(column);
- if(hiddenColumnsName.contains(name)) {
- column.setIsHidden(true);
- }
- }
- }
- }
-
- /**
- * Returns the list of the columns to hide. Currently, the name can be :
- * <ul>
- * <li>[Label]</li>
- * <li>[Metaclass]</li>
- * <li>/eContainer</li>
- * </ul>
- *
- * @return
- * the list of the columns to hide
- */
- protected List<String> getHiddenColumnName() {
- return Collections.emptyList();
- }
-
- /**
- * Returns the table configura
- * tion for the table
- *
- * @return
- * the table configuration of the table
- */
- protected TableConfiguration getTableConfiguration(){
- return null;
- }
-
- /**
- * Set the table synchronization to <code>true</code> if there is filling queries, to <code>false</code> if not
- *
- * @param papyrusTable
- * the papyrusTable
- */
- protected void setSynchronization(final PapyrusTableInstance papyrusTable) {
- papyrusTable.setIsSynchronized(papyrusTable.getFillingQueries().size() != 0);
- }
-
- /**
- * Set the queries used to fill Papyrus
- *
- * @param papyrusTable
- * the {@link PapyrusTableInstance} to fill with queries
- */
- protected void setFillingQueries(final PapyrusTableInstance papyrusTable) {
- ModelQuerySetCatalog catalog = ModelQuerySetCatalog.getSingleton();
- for(QueryRepresentation rep : getQueryRepresentations()) {
- ModelQuerySet querySet = catalog.getModelQuerySet(rep.getQuerySetName());
- if(querySet != null) {
- ModelQuery query = querySet.getQuery(rep.getQueryName());
- if(query != null) {
- papyrusTable.getFillingQueries().add(query);
- }
- }
- }
- }
-
- /**
- * Get the current MultiDiagramEditor.
- *
- * @return
- * @throws BackboneException
- */
- protected IMultiDiagramEditor getMultiDiagramEditor() throws BackboneException {
- return EditorUtils.getMultiDiagramEditorChecked();
- }
-
- /**
- * Returns the context used to create the table
- *
- * @return
- * the context used to create the table or <code>null</code> if not found
- * @throws ServiceException
- */
- protected EObject getTableContext() {
- List<EObject> selection = getSelection();
-
- if(!selection.isEmpty()) {
- return selection.get(0);
- }
- ModelSet modelSet = null;
- ServicesRegistry serviceRegistry;
- try {
- serviceRegistry = ServiceUtilsForActionHandlers.getInstance().getServiceRegistry();
- modelSet = ServiceUtils.getInstance().getModelSet(serviceRegistry);
- } catch (NullPointerException npe) {
- //
- } catch (ServiceException exception) {
-
- }
- if(modelSet != null) {
- IModel model = modelSet.getModel(org.eclipse.papyrus.resource.uml.UmlModel.MODEL_ID);
-
- if(model instanceof AbstractBaseModel) {
- return getRootElement(((AbstractBaseModel)model).getResource());
- }
- }
- return null;
- }
-
- /**
- *
- * @return
- */
- protected List<EObject> getSelection() {
- List<EObject> selectedElements = new ArrayList<EObject>();
- ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
- if(selection instanceof IStructuredSelection) {
-
- IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-
- Iterator<?> it = structuredSelection.iterator();
- while(it.hasNext()) {
- Object object = it.next();
- if(object instanceof IAdaptable) {
- EObject currentEObject = (EObject)((IAdaptable)object).getAdapter(EObject.class);
-
- if(currentEObject != null) {
- selectedElements.add(currentEObject);
- }
- }
-
- }
- }
- return selectedElements;
- }
-
- /**
- * Get the root element associated with canvas.
- */
- protected EObject getRootElement(final Resource modelResource) {
- EObject rootElement = null;
- if(modelResource != null && modelResource.getContents() != null && modelResource.getContents().size() > 0) {
- Object root = modelResource.getContents().get(0);
- if(root instanceof EObject) {
- rootElement = (EObject)root;
- }
- }
- return rootElement;
- }
-
- /**
- * This method should be overridden by the user, if he wants provide filling queries
- * The list of the queries used to fill the table, identified by their querySet name and query name.
- *
- *
- * @return
- * The list of the queries used to fill the table, identified by their querySet name and query name.
- *
- */
- protected List<QueryRepresentation> getQueryRepresentations() {
- List<QueryRepresentation> list = new ArrayList<QueryRepresentation>();
- return list;
- }
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/CreateNewElementContributionItem.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/CreateNewElementContributionItem.java
deleted file mode 100644
index 090a854e064..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/handlers/CreateNewElementContributionItem.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 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:
- * Nicolas Guyomar (Mia-Software) - Bug 335020 - Nattable widget should use the Eclipse framework
- *******************************************************************************/
-package org.eclipse.papyrus.table.common.handlers;
-
-import org.eclipse.emf.facet.widgets.nattable.INatTableWidget;
-import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
-import org.eclipse.emf.facet.widgets.nattable.tableconfiguration.InstantiationMethod;
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Comes from org.eclipse.emf.facet.widget.nattable.workbench.
- *
- */
-public class CreateNewElementContributionItem extends ContributionItem {
-
- private static final int NUMBER_OF_METHOD = 5;
-
- @Override
- public void fill(final Menu menu, final int index) {
- IWorkbenchPart activePart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-
- if(activePart != null) {
- if(activePart instanceof INatTableWidgetProvider) {
- INatTableWidgetProvider nattINatableWidgetProvider = (INatTableWidgetProvider)activePart;
- final INatTableWidget natTableWidget = nattINatableWidgetProvider.getNatTableWidget();
- if(natTableWidget.getInstantionMethodHistory() != null && !natTableWidget.getInstantionMethodHistory().isEmpty()) {
- for(int i = 0; i < natTableWidget.getInstantionMethodHistory().size(); i++) {
- if(i >= CreateNewElementContributionItem.NUMBER_OF_METHOD) {
- break;
- }
- final InstantiationMethod meth = natTableWidget.getInstantionMethodHistory().get(i);
- MenuItem menuItem = new MenuItem(menu, SWT.CHECK);
- menuItem.setText(i + " " + meth.getName()); //$NON-NLS-1$
- menuItem.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(final SelectionEvent e) {
- for(MenuItem menuItem2 : menu.getItems()) {
- menuItem2.setSelection(false);
- }
- MenuItem localMenuItem = (MenuItem)e.widget;
- localMenuItem.setSelection(true);
- natTableWidget.createNewElement(meth);
- }
- });
- }
- }
- }
- }
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/NatTableEditor.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/NatTableEditor.java
deleted file mode 100644
index d84512bb1cf..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/NatTableEditor.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Mia-Software.
- * 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:
- * Nicolas Bros (Mia-Software) - Bug 331203 - table model editor - initial API and implementation
- * Nicolas Guyomar (Mia-Software) - Bug 331442 - To be able to add and remove lines (model elements) from the table
- * Nicolas Bros (Mia-Software) - Bug 332226 - To be able to create or delete model element from the table
- * Nicolas Guyomar (Mia-Software) - Bug 332226 - To be able to create or delete model element from the table
- * Nicolas Bros (Mia-Software) - Bug 331900 - customizable NatTable
- * Nicolas Guyomar (Mia-Software) - Bug 332924 - To be able to save the table
- * Nicolas Guyomar (Mia-Software) - Bug 332998 - To be able to add a column and fill it with the result of a query
- * Gregoire Dupe (Mia-Software) - Bug 332998 - To be able to add a column and fill it with the result of a query
- * Nicolas Guyomar (Mia-Software) - Bug 333015 - To be able to hide columns
- * Nicolas Guyomar (Mia-Software) - Bug 333029 - To be able to save the size of the lines and the columns
- * Nicolas Guyomar (Mia-Software) - Bug 335154 - Sort Column By Type : Cannot modify resource set without a write transaction
- * Nicolas Guyomar (Mia-Software) - Bug 335020 - Nattable widget should use the Eclipse framework
- *******************************************************************************/
-package org.eclipse.papyrus.table.common.internal;
-
-import java.util.EventObject;
-import java.util.HashMap;
-
-import org.eclipse.core.databinding.conversion.IConverter;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.databinding.EObjectObservableValue;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.facet.widgets.nattable.INatTableWidget;
-import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetFactory;
-import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
-import org.eclipse.emf.facet.widgets.nattable.IWorkbenchPartProvider;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableinstancePackage;
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.diagram.common.providers.EditorLabelProvider;
-import org.eclipse.papyrus.properties.databinding.EMFObservableValue;
-import org.eclipse.papyrus.table.common.messages.Messages;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.widgets.editors.StringEditor;
-import org.eclipse.papyrus.widgets.editors.StringLabel;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.EditorPart;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Comes from org.eclipse.emf.facet.widget.nattable.workbench.
- *
- * This class should not be used by others plugins
- * TODO Should be deleted or merge with an other classe
- */
-public class NatTableEditor extends EditorPart implements ISelectionProvider, IEditingDomainProvider, IWorkbenchPartProvider {
-
- public static final String ID = "org.eclipse.emf.facet.widgets.nattable.workbench.editor.NatTableEditor"; //$NON-NLS-1$
-
- private TableEditorInput tableEditorInput;
-
- private INatTableWidget natTableWidget;
-
- private EditingDomain editingDomain;
-
- private MenuManager menuMgr;
-
- private StringLabel contextLabel;
-
- private final CommandStackListener commandListener = new CommandStackListener() {
-
- public void commandStackChanged(final EventObject event) {
- Display.getCurrent().asyncExec(new Runnable() {
-
- public void run() {
- firePropertyChange(PROP_DIRTY);
- }
- });
- }
- };
-
- //this code comes from NatTableWidget
- //we need to listen change on the context when its a table fillied with queries :
- private final Adapter modelChangeAdapter = new AdapterImpl() {
-
- @Override
- public void notifyChanged(final Notification msg) {
- //TODO remove the listener!
- int eventType = msg.getEventType();
- if(eventType != Notification.REMOVING_ADAPTER && eventType != Notification.RESOLVE) {
- // redraw table when model changes
- // System.out.println("we listen a change on the context");
- }
- }
- };
-
- /**
- * we listen the context to refresh it in the table if the context change
- */
- private final Adapter contextListener = new AdapterImpl() {
-
- /**
- *
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
- *
- * @param notification
- */
- @Override
- public void notifyChanged(final Notification notification) {
- NatTableEditor.this.contextLabel.refreshValue();
- super.notifyChanged(notification);
- }
- };
-
- @SuppressWarnings("rawtypes")
- // We cannot change the method signature because of the override
- @Override
- public Object getAdapter(final Class adapter) {
- if(adapter == INatTableWidgetProvider.class) {
- return new INatTableWidgetProvider() {
-
- public INatTableWidget getNatTableWidget() {
- return NatTableEditor.this.natTableWidget;
- }
- };
- }
- return null;
- }
-
- @Override
- public void init(final IEditorSite site, final IEditorInput input) throws PartInitException {
- if(input instanceof TableEditorInput) {
- this.tableEditorInput = (TableEditorInput)input;
- this.editingDomain = this.tableEditorInput.getEditingDomain();
- initializeEditingDomain();
- setSite(site);
- setInput(this.tableEditorInput);
- setPartName(this.tableEditorInput.getName());
- } else if(input instanceof FileEditorInput) {
- initializeEditingDomain();
- FileEditorInput fileEditorInput = (FileEditorInput)input;
- URI uri = URI.createPlatformResourceURI(fileEditorInput.getFile().getFullPath().toString(), false);
- if(uri != null) {
- Resource resource = null;
- if(getEditingDomain() != null) {
- resource = getEditingDomain().loadResource(uri.toString());
- } else {
- ResourceSet rSet = new ResourceSetImpl();
- resource = rSet.createResource(uri);
- }
- PapyrusTableInstance tableInstance = null;
- for(EObject eObject : resource.getContents()) {
- if(eObject instanceof PapyrusTableInstance) {
- tableInstance = (PapyrusTableInstance)eObject;
- // One instance of tableInstance per .table file
- break;
- }
- }
- this.tableEditorInput = new TableEditorInput(tableInstance, getEditingDomain());
- setSite(site);
- setInput(this.tableEditorInput);
- setPartName(fileEditorInput.getName());
- }
-
- } else {
- throw new PartInitException("Input should be of type TableEditorInput or a .table file"); //$NON-NLS-1$
- }
- }
-
- /**
- *
- * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
- *
- * @param parent
- */
- @Override
- public void createPartControl(final Composite parent) {
- this.menuMgr = new MenuManager("#PopUp", NatTableEditor.ID); //$NON-NLS-1$
- this.menuMgr.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
- this.menuMgr.setRemoveAllWhenShown(true);
-
- final TableInstance table = this.tableEditorInput.getPapyrusTableInstance().getTable();
- EClass tableEClass = table.eClass();
-
- final Composite editorComposite = new Composite(parent, SWT.BORDER);
- final GridLayout editorGridLayout = new GridLayout(1, false);
- editorGridLayout.marginHeight = 0;
- editorGridLayout.marginWidth = 0;
- editorComposite.setLayout(editorGridLayout);
-
- //we display the context of the table
- this.contextLabel = new StringLabel(editorComposite, SWT.LEFT);
- this.contextLabel.setLabel(Messages.NatTableEditor_TableContextLabel);
- this.contextLabel.setToolTipText(Messages.NatTableEditor_TableContextTollTip);
-
- //we observe the feature context of the table (and not the name of the context, because the context is not a NamedElement, but an EObject
- final IObservableValue contextObservable2 = new EObjectObservableValue(table, TableinstancePackage.eINSTANCE.getTableInstance_Context());
- table.getContext().eAdapters().add(this.contextListener);
- /*
- * we should set the converted before the observable!
- */
- this.contextLabel.setConverters(null, new ContextLabelConverter());
- this.contextLabel.setLabelProvider(new EditorLabelProvider());
- this.contextLabel.setModelObservable(contextObservable2);
-
-
- //set the layout for contextLabel
- GridData contextGridData = new GridData();
- contextGridData.grabExcessHorizontalSpace = true;
- contextGridData.horizontalAlignment = SWT.FILL;
- this.contextLabel.setLayoutData(contextGridData);
-
-
- //we display the description of the table
-
- final StringEditor descriptionEditor = new StringEditor(editorComposite, SWT.MULTI);
- descriptionEditor.setLabel(Messages.NatTableEditor_TaleDescriptionLabel);
- descriptionEditor.setToolTipText(Messages.NatTableEditor_TableDescriptionToolTip);
- EStructuralFeature myFeature = tableEClass.getEStructuralFeature(TableinstancePackage.TABLE_INSTANCE__DESCRIPTION);
- EMFObservableValue observable = new EMFObservableValue(table, myFeature, getEditingDomain());
- descriptionEditor.setModelObservable(observable);
-
- //set the layout for the description editor
- GridData descriptionGridData = new GridData();
- descriptionGridData.grabExcessHorizontalSpace = true;
- descriptionGridData.horizontalAlignment = SWT.FILL;
- descriptionEditor.setLayoutData(descriptionGridData);
-
-
- // the composite owning the table
- final Composite tableComposite = new Composite(editorComposite, SWT.NONE);
- GridLayout tableCompositeGridLayout = new GridLayout(1, true);
- tableComposite.setLayout(tableCompositeGridLayout);
-
- final GridData compositeTableGridLayout = new GridData();
- compositeTableGridLayout.grabExcessHorizontalSpace = true;
- compositeTableGridLayout.grabExcessVerticalSpace = true;
- compositeTableGridLayout.horizontalAlignment = SWT.FILL;
- compositeTableGridLayout.verticalAlignment = SWT.FILL;
- tableComposite.setLayoutData(compositeTableGridLayout);
-
- // the nattable widget itself
- this.natTableWidget = INatTableWidgetFactory.INSTANCE.createNatTableWidget(tableComposite, this, this.tableEditorInput.getPapyrusTableInstance().getTable(), this.menuMgr);
-
-
- final GridData tableGridData = new GridData();
- tableGridData.grabExcessHorizontalSpace = true;
- tableGridData.grabExcessVerticalSpace = true;
- tableGridData.horizontalAlignment = SWT.FILL;
- tableGridData.verticalAlignment = SWT.FILL;
- this.natTableWidget.getComposite().setLayoutData(tableGridData);
-
- getSite().setSelectionProvider(this);
- getSite().registerContextMenu(this.menuMgr, this.natTableWidget);
-
-
- //we add a listener on the resource in order to be synchronized with queries
- Resource res = this.tableEditorInput.getPapyrusTableInstance().getTable().getContext().eResource();
-
-
- res.setTrackingModification(true);
- if(!res.eAdapters().contains(this.modelChangeAdapter)) {
- res.eAdapters().add(this.modelChangeAdapter);
- }
- }
-
- @Override
- public void dispose() {
- this.natTableWidget.getTableInstance().getContext().eAdapters().remove(this.contextListener);
- Resource res = this.tableEditorInput.getPapyrusTableInstance().getTable().getContext().eResource();
- res.eAdapters().remove(this.modelChangeAdapter);
- super.dispose();
- }
-
- @Override
- public void setFocus() {
- this.natTableWidget.getComposite().setFocus();
- }
-
- @Override
- public boolean isDirty() {
- return ((BasicCommandStack)this.editingDomain.getCommandStack()).isSaveNeeded();
- }
-
- @Override
- public boolean isSaveAsAllowed() {
- return true;
- }
-
- @Override
- public void doSave(final IProgressMonitor monitor) {
- this.natTableWidget.save();
- firePropertyChange(PROP_DIRTY);
- }
-
- @Override
- public void doSaveAs() {
- this.natTableWidget.saveAs();
- firePropertyChange(PROP_DIRTY);
- }
-
- public void addSelectionChangedListener(final ISelectionChangedListener listener) {
- this.natTableWidget.addSelectionChangedListener(listener);
- }
-
- public ISelection getSelection() {
- ISelection selection = this.natTableWidget.getSelection();
- if(selection.isEmpty()) {
- selection = new StructuredSelection(this.tableEditorInput.getPapyrusTableInstance());
- }
- return selection;
- }
-
- public EditingDomain getEditingDomain() {
- return this.editingDomain;
- }
-
- public void removeSelectionChangedListener(final ISelectionChangedListener listener) {
- this.natTableWidget.removeSelectionChangedListener(listener);
- }
-
- public void setSelection(final ISelection selection) {
- this.natTableWidget.setSelection(selection);
- }
-
- /**
- * This sets up the editing domain for the model editor
- */
- protected void initializeEditingDomain() {
- if(this.editingDomain == null) {
- ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
- BasicCommandStack commandStack = new BasicCommandStack();
- this.editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
- }
- this.editingDomain.getCommandStack().removeCommandStackListener(this.commandListener);
- this.editingDomain.getCommandStack().addCommandStackListener(this.commandListener);
- }
-
- public IWorkbenchPart getPart() {
- return this;
- }
-
- /**
- * This ocnverter is used by the LabelEditor (used to display the context)
- *
- *
- *
- */
- private class ContextLabelConverter implements IConverter {
-
- /**
- *
- * @see org.eclipse.core.databinding.conversion.IConverter#getToType()
- *
- * @return
- */
- public Object getToType() {
- return String.class;
- }
-
- /**
- *
- * @see org.eclipse.core.databinding.conversion.IConverter#getFromType()
- *
- * @return
- */
- public Object getFromType() {
- return Object.class;
- }
-
- /**
- *
- * @see org.eclipse.core.databinding.conversion.IConverter#convert(java.lang.Object)
- *
- * @param fromObject
- * @return
- */
- public Object convert(final Object fromObject) {
- if(fromObject instanceof EObject) {
- return UMLUtil.getQualifiedText((EObject)fromObject);
- }
- return ""; //$NON-NLS-1$
- }
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/TableEditorInput.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/TableEditorInput.java
deleted file mode 100644
index ec776c5db29..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/internal/TableEditorInput.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Mia-Software.
- * 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:
- * Nicolas Bros (Mia-Software) - Bug 331203 - table model editor - initial API and implementation
- * Nicolas Guyomar (Mia-Software) - Bug 332924 - To be able to save the table
- * Nicolas Guyomar (Mia-Software) - Bug 333029 - To be able to save the size of the lines and the columns
- *******************************************************************************/
-package org.eclipse.papyrus.table.common.internal;
-
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
-/**
- * Comes from org.eclipse.emf.facet.widget.nattable.workbench.
- *
- * This class should not be used by others plugins
- */
-public class TableEditorInput implements IEditorInput {
-
- /** The input for the Table widget */
- private final PapyrusTableInstance tableInstance;
-
- /** A textual description of what is shown in the editor */
- private final String description;
-
- private final EditingDomain editingDomain;
-
- public TableEditorInput(final PapyrusTableInstance papyrusTable, final EditingDomain editingDomain) {
- this.tableInstance = papyrusTable;
- this.description = papyrusTable.getTable().getDescription();
- this.editingDomain = editingDomain;
- }
-
- public PapyrusTableInstance getPapyrusTableInstance() {
- return this.tableInstance;
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public boolean exists() {
- return false;
- }
-
- public ImageDescriptor getImageDescriptor() {
- return null;
- }
-
- public String getName() {
- return "Model Table"; //$NON-NLS-1$
- }
-
- public IPersistableElement getPersistable() {
- return null;
- }
-
- public String getToolTipText() {
- return "Model Table"; //$NON-NLS-1$
- }
-
- public Object getAdapter(@SuppressWarnings("rawtypes") final Class adapter) {
- return null;
- }
-
- protected EditingDomain getEditingDomain() {
- return this.editingDomain;
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/messages/Messages.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/messages/Messages.java
deleted file mode 100644
index f40e49d1226..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/messages/Messages.java
+++ /dev/null
@@ -1,42 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.common.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.table.common.messages.messages"; //$NON-NLS-1$
-
- public static String AbstractCreateNattableEditorCommand_CreateNewTableDialog_TableDescriptionMessage;
-
- public static String AbstractCreateNattableEditorCommand_CreateNewTableDialog_TableNameMessage;
-
- public static String AbstractCreateNattableEditorCommand_CreateNewTableDialogTitle;
-
- public static String NatTableEditor_TableContextLabel;
-
- public static String NatTableEditor_TableContextTollTip;
-
- public static String NatTableEditor_TableDescriptionToolTip;
-
- public static String NatTableEditor_TaleDescriptionLabel;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/messages/messages.properties b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/messages/messages.properties
deleted file mode 100644
index 4a229edb74b..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/messages/messages.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-AbstractCreateNattableEditorCommand_CreateNewTableDialog_TableDescriptionMessage=The new table description:
-AbstractCreateNattableEditorCommand_CreateNewTableDialog_TableNameMessage=The new table name:
-AbstractCreateNattableEditorCommand_CreateNewTableDialogTitle=Enter a new Table Name and a new Table Description
-NatTableEditor_TableContextLabel=Table Context :
-NatTableEditor_TableContextTollTip=This context will be the parent of the created elements. This field can not be modify.
-NatTableEditor_TableDescriptionToolTip=The table description
-NatTableEditor_TaleDescriptionLabel=Table Description :
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/EMFFacetNattableModel.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/EMFFacetNattableModel.java
deleted file mode 100644
index 284e618801b..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/EMFFacetNattableModel.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 LIFL & 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:
- * Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.table.common.modelresource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.resource.AbstractModelWithSharedResource;
-import org.eclipse.papyrus.resource.IModel;
-import org.eclipse.papyrus.resource.ModelSet;
-
-
-
-/**
- * A model used to save data from the {@link DefaultNattableEditor}
- *
- * @author cedric dumoulin
- *
- */
-public class EMFFacetNattableModel extends /* AbstractBaseModel */AbstractModelWithSharedResource<TableInstance> implements IModel {
-
- /*
- * To save in a new file :
- * the class should extends AbstractBaseModel and NOTATION_FILE_EXTENSION = "nattable" for example
- */
-
-
- /**
- * File extension used for notation.
- */
- // public static final String NOTATION_FILE_EXTENSION = "nattable"; //$NON-NLS-1$
-
- public static final String NOTATION_FILE_EXTENSION = "di"; //$NON-NLS-1$
-
- /**
- * Model ID.
- */
- public static final String MODEL_ID = "org.eclipse.papyrus.emf.facet.nattable.resource.NattableModel"; //$NON-NLS-1$
-
-
- /**
- *
- * Constructor.
- *
- */
- public EMFFacetNattableModel() {
-
- }
-
- // Initialize stuff in the model.
- @Override
- public void init(ModelSet modelManager) {
- super.init(modelManager);
- // nothing to do now
- }
-
- /**
- * Get the file extension used for this model.
- *
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()
- *
- * @return
- */
- @Override
- protected String getModelFileExtension() {
- return NOTATION_FILE_EXTENSION;
- }
-
- /**
- * Get the identifier used to register this model.
- *
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()
- *
- * @return
- */
- @Override
- public String getIdentifier() {
- return MODEL_ID;
- }
-
-
- /**
- * Add a new initialized {@link Diagram} to the model.
- *
- * @param newDiagram
- * The diagram to add.
- */
- public void addTableInstance(TableInstance tableInstance) {
- getResource().getContents().add(tableInstance);
- }
-
- /**
- * Add a new initialized {@link Diagram} to the model.
- *
- * @param newDiagram
- * The diagram to add.
- */
- public void removeTableInstance(TableInstance tableInstance) {
- getResource().getContents().remove(tableInstance);
- }
-
- /**
- *
- * @see org.eclipse.papyrus.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)
- *
- * @param object
- * @return
- */
- @Override
- protected boolean isModelRoot(EObject object) {
- return false;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/PapyrusNattableModel.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/PapyrusNattableModel.java
deleted file mode 100644
index 25ad302a6b0..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/modelresource/PapyrusNattableModel.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 LIFL & 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:
- * Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.table.common.modelresource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.resource.AbstractModelWithSharedResource;
-import org.eclipse.papyrus.resource.IModel;
-import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-
-
-
-/**
- * A model used to save data from the {@link DefaultNattableEditor}
- *
- * @author cedric dumoulin
- *
- */
-public class PapyrusNattableModel extends AbstractModelWithSharedResource<TableInstance> implements IModel {
-
- /*
- * To save in a new file :
- * the class should extends AbstractBaseModel and NOTATION_FILE_EXTENSION = "nattable" for example
- */
-
-
- /**
- * File extension used for notation.
- */
- // public static final String NOTATION_FILE_EXTENSION = "nattable"; //$NON-NLS-1$
-
- public static final String NOTATION_FILE_EXTENSION = "di"; //$NON-NLS-1$
-
- /**
- * Model ID.
- */
- public static final String MODEL_ID = "org.eclipse.papyrus.nattable.resource.NattableModel"; //$NON-NLS-1$
-
-
- /**
- *
- * Constructor.
- *
- */
- public PapyrusNattableModel() {
-
- }
-
- // Initialize stuff in the model.
- @Override
- public void init(ModelSet modelManager) {
- super.init(modelManager);
- // nothing to do now
- }
-
- /**
- * Get the file extension used for this model.
- *
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()
- *
- * @return
- */
- @Override
- protected String getModelFileExtension() {
- return NOTATION_FILE_EXTENSION;
- }
-
- /**
- * Get the identifier used to register this model.
- *
- * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()
- *
- * @return
- */
- @Override
- public String getIdentifier() {
- return MODEL_ID;
- }
-
-
- /**
- * Add a new initialized {@link Diagram} to the model.
- *
- * @param newDiagram
- * The diagram to add.
- */
- public void addPapyrusTableInstance(PapyrusTableInstance tableInstance) {
- getResource().getContents().add(tableInstance);
- }
-
- /**
- * Add a new initialized {@link Diagram} to the model.
- *
- * @param newDiagram
- * The diagram to add.
- */
- public void removeTableInstance(PapyrusTableInstance tableInstance) {
- getResource().getContents().remove(tableInstance);
- }
-
- /**
- *
- * @see org.eclipse.papyrus.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)
- *
- * @param object
- * @return
- */
- @Override
- protected boolean isModelRoot(EObject object) {
- return false;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/util/QueryRepresentation.java b/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/util/QueryRepresentation.java
deleted file mode 100644
index 53a73f4d714..00000000000
--- a/incoming/org.eclipse.papyrus.table.common/src/org/eclipse/papyrus/table/common/util/QueryRepresentation.java
+++ /dev/null
@@ -1,69 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.common.util;
-
-
-/**
- * This class is used to represent the queries used to fill the table.
- *
- *
- *
- */
-public class QueryRepresentation {
-
- /**
- * the query set name
- */
- private String querySetName;
-
- /**
- * the query name
- */
- private String queryName;
-
- /**
- *
- * Constructor.
- *
- * @param querySetName
- * the querySet name
- * @param queryName
- * the query name
- */
- public QueryRepresentation(String querySetName, String queryName) {
- this.querySetName = querySetName;
- this.queryName = queryName;
- }
-
- /**
- * Getter for {@link #querySetName}
- *
- * @return
- * this{@link #querySetName}
- */
- public String getQuerySetName() {
- return querySetName;
- }
-
- /**
- * Getter for {@link #queryName}
- *
- * @return
- * this {@link #queryName}
- */
- public String getQueryName() {
- return queryName;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.default/.classpath b/incoming/org.eclipse.papyrus.table.default/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/incoming/org.eclipse.papyrus.table.default/.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/incoming/org.eclipse.papyrus.table.default/.project b/incoming/org.eclipse.papyrus.table.default/.project
deleted file mode 100644
index 21c3a95b25a..00000000000
--- a/incoming/org.eclipse.papyrus.table.default/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.table.default</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/incoming/org.eclipse.papyrus.table.default/.settings/org.eclipse.jdt.core.prefs b/incoming/org.eclipse.papyrus.table.default/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7dc5fb2632c..00000000000
--- a/incoming/org.eclipse.papyrus.table.default/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Jan 07 15:31:33 CET 2011
-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/incoming/org.eclipse.papyrus.table.default/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.table.default/META-INF/MANIFEST.MF
deleted file mode 100644
index 3db30305ed8..00000000000
--- a/incoming/org.eclipse.papyrus.table.default/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.table.default;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.table.defaultt.Activator
-Require-Bundle: org.eclipse.papyrus.core,
- org.eclipse.papyrus.table.common;bundle-version="0.8.0",
- org.eclipse.papyrus.table.instance;bundle-version="0.8.0",
- org.eclipse.emf.facet.widgets.nattable;bundle-version="0.1.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %providerName
-Export-Package: org.eclipse.papyrus.table.defaultt,
- org.eclipse.papyrus.table.defaultt.editor,
- org.eclipse.papyrus.table.defaultt.factory,
- org.eclipse.papyrus.table.defaultt.handlers
-
diff --git a/incoming/org.eclipse.papyrus.table.default/about.html b/incoming/org.eclipse.papyrus.table.default/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/incoming/org.eclipse.papyrus.table.default/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/incoming/org.eclipse.papyrus.table.default/build.properties b/incoming/org.eclipse.papyrus.table.default/build.properties
deleted file mode 100644
index 2d4f41295f9..00000000000
--- a/incoming/org.eclipse.papyrus.table.default/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- icons/,\
- about.html
-src.includes = icons/,\
- about.html
diff --git a/incoming/org.eclipse.papyrus.table.default/plugin.properties b/incoming/org.eclipse.papyrus.table.default/plugin.properties
deleted file mode 100644
index b0570431d94..00000000000
--- a/incoming/org.eclipse.papyrus.table.default/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:
-# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
-##################################################################################
-pluginName=Papyrus Default Table Editor (Incubation)
-providerName=Eclipse.org
diff --git a/incoming/org.eclipse.papyrus.table.default/plugin.xml b/incoming/org.eclipse.papyrus.table.default/plugin.xml
deleted file mode 100644
index f4c2da51f90..00000000000
--- a/incoming/org.eclipse.papyrus.table.default/plugin.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.papyrus.core.papyrusDiagram">
- <editorDiagram
- factoryClass="org.eclipse.papyrus.table.defaultt.factory.NattableEditorFactory"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/table.png">
- </editorDiagram>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- categoryId="org.eclipse.papyrus.editor.category"
- description="Create a New Default Table Editor"
- id="org.eclipse.papyrus.default.table.command"
- name="Create a Default Table Editor">
- </command>
- </extension>
- <extension
- point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.papyrus.table.defaultt.handlers.CreateNattableEditorCommand"
- commandId="org.eclipse.papyrus.default.table.command">
- <activeWhen>
- <or>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.core.papyrusEditor">
- </equals>
- </with>
- </or>
- </activeWhen>
- </handler>
- </extension>
- <extension
- id="create.table.menus"
- name="Create Table Menus"
- point="org.eclipse.ui.menus">
- <menuContribution
- allPopups="false"
- locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.createtable">
- <command
- commandId="org.eclipse.papyrus.default.table.command"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/table.png"
- label="Default Table"
- mnemonic="&amp;D"
- style="push"
- tooltip="Create a new Default Table">
- <visibleWhen>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.core.papyrusEditor">
- </equals>
- </with>
- </visibleWhen>
- </command>
- </menuContribution>
- <menuContribution
- allPopups="false"
- locationURI="menu:org.eclipse.papyrus.table.ui.menu.tables">
- <command
- commandId="org.eclipse.papyrus.default.table.command"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/table.png"
- label="Default Table"
- mnemonic="&amp;D"
- style="push"
- tooltip="Create a new Default Table">
- <visibleWhen>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.core.papyrusEditor">
- </equals>
- </with>
- </visibleWhen>
- </command>
- </menuContribution>
- <menuContribution
- allPopups="false"
- locationURI="toolbar:org.eclipse.papyrus.table.ui.toolbar">
- <command
- commandId="org.eclipse.papyrus.default.table.command"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/table.png"
- label="Default Table"
- mnemonic="&amp;D"
- style="push"
- tooltip="Create a new Default Table">
- <visibleWhen>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.core.papyrusEditor">
- </equals>
- </with>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
-</plugin>
diff --git a/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/Activator.java b/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/Activator.java
deleted file mode 100644
index ae2311178d2..00000000000
--- a/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/Activator.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 LIFL & 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:
- * Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.table.defaultt;
-
-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
- */
-public class Activator extends AbstractUIPlugin {
-
- /** The plug-in ID */
- public static final String ID = "org.eclipse.papyrus.diagram.nattable"; //$NON-NLS-1$
-
- /** 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 getInstance() {
- return plugin;
- }
-
-
-
- /**
- *
- * @param error
- */
- public void logError(String error) {
- logError(error, null);
- }
-
- /**
- * @param error
- * the error
- * @param throwable
- * actual error or null could be passed
- *
- */
- public void logError(String error, Throwable throwable) {
- if(error == null && throwable != null) {
- error = throwable.getMessage();
- }
- getLog().log(new Status(IStatus.ERROR, Activator.ID, IStatus.OK, error, throwable));
- debug(error, throwable);
- }
-
- /**
- *
- * @param message
- */
- public void logInfo(String message) {
- logInfo(message, null);
- }
-
- /**
- * @param message
- * the message
- * @param throwable
- * actual error or null could be passed
- * @generated
- */
- public void logInfo(String message, Throwable throwable) {
- if(message == null && throwable != null) {
- message = throwable.getMessage();
- }
- getLog().log(new Status(IStatus.INFO, Activator.ID, IStatus.OK, message, throwable));
- debug(message, throwable);
- }
-
- /**
- *
- * @param message
- * @param throwable
- */
- private void debug(String message, Throwable throwable) {
- if(!isDebugging()) {
- return;
- }
- if(message != null) {
- System.err.println(message);
- }
- if(throwable != null) {
- throwable.printStackTrace();
- }
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/editor/DefaultNattableEditor.java b/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/editor/DefaultNattableEditor.java
deleted file mode 100644
index 06e42cd9ec3..00000000000
--- a/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/editor/DefaultNattableEditor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
- *
- * 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:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
- *****************************************************************************/
-package org.eclipse.papyrus.table.defaultt.editor;
-
-import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.table.common.editor.AbstractNattableEditor;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-
-
-/**
- * A TextEditor that can be used as Tab of a sashes window.
- *
- * @author dumoulin
- */
-public class DefaultNattableEditor extends AbstractNattableEditor {
-
-
-
- /** the type of the editor */
- public static final String EDITOR_TYPE = "PapyrusDefaultTable"; //$NON-NLS-1$
-
- /** the default name for this table */
- public static final String DEFAULT_NAME = "DefaultTable"; //$NON-NLS-1$
-
- /**
- * @param servicesRegistry
- * @param rawModel
- *
- */
- public DefaultNattableEditor(ServicesRegistry servicesRegistry, PapyrusTableInstance rawModel) {
- super(servicesRegistry, rawModel);
-
- }
-
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/factory/NattableEditorFactory.java b/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/factory/NattableEditorFactory.java
deleted file mode 100644
index 2778486697f..00000000000
--- a/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/factory/NattableEditorFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 LIFL & 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:
- * Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
- * Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
- *****************************************************************************/
-
-package org.eclipse.papyrus.table.defaultt.factory;
-
-import org.eclipse.papyrus.table.common.factory.AbstractNattableEditorFactory;
-import org.eclipse.papyrus.table.defaultt.editor.DefaultNattableEditor;
-
-
-/**
- * @author dumoulin
- *
- */
-public class NattableEditorFactory extends AbstractNattableEditorFactory {
-
-
- /**
- * Constructor.
- *
- * @param diagramClass
- * @param expectedType
- */
- public NattableEditorFactory() {
- super(DefaultNattableEditor.class, DefaultNattableEditor.EDITOR_TYPE);
- }
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/handlers/CreateNattableEditorCommand.java b/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/handlers/CreateNattableEditorCommand.java
deleted file mode 100644
index c6d72eb2b3e..00000000000
--- a/incoming/org.eclipse.papyrus.table.default/src/org/eclipse/papyrus/table/defaultt/handlers/CreateNattableEditorCommand.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 LIFL & 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:
- * Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
- * Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
- *****************************************************************************/
-
-package org.eclipse.papyrus.table.defaultt.handlers;
-
-import org.eclipse.papyrus.table.common.handlers.AbstractCreateNattableEditorCommand;
-import org.eclipse.papyrus.table.defaultt.editor.DefaultNattableEditor;
-
-
-/**
- * @author dumoulin
- *
- */
-public class CreateNattableEditorCommand extends AbstractCreateNattableEditorCommand {
-
- /**
- *
- * Constructor.
- *
- */
- public CreateNattableEditorCommand() {
- super(DefaultNattableEditor.EDITOR_TYPE, DefaultNattableEditor.DEFAULT_NAME);
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.instance/.classpath b/incoming/org.eclipse.papyrus.table.instance/.classpath
deleted file mode 100644
index 45f024e850e..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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/incoming/org.eclipse.papyrus.table.instance/.project b/incoming/org.eclipse.papyrus.table.instance/.project
deleted file mode 100644
index f5596956ceb..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.table.instance</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/incoming/org.eclipse.papyrus.table.instance/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.table.instance/META-INF/MANIFEST.MF
deleted file mode 100644
index 46f812b5414..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.table.instance;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0",
- org.eclipse.ui.workbench
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.table.instance,
- org.eclipse.papyrus.table.instance.papyrustableinstance;uses:="org.eclipse.emf.ecore,org.eclipse.emf.facet.widgets.nattable.instance.tableinstance",
- org.eclipse.papyrus.table.instance.papyrustableinstance.util;
- uses:="org.eclipse.emf.ecore.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common.notify.impl,
- org.eclipse.emf.common.notify"
-Bundle-Activator: org.eclipse.papyrus.table.instance.Activator
-
diff --git a/incoming/org.eclipse.papyrus.table.instance/build.properties b/incoming/org.eclipse.papyrus.table.instance/build.properties
deleted file mode 100644
index 1a3a48b2220..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-bin.includes = .,\
- model/,\
- META-INF/,\
- plugin.xml,\
- plugin.properties
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.ecore b/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.ecore
deleted file mode 100644
index 7de4d7f390d..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.ecore
+++ /dev/null
@@ -1,37 +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="papyrustableinstance"
- nsURI="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" nsPrefix="org.eclipse.papyrus.table.instance.papyrustableinstance">
- <eClassifiers xsi:type="ecore:EClass" name="PapyrusTableInstance">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- defaultValueLiteral="no name">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The name of the table."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- defaultValueLiteral="PapyrusDefaultTable">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The type of the table"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSynchronized" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Indicates if the table is synchronized with its context or not. Synchronization is done with the filling queries."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="table" eType="ecore:EClass platform:/plugin/org.eclipse.emf.facet.widgets.nattable.instance/model/tableinstance2.ecore#//TableInstance2">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The TableInstance"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="fillingQueries" upperBound="-1"
- eType="ecore:EClass platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.ecore#//ModelQuery">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The queries used to fill the table"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.genmodel b/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.genmodel
deleted file mode 100644
index 8b4e8745c6c..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/model/papyrustableinstance.genmodel
+++ /dev/null
@@ -1,19 +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.table.instance/src"
- modelPluginID="org.eclipse.papyrus.table.instance" modelName="Papyrustableinstance"
- importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
- usedGenPackages="platform:/plugin/org.eclipse.emf.facet.widgets.celleditors/model/celleditors.genmodel#//modelCellEditor platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.facet.infra.facet/model/facet.genmodel#//facet platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.emf.facet.widgets.nattable.tableconfiguration/model/tableConfiguration.genmodel#//tableconfiguration platform:/plugin/org.eclipse.emf.facet.widgets.nattable.instance/model/tableinstance.genmodel#//tableinstance platform:/plugin/org.eclipse.emf.facet.widgets.nattable.instance/model/tableinstance2.genmodel#//tableinstance2 platform:/plugin/org.eclipse.emf.facet.infra.browser.custom/models/uiCustom.genmodel#//custom">
- <foreignModel>papyrustableinstance.ecore</foreignModel>
- <genPackages prefix="Papyrustableinstance" basePackage="org.eclipse.papyrus.table.instance"
- disposableProviderFactory="true" ecorePackage="papyrustableinstance.ecore#/">
- <genClasses ecoreClass="papyrustableinstance.ecore#//PapyrusTableInstance">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrustableinstance.ecore#//PapyrusTableInstance/name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrustableinstance.ecore#//PapyrusTableInstance/type"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrustableinstance.ecore#//PapyrusTableInstance/isSynchronized"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrustableinstance.ecore#//PapyrusTableInstance/table"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrustableinstance.ecore#//PapyrusTableInstance/fillingQueries"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/incoming/org.eclipse.papyrus.table.instance/plugin.properties b/incoming/org.eclipse.papyrus.table.instance/plugin.properties
deleted file mode 100644
index d3f0ba6368c..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName = Papyrus Nattable Instance
-providerName = Eclipse Modeling Project
diff --git a/incoming/org.eclipse.papyrus.table.instance/plugin.xml b/incoming/org.eclipse.papyrus.table.instance/plugin.xml
deleted file mode 100644
index c6ef3e422f0..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/plugin.xml
+++ /dev/null
@@ -1,20 +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/Table/0.8.0/papyrustableinstance"
- class="org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage"
- genModel="model/papyrusnattableinstance.genmodel"/>
- </extension>
-
-</plugin>
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java
deleted file mode 100644
index 8b42788be9f..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java
+++ /dev/null
@@ -1,67 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.instance;
-
-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.table.instance"; //$NON-NLS-1$
-
- // 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(final 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(final BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrusTableInstance.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrusTableInstance.java
deleted file mode 100644
index 02a39dd51f6..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrusTableInstance.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.table.instance.papyrustableinstance;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.facet.infra.query.ModelQuery;
-
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.TableInstance2;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Papyrus Table Instance</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized <em>Is Synchronized</em>}</li>
- * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getTable <em>Table</em>}</li>
- * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getFillingQueries <em>Filling Queries</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance()
- * @model
- * @generated
- */
-public interface PapyrusTableInstance extends EObject {
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * The default value is <code>"no name"</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The name of the table.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Name()
- * @model default="no name"
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#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);
-
- /**
- * Returns the value of the '<em><b>Type</b></em>' attribute.
- * The default value is <code>"PapyrusDefaultTable"</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The type of the table
- * <!-- end-model-doc -->
- * @return the value of the '<em>Type</em>' attribute.
- * @see #setType(String)
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Type()
- * @model default="PapyrusDefaultTable"
- * @generated
- */
- String getType();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getType <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type</em>' attribute.
- * @see #getType()
- * @generated
- */
- void setType(String value);
-
- /**
- * Returns the value of the '<em><b>Is Synchronized</b></em>' attribute.
- * The default value is <code>"false"</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Indicates if the table is synchronized with its context or not. Synchronization is done with the filling queries.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Is Synchronized</em>' attribute.
- * @see #setIsSynchronized(boolean)
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_IsSynchronized()
- * @model default="false"
- * @generated
- */
- boolean isIsSynchronized();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized <em>Is Synchronized</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Is Synchronized</em>' attribute.
- * @see #isIsSynchronized()
- * @generated
- */
- void setIsSynchronized(boolean value);
-
- /**
- * Returns the value of the '<em><b>Table</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The TableInstance
- * <!-- end-model-doc -->
- * @return the value of the '<em>Table</em>' reference.
- * @see #setTable(TableInstance2)
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_Table()
- * @model
- * @generated
- */
- TableInstance2 getTable();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getTable <em>Table</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Table</em>' reference.
- * @see #getTable()
- * @generated
- */
- void setTable(TableInstance2 value);
-
- /**
- * Returns the value of the '<em><b>Filling Queries</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.facet.infra.query.ModelQuery}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The queries used to fill the table
- * <!-- end-model-doc -->
- * @return the value of the '<em>Filling Queries</em>' reference list.
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage#getPapyrusTableInstance_FillingQueries()
- * @model
- * @generated
- */
- EList<ModelQuery> getFillingQueries();
-
-} // PapyrusTableInstance
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java
deleted file mode 100644
index f4dd30e64ab..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.table.instance.papyrustableinstance;
-
-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.table.instance.papyrustableinstance.PapyrustableinstancePackage
- * @generated
- */
-public interface PapyrustableinstanceFactory extends EFactory {
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- PapyrustableinstanceFactory eINSTANCE = org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrustableinstanceFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Papyrus Table Instance</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Papyrus Table Instance</em>'.
- * @generated
- */
- PapyrusTableInstance createPapyrusTableInstance();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- PapyrustableinstancePackage getPapyrustableinstancePackage();
-
-} //PapyrustableinstanceFactory
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstancePackage.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstancePackage.java
deleted file mode 100644
index 59a8a4511c6..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/PapyrustableinstancePackage.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.table.instance.papyrustableinstance;
-
-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.table.instance.papyrustableinstance.PapyrustableinstanceFactory
- * @model kind="package"
- * @generated
- */
-public interface PapyrustableinstancePackage extends EPackage {
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "papyrustableinstance";
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance";
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "org.eclipse.papyrus.table.instance.papyrustableinstance";
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- PapyrustableinstancePackage eINSTANCE = org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl <em>Papyrus Table Instance</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl#getPapyrusTableInstance()
- * @generated
- */
- int PAPYRUS_TABLE_INSTANCE = 0;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PAPYRUS_TABLE_INSTANCE__NAME = 0;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PAPYRUS_TABLE_INSTANCE__TYPE = 1;
-
- /**
- * The feature id for the '<em><b>Is Synchronized</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PAPYRUS_TABLE_INSTANCE__IS_SYNCHRONIZED = 2;
-
- /**
- * The feature id for the '<em><b>Table</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PAPYRUS_TABLE_INSTANCE__TABLE = 3;
-
- /**
- * The feature id for the '<em><b>Filling Queries</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PAPYRUS_TABLE_INSTANCE__FILLING_QUERIES = 4;
-
- /**
- * The number of structural features of the '<em>Papyrus Table Instance</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PAPYRUS_TABLE_INSTANCE_FEATURE_COUNT = 5;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance <em>Papyrus Table Instance</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Papyrus Table Instance</em>'.
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance
- * @generated
- */
- EClass getPapyrusTableInstance();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getName()
- * @see #getPapyrusTableInstance()
- * @generated
- */
- EAttribute getPapyrusTableInstance_Name();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getType <em>Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type</em>'.
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getType()
- * @see #getPapyrusTableInstance()
- * @generated
- */
- EAttribute getPapyrusTableInstance_Type();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized <em>Is Synchronized</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Is Synchronized</em>'.
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#isIsSynchronized()
- * @see #getPapyrusTableInstance()
- * @generated
- */
- EAttribute getPapyrusTableInstance_IsSynchronized();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getTable <em>Table</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Table</em>'.
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getTable()
- * @see #getPapyrusTableInstance()
- * @generated
- */
- EReference getPapyrusTableInstance_Table();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getFillingQueries <em>Filling Queries</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Filling Queries</em>'.
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance#getFillingQueries()
- * @see #getPapyrusTableInstance()
- * @generated
- */
- EReference getPapyrusTableInstance_FillingQueries();
-
- /**
- * 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
- */
- PapyrustableinstanceFactory getPapyrustableinstanceFactory();
-
- /**
- * <!-- 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.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl <em>Papyrus Table Instance</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl
- * @see org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrustableinstancePackageImpl#getPapyrusTableInstance()
- * @generated
- */
- EClass PAPYRUS_TABLE_INSTANCE = eINSTANCE.getPapyrusTableInstance();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute PAPYRUS_TABLE_INSTANCE__NAME = eINSTANCE.getPapyrusTableInstance_Name();
-
- /**
- * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute PAPYRUS_TABLE_INSTANCE__TYPE = eINSTANCE.getPapyrusTableInstance_Type();
-
- /**
- * The meta object literal for the '<em><b>Is Synchronized</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute PAPYRUS_TABLE_INSTANCE__IS_SYNCHRONIZED = eINSTANCE.getPapyrusTableInstance_IsSynchronized();
-
- /**
- * The meta object literal for the '<em><b>Table</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference PAPYRUS_TABLE_INSTANCE__TABLE = eINSTANCE.getPapyrusTableInstance_Table();
-
- /**
- * The meta object literal for the '<em><b>Filling Queries</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference PAPYRUS_TABLE_INSTANCE__FILLING_QUERIES = eINSTANCE.getPapyrusTableInstance_FillingQueries();
-
- }
-
-} //PapyrustableinstancePackage
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java
deleted file mode 100644
index b1a8c7563a8..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.table.instance.papyrustableinstance.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-
-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.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
-import org.eclipse.emf.facet.infra.query.ModelQuery;
-
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.TableInstance2;
-
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Papyrus Table Instance</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#isIsSynchronized <em>Is Synchronized</em>}</li>
- * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getTable <em>Table</em>}</li>
- * <li>{@link org.eclipse.papyrus.table.instance.papyrustableinstance.impl.PapyrusTableInstanceImpl#getFillingQueries <em>Filling Queries</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PapyrusTableInstanceImpl extends EObjectImpl implements PapyrusTableInstance {
- /**
- * 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 = "no name";
-
- /**
- * 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;
-
- /**
- * The default value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected static final String TYPE_EDEFAULT = "PapyrusDefaultTable";
-
- /**
- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected String type = TYPE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isIsSynchronized() <em>Is Synchronized</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isIsSynchronized()
- * @generated
- * @ordered
- */
- protected static final boolean IS_SYNCHRONIZED_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isIsSynchronized() <em>Is Synchronized</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isIsSynchronized()
- * @generated
- * @ordered
- */
- protected boolean isSynchronized = IS_SYNCHRONIZED_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getTable() <em>Table</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTable()
- * @generated
- * @ordered
- */
- protected TableInstance2 table;
-
- /**
- * The cached value of the '{@link #getFillingQueries() <em>Filling Queries</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFillingQueries()
- * @generated
- * @ordered
- */
- protected EList<ModelQuery> fillingQueries;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PapyrusTableInstanceImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return PapyrustableinstancePackage.Literals.PAPYRUS_TABLE_INSTANCE;
- }
-
- /**
- * <!-- 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, PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getType() {
- return type;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setType(String newType) {
- String oldType = type;
- type = newType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__TYPE, oldType, type));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isIsSynchronized() {
- return isSynchronized;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setIsSynchronized(boolean newIsSynchronized) {
- boolean oldIsSynchronized = isSynchronized;
- isSynchronized = newIsSynchronized;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__IS_SYNCHRONIZED, oldIsSynchronized, isSynchronized));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TableInstance2 getTable() {
- if (table != null && table.eIsProxy()) {
- InternalEObject oldTable = (InternalEObject)table;
- table = (TableInstance2)eResolveProxy(oldTable);
- if (table != oldTable) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__TABLE, oldTable, table));
- }
- }
- return table;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TableInstance2 basicGetTable() {
- return table;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTable(TableInstance2 newTable) {
- TableInstance2 oldTable = table;
- table = newTable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__TABLE, oldTable, table));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<ModelQuery> getFillingQueries() {
- if (fillingQueries == null) {
- fillingQueries = new EObjectResolvingEList<ModelQuery>(ModelQuery.class, this, PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__FILLING_QUERIES);
- }
- return fillingQueries;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__NAME:
- return getName();
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__TYPE:
- return getType();
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__IS_SYNCHRONIZED:
- return isIsSynchronized();
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__TABLE:
- if (resolve) return getTable();
- return basicGetTable();
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__FILLING_QUERIES:
- return getFillingQueries();
- }
- 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 PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__NAME:
- setName((String)newValue);
- return;
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__TYPE:
- setType((String)newValue);
- return;
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__IS_SYNCHRONIZED:
- setIsSynchronized((Boolean)newValue);
- return;
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__TABLE:
- setTable((TableInstance2)newValue);
- return;
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__FILLING_QUERIES:
- getFillingQueries().clear();
- getFillingQueries().addAll((Collection<? extends ModelQuery>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__TYPE:
- setType(TYPE_EDEFAULT);
- return;
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__IS_SYNCHRONIZED:
- setIsSynchronized(IS_SYNCHRONIZED_EDEFAULT);
- return;
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__TABLE:
- setTable((TableInstance2)null);
- return;
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__FILLING_QUERIES:
- getFillingQueries().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__TYPE:
- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__IS_SYNCHRONIZED:
- return isSynchronized != IS_SYNCHRONIZED_EDEFAULT;
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__TABLE:
- return table != null;
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__FILLING_QUERIES:
- return fillingQueries != null && !fillingQueries.isEmpty();
- }
- 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(", type: ");
- result.append(type);
- result.append(", isSynchronized: ");
- result.append(isSynchronized);
- result.append(')');
- return result.toString();
- }
-
-} //PapyrusTableInstanceImpl
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java
deleted file mode 100644
index 8e1eff8a5ac..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.table.instance.papyrustableinstance.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.table.instance.papyrustableinstance.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrustableinstanceFactoryImpl extends EFactoryImpl implements PapyrustableinstanceFactory {
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static PapyrustableinstanceFactory init() {
- try {
- PapyrustableinstanceFactory thePapyrustableinstanceFactory = (PapyrustableinstanceFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance");
- if (thePapyrustableinstanceFactory != null) {
- return thePapyrustableinstanceFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new PapyrustableinstanceFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PapyrustableinstanceFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE: return createPapyrusTableInstance();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PapyrusTableInstance createPapyrusTableInstance() {
- PapyrusTableInstanceImpl papyrusTableInstance = new PapyrusTableInstanceImpl();
- return papyrusTableInstance;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PapyrustableinstancePackage getPapyrustableinstancePackage() {
- return (PapyrustableinstancePackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- @Deprecated
- public static PapyrustableinstancePackage getPackage() {
- return PapyrustableinstancePackage.eINSTANCE;
- }
-
-} //PapyrustableinstanceFactoryImpl
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java
deleted file mode 100644
index d3d504c77cc..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.table.instance.papyrustableinstance.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.emf.facet.infra.query.QueryPackage;
-
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance2.Tableinstance2Package;
-
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstanceFactory;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrustableinstancePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrustableinstancePackageImpl extends EPackageImpl implements PapyrustableinstancePackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass papyrusTableInstanceEClass = 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.table.instance.papyrustableinstance.PapyrustableinstancePackage#eNS_URI
- * @see #init()
- * @generated
- */
- private PapyrustableinstancePackageImpl() {
- super(eNS_URI, PapyrustableinstanceFactory.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 PapyrustableinstancePackage#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 PapyrustableinstancePackage init() {
- if (isInited) return (PapyrustableinstancePackage)EPackage.Registry.INSTANCE.getEPackage(PapyrustableinstancePackage.eNS_URI);
-
- // Obtain or create and register package
- PapyrustableinstancePackageImpl thePapyrustableinstancePackage = (PapyrustableinstancePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PapyrustableinstancePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PapyrustableinstancePackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- Tableinstance2Package.eINSTANCE.eClass();
-
- // Create package meta-data objects
- thePapyrustableinstancePackage.createPackageContents();
-
- // Initialize created meta-data
- thePapyrustableinstancePackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- thePapyrustableinstancePackage.freeze();
-
-
- // Update the registry and return the package
- EPackage.Registry.INSTANCE.put(PapyrustableinstancePackage.eNS_URI, thePapyrustableinstancePackage);
- return thePapyrustableinstancePackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPapyrusTableInstance() {
- return papyrusTableInstanceEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPapyrusTableInstance_Name() {
- return (EAttribute)papyrusTableInstanceEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPapyrusTableInstance_Type() {
- return (EAttribute)papyrusTableInstanceEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPapyrusTableInstance_IsSynchronized() {
- return (EAttribute)papyrusTableInstanceEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPapyrusTableInstance_Table() {
- return (EReference)papyrusTableInstanceEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPapyrusTableInstance_FillingQueries() {
- return (EReference)papyrusTableInstanceEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PapyrustableinstanceFactory getPapyrustableinstanceFactory() {
- return (PapyrustableinstanceFactory)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
- papyrusTableInstanceEClass = createEClass(PAPYRUS_TABLE_INSTANCE);
- createEAttribute(papyrusTableInstanceEClass, PAPYRUS_TABLE_INSTANCE__NAME);
- createEAttribute(papyrusTableInstanceEClass, PAPYRUS_TABLE_INSTANCE__TYPE);
- createEAttribute(papyrusTableInstanceEClass, PAPYRUS_TABLE_INSTANCE__IS_SYNCHRONIZED);
- createEReference(papyrusTableInstanceEClass, PAPYRUS_TABLE_INSTANCE__TABLE);
- createEReference(papyrusTableInstanceEClass, PAPYRUS_TABLE_INSTANCE__FILLING_QUERIES);
- }
-
- /**
- * <!-- 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
- Tableinstance2Package theTableinstance2Package = (Tableinstance2Package)EPackage.Registry.INSTANCE.getEPackage(Tableinstance2Package.eNS_URI);
- QueryPackage theQueryPackage = (QueryPackage)EPackage.Registry.INSTANCE.getEPackage(QueryPackage.eNS_URI);
-
- // Create type parameters
-
- // Set bounds for type parameters
-
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(papyrusTableInstanceEClass, PapyrusTableInstance.class, "PapyrusTableInstance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPapyrusTableInstance_Name(), ecorePackage.getEString(), "name", "no name", 0, 1, PapyrusTableInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPapyrusTableInstance_Type(), ecorePackage.getEString(), "type", "PapyrusDefaultTable", 0, 1, PapyrusTableInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPapyrusTableInstance_IsSynchronized(), ecorePackage.getEBoolean(), "isSynchronized", "false", 0, 1, PapyrusTableInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPapyrusTableInstance_Table(), theTableinstance2Package.getTableInstance2(), null, "table", null, 0, 1, PapyrusTableInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPapyrusTableInstance_FillingQueries(), theQueryPackage.getModelQuery(), null, "fillingQueries", null, 0, -1, PapyrusTableInstance.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);
- }
-
-} //PapyrustableinstancePackageImpl
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java
deleted file mode 100644
index 86263902a72..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.table.instance.papyrustableinstance.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.table.instance.papyrustableinstance.*;
-
-/**
- * <!-- 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.table.instance.papyrustableinstance.PapyrustableinstancePackage
- * @generated
- */
-public class PapyrustableinstanceAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static PapyrustableinstancePackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PapyrustableinstanceAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = PapyrustableinstancePackage.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 PapyrustableinstanceSwitch<Adapter> modelSwitch =
- new PapyrustableinstanceSwitch<Adapter>() {
- @Override
- public Adapter casePapyrusTableInstance(PapyrusTableInstance object) {
- return createPapyrusTableInstanceAdapter();
- }
- @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.table.instance.papyrustableinstance.PapyrusTableInstance <em>Papyrus Table Instance</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.table.instance.papyrustableinstance.PapyrusTableInstance
- * @generated
- */
- public Adapter createPapyrusTableInstanceAdapter() {
- 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;
- }
-
-} //PapyrustableinstanceAdapterFactory
diff --git a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java b/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java
deleted file mode 100644
index ffe19768518..00000000000
--- a/incoming/org.eclipse.papyrus.table.instance/src/org/eclipse/papyrus/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.table.instance.papyrustableinstance.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.papyrus.table.instance.papyrustableinstance.*;
-
-/**
- * <!-- 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.table.instance.papyrustableinstance.PapyrustableinstancePackage
- * @generated
- */
-public class PapyrustableinstanceSwitch<T> extends Switch<T> {
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static PapyrustableinstancePackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PapyrustableinstanceSwitch() {
- if (modelPackage == null) {
- modelPackage = PapyrustableinstancePackage.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 PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE: {
- PapyrusTableInstance papyrusTableInstance = (PapyrusTableInstance)theEObject;
- T result = casePapyrusTableInstance(papyrusTableInstance);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Papyrus Table Instance</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>Papyrus Table Instance</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T casePapyrusTableInstance(PapyrusTableInstance 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;
- }
-
-} //PapyrustableinstanceSwitch
diff --git a/incoming/org.eclipse.papyrus.table.menu/.classpath b/incoming/org.eclipse.papyrus.table.menu/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/.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/incoming/org.eclipse.papyrus.table.menu/.project b/incoming/org.eclipse.papyrus.table.menu/.project
deleted file mode 100644
index 31d3e8240c4..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.table.menu</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/incoming/org.eclipse.papyrus.table.menu/.settings/org.eclipse.core.resources.prefs b/incoming/org.eclipse.papyrus.table.menu/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 5bdce069f07..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 10 14:50:02 CET 2011
-eclipse.preferences.version=1
-encoding//src/org/eclipse/papyrus/table/menu/messages/messages.properties=ISO-8859-1
diff --git a/incoming/org.eclipse.papyrus.table.menu/.settings/org.eclipse.jdt.core.prefs b/incoming/org.eclipse.papyrus.table.menu/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 62e64d3aa81..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Feb 11 11:37:09 CET 2011
-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/incoming/org.eclipse.papyrus.table.menu/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.table.menu/META-INF/MANIFEST.MF
deleted file mode 100644
index 2ee76c11a18..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.table.menu;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.table.menu.Activator
-Require-Bundle: org.eclipse.core.expressions,
- org.eclipse.papyrus.table.default,
- org.eclipse.papyrus.diagram.common,
- org.eclipse.papyrus.diagram.menu,
- org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",
- org.eclipse.papyrus.table.common;bundle-version="0.8.0",
- org.eclipse.emf.facet.widgets.nattable,
- org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.table.menu,
- org.eclipse.papyrus.table.menu.handler,
- org.eclipse.papyrus.table.menu.providers
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/incoming/org.eclipse.papyrus.table.menu/about.html b/incoming/org.eclipse.papyrus.table.menu/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/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/incoming/org.eclipse.papyrus.table.menu/build.properties b/incoming/org.eclipse.papyrus.table.menu/build.properties
deleted file mode 100644
index 3ff4800e612..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties
-src.includes = about.html
diff --git a/incoming/org.eclipse.papyrus.table.menu/icons/empty.png b/incoming/org.eclipse.papyrus.table.menu/icons/empty.png
deleted file mode 100644
index 8b24ec18ae6..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/icons/empty.png
+++ /dev/null
Binary files differ
diff --git a/incoming/org.eclipse.papyrus.table.menu/icons/not_NA.png b/incoming/org.eclipse.papyrus.table.menu/icons/not_NA.png
deleted file mode 100644
index b6a694ee3b4..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/icons/not_NA.png
+++ /dev/null
Binary files differ
diff --git a/incoming/org.eclipse.papyrus.table.menu/icons/rename.gif b/incoming/org.eclipse.papyrus.table.menu/icons/rename.gif
deleted file mode 100644
index e6f786eca9a..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/icons/rename.gif
+++ /dev/null
Binary files differ
diff --git a/incoming/org.eclipse.papyrus.table.menu/icons/select_column_to_hide.png b/incoming/org.eclipse.papyrus.table.menu/icons/select_column_to_hide.png
deleted file mode 100644
index c251d61c2a1..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/icons/select_column_to_hide.png
+++ /dev/null
Binary files differ
diff --git a/incoming/org.eclipse.papyrus.table.menu/icons/select_column_to_hide_2.png b/incoming/org.eclipse.papyrus.table.menu/icons/select_column_to_hide_2.png
deleted file mode 100644
index 5a2446c88ef..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/icons/select_column_to_hide_2.png
+++ /dev/null
Binary files differ
diff --git a/incoming/org.eclipse.papyrus.table.menu/plugin.properties b/incoming/org.eclipse.papyrus.table.menu/plugin.properties
deleted file mode 100644
index e3c95ea18bc..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.table.menu
-providerName = Eclipse.org
-pluginName = Papyrus Table Menu \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.table.menu/plugin.xml b/incoming/org.eclipse.papyrus.table.menu/plugin.xml
deleted file mode 100644
index f35cf67cecb..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/plugin.xml
+++ /dev/null
@@ -1,538 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.ui.commands">
- <command
- categoryId="org.eclipse.emf.facet.widgets.nattable.command.category"
- defaultHandler="org.eclipse.papyrus.table.menu.handler.CommonColumnHandler"
- description="Show only the common columns"
- id="org.eclipse.emf.facet.widget.nattable.common.columns.command"
- name="Common Columns Command">
- <state
- class="org.eclipse.papyrus.table.menu.handler.states.OnlyCommonColumnsState"
- id="org.eclipse.ui.commands.toggleState">
- </state>
- </command>
- <command
- categoryId="org.eclipse.emf.facet.widgets.nattable.command.category"
- defaultHandler="org.eclipse.papyrus.table.menu.handler.HideEmptyColumnsHandler"
- description="This command hides the empty columns"
- id="org.eclipse.emf.facet.widget.nattable.empty.columns.command"
- name="Hide Empty Columns Command">
- <state
- class="org.eclipse.papyrus.table.menu.handler.states.HideEmptyColumnState"
- id="org.eclipse.ui.commands.toggleState">
- </state>
- </command>
- </extension>
- <!-- We remove this action, between, now we have the Drag&Drop -->
- <!--
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- allPopups="false"
- locationURI="popup:org.eclipse.papyrus.modelexplorer.modelexplorer.popup">
- <command
- commandId="org.eclipse.papyrus.table.menu.add.in.table"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/table.png"
- label="Add in a table"
- mnemonic="&amp;A"
- style="push"
- tooltip="Add the selected elements in the last opened table">
- <visibleWhen>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.core.papyrusEditor">
- </equals>
- </with>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- -->
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- allPopups="false"
- locationURI="menu:org.eclipse.ui.main.menu?before=navigate">
- <menu
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/table.png"
- id="org.eclipse.papyrus.table.menu"
- label="&amp;Table"
- tooltip="The table Menu">
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.loadCustomizationCommand"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/uiCustom.gif"
- id="org.eclipse.papyrus.table.menu.load.customization"
- style="push"
- tooltip="%load.customization">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.loadFacetCommand"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/facet.gif"
- id="org.eclipse.papyrus.table.menu.load.emf.facet"
- style="push"
- tooltip="%load.emf.facet">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.openSavedTableCommand"
- icon="IMG_OBJ_FOLDER"
- id="org.eclipse.papyrus.table.menu.open.table"
- style="push"
- tooltip="%open.table">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.hideColumnCommand"
- icon="icons/select_column_to_hide_2.png"
- id="org.eclipse.papyrus.table.menu.hide.empty.column"
- style="push"
- tooltip="%select.column.to.hide">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.sortColumnByTypeCommand"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/sort_links_by_type.gif"
- id="org.eclipse.papyrus.table.menu.sort.column"
- mnemonic="org.eclipse.papyrus.table.toolbar.delete.line"
- style="push"
- tooltip="%sort.column.by.type">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </visibleWhen>
- </command>
- <separator
- name="org.eclipse.papyrus.table.menu.separator"
- visible="true">
- </separator>
- <command
- commandId="org.eclipse.emf.facet.widget.nattable.empty.columns.command"
- icon="icons/empty.png"
- id="org.eclipse.papyrus.table.menu.hide.empty.column"
- label="&amp;Hide the empty columns"
- style="toggle"
- tooltip="Hide the empty columns">
- <visibleWhen
- checkEnabled="false">
- <and>
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- <with
- variable="activeEditor">
- <instanceof
- value="org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor">
- </instanceof>
- </with>
- </and>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.emf.facet.widget.nattable.common.columns.command"
- icon="icons/not_NA.png"
- id="org.eclipse.papyrus.table.menu.common.column"
- label="&amp;Show only the common columns"
- style="toggle"
- tooltip="Show only the common columns">
- <visibleWhen
- checkEnabled="false">
- <and>
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- <with
- variable="activeEditor">
- <instanceof
- value="org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor">
- </instanceof>
- </with>
- </and>
- </visibleWhen>
- </command>
- </menu>
- </menuContribution>
- <menuContribution
- allPopups="false"
- locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
- <toolbar
- id="org.eclipse.papyrus.table.toolbar"
- label="Papyrus Table Toolbar">
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.createNewElementCommand"
- icon="IMG_OBJ_ADD"
- id="org.eclipse.papyrus.table.toolbar.create.new.element"
- style="pulldown"
- tooltip="%create.new.element">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.exportCommand"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/export.gif"
- id="org.eclipse.papyrus.table.toolbar.export.xmi"
- style="push"
- tooltip="Export as XMI File">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.loadCustomizationCommand"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/uiCustom.gif"
- id="org.eclipse.papyrus.table.toolbar.load.customization"
- style="push"
- tooltip="Load a Customization">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.loadFacetCommand"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/facet.gif"
- id="org.eclipse.papyrus.table.toolbar.load.facet"
- style="push"
- tooltip="Load an EMF Facet">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.hideColumnCommand"
- icon="icons/select_column_to_hide_2.png"
- id="org.eclipse.papyrus.table.toolbar.hide.column"
- style="push"
- tooltip="Select Columns To Hide">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.sortColumnByTypeCommand"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/sort_links_by_type.gif"
- id="org.eclipse.papyrus.table.toolbar.sort.column.by.type"
- style="push"
- tooltip="Sort Columns By Type">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </visibleWhen>
- </command>
- <separator
- name="org.eclipse.papyrus.table.menu.separator1"
- visible="true">
- </separator>
- <command
- commandId="org.eclipse.emf.facet.widget.nattable.common.columns.command"
- icon="icons/not_NA.png"
- id="org.eclipse.papyrus.table.toolbar.common.column"
- label="&amp;Show only the common columns"
- style="toggle"
- tooltip="Show only the common columns">
- <visibleWhen
- checkEnabled="false">
- <and>
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- <with
- variable="activeEditor">
- <instanceof
- value="org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor">
- </instanceof>
- </with>
- </and>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.emf.facet.widget.nattable.empty.columns.command"
- icon="icons/empty.png"
- id="org.eclipse.papyrus.table.toolbar.hide.empty.column"
- label="&amp;Hide the empty columns"
- style="toggle"
- tooltip="Hide the empty columns">
- <visibleWhen
- checkEnabled="false">
- <and>
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- <with
- variable="activeEditor">
- <instanceof
- value="org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor">
- </instanceof>
- </with>
- </and>
- </visibleWhen>
- </command>
- </toolbar>
- </menuContribution>
- <menuContribution
- allPopups="true"
- locationURI="popup:org.eclipse.ui.popup.any">
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.removeLineCommand"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/remove_line.gif"
- id="delete.line"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <and>
- <with
- variable="activePart">
- <instanceof
- value="org.eclipse.ui.IEditorPart">
- </instanceof>
- </with>
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </and>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.emf.facet.widgets.nattable.addQueryColumnCommand"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/query.png"
- id="add.query.column"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <and>
- <with
- variable="activePart">
- <instanceof
- value="org.eclipse.ui.IEditorPart">
- </instanceof>
- </with>
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </and>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.ui.edit.delete"
- disabledIcon="IMG_ETOOL_DELETE_DISABLED"
- icon="IMG_ETOOL_DELETE"
- id="delete.element"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <and>
- <with
- variable="activePart">
- <instanceof
- value="org.eclipse.ui.IEditorPart">
- </instanceof>
- </with>
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </and>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.ui.edit.copy"
- disabledIcon="IMG_TOOL_COPY_DISABLED"
- icon="IMG_TOOL_COPY"
- id="copy.element"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <and>
- <with
- variable="activePart">
- <instanceof
- value="org.eclipse.ui.IEditorPart">
- </instanceof>
- </with>
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </and>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.ui.edit.selectAll"
- id="select.all"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <and>
- <with
- variable="activePart">
- <instanceof
- value="org.eclipse.ui.IEditorPart">
- </instanceof>
- </with>
- <with
- variable="selection">
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable"
- value="true">
- </test>
- </with>
- </and>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- <extension
- point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- class="org.eclipse.papyrus.table.menu.providers.TableTester"
- id="org.eclipse.papyrus.table.menu.providers.TableTester"
- namespace="org.eclipse.papyrus.table.menu.providers.TableTester"
- properties="isTable"
- type="org.eclipse.jface.viewers.IStructuredSelection">
- </propertyTester>
- </extension>
-
-
-
-
-
-
-
-</plugin>
diff --git a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/Activator.java b/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/Activator.java
deleted file mode 100644
index bc577a35781..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/Activator.java
+++ /dev/null
@@ -1,65 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.menu;
-
-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 ID = "org.eclipse.papyrus.table.menu"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- 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)
- */
- 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;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/CommonColumnHandler.java b/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/CommonColumnHandler.java
deleted file mode 100644
index f39d4fde129..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/CommonColumnHandler.java
+++ /dev/null
@@ -1,56 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.menu.handler;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.emf.facet.widgets.nattable.INatTableWidget;
-import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- * This class provides the handler to show only the common columns or to display all the columns
- *
- *
- *
- */
-public class CommonColumnHandler extends AbstractHandler implements IHandler {
-
-
-
-
- /**
- *
- * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
- *
- * @param event
- * @return
- * @throws ExecutionException
- */
- public Object execute(ExecutionEvent event) throws ExecutionException {
- IEditorPart editor = HandlerUtil.getActiveEditor(event);
- INatTableWidgetProvider provider = (INatTableWidgetProvider)editor.getAdapter(INatTableWidgetProvider.class);
- if(provider != null) {
- INatTableWidget widget = provider.getNatTableWidget();
- widget.setOnlyShowCommonColumns(!widget.getTableInstance().isOnlyShowCommonColumns());
- //change the state of the command
- HandlerUtil.toggleCommandState(event.getCommand());
- }
- return null;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/HideEmptyColumnsHandler.java b/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/HideEmptyColumnsHandler.java
deleted file mode 100644
index fc9946a5d85..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/HideEmptyColumnsHandler.java
+++ /dev/null
@@ -1,50 +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:
- * Nicolas Guyomar (Mia-Software) - Bug 335020 - Nattable widget should use the Eclipse framework
- *******************************************************************************/
-package org.eclipse.papyrus.table.menu.handler;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.emf.facet.widgets.nattable.INatTableWidget;
-import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- * This class provides the handler to hide or show the empty column
- *
- *
- *
- */
-public class HideEmptyColumnsHandler extends AbstractHandler {
-
- /**
- *
- * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
- *
- * @param event
- * @return
- * @throws ExecutionException
- */
- public Object execute(ExecutionEvent event) throws ExecutionException {
- IEditorPart editor = HandlerUtil.getActiveEditor(event);
- INatTableWidgetProvider provider = (INatTableWidgetProvider)editor.getAdapter(INatTableWidgetProvider.class);
- if(provider != null) {
- INatTableWidget widget = provider.getNatTableWidget();
- widget.setHideEmptyColumns(!widget.getTableInstance().isHideEmptyColumns());
- //change the state of the command
- HandlerUtil.toggleCommandState(event.getCommand());
- }
- return null;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/AbstractToggleStateProvider.java b/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/AbstractToggleStateProvider.java
deleted file mode 100644
index 30d77857b68..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/AbstractToggleStateProvider.java
+++ /dev/null
@@ -1,91 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.menu.handler.states;
-
-import org.eclipse.jface.commands.ToggleState;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Abstract class for the command using toggle state
- * In order refresh command state, this class adds a listener on the SelectionService
- *
- *
- */
-public abstract class AbstractToggleStateProvider extends ToggleState implements ISelectionListener {
-
-
- /** the selection service */
- private ISelectionService serv = null;
-
- /**
- *
- * Constructor.
- *
- */
- public AbstractToggleStateProvider() {
- addSelectionListener();
- refreshState();
- }
-
- /**
- * add a listener on the selection service
- */
- protected void addSelectionListener() {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-
- public void run() {
- // TODO Auto-generated method stub
- serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
- if(serv != null) {
- //serv.addSelectionListener(this);
- serv.addSelectionListener(AbstractToggleStateProvider.this);
- }
- }
- });
-
- }
-
- /**
- *
- * @see org.eclipse.core.commands.State#dispose()
- *
- */
- @Override
- public void dispose() {
- if(this.serv != null) {
- this.serv.removeSelectionListener(this);
- }
- super.dispose();
- }
-
- /**
- *
- * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
- *
- * @param part
- * @param selection
- */
- public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- refreshState();
- }
-
- /**
- * Refresh the status of the command
- */
- protected abstract void refreshState();
-}
diff --git a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/HideEmptyColumnState.java b/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/HideEmptyColumnState.java
deleted file mode 100644
index 64a72088c62..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/HideEmptyColumnState.java
+++ /dev/null
@@ -1,55 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.menu.handler.states;
-
-import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class provides the state for the Hide Empty Column Action
- *
- *
- *
- */
-public class HideEmptyColumnState extends AbstractToggleStateProvider {
-
- /**
- *
- * @see org.eclipse.table.handler.states.AbstractToggleStateProvider#refreshState()
- *
- */
- @Override
- protected void refreshState() {
- try {
- IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- INatTableWidgetProvider widget = (INatTableWidgetProvider)activeEditor.getAdapter(INatTableWidgetProvider.class);
- if(widget != null) {
- Boolean currentCommandValue = (Boolean)getValue();
- boolean realValue = new Boolean(widget.getNatTableWidget().getTableInstance().isHideEmptyColumns());
-
- if(!currentCommandValue.equals(realValue)) {
- //change the state of the command
- setValue(realValue);
- }
- } else {
- setValue(false);
- }
- } catch (NullPointerException e) {
-
- }
-
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/OnlyCommonColumnsState.java b/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/OnlyCommonColumnsState.java
deleted file mode 100644
index d39c1c380db..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/handler/states/OnlyCommonColumnsState.java
+++ /dev/null
@@ -1,56 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.menu.handler.states;
-
-import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-
-
-
-/**
- * This class provides the state for the Only Common Column Action
- *
- *
- *
- */
-public class OnlyCommonColumnsState extends AbstractToggleStateProvider /* implements IStartup */{
-
-
- /**
- *
- * @see org.eclipse.table.handler.states.AbstractToggleStateProvider#refreshState()
- *
- */
- @Override
- protected void refreshState() {
- try {
- IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- INatTableWidgetProvider widget = (INatTableWidgetProvider)activeEditor.getAdapter(INatTableWidgetProvider.class);
- if(widget != null) {
- Boolean currentCommandValue = (Boolean)getValue();
- boolean realValue = new Boolean(widget.getNatTableWidget().getTableInstance().isOnlyShowCommonColumns());
-
- if(!currentCommandValue.equals(realValue)) {
- //change the state of the command
- setValue(realValue);
- }
- } else {
- setValue(false);
- }
- } catch (NullPointerException e) {
-
- }
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/messages/Messages.java b/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/messages/Messages.java
deleted file mode 100644
index 618ff5122cd..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/messages/Messages.java
+++ /dev/null
@@ -1,32 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.menu.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.table.menu.messages.messages"; //$NON-NLS-1$
-
- public static String EditTableHandler_EditDescription_Message;
-
- public static String EditTableHandler_EditDescription_Title;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/messages/messages.properties b/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/messages/messages.properties
deleted file mode 100644
index b89d68cb34a..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/messages/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-EditTableHandler_EditDescription_Message=Enter a new description.
-EditTableHandler_EditDescription_Title=Change the description
diff --git a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/providers/TableTester.java b/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/providers/TableTester.java
deleted file mode 100644
index 77507b143bd..00000000000
--- a/incoming/org.eclipse.papyrus.table.menu/src/org/eclipse/papyrus/table/menu/providers/TableTester.java
+++ /dev/null
@@ -1,67 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.menu.providers;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.emf.facet.widgets.nattable.INatTableWidgetProvider;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This tester provides action in order to active handlers
- *
- *
- *
- */
-public class TableTester extends PropertyTester {
-
- /**
- * the properties to tests
- */
- public static final String IS_TABLE = "isTable"; //$NON-NLS-1$
-
- /**
- *
- * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
- *
- * @param receiver
- * @param property
- * @param args
- * @param expectedValue
- * @return
- */
- public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
- if(IS_TABLE.equals(property) && expectedValue instanceof Boolean) {
- boolean answer = isTable();
- return new Boolean(answer).equals(expectedValue);
- }
- return false;
- }
-
- /**
- * Tests if the current editor is a table
- *
- * @return
- * <code>true</code> if the current editor is a table
- */
- protected boolean isTable() {
- IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- if(editor != null) {
- Object provider = editor.getAdapter(INatTableWidgetProvider.class);
- return provider != null;
- }
- return false;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/.classpath b/incoming/org.eclipse.papyrus.table.modelexplorer/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/.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/incoming/org.eclipse.papyrus.table.modelexplorer/.project b/incoming/org.eclipse.papyrus.table.modelexplorer/.project
deleted file mode 100644
index 271ebf04bf7..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.table.modelexplorer</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/incoming/org.eclipse.papyrus.table.modelexplorer/.settings/org.eclipse.core.resources.prefs b/incoming/org.eclipse.papyrus.table.modelexplorer/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index ce87eeafde2..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 24 14:02:49 CET 2011
-eclipse.preferences.version=1
-encoding//src/org/eclipse/papyrus/table/modelexplorer/messages/messages.properties=ISO-8859-1
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/incoming/org.eclipse.papyrus.table.modelexplorer/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index eef3e01dddb..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Feb 18 14:48:14 CET 2011
-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/incoming/org.eclipse.papyrus.table.modelexplorer/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.table.modelexplorer/META-INF/MANIFEST.MF
deleted file mode 100644
index cefc7d7d11b..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.table.modelexplorer;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.table.modelexplorer.Activator
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.papyrus.resource,
- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",
- org.eclipse.emf.facet.infra.browser.custom.core,
- org.eclipse.papyrus.modelexplorer;bundle-version="0.8.0",
- org.eclipse.core.expressions,
- org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0",
- org.eclipse.papyrus.table.instance
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.papyrus.table.modelexplorer,
- org.eclipse.papyrus.table.modelexplorer.handlers,
- org.eclipse.papyrus.table.modelexplorer.messages,
- org.eclipse.papyrus.table.modelexplorer.providers
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/about.html b/incoming/org.eclipse.papyrus.table.modelexplorer/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/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/incoming/org.eclipse.papyrus.table.modelexplorer/build.properties b/incoming/org.eclipse.papyrus.table.modelexplorer/build.properties
deleted file mode 100644
index 8665ac2ffec..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/plugin.properties b/incoming/org.eclipse.papyrus.table.modelexplorer/plugin.properties
deleted file mode 100644
index c3c053f7a7e..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.table.modelexplorer
-pluginProvider = Eclipse Modeling Project
-pluginName = Table Customization For Model Explorer \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/plugin.xml b/incoming/org.eclipse.papyrus.table.modelexplorer/plugin.xml
deleted file mode 100644
index eef5797acd5..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/plugin.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <!-- we provide a new navigator content for the tables. To be called, this navigator content should have an id beginning with org.eclipse.papyrus.modelexplorer.* -->
- <extension
- point="org.eclipse.ui.navigator.navigatorContent">
- <navigatorContent
-
- activeByDefault="true"
- contentProvider="org.eclipse.papyrus.table.modelexplorer.providers.NavigatorTableContentProvider"
- icon="platform:/plugin/org.eclipse.emf.facet.widgets.nattable.workbench/icons/table.png"
- id="org.eclipse.papyrus.modelexplorer.table.navigatorContent"
- labelProvider="org.eclipse.papyrus.table.modelexplorer.providers.NavigatorTableLabelProvider"
- name="Table Navigator Content"
- priority="higher">
- <possibleChildren>
- <or>
- <instanceof
- value="org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance">
- </instanceof>
- </or>
- </possibleChildren>
- <triggerPoints>
- <or>
- <instanceof
- value="org.eclipse.emf.ecore.EObject">
- </instanceof>
- <adapt
- type="org.eclipse.emf.ecore.EObject">
- </adapt>
- <instanceof
- value="java.lang.Object">
- </instanceof>
- </or>
- </triggerPoints>
- </navigatorContent>
- </extension>
- <extension
- point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.papyrus.table.modelexplorer.handlers.DeleteTableHandler"
- commandId="org.eclipse.ui.edit.delete">
-<activeWhen>
- <and>
- <with
- variable="selection">
- <and>
- <count
- value="1">
- </count>
- <iterate>
- <instanceof
- value="org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance">
- </instanceof>
- </iterate>
- </and>
- </with>
- <with
- variable="selection">
- <!-- We add these tests for :
- - force the refresh of the action in the menu edit
- - avoid have 2 handlers enabled in the same time
- -->
- <and>
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.modelexplorer.tester.isDiagram"
- value="false">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.modelexplorer.tester.isTable"
- value="true">
- </test>
- </and>
- </with>
- </and>
- </activeWhen>
- </handler>
- <handler
- class="org.eclipse.papyrus.table.modelexplorer.handlers.DuplicateTableHandler"
- commandId="org.eclipse.papyrus.modelexplorer.duplicate.command">
- <activeWhen>
- <and>
- <with
- variable="selection">
- <and>
- <count
- value="1">
- </count>
- <iterate>
- <instanceof
- value="org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance">
- </instanceof>
- </iterate>
- </and>
- </with>
- <with
- variable="selection">
- <!-- We add these tests for :
- - force the refresh of the action in the menu edit
- - avoid have 2 handlers enabled in the same time
- -->
- <and>
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.modelexplorer.tester.isDiagram"
- value="false">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.modelexplorer.tester.isTable"
- value="true">
- </test>
- </and>
- </with>
- </and>
- </activeWhen>
- </handler>
- <handler
- class="org.eclipse.papyrus.table.modelexplorer.handlers.RenameTableHandler"
- commandId="org.eclipse.ui.edit.rename">
- <activeWhen>
- <and>
- <with
- variable="selection">
- <and>
- <count
- value="1">
- </count>
- <iterate>
- <instanceof
- value="org.eclipse.papyrus.nattable.instance.papyrustableinstance.PapyrusTableInstance">
- </instanceof>
- </iterate>
- </and>
- </with>
- <with
- variable="selection">
- <!-- We add these tests for :
- - force the refresh of the action in the menu edit
- - avoid have 2 handlers enabled in the same time
- -->
- <and>
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.modelexplorer.tester.isDiagram"
- value="false">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.papyrus.table.modelexplorer.tester.isTable"
- value="true">
- </test>
- </and>
- </with>
- </and>
- </activeWhen>
- </handler>
- </extension>
- <extension
- point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- class="org.eclipse.papyrus.table.modelexplorer.providers.TablePropertyTester"
- id="org.eclipse.papyrus.table.modelexplorer.tester"
- namespace="org.eclipse.papyrus.table.modelexplorer.tester"
- properties="isTable"
- type="org.eclipse.jface.viewers.IStructuredSelection">
- </propertyTester>
- </extension>
-</plugin>
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/Activator.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/Activator.java
deleted file mode 100644
index b831a96e9e3..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/Activator.java
+++ /dev/null
@@ -1,117 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.edit.EMFEditPlugin;
-import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;
-import org.eclipse.emf.facet.infra.browser.custom.core.CustomizationsCatalog;
-import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;
-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.table.modelexplorer"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /** the customization manager */
- private CustomizationManager fCustomizationManager;
-
- /**
- * 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;
- EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry();
- }
-
- /*
- * (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;
- }
-
- /**
- *
- * @return the customization manager in charge to adapt element in modisco
- */
- public CustomizationManager getCustomizationManager() {
- if(this.fCustomizationManager == null) {
- this.fCustomizationManager = new CustomizationManager();
- init(this.fCustomizationManager);
- }
- return this.fCustomizationManager;
- }
-
- /**
- *
- * @param customizationManager
- * the customization manager to init
- */
- private void init(final CustomizationManager customizationManager) {
- // the appearance can be customized here:
-
- customizationManager.setShowDerivedLinks(true);
-
- try {
-
- // load customizations defined as default through the customization
- // extension
- List<MetamodelView> registryDefaultCustomizations = CustomizationsCatalog.getInstance().getRegistryDefaultCustomizations();
- for(MetamodelView metamodelView : registryDefaultCustomizations) {
- customizationManager.registerCustomization(metamodelView);
- }
- customizationManager.loadCustomizations();
-
- } catch (Throwable e) {
- Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error initializing customizations", e)); //$NON-NLS-1$
- }
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java
deleted file mode 100644
index bd55e95e3bd..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java
+++ /dev/null
@@ -1,57 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.handlers;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.modelexplorer.handler.AbstractCommandHandler;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.ui.PlatformUI;
-
-
-public abstract class AbstractTableModelExplorerHandler extends AbstractCommandHandler {
-
- /**
- * Returns the list of selected tables
- *
- * @return
- * the list of selected tables
- */
- protected List<PapyrusTableInstance> getSelectedTables() {
- List<PapyrusTableInstance> tables = new ArrayList<PapyrusTableInstance>();
- ISelection selection = null;
-
- // Get current selection
- selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
-
- // Get first element if the selection is an IStructuredSelection
- if(selection instanceof IStructuredSelection) {
- IStructuredSelection structuredSelection = (IStructuredSelection)selection;
- Iterator<?> iter = structuredSelection.iterator();
- while(iter.hasNext()) {
- Object current = iter.next();
- if(current instanceof PapyrusTableInstance) {
- tables.add((PapyrusTableInstance)current);
- }
- }
- }
-
- return tables;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DeleteTableHandler.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DeleteTableHandler.java
deleted file mode 100644
index 0826985bb33..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DeleteTableHandler.java
+++ /dev/null
@@ -1,73 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.handlers;
-
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-
-/**
- * Handler for the delete Table action
- *
- *
- *
- */
-public class DeleteTableHandler extends AbstractTableModelExplorerHandler {
-
-
- /**
- *
- * @see org.eclipse.papyrus.modelexplorer.handler.AbstractCommandHandler#getCommand()
- *
- * @return
- */
- @Override
- protected Command getCommand() {
- TransactionalEditingDomain editingDomain = getEditingDomain();
- final IPageMngr pageMngr = getPageManager();
-
- List<PapyrusTableInstance> tables = getSelectedTables();
-
- if(editingDomain != null && pageMngr != null && !tables.isEmpty()) {
- CompoundCommand command = new CompoundCommand();
-
- for(final PapyrusTableInstance table : tables) {
- Command sashRemoveComd = new RecordingCommand(editingDomain) {
-
- @Override
- protected void doExecute() {
- if(pageMngr.isOpen(table)) {
- pageMngr.closePage(table);
- }
- pageMngr.removePage(table);
- }
- };
- EList<EObject> tabls = table.eResource().getContents();
- command.append(sashRemoveComd);
- command.append(new RemoveCommand(editingDomain, tabls, table));
- }
- return command.isEmpty() ? UnexecutableCommand.INSTANCE : command;
- }
- return UnexecutableCommand.INSTANCE;
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DuplicateTableHandler.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DuplicateTableHandler.java
deleted file mode 100644
index f5f201b8e52..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/DuplicateTableHandler.java
+++ /dev/null
@@ -1,82 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.handlers;
-
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.modelexplorer.messages.Messages;
-
-/**
- * This handler provides the duplicate action for the tables
- *
- *
- *
- */
-public class DuplicateTableHandler extends AbstractTableModelExplorerHandler {
-
- /**
- *
- * @see org.eclipse.papyrus.modelexplorer.handler.AbstractCommandHandler#getCommand()
- *
- * @return
- */
- @Override
- protected Command getCommand() {
- TransactionalEditingDomain editingDomain = getEditingDomain();
- final IPageMngr pageManager = getPageManager();
- List<PapyrusTableInstance> tables = getSelectedTables();
-
- if(editingDomain != null && pageManager != null && !tables.isEmpty()) {
- CompoundCommand command = new CompoundCommand();
- for(PapyrusTableInstance table : tables) {
-
- // Clone the current table
- final PapyrusTableInstance newTable = EcoreUtil.copy(table);
-
- // Give a new name
- newTable.setName(Messages.DuplicateTableHandler_CopyOf + newTable.getName());
-
- //we duplicate parameters and rename the new table!
-
-
- Command addGmfDiagramCmd = new AddCommand(editingDomain, table.eResource().getContents(), newTable);
- // EMFCommandOperation operation = new EMFCommandOperation(editingDomain, addGmfDiagramCmd);
-
- Command sashOpenCmd = new RecordingCommand(editingDomain) {
-
- @Override
- protected void doExecute() {
- pageManager.openPage(newTable);
- }
- };
- //
- // // TODO : synchronize with Cedric
- // command.append(operation.getCommand());
- command.append(addGmfDiagramCmd);
- command.append(sashOpenCmd);
- }
- return command.isEmpty() ? UnexecutableCommand.INSTANCE : command;
- }
- return UnexecutableCommand.INSTANCE;
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/RenameTableHandler.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/RenameTableHandler.java
deleted file mode 100644
index e2868a96bfc..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/handlers/RenameTableHandler.java
+++ /dev/null
@@ -1,84 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.handlers;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.modelexplorer.handler.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.table.modelexplorer.messages.Messages;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * This handler provides the method to rename a Table
- *
- *
- *
- */
-public class RenameTableHandler extends AbstractTableModelExplorerHandler {
-
-
- /**
- *
- * @see org.eclipse.papyrus.modelexplorer.handler.AbstractCommandHandler#getCommand()
- *
- * @return
- */
- @Override
- protected Command getCommand() {
- TransactionalEditingDomain editingDomain = getEditingDomain();
- List<PapyrusTableInstance> tables = getSelectedTables();
- if(editingDomain != null && tables.size() == 1) {
-
- final PapyrusTableInstance table = tables.get(0);
- final String currentName = table.getName();
-
- if(currentName != null) {
-
- AbstractTransactionalCommand cmd = new AbstractTransactionalCommand(editingDomain, "RenameTableCommand", null) { //$NON-NLS-1$
-
- @Override
- protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) {
- InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), Messages.RenameTableHandler_RenameAnExistingTable_Title, Messages.RenameTableHandler_NewNameMessage, currentName, null);
- if(dialog.open() == Window.OK) {
- final String name = dialog.getValue();
- if(name != null && name.length() > 0) {
- table.setName(name);
- }
- return CommandResult.newOKCommandResult();
- } else {
- return CommandResult.newCancelledCommandResult();
- }
- }
- };
- return new GMFtoEMFCommandWrapper(cmd);
- }
-
- }
- return UnexecutableCommand.INSTANCE;
- }
-
-
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/messages/Messages.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/messages/Messages.java
deleted file mode 100644
index 67d370df68a..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/messages/Messages.java
+++ /dev/null
@@ -1,34 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.table.modelexplorer.messages.messages"; //$NON-NLS-1$
-
- public static String DuplicateTableHandler_CopyOf;
-
- public static String RenameTableHandler_NewNameMessage;
-
- public static String RenameTableHandler_RenameAnExistingTable_Title;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/messages/messages.properties b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/messages/messages.properties
deleted file mode 100644
index c5ff485ad7f..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/messages/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-DuplicateTableHandler_CopyOf=Copy of
-RenameTableHandler_NewNameMessage=New name
-RenameTableHandler_RenameAnExistingTable_Title=Rename an existing table
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableContentProvider.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableContentProvider.java
deleted file mode 100644
index 50335192c8c..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableContentProvider.java
+++ /dev/null
@@ -1,95 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.providers;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.modelexplorer.MoDiscoContentProvider;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-
-/**
- * This class provides a NavigatorContentProvider used to display tables in the Model Explorer
- *
- *
- *
- */
-public class NavigatorTableContentProvider extends MoDiscoContentProvider {
-
-
- /**
- *
- * @see org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelContentProvider#hasChildren(java.lang.Object)
- *
- * @param element
- * @return
- */
- @Override
- public boolean hasChildren(final Object element) {
- return getChildren(element).length > 0;
- }
-
- @Override
- public Object[] getChildren(final Object parentElement) {
- ArrayList<Object> result = new ArrayList<Object>();
-
- /**
- * We look for diagrams and tables
- */
- if(parentElement instanceof IAdaptable) {
- EObject eObject = (EObject)((IAdaptable)parentElement).getAdapter(EObject.class);
- if(eObject != null) {
- List<PapyrusTableInstance> tableList = findAllExistingPapyrusTables(eObject);
- Iterator<PapyrusTableInstance> iter = tableList.iterator();
- while(iter.hasNext()) {
- result.add(iter.next());
- }
- }
- }
- return result.toArray();
- }
-
- /**
- * @param owner
- * the owner of the tables
- * @return the list of tables contained by the given owner
- */
- private List<PapyrusTableInstance> findAllExistingPapyrusTables(final EObject owner) {
- ArrayList<PapyrusTableInstance> tables = new ArrayList<PapyrusTableInstance>();
-
-
-
- if(pageMngr != null) {
-
- // Walk on page (Table) references
- for(Object page : pageMngr.allPages()) {
- if(!(page instanceof PapyrusTableInstance)) {
- continue;
- }
- // We have a Table
- PapyrusTableInstance papyrusTable = (PapyrusTableInstance)page;
- if(owner.equals(papyrusTable.getTable().getContext())) {
- tables.add(papyrusTable);
- }
-
- }
- }
- return tables;
- }
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableLabelProvider.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableLabelProvider.java
deleted file mode 100644
index 08a8d36090a..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/NavigatorTableLabelProvider.java
+++ /dev/null
@@ -1,56 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.providers;
-
-import org.eclipse.papyrus.modelexplorer.MoDiscoLabelProvider;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This Label Provider provides the names of the tables
- *
- *
- *
- */
-public class NavigatorTableLabelProvider extends MoDiscoLabelProvider {
-
-
- /**
- * return the image of an element in the model browser
- * evaluates error markers.
- */
- @Override
- public Image getImage(final Object element) {
- if(element instanceof PapyrusTableInstance) {
- return getEditorRegistry().getEditorIcon(element);
- }
- return super.getImage(element);
- }
-
- /**
- *
- * @see org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelLabelProvider#getText(java.lang.Object)
- *
- * @param element
- * @return
- */
- @Override
- public String getText(final Object element) {
- if(element instanceof PapyrusTableInstance) {
- return ((PapyrusTableInstance)element).getName();
- }
- return super.getText(element);
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/TablePropertyTester.java b/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/TablePropertyTester.java
deleted file mode 100644
index c3b809f1516..00000000000
--- a/incoming/org.eclipse.papyrus.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/providers/TablePropertyTester.java
+++ /dev/null
@@ -1,78 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.table.modelexplorer.providers;
-
-import java.util.Iterator;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.table.instance.papyrustableinstance.PapyrusTableInstance;
-
-/**
- * This class provides test called by the plugin.xml in order to know if handlers should be active or not.
- *
- * Sometimes these test can be done directly in the plugin.xml in the activeWhen (with instanceof, adapt, ...),
- * but in this case, Eclipse doesn't refresh correctly the status of the command in the menu Edit or in other menu.
- *
- *
- *
- */
-public class TablePropertyTester extends PropertyTester {
-
-
- /** property to test if the selected elements is a table */
- public static final String IS_TABLE = "isTable"; //$NON-NLS-1$
-
-
- /**
- *
- * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
- *
- * @param receiver
- * @param property
- * @param args
- * @param expectedValue
- * @return
- */
- public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {
- if(IS_TABLE.equals(property) && receiver instanceof IStructuredSelection) {
- boolean answer = isTable((IStructuredSelection)receiver);
- return new Boolean(answer).equals(expectedValue);
- }
- return false;
- }
-
-
-
- /**
- * Tests the selection in order to know if it contains only {@link TableInstance}
- *
- * @param selection
- * @return
- * <code>true</code> if the selection is composed by {@link TableInstance}
- */
- private boolean isTable(final IStructuredSelection selection) {
- if(!selection.isEmpty()) {
- Iterator<?> iter = selection.iterator();
- while(iter.hasNext()) {
- if(!(iter.next() instanceof PapyrusTableInstance)) {
- return false;
- }
- }
- return true;
- }
- return false;
- }
-}
diff --git a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/.classpath b/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/.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/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/.project b/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/.project
deleted file mode 100644
index 8e0973919b2..00000000000
--- a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.table.widgets.celleditors.uml</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/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/.settings/org.eclipse.jdt.core.prefs b/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 945dfdfa7d8..00000000000
--- a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Apr 29 15:57:42 CEST 2011
-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/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/META-INF/MANIFEST.MF
deleted file mode 100644
index b24a31a7c6e..00000000000
--- a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.table.widgets.celleditors.uml;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.widget.celleditors.uml.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.facet.widgets.celleditors,
- org.eclipse.emf.facet.widgets.celleditors.ecore;bundle-version="0.1.0",
- org.eclipse.emf.facet.util.core,
- org.eclipse.papyrus.log
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
diff --git a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/build.properties b/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/build.properties
deleted file mode 100644
index 9c684662ef2..00000000000
--- a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- resources/,\
- plugin.properties
diff --git a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/plugin.properties b/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/plugin.properties
deleted file mode 100644
index 2b58aa4a0e3..00000000000
--- a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.table.widgets.celleditors.uml
-providerName = Eclipse Modeling Project
-pluginName = Cell Editors for Papyrus Tables \ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/plugin.xml b/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/plugin.xml
deleted file mode 100644
index d6997f190f0..00000000000
--- a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.emf.facet.widgets.celleditors.celleditors">
- <cellEditorsModel
- path="resources/umlCellEditors.modelcelleditors">
- </cellEditorsModel>
- </extension>
-
-</plugin>
diff --git a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/resources/umlCellEditors.modelcelleditors b/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/resources/umlCellEditors.modelcelleditors
deleted file mode 100644
index 2d2ed409ebd..00000000000
--- a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/resources/umlCellEditors.modelcelleditors
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<modelCellEditor:ModelCellEditorDeclarations 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:modelCellEditor="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/modelCellEditor">
- <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="uml_boolean_cell_papyrus" basicCellEditorImpl="org.eclipse.papyrus.widget.celleditors.uml.editors.BooleanCellEditor">
- <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//Boolean"/>
- </modelCellEditors>
- <modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="uml_string_cell_papyrus" basicCellEditorImpl="org.eclipse.papyrus.widget.celleditors.uml.editors.StringMultiCellEditor">
- <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>
- </modelCellEditors>
-</modelCellEditor:ModelCellEditorDeclarations>
diff --git a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/src/org/eclipse/papyrus/widget/celleditors/uml/Activator.java b/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/src/org/eclipse/papyrus/widget/celleditors/uml/Activator.java
deleted file mode 100644
index f578f19565d..00000000000
--- a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/src/org/eclipse/papyrus/widget/celleditors/uml/Activator.java
+++ /dev/null
@@ -1,73 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.widget.celleditors.uml;
-
-import org.eclipse.papyrus.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.widget.celleditors.uml"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /** Logging helper */
- public static LogHelper log;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(final BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- // register the login helper
- log = new LogHelper(plugin);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(final BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/src/org/eclipse/papyrus/widget/celleditors/uml/editors/BooleanCellEditor.java b/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/src/org/eclipse/papyrus/widget/celleditors/uml/editors/BooleanCellEditor.java
deleted file mode 100644
index cc1abfa63fa..00000000000
--- a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/src/org/eclipse/papyrus/widget/celleditors/uml/editors/BooleanCellEditor.java
+++ /dev/null
@@ -1,74 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.widget.celleditors.uml.editors;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.facet.widgets.celleditors.IListener;
-import org.eclipse.emf.facet.widgets.celleditors.IModelCellEditHandler;
-import org.eclipse.emf.facet.widgets.celleditors.IModelCellEditor;
-import org.eclipse.emf.facet.widgets.celleditors.ecore.composite.BooleanComposite;
-import org.eclipse.papyrus.widget.celleditors.uml.Activator;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/** A cell editor for Boolean */
-public class BooleanCellEditor implements IModelCellEditor {
-
- /**
- * The boolean composite
- */
- private BooleanComposite composite = null;
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.celleditors.IModelCellEditor#activateCell(org.eclipse.swt.widgets.Composite, java.lang.Object,
- * org.eclipse.emf.facet.widgets.celleditors.IModelCellEditHandler, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.ecore.EObject)
- *
- * @param parent
- * @param originalValue
- * @param editHandler
- * @param feature
- * @param source
- * @return
- */
- public Control activateCell(final Composite parent, final Object originalValue, final IModelCellEditHandler editHandler, final EStructuralFeature feature, final EObject source) {
- composite = new BooleanComposite(parent);
- if(originalValue != null) {
- if(originalValue instanceof Boolean) {
- composite.setValue((Boolean)originalValue);
- } else {
- Activator.log.info("An instance of Boolean was expected");
- }
- }
- composite.addCommitListener(new IListener() {
-
- public void handleEvent() {
- editHandler.commit();
- }
- });
- return composite;
- }
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.celleditors.IModelCellEditor#getValue()
- *
- * @return
- */
- public Object getValue() {
- return composite.getValue();
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/src/org/eclipse/papyrus/widget/celleditors/uml/editors/StringMultiCellEditor.java b/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/src/org/eclipse/papyrus/widget/celleditors/uml/editors/StringMultiCellEditor.java
deleted file mode 100644
index f5a78258f0c..00000000000
--- a/incoming/org.eclipse.papyrus.table.widgets.celleditors.uml/src/org/eclipse/papyrus/widget/celleditors/uml/editors/StringMultiCellEditor.java
+++ /dev/null
@@ -1,68 +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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.widget.celleditors.uml.editors;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.facet.widgets.celleditors.IListener;
-import org.eclipse.emf.facet.widgets.celleditors.IModelCellEditHandler;
-import org.eclipse.emf.facet.widgets.celleditors.IModelCellEditor;
-import org.eclipse.emf.facet.widgets.celleditors.ecore.composite.StringMultiComposite;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * A cell editor for String
- */
-public class StringMultiCellEditor implements IModelCellEditor {
-
- /**
- * The StringMultiComposite
- */
- private StringMultiComposite<String> composite = null;
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.celleditors.IModelCellEditor#activateCell(org.eclipse.swt.widgets.Composite, java.lang.Object,
- * org.eclipse.emf.facet.widgets.celleditors.IModelCellEditHandler, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.ecore.EObject)
- *
- * @param parent
- * @param originalValue
- * @param editHandler
- * @param feature
- * @param source
- * @return
- */
- public Control activateCell(final Composite parent, final Object originalValue, final IModelCellEditHandler editHandler, final EStructuralFeature feature, final EObject source) {
- composite = new StringMultiComposite<String>(parent, originalValue);
-
- composite.addCommitListener(new IListener() {
-
- public void handleEvent() {
- editHandler.commit();
- }
- });
- return composite;
- }
-
- /**
- *
- * @see org.eclipse.emf.facet.widgets.celleditors.IModelCellEditor#getValue()
- *
- * @return
- */
- public Object getValue() {
- return composite.getValue();
- }
-}

Back to the top