Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2013-07-16 12:13:35 +0000
committerVincent Lorenzo2013-07-16 12:13:35 +0000
commit0c692799e070d0c6e568fd771d15ee0397d154df (patch)
tree8cd408bfa6abde5c4d381503420548439079b669
parent0f582c5b290a16eb1ac948581c875749e923bd7a (diff)
downloadorg.eclipse.papyrus-0c692799e070d0c6e568fd771d15ee0397d154df.tar.gz
org.eclipse.papyrus-0c692799e070d0c6e568fd771d15ee0397d154df.tar.xz
org.eclipse.papyrus-0c692799e070d0c6e568fd771d15ee0397d154df.zip
412841: [Table 2] Table metamodel must have a Cell Element to allow to
store specific information for a specific cell https://bugs.eclipse.org/bugs/show_bug.cgi?id=412841 Correct the cell metamodel (change isContainment for CellAxisWrapper Provides test the the generated emf cell editor and problem editor
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF8
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties14
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml26
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java5
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF10
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties13
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml82
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java4
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java4
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java4
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java4
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java4
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java4
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java4
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF9
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag40
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/plugin.xml16
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java34
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java19
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java26
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java39
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java10
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java10
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java10
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java10
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java10
-rw-r--r--extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java10
-rw-r--r--tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java7
-rw-r--r--tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java16
29 files changed, 392 insertions, 60 deletions
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
index 9b738bc3ff0..07affac1d17 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
@@ -2,8 +2,10 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider,
+ org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider,
org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider,
+ org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider,
org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider,
org.eclipse.papyrus.infra.nattable.model.nattable.provider
Bundle-ActivationPolicy: lazy
@@ -19,8 +21,6 @@ Require-Bundle: org.eclipse.core.runtime,
Bundle-Vendor: %providerName
Bundle-Version: 0.10.1.qualifier
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.pr
- ovider.NattableEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.edit;sin
- gleton:=true
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin$Implementation
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.edit;singleton:=true
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
index 494b04e2fec..2ca8576a7a5 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
@@ -195,3 +195,17 @@ _UI_AxisManagerRepresentation_specificAxisConfigurations_feature = Specific Axis
_UI_AxisManagerConfiguration_localSpecificConfigurations_feature = Local Specific Configurations
_UI_AbstractHeaderAxisConfiguration_ownedLabelConfigurations_feature = Owned Label Configurations
_UI_AbstractHeaderAxisConfiguration_ownedAxisConfigurations_feature = Owned Axis Configurations
+_UI_Cell_type = Cell
+_UI_ICellAxisWrapper_type = ICell Axis Wrapper
+_UI_EObjectAxisWrapper_type = EObject Axis Wrapper
+_UI_IdAxisWrapper_type = Id Axis Wrapper
+_UI_Problem_type = Problem
+_UI_StringResolutionProblem_type = String Resolution Problem
+_UI_Table_cells_feature = Cells
+_UI_Cell_columnWrapper_feature = Column Wrapper
+_UI_Cell_rowWrapper_feature = Row Wrapper
+_UI_Cell_problems_feature = Problems
+_UI_EObjectAxisWrapper_element_feature = Element
+_UI_IdAxisWrapper_element_feature = Element
+_UI_StringResolutionProblem_valueAsString_feature = Value As String
+_UI_StringResolutionProblem_unresolvedString_feature = Unresolved String
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml
index bea95126aa4..2b87fb5caac 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml
@@ -107,4 +107,30 @@
org.eclipse.emf.edit.provider.IItemPropertySource"/>
</extension>
+ <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+ <!-- @generated nattable -->
+ <factory
+ uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"
+ class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory"
+ supportedTypes=
+ "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+ org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+ org.eclipse.emf.edit.provider.ITreeItemContentProvider
+ org.eclipse.emf.edit.provider.IItemLabelProvider
+ org.eclipse.emf.edit.provider.IItemPropertySource"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+ <!-- @generated nattable -->
+ <factory
+ uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"
+ class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory"
+ supportedTypes=
+ "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+ org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+ org.eclipse.emf.edit.provider.ITreeItemContentProvider
+ org.eclipse.emf.edit.provider.IItemLabelProvider
+ org.eclipse.emf.edit.provider.IItemPropertySource"/>
+ </extension>
+
</plugin>
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
index f990efba15a..fc04b05f2f6 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
@@ -40,6 +40,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.TableNamedElementItemProvider;
/**
@@ -165,6 +166,7 @@ public class TableItemProvider extends TableNamedElementItemProvider implements
childrenFeatures.add(NattablePackage.Literals.TABLE__ROW_AXIS_PROVIDERS_HISTORY);
childrenFeatures.add(NattablePackage.Literals.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION);
childrenFeatures.add(NattablePackage.Literals.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION);
+ childrenFeatures.add(NattablePackage.Literals.TABLE__CELLS);
}
return childrenFeatures;
}
@@ -229,6 +231,7 @@ public class TableItemProvider extends TableNamedElementItemProvider implements
case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:
case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:
case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:
+ case NattablePackage.TABLE__CELLS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
@@ -258,6 +261,8 @@ public class TableItemProvider extends TableNamedElementItemProvider implements
newChildDescriptors.add(createChildParameter(NattablePackage.Literals.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, NattableaxisconfigurationFactory.eINSTANCE.createLocalTableHeaderAxisConfiguration()));
newChildDescriptors.add(createChildParameter(NattablePackage.Literals.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, NattableaxisconfigurationFactory.eINSTANCE.createLocalTableHeaderAxisConfiguration()));
+
+ newChildDescriptors.add(createChildParameter(NattablePackage.Literals.TABLE__CELLS, NattablecellFactory.eINSTANCE.createCell()));
}
/**
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
index 97b7f9287ad..e436ccf3e3f 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
@@ -3,8 +3,10 @@ Export-Package: org.eclipse.papyrus.infra.nattable.model.editor.customeditors,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation,
+ org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation,
org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation,
+ org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation,
org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation,
org.eclipse.papyrus.infra.nattable.model.nattable.presentation
Bundle-ActivationPolicy: lazy
@@ -14,7 +16,7 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="0.10.1";visibility:=reexport,
+ org.eclipse.papyrus.infra.nattable.model.edit;visibility:=reexport;bundle-version="0.10.1",
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.emf.edit.ui;visibility:=reexport,
org.eclipse.ui.ide;visibility:=reexport,
@@ -23,8 +25,6 @@ Require-Bundle: org.eclipse.core.runtime,
Bundle-Vendor: %providerName
Bundle-Version: 0.10.1.qualifier
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.pr
- esentation.NattableEditorPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor;s
- ingleton:=true
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin$Implementation
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor;singleton:=true
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
index 6fa9b96d89e..5ee833366c0 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
@@ -112,3 +112,16 @@ _UI_NattableaxisModelWizard_description = Create a new Nattableaxis model
_UI_NattableaxisEditorFilenameDefaultBase = My
_UI_NattableaxisEditorFilenameExtensions = nattableaxis
+_UI_NattablecellEditor_menu = &Nattablecell Editor
+_UI_NattableproblemEditor_menu = &Nattableproblem Editor
+ _UI_NattablecellModelWizard_label = Nattablecell Model
+_UI_NattablecellModelWizard_description = Create a new Nattablecell model
+ _UI_NattablecellEditor_label = Nattablecell Model Editor
+ _UI_NattablecellEditorFilenameDefaultBase = My
+_UI_NattablecellEditorFilenameExtensions = nattablecell
+ _UI_NattableproblemModelWizard_label = Nattableproblem Model
+_UI_NattableproblemModelWizard_description = Create a new Nattableproblem model
+ _UI_NattableproblemEditor_label = Nattableproblem Model Editor
+ _UI_NattableproblemEditorFilenameDefaultBase = My
+_UI_NattableproblemEditorFilenameExtensions = nattableproblem
+
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
index 6de1ec1bb5f..ba0cd1877b8 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
@@ -33,7 +33,48 @@
</extension>
<extension point="org.eclipse.ui.editors">
+ <!-- @generated NOT nattable -->
+ <editor
+ id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemEditorID"
+ name="%_UI_NattableproblemEditor_label"
+ icon="icons/full/obj16/NattableproblemModelFile.gif"
+ extensions="nattableproblem"
+ class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableproblemEditor"
+ contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemActionBarContributor">
+ </editor>
+ </extension>
+
+ <extension point="org.eclipse.ui.editors">
+ <!-- @generated NOT nattable -->
+ <editor
+ id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellEditorID"
+ name="%_UI_NattablecellEditor_label"
+ icon="icons/full/obj16/NattablecellModelFile.gif"
+ extensions="nattablecell"
+ class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablecellEditor"
+ contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellActionBarContributor">
+ </editor>
+ </extension>
+
+ <extension point="org.eclipse.ui.newWizards">
<!-- @generated nattable -->
+ <category
+ id="org.eclipse.emf.ecore.Wizard.category.ID"
+ name="%_UI_Wizard_category"/>
+ <wizard
+ id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemModelWizardID"
+ name="%_UI_NattableproblemModelWizard_label"
+ class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemModelWizard"
+ category="org.eclipse.emf.ecore.Wizard.category.ID"
+ icon="icons/full/obj16/NattableproblemModelFile.gif">
+ <description>%_UI_NattableproblemModelWizard_description</description>
+ <selection class="org.eclipse.core.resources.IResource"/>
+ </wizard>
+ </extension>
+
+null
+ <extension point="org.eclipse.ui.editors">
+ <!-- @generated NOT nattable -->
<editor
id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisEditorID"
name="%_UI_NattableaxisEditor_label"
@@ -44,8 +85,25 @@
</editor>
</extension>
- <extension point="org.eclipse.ui.editors">
+ <extension point="org.eclipse.ui.newWizards">
<!-- @generated nattable -->
+ <category
+ id="org.eclipse.emf.ecore.Wizard.category.ID"
+ name="%_UI_Wizard_category"/>
+ <wizard
+ id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellModelWizardID"
+ name="%_UI_NattablecellModelWizard_label"
+ class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellModelWizard"
+ category="org.eclipse.emf.ecore.Wizard.category.ID"
+ icon="icons/full/obj16/NattablecellModelFile.gif">
+ <description>%_UI_NattablecellModelWizard_description</description>
+ <selection class="org.eclipse.core.resources.IResource"/>
+ </wizard>
+ </extension>
+
+null
+ <extension point="org.eclipse.ui.editors">
+ <!-- @generated NOT nattable -->
<editor
id="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterEditorID"
name="%_UI_NattabletesterEditor_label"
@@ -72,8 +130,10 @@
</wizard>
</extension>
+null
+
<extension point="org.eclipse.ui.editors">
- <!-- @generated nattable -->
+ <!-- @generated NOT nattable -->
<editor
id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationEditorID"
name="%_UI_NattableaxisconfigurationEditor_label"
@@ -100,8 +160,10 @@
</wizard>
</extension>
+null
+
<extension point="org.eclipse.ui.editors">
- <!-- @generated nattable -->
+ <!-- @generated NOT nattable -->
<editor
id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderEditorID"
name="%_UI_NattablelabelproviderEditor_label"
@@ -128,9 +190,11 @@
</wizard>
</extension>
+null
+
<extension point="org.eclipse.ui.editors">
- <!-- @generated nattable -->
+ <!-- @generated NOT nattable -->
<editor
id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderEditorID"
name="%_UI_NattableaxisproviderEditor_label"
@@ -157,9 +221,11 @@
</wizard>
</extension>
+null
+
<extension point="org.eclipse.ui.editors">
- <!-- @generated nattable -->
+ <!-- @generated NOT nattable -->
<editor
id="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorID"
name="%_UI_NattableEditor_label"
@@ -186,8 +252,10 @@
</wizard>
</extension>
+null
+
<extension point="org.eclipse.ui.editors">
- <!-- @generated nattable -->
+ <!-- @generated NOT nattable -->
<editor
id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditorID"
name="%_UI_NattableconfigurationEditor_label"
@@ -214,4 +282,6 @@
</wizard>
</extension>
+null
+
</plugin>
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
index 477ed69cae9..f2e476358bb 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
@@ -171,10 +171,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
@@ -752,6 +754,8 @@ public class NattableaxisEditor extends MultiPageEditorPart implements IEditingD
adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
index be009a87b32..5ccd362108c 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
@@ -171,10 +171,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.N
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
@@ -752,6 +754,8 @@ public class NattableaxisconfigurationEditor extends MultiPageEditorPart impleme
adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
index 77e2acc849d..ff774dbd67f 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
@@ -171,10 +171,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.N
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
@@ -752,6 +754,8 @@ public class NattableaxisproviderEditor extends MultiPageEditorPart implements I
adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
index 01c8e12184b..7fab53b3dbc 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
@@ -173,8 +173,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
@@ -752,6 +754,8 @@ public class NattableconfigurationEditor extends MultiPageEditorPart implements
adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
index 7cb2fbda3e1..ef2dfddf667 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
@@ -173,8 +173,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
@@ -752,6 +754,8 @@ public class NattablelabelproviderEditor extends MultiPageEditorPart implements
adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
index 5c305e843b1..2a2879255df 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
@@ -173,10 +173,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
@@ -752,6 +754,8 @@ public class NattabletesterEditor extends MultiPageEditorPart implements IEditin
adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
index 982efcc712f..b26ae8b2cfc 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
@@ -173,10 +173,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
@@ -750,6 +752,8 @@ public class NattableEditor extends MultiPageEditorPart implements IEditingDomai
adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
index 3b4d7289eb0..0bee675d94e 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
@@ -11,12 +11,18 @@ Export-Package: org.eclipse.papyrus.infra.nattable.model,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util,
+ org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell,
+ org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl,
+ org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl,
org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util,
org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider,
org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl,
org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util,
+ org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem,
+ org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl,
+ org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util,
org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester,
org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl,
org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util,
@@ -33,6 +39,5 @@ Bundle-Vendor: %providerName
Bundle-Version: 0.10.1.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model;singleto
- n:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model;singleton:=true
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
index 1b799c62dcf..3342f7c106f 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
@@ -774,20 +774,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGAaHtEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGAqHtEeKNUa7kbzEWsw" id="(0.25,0.9264705882352942)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_EhRWcKHtEeKNUa7kbzEWsw" type="3002" source="_EfVc8aHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">
- <children xmi:type="notation:Node" xmi:id="_EhRWdKHtEeKNUa7kbzEWsw" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWdaHtEeKNUa7kbzEWsw" x="-31" y="24"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_EhRWdqHtEeKNUa7kbzEWsw" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWd6HtEeKNUa7kbzEWsw" y="-16"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWcaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_EhRWcqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localSpecificConfiguration"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWc6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 286]$[0, -286, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGHaHtEeKNUa7kbzEWsw" id="(0.07894736842105263,0.19318181818181818)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGHqHtEeKNUa7kbzEWsw" id="(0.9893617021276596,0.6344086021505376)"/>
- </edges>
<edges xmi:type="notation:Edge" xmi:id="_EhRWeKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EfVc_aHtEeKNUa7kbzEWsw">
<styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWeaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_EhRWeqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
@@ -796,20 +782,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGE6HtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGFKHtEeKNUa7kbzEWsw" id="(0.2072072072072072,1.0)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_EhRWhKHtEeKNUa7kbzEWsw" type="3002" source="_EfVdCaHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">
- <children xmi:type="notation:Node" xmi:id="_EhRWiKHtEeKNUa7kbzEWsw" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWiaHtEeKNUa7kbzEWsw" x="-817" y="342"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_EhRWiqHtEeKNUa7kbzEWsw" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWi6HtEeKNUa7kbzEWsw" x="-725" y="295"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWhaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_EhRWhqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedAxisConfiguration"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWh6HtEeKNUa7kbzEWsw" points="[-11, -7, 1191, 179]$[-886, -7, 316, 179]$[-1202, -186, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF-aHtEeKNUa7kbzEWsw" id="(0.057692307692307696,0.19327731092436976)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF-qHtEeKNUa7kbzEWsw" id="(0.8297872340425532,1.0)"/>
- </edges>
<edges xmi:type="notation:Edge" xmi:id="_EhbHdKHtEeKNUa7kbzEWsw" type="3003" source="_EffOAaHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">
<styles xmi:type="notation:ConnectorStyle" xmi:id="_EhbHdaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_EhbHdqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
@@ -998,18 +970,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NTAooKJ4EeKNUa7kbzEWsw" id="(0.3355263157894737,0.958904109589041)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m2_6UKH2EeKNUa7kbzEWsw" id="(0.982532751091703,0.16666666666666666)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_rlo-QKH3EeKNUa7kbzEWsw" type="3002" source="_EfMSxaHtEeKNUa7kbzEWsw" target="_rlVcQKH3EeKNUa7kbzEWsw">
- <children xmi:type="notation:Node" xmi:id="_rlo-RKH3EeKNUa7kbzEWsw" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_rlo-RaH3EeKNUa7kbzEWsw" x="-10" y="-10"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_rlo-RqH3EeKNUa7kbzEWsw" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_rlo-R6H3EeKNUa7kbzEWsw" x="10" y="10"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_rlo-QaH3EeKNUa7kbzEWsw" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_rlo-QqH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis/element"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rlo-Q6H3EeKNUa7kbzEWsw" points="[-20, -29, 1099, 1596]$[-1118, -1624, 1, 1]"/>
- </edges>
<edges xmi:type="notation:Edge" xmi:id="_xj1bAqH3EeKNUa7kbzEWsw" type="3003" source="_xjigEKH3EeKNUa7kbzEWsw" target="_xjrqDKH3EeKNUa7kbzEWsw">
<styles xmi:type="notation:ConnectorStyle" xmi:id="_xj1bA6H3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_xj1bBKH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/plugin.xml b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/plugin.xml
index 4b776100e16..01c486d2676 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/plugin.xml
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/plugin.xml
@@ -71,4 +71,20 @@
genModel="model/nattable.genmodel"/>
</extension>
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated nattable -->
+ <package
+ uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"
+ class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage"
+ genModel="model/nattable.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated nattable -->
+ <package
+ uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"
+ class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage"
+ genModel="model/nattable.genmodel"/>
+ </extension>
+
</plugin>
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
index ea9b824d302..b5cdff2b4d7 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
@@ -209,6 +209,16 @@ public interface NattablePackage extends EPackage {
int TABLE__CURRENT_COLUMN_AXIS_PROVIDER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 8;
/**
+ * The feature id for the '<em><b>Cells</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TABLE__CELLS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 9;
+
+ /**
* The number of structural features of the '<em>Table</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -216,7 +226,7 @@ public interface NattablePackage extends EPackage {
* @generated
* @ordered
*/
- int TABLE_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 9;
+ int TABLE_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 10;
/**
* The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -368,6 +378,19 @@ public interface NattablePackage extends EPackage {
EReference getTable_CurrentColumnAxisProvider();
/**
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells
+ * <em>Cells</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>Cells</em>'.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells()
+ * @see #getTable()
+ * @generated
+ */
+ EReference getTable_Cells();
+
+ /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -485,6 +508,15 @@ public interface NattablePackage extends EPackage {
*/
EReference TABLE__CURRENT_COLUMN_AXIS_PROVIDER = eINSTANCE.getTable_CurrentColumnAxisProvider();
+ /**
+ * The meta object literal for the '<em><b>Cells</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TABLE__CELLS = eINSTANCE.getTable_Cells();
+
}
} //NattablePackage
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
index baf161074a9..0694ecb41f1 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
@@ -48,6 +49,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.T
* </em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells <em>Cells</em>}</li>
* </ul>
* </p>
*
@@ -303,4 +305,21 @@ public interface Table extends TableNamedElement {
*/
void setCurrentColumnAxisProvider(AbstractAxisProvider value);
+ /**
+ * Returns the value of the '<em><b>Cells</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * Cells of the table. They are used when the value to display can't be deduced of
+ * the intersection of the row and the column.
+ * <!-- end-model-doc -->
+ *
+ * @return the value of the '<em>Cells</em>' containment reference list.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Cells()
+ * @model containment="true"
+ * @generated
+ */
+ EList<Cell> getCells();
+
} // Table
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
index 3fa986894ef..ebd416ddfe4 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
@@ -37,6 +37,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
@@ -45,6 +47,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
@@ -124,6 +128,8 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
// Create package meta-data objects
theNattablePackage.createPackageContents();
@@ -133,6 +139,8 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
theNattableaxisconfigurationPackage.createPackageContents();
theNattabletesterPackage.createPackageContents();
theNattableaxisPackage.createPackageContents();
+ theNattablecellPackage.createPackageContents();
+ theNattableproblemPackage.createPackageContents();
// Initialize created meta-data
theNattablePackage.initializePackageContents();
@@ -142,6 +150,8 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
theNattableaxisconfigurationPackage.initializePackageContents();
theNattabletesterPackage.initializePackageContents();
theNattableaxisPackage.initializePackageContents();
+ theNattablecellPackage.initializePackageContents();
+ theNattableproblemPackage.initializePackageContents();
// Register package validator
EValidator.Registry.INSTANCE.put(theNattablePackage, new EValidator.Descriptor() {
@@ -266,6 +276,16 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
*
* @generated
*/
+ public EReference getTable_Cells() {
+ return (EReference)tableEClass.getEStructuralFeatures().get(9);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
public NattableFactory getNattableFactory() {
return (NattableFactory)getEFactoryInstance();
}
@@ -302,6 +322,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
createEReference(tableEClass, TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION);
createEReference(tableEClass, TABLE__CURRENT_ROW_AXIS_PROVIDER);
createEReference(tableEClass, TABLE__CURRENT_COLUMN_AXIS_PROVIDER);
+ createEReference(tableEClass, TABLE__CELLS);
}
/**
@@ -337,6 +358,8 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
+ NattablecellPackage theNattablecellPackage = (NattablecellPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI);
+ NattableproblemPackage theNattableproblemPackage = (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);
// Add subpackages
getESubpackages().add(theNattableconfigurationPackage);
@@ -345,6 +368,8 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
getESubpackages().add(theNattableaxisconfigurationPackage);
getESubpackages().add(theNattabletesterPackage);
getESubpackages().add(theNattableaxisPackage);
+ getESubpackages().add(theNattablecellPackage);
+ getESubpackages().add(theNattableproblemPackage);
// Create type parameters
@@ -364,6 +389,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
initEReference(getTable_LocalColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localColumnHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getTable_CurrentRowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "currentRowAxisProvider", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getTable_CurrentColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "currentColumnAxisProvider", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTable_Cells(), theNattablecellPackage.getCell(), null, "cells", null, 0, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
// Create resource
createResource(eNS_URI);
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
index 2c1b0d190de..91e14488181 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
@@ -35,6 +35,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;
@@ -57,6 +58,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.i
* Configuration</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCells <em>Cells</em>}</li>
* </ul>
* </p>
*
@@ -176,6 +178,17 @@ public class TableImpl extends TableNamedElementImpl implements Table {
protected AbstractAxisProvider currentColumnAxisProvider;
/**
+ * The cached value of the '{@link #getCells() <em>Cells</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getCells()
+ * @generated
+ * @ordered
+ */
+ protected EList<Cell> cells;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -513,6 +526,19 @@ public class TableImpl extends TableNamedElementImpl implements Table {
*
* @generated
*/
+ public EList<Cell> getCells() {
+ if(cells == null) {
+ cells = new EObjectContainmentEList<Cell>(Cell.class, this, NattablePackage.TABLE__CELLS);
+ }
+ return cells;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch(featureID) {
@@ -524,6 +550,8 @@ public class TableImpl extends TableNamedElementImpl implements Table {
return basicSetLocalRowHeaderAxisConfiguration(null, msgs);
case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:
return basicSetLocalColumnHeaderAxisConfiguration(null, msgs);
+ case NattablePackage.TABLE__CELLS:
+ return ((InternalEList<?>)getCells()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -563,6 +591,8 @@ public class TableImpl extends TableNamedElementImpl implements Table {
if(resolve)
return getCurrentColumnAxisProvider();
return basicGetCurrentColumnAxisProvider();
+ case NattablePackage.TABLE__CELLS:
+ return getCells();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -606,6 +636,10 @@ public class TableImpl extends TableNamedElementImpl implements Table {
case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:
setCurrentColumnAxisProvider((AbstractAxisProvider)newValue);
return;
+ case NattablePackage.TABLE__CELLS:
+ getCells().clear();
+ getCells().addAll((Collection<? extends Cell>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -646,6 +680,9 @@ public class TableImpl extends TableNamedElementImpl implements Table {
case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:
setCurrentColumnAxisProvider((AbstractAxisProvider)null);
return;
+ case NattablePackage.TABLE__CELLS:
+ getCells().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -677,6 +714,8 @@ public class TableImpl extends TableNamedElementImpl implements Table {
return currentRowAxisProvider != null;
case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:
return currentColumnAxisProvider != null;
+ case NattablePackage.TABLE__CELLS:
+ return cells != null && !cells.isEmpty();
}
return super.eIsSet(featureID);
}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
index a96776b945f..2acbfed921f 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
@@ -44,6 +44,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
@@ -52,6 +54,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
@@ -185,6 +189,8 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
// Create package meta-data objects
theNattableaxisPackage.createPackageContents();
@@ -194,6 +200,8 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
theNattablelabelproviderPackage.createPackageContents();
theNattableaxisconfigurationPackage.createPackageContents();
theNattabletesterPackage.createPackageContents();
+ theNattablecellPackage.createPackageContents();
+ theNattableproblemPackage.createPackageContents();
// Initialize created meta-data
theNattableaxisPackage.initializePackageContents();
@@ -203,6 +211,8 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
theNattablelabelproviderPackage.initializePackageContents();
theNattableaxisconfigurationPackage.initializePackageContents();
theNattabletesterPackage.initializePackageContents();
+ theNattablecellPackage.initializePackageContents();
+ theNattableproblemPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theNattableaxisPackage.freeze();
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
index b988df35395..66ea95d2bd3 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
@@ -51,6 +51,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
@@ -59,6 +61,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
@@ -224,6 +228,8 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
// Create package meta-data objects
theNattableaxisconfigurationPackage.createPackageContents();
@@ -233,6 +239,8 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
theNattablelabelproviderPackage.createPackageContents();
theNattabletesterPackage.createPackageContents();
theNattableaxisPackage.createPackageContents();
+ theNattablecellPackage.createPackageContents();
+ theNattableproblemPackage.createPackageContents();
// Initialize created meta-data
theNattableaxisconfigurationPackage.initializePackageContents();
@@ -242,6 +250,8 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
theNattablelabelproviderPackage.initializePackageContents();
theNattabletesterPackage.initializePackageContents();
theNattableaxisPackage.initializePackageContents();
+ theNattablecellPackage.initializePackageContents();
+ theNattableproblemPackage.initializePackageContents();
// Register package validator
EValidator.Registry.INSTANCE.put(theNattableaxisconfigurationPackage, new EValidator.Descriptor() {
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
index ffdc2c4c902..3499af49c7c 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
@@ -42,6 +42,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
@@ -50,6 +52,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
@@ -167,6 +171,8 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
// Create package meta-data objects
theNattableaxisproviderPackage.createPackageContents();
@@ -176,6 +182,8 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
theNattableaxisconfigurationPackage.createPackageContents();
theNattabletesterPackage.createPackageContents();
theNattableaxisPackage.createPackageContents();
+ theNattablecellPackage.createPackageContents();
+ theNattableproblemPackage.createPackageContents();
// Initialize created meta-data
theNattableaxisproviderPackage.initializePackageContents();
@@ -185,6 +193,8 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
theNattableaxisconfigurationPackage.initializePackageContents();
theNattabletesterPackage.initializePackageContents();
theNattableaxisPackage.initializePackageContents();
+ theNattablecellPackage.initializePackageContents();
+ theNattableproblemPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theNattableaxisproviderPackage.freeze();
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
index 5704f459643..c3740571286 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
@@ -38,6 +38,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
@@ -50,6 +52,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
@@ -143,6 +147,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
// Create package meta-data objects
theNattableconfigurationPackage.createPackageContents();
@@ -152,6 +158,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
theNattableaxisconfigurationPackage.createPackageContents();
theNattabletesterPackage.createPackageContents();
theNattableaxisPackage.createPackageContents();
+ theNattablecellPackage.createPackageContents();
+ theNattableproblemPackage.createPackageContents();
// Initialize created meta-data
theNattableconfigurationPackage.initializePackageContents();
@@ -161,6 +169,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
theNattableaxisconfigurationPackage.initializePackageContents();
theNattabletesterPackage.initializePackageContents();
theNattableaxisPackage.initializePackageContents();
+ theNattablecellPackage.initializePackageContents();
+ theNattableproblemPackage.initializePackageContents();
// Register package validator
EValidator.Registry.INSTANCE.put(theNattableconfigurationPackage, new EValidator.Descriptor() {
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
index b093293d9d7..cfdd061c011 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
@@ -35,6 +35,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
@@ -45,6 +47,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
@@ -138,6 +142,8 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
// Create package meta-data objects
theNattablelabelproviderPackage.createPackageContents();
@@ -147,6 +153,8 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
theNattableaxisconfigurationPackage.createPackageContents();
theNattabletesterPackage.createPackageContents();
theNattableaxisPackage.createPackageContents();
+ theNattablecellPackage.createPackageContents();
+ theNattableproblemPackage.createPackageContents();
// Initialize created meta-data
theNattablelabelproviderPackage.initializePackageContents();
@@ -156,6 +164,8 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
theNattableaxisconfigurationPackage.initializePackageContents();
theNattabletesterPackage.initializePackageContents();
theNattableaxisPackage.initializePackageContents();
+ theNattablecellPackage.initializePackageContents();
+ theNattableproblemPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theNattablelabelproviderPackage.freeze();
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
index b8b31232f38..d5f7bc0db41 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
@@ -36,6 +36,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
@@ -44,6 +46,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;
@@ -130,6 +134,8 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+ NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+ NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
// Create package meta-data objects
theNattabletesterPackage.createPackageContents();
@@ -139,6 +145,8 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
theNattablelabelproviderPackage.createPackageContents();
theNattableaxisconfigurationPackage.createPackageContents();
theNattableaxisPackage.createPackageContents();
+ theNattablecellPackage.createPackageContents();
+ theNattableproblemPackage.createPackageContents();
// Initialize created meta-data
theNattabletesterPackage.initializePackageContents();
@@ -148,6 +156,8 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
theNattablelabelproviderPackage.initializePackageContents();
theNattableaxisconfigurationPackage.initializePackageContents();
theNattableaxisPackage.initializePackageContents();
+ theNattablecellPackage.initializePackageContents();
+ theNattableproblemPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theNattabletesterPackage.freeze();
diff --git a/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java b/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java
index 231e537885e..3dbf0bbf06f 100644
--- a/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java
+++ b/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java
@@ -27,8 +27,9 @@ public class Activator extends AbstractUIPlugin {
// The shared instance
private static Activator plugin;
-
+
public static LogHelper log;
+
/**
* The constructor
*/
@@ -37,6 +38,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
public void start(BundleContext context) throws Exception {
@@ -47,6 +49,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception {
@@ -56,7 +59,7 @@ public class Activator extends AbstractUIPlugin {
/**
* Returns the shared instance
- *
+ *
* @return the shared instance
*/
public static Activator getDefault() {
diff --git a/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java b/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java
index 0aa271395ee..9c2c655af28 100644
--- a/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java
+++ b/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java
@@ -23,8 +23,10 @@ import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNatta
import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisEditor;
import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisconfigurationEditor;
import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisproviderEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablecellEditor;
import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableconfigurationEditor;
import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablelabelproviderEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableproblemEditor;
import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattabletesterEditor;
import org.eclipse.papyrus.infra.nattable.model.editor.tests.Activator;
import org.eclipse.papyrus.junit.utils.EditorUtils;
@@ -140,6 +142,20 @@ public class EditorsTests {
Assert.assertTrue(editor instanceof CustomNattabletesterEditor);
}
+
+ @Test
+ public void testOpenNattableTesterCellEditor() throws Exception {
+ IEditorPart editor = openFile("testTableConfiguration", "My.nattablecell", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+ Assert.assertTrue(editor instanceof CustomNattablecellEditor);
+ }
+
+
+ @Test
+ public void testOpenNattableTesterProblemEditor() throws Exception {
+ IEditorPart editor = openFile("testTableConfiguration", "My.nattableproblem", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+ Assert.assertTrue(editor instanceof CustomNattableproblemEditor);
+ }
+
protected String getSourcePath() {
return "/resources/"; //$NON-NLS-1$
}

Back to the top