Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypesConstants.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleBooleanCellEditorConfiguration.java196
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleIntegerCellEditorConfiguration.java198
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleStringCellEditorConfiguration.java2
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanComboBoxCellEditorFilterConfiguration.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EDoubleEditorFilterConfiguration.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EIntegereEditorFilterConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml76
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiBooleanCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiIntegerCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiStringCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLBooleanCellEditorConfiguration.java59
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLIntegerCellEditorConfiguration.java59
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLStringCellEditorConfiguration.java59
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLBooleanCellEditorConfiguration.java60
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLIntegerCellEditorConfiguration.java60
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLStringCellEditorConfiguration.java60
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java7
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiBooleanCellEditorConfiguration.java3
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiIntegerCellEditorConfiguration.java4
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiRealCellEditorConfiguration.java3
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiStringCellEditorConfiguration.java4
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLBooleanCellEditorConfiguration.java66
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLIntegerCellEditorConfiguration.java66
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLStringCellEditorConfiguration.java66
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration.java3
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleBooleanCellEditorConfiguration.java4
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleIntegerCellEditorConfiguration.java4
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleRealCellEditorConfiguration.java3
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleStringCellEditorConfiguration.java4
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLBooleanCellEditorConfiguration.java67
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLIntegerCellEditorConfiguration.java67
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLStringCellEditorConfiguration.java67
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration.java3
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLBooleanEditorFilterConfiguration.java151
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLIntegerEditorFilterConfiguration.java175
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.notation38
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.profile.notation36
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.profile.uml305
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.uml32
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/CellEditorsConfigurationTest.java174
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java1
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/CellEditorsConfigurationTest.java280
43 files changed, 1878 insertions, 604 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypesConstants.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypesConstants.java
index b4c256c14a5..b4359d2cee0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypesConstants.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypesConstants.java
@@ -28,11 +28,19 @@ public class TypesConstants {
}
public static final String STRING = "String"; //$NON-NLS-1$
+
+ public static final String ESTRING = "EString"; //$NON-NLS-1$
public static final String BOOLEAN = "Boolean"; //$NON-NLS-1$
+
+ public static final String EBOOLEAN = "EBoolean"; //$NON-NLS-1$
public static final String INTEGER = "Integer"; //$NON-NLS-1$
+
+ public static final String EINT = "EInt"; //$NON-NLS-1$
public static final String DOUBLE = "Double"; //$NON-NLS-1$
+
+ public static final String EDOUBLE = "EDouble"; //$NON-NLS-1$
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleBooleanCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleBooleanCellEditorConfiguration.java
index 8959aa558e7..21d2414bee6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleBooleanCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleBooleanCellEditorConfiguration.java
@@ -1,98 +1,98 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.emf.nattable.celleditor.config;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
-import org.eclipse.nebula.widgets.nattable.data.convert.DefaultBooleanDisplayConverter;
-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
-import org.eclipse.nebula.widgets.nattable.edit.editor.CheckBoxCellEditor;
-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
-import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.nattable.painter.CustomCheckBoxPainter;
-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
-import org.eclipse.papyrus.infra.tools.util.TypesConstants;
-
-/**
- * @author MA244259
- *
- */
-public class SingleBooleanCellEditorConfiguration implements ICellAxisConfiguration {
-
- /**
- * the id of this editor
- */
- private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.SingleBooleanCellEditorConfiguration.CheckBox";//$NON-NLS-1$
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()
- *
- * @return
- */
- @Override
- public String getConfigurationId() {
- return ID;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()
- *
- * @return
- */
- @Override
- public String getConfigurationDescription() {
- return "This configuration provides a CheckBox editor for a single Boolean"; //$NON-NLS-1$
- }
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
- *
- * @param table
- * @param axisElement
- * @return
- */
- @Override
- public boolean handles(Table table, Object axisElement) {
- Object object = AxisUtils.getRepresentedElement(axisElement);
- if (object instanceof EStructuralFeature) {
- EStructuralFeature feature = (EStructuralFeature) object;
- if (!feature.isMany()) {
- EClassifier etype = feature.getEType();
- if (etype instanceof EDataType) {
- EDataType datatype = (EDataType) etype;
- return TypesConstants.BOOLEAN.equals(datatype.getName());
- }
- }
- }
- return false;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)
- *
- * @param configRegistry
- * @param axis
- * @param configLabel
- */
- @Override
- public void configureCellEditor(IConfigRegistry configRegistry, Object axis, String configLabel) {
- configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomCheckBoxPainter(), DisplayMode.NORMAL, configLabel);
- configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new CheckBoxCellEditor(), DisplayMode.NORMAL, configLabel);
- configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultBooleanDisplayConverter(), DisplayMode.NORMAL, configLabel);
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.celleditor.config;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultBooleanDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.editor.CheckBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.painter.CustomCheckBoxPainter;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
+
+/**
+ * @author MA244259
+ *
+ */
+public class SingleBooleanCellEditorConfiguration implements ICellAxisConfiguration {
+
+ /**
+ * the id of this editor
+ */
+ private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.SingleBooleanCellEditorConfiguration.CheckBox";//$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationDescription() {
+ return "This configuration provides a CheckBox editor for a single Boolean"; //$NON-NLS-1$
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ *
+ * @param table
+ * @param axisElement
+ * @return
+ */
+ @Override
+ public boolean handles(Table table, Object axisElement) {
+ Object object = AxisUtils.getRepresentedElement(axisElement);
+ if (object instanceof EStructuralFeature) {
+ EStructuralFeature feature = (EStructuralFeature) object;
+ if (!feature.isMany()) {
+ EClassifier etype = feature.getEType();
+ if (etype instanceof EDataType) {
+ EDataType datatype = (EDataType) etype;
+ return TypesConstants.BOOLEAN.equals(datatype.getName()) || TypesConstants.EBOOLEAN.equals(datatype.getName());
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)
+ *
+ * @param configRegistry
+ * @param axis
+ * @param configLabel
+ */
+ @Override
+ public void configureCellEditor(IConfigRegistry configRegistry, Object axis, String configLabel) {
+ configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomCheckBoxPainter(), DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new CheckBoxCellEditor(), DisplayMode.NORMAL, configLabel);
+ configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultBooleanDisplayConverter(), DisplayMode.NORMAL, configLabel);
+ }
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleIntegerCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleIntegerCellEditorConfiguration.java
index abf75fe4cd0..2037921177e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleIntegerCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleIntegerCellEditorConfiguration.java
@@ -1,99 +1,99 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.emf.nattable.celleditor.config;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
-import org.eclipse.nebula.widgets.nattable.data.convert.DefaultIntegerDisplayConverter;
-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
-import org.eclipse.nebula.widgets.nattable.edit.editor.TextCellEditor;
-import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
-import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
-import org.eclipse.papyrus.infra.tools.util.TypesConstants;
-
-/**
- * @author MA244259
- *
- */
-public class SingleIntegerCellEditorConfiguration implements ICellAxisConfiguration {
-
- /**
- * the id of this editor
- */
- private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.SingleIntegerCellEditorConfiguration.Text";//$NON-NLS-1$
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()
- *
- * @return
- */
- @Override
- public String getConfigurationId() {
- return ID;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()
- *
- * @return
- */
- @Override
- public String getConfigurationDescription() {
- return "This configuration provides a Text editor for a single Integer"; //$NON-NLS-1$
- }
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
- *
- * @param table
- * @param axisElement
- * @return
- */
- @Override
- public boolean handles(Table table, Object axisElement) {
- Object object = AxisUtils.getRepresentedElement(axisElement);
- if (object instanceof EStructuralFeature) {
- EStructuralFeature feature = (EStructuralFeature) object;
- if (!feature.isMany()) {
- EClassifier etype = feature.getEType();
- if (etype instanceof EDataType) {
- EDataType datatype = (EDataType) etype;
- return TypesConstants.INTEGER.equals(datatype.getName());
- }
- }
- }
- return false;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)
- *
- * @param configRegistry
- * @param axis
- * @param configLabel
- */
- @Override
- public void configureCellEditor(IConfigRegistry configRegistry, Object axis, String configLabel) {
- configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new TextPainter(), DisplayMode.EDIT, configLabel);
- configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new TextCellEditor(), DisplayMode.EDIT, configLabel);
- configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultIntegerDisplayConverter(), DisplayMode.EDIT, configLabel);
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.celleditor.config;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultIntegerDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.editor.TextCellEditor;
+import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
+
+/**
+ * @author MA244259
+ *
+ */
+public class SingleIntegerCellEditorConfiguration implements ICellAxisConfiguration {
+
+ /**
+ * the id of this editor
+ */
+ private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.SingleIntegerCellEditorConfiguration.Text";//$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationDescription() {
+ return "This configuration provides a Text editor for a single Integer"; //$NON-NLS-1$
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ *
+ * @param table
+ * @param axisElement
+ * @return
+ */
+ @Override
+ public boolean handles(Table table, Object axisElement) {
+ Object object = AxisUtils.getRepresentedElement(axisElement);
+ if (object instanceof EStructuralFeature) {
+ EStructuralFeature feature = (EStructuralFeature) object;
+ if (!feature.isMany()) {
+ EClassifier etype = feature.getEType();
+ if (etype instanceof EDataType) {
+ EDataType datatype = (EDataType) etype;
+ return TypesConstants.INTEGER.equals(datatype.getName()) || TypesConstants.EINT.equals(datatype.getName());
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)
+ *
+ * @param configRegistry
+ * @param axis
+ * @param configLabel
+ */
+ @Override
+ public void configureCellEditor(IConfigRegistry configRegistry, Object axis, String configLabel) {
+ configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new TextPainter(), DisplayMode.EDIT, configLabel);
+ configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new TextCellEditor(), DisplayMode.EDIT, configLabel);
+ configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultIntegerDisplayConverter(), DisplayMode.EDIT, configLabel);
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleStringCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleStringCellEditorConfiguration.java
index c8063c28ff2..6052838bfbf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleStringCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleStringCellEditorConfiguration.java
@@ -74,7 +74,7 @@ public class SingleStringCellEditorConfiguration implements ICellAxisConfigurati
EClassifier etype = feature.getEType();
if (etype instanceof EDataType) {
EDataType datatype = (EDataType) etype;
- return TypesConstants.STRING.equals(datatype.getName());
+ return TypesConstants.STRING.equals(datatype.getName()) || TypesConstants.ESTRING.equals(datatype.getName());
}
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanComboBoxCellEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanComboBoxCellEditorFilterConfiguration.java
index 55193353121..1b494f2d75f 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanComboBoxCellEditorFilterConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EBooleanComboBoxCellEditorFilterConfiguration.java
@@ -48,7 +48,7 @@ public class EBooleanComboBoxCellEditorFilterConfiguration extends AbstractBoole
EClassifier etype = feature.getEType();
if (etype instanceof EDataType) {
EDataType datatype = (EDataType) etype;
- return TypesConstants.BOOLEAN.equals(datatype.getName());
+ return TypesConstants.BOOLEAN.equals(datatype.getName()) || TypesConstants.EBOOLEAN.equals(datatype.getName());
}
}
return false;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EDoubleEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EDoubleEditorFilterConfiguration.java
index 2d98bac443b..c91c995a8d5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EDoubleEditorFilterConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EDoubleEditorFilterConfiguration.java
@@ -47,7 +47,7 @@ public class EDoubleEditorFilterConfiguration extends AbstractDoubleEditorFilter
EClassifier etype = feature.getEType();
if (etype instanceof EDataType) {
EDataType datatype = (EDataType) etype;
- return TypesConstants.DOUBLE.equals(datatype.getName());
+ return TypesConstants.DOUBLE.equals(datatype.getName()) || TypesConstants.EDOUBLE.equals(datatype.getName());
}
}
return false;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EIntegereEditorFilterConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EIntegereEditorFilterConfiguration.java
index 7ffca787614..e2390b18a89 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EIntegereEditorFilterConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/filter/configuration/EIntegereEditorFilterConfiguration.java
@@ -47,7 +47,7 @@ public class EIntegereEditorFilterConfiguration extends AbstractIntegerEditorFil
EClassifier etype = feature.getEType();
if (etype instanceof EDataType) {
EDataType datatype = (EDataType) etype;
- return TypesConstants.INTEGER.equals(datatype.getName());
+ return TypesConstants.INTEGER.equals(datatype.getName()) || TypesConstants.EINT.equals(datatype.getName());
}
}
return false;
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
index f279e5f7c95..ac8958a747f 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
@@ -16,11 +16,11 @@
order="401">
</configuration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleBooleanCellEditorConfiguration"
+ class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleUMLBooleanCellEditorConfiguration"
order="410">
</cellAxisConfiguration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeMultiBooleanCellEditorConfiguration"
+ class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeMultiUMLBooleanCellEditorConfiguration"
order="411">
</cellAxisConfiguration>
<cellAxisConfiguration
@@ -32,11 +32,11 @@
order="421">
</cellAxisConfiguration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleIntegerCellEditorConfiguration"
+ class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleUMLIntegerCellEditorConfiguration"
order="430">
</cellAxisConfiguration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeMultiIntegerCellEditorConfiguration"
+ class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeMultiUMLIntegerCellEditorConfiguration"
order="431">
</cellAxisConfiguration>
<cellAxisConfiguration
@@ -56,28 +56,36 @@
order="451">
</cellAxisConfiguration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleStringCellEditorConfiguration"
+ class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleUMLStringCellEditorConfiguration"
order="460">
</cellAxisConfiguration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeMultiStringCellEditorConfiguration"
+ class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeMultiUMLStringCellEditorConfiguration"
order="461">
</cellAxisConfiguration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.SingleRealCellEditorConfiguration"
- order="470">
+ class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleBooleanCellEditorConfiguration"
+ order="500">
</cellAxisConfiguration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.MultiRealCellEditorConfiguration"
- order="471">
+ class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeMultiBooleanCellEditorConfiguration"
+ order="501">
</cellAxisConfiguration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.SingleUnlimitedNaturalCellEditorConfiguration"
- order="480">
+ class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleIntegerCellEditorConfiguration"
+ order="510">
</cellAxisConfiguration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.MultiUnlimitedNaturalCellEditorConfiguration"
- order="480">
+ class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeMultiIntegerCellEditorConfiguration"
+ order="511">
+ </cellAxisConfiguration>
+ <cellAxisConfiguration
+ class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleStringCellEditorConfiguration"
+ order="520">
+ </cellAxisConfiguration>
+ <cellAxisConfiguration
+ class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeMultiStringCellEditorConfiguration"
+ order="521">
</cellAxisConfiguration>
<cellAxisConfiguration
class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleUMLReferenceCellEditorConfiguration"
@@ -96,6 +104,46 @@
order="701">
</cellAxisConfiguration>
<cellAxisConfiguration
+ class="org.eclipse.papyrus.uml.nattable.config.SingleUMLBooleanCellEditorConfiguration"
+ order="900">
+ </cellAxisConfiguration>
+ <cellAxisConfiguration
+ class="org.eclipse.papyrus.uml.nattable.config.MultiUMLBooleanCellEditorConfiguration"
+ order="901">
+ </cellAxisConfiguration>
+ <cellAxisConfiguration
+ class="org.eclipse.papyrus.uml.nattable.config.SingleUMLIntegerCellEditorConfiguration"
+ order="910">
+ </cellAxisConfiguration>
+ <cellAxisConfiguration
+ class="org.eclipse.papyrus.uml.nattable.config.MultiUMLIntegerCellEditorConfiguration"
+ order="911">
+ </cellAxisConfiguration>
+ <cellAxisConfiguration
+ class="org.eclipse.papyrus.uml.nattable.config.SingleRealCellEditorConfiguration"
+ order="920">
+ </cellAxisConfiguration>
+ <cellAxisConfiguration
+ class="org.eclipse.papyrus.uml.nattable.config.MultiRealCellEditorConfiguration"
+ order="921">
+ </cellAxisConfiguration>
+ <cellAxisConfiguration
+ class="org.eclipse.papyrus.uml.nattable.config.SingleUnlimitedNaturalCellEditorConfiguration"
+ order="930">
+ </cellAxisConfiguration>
+ <cellAxisConfiguration
+ class="org.eclipse.papyrus.uml.nattable.config.MultiUnlimitedNaturalCellEditorConfiguration"
+ order="931">
+ </cellAxisConfiguration>
+ <cellAxisConfiguration
+ class="org.eclipse.papyrus.uml.nattable.config.SingleUMLStringCellEditorConfiguration"
+ order="940">
+ </cellAxisConfiguration>
+ <cellAxisConfiguration
+ class="org.eclipse.papyrus.uml.nattable.config.MultiUMLStringCellEditorConfiguration"
+ order="941">
+ </cellAxisConfiguration>
+ <cellAxisConfiguration
class="org.eclipse.papyrus.uml.nattable.config.MultiBooleanCellEditorConfiguration"
order="1001">
</cellAxisConfiguration>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiBooleanCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiBooleanCellEditorConfiguration.java
index 77436ef6141..d429a555a0f 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiBooleanCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiBooleanCellEditorConfiguration.java
@@ -75,7 +75,7 @@ public class MultiBooleanCellEditorConfiguration implements ICellAxisConfigurati
EClassifier etype = feature.getEType();
if (etype instanceof EDataType) {
EDataType datatype = (EDataType) etype;
- result = TypesConstants.BOOLEAN.equals(datatype.getName());
+ result = TypesConstants.BOOLEAN.equals(datatype.getName()) || TypesConstants.EBOOLEAN.equals(datatype.getName());
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiIntegerCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiIntegerCellEditorConfiguration.java
index 5b4f58f9827..e9c0e275a77 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiIntegerCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiIntegerCellEditorConfiguration.java
@@ -75,7 +75,7 @@ public class MultiIntegerCellEditorConfiguration implements ICellAxisConfigurati
EClassifier etype = feature.getEType();
if (etype instanceof EDataType) {
EDataType datatype = (EDataType) etype;
- result = TypesConstants.INTEGER.equals(datatype.getName());
+ result = TypesConstants.INTEGER.equals(datatype.getName()) || TypesConstants.EINT.equals(datatype.getName());
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiStringCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiStringCellEditorConfiguration.java
index 338302c8796..56c4a9f74f2 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiStringCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiStringCellEditorConfiguration.java
@@ -75,7 +75,7 @@ public class MultiStringCellEditorConfiguration implements ICellAxisConfiguratio
EClassifier etype = feature.getEType();
if (etype instanceof EDataType) {
EDataType datatype = (EDataType) etype;
- result = TypesConstants.STRING.equals(datatype.getName());
+ result = TypesConstants.STRING.equals(datatype.getName()) || TypesConstants.ESTRING.equals(datatype.getName());
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLBooleanCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLBooleanCellEditorConfiguration.java
new file mode 100644
index 00000000000..02794c9002a
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLBooleanCellEditorConfiguration.java
@@ -0,0 +1,59 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.config;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.uml2.types.TypesPackage;
+
+/**
+ * The cell editor configuration for the multi UML boolean value.
+ */
+public class MultiUMLBooleanCellEditorConfiguration extends MultiBooleanCellEditorConfiguration {
+
+ /**
+ * The id of this editor.
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUMLBooleanCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.config.MultiBooleanCellEditorConfiguration#getConfigurationId()
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.config.MultiBooleanCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ */
+ @Override
+ public boolean handles(final Table table, final Object axisElement) {
+ boolean result = false;
+ Object object = AxisUtils.getRepresentedElement(axisElement);
+ if (object instanceof EStructuralFeature) {
+ EStructuralFeature feature = (EStructuralFeature) object;
+ if (feature.isMany()) {
+ result = feature.getEType() == TypesPackage.eINSTANCE.getBoolean();
+ }
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLIntegerCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLIntegerCellEditorConfiguration.java
new file mode 100644
index 00000000000..08b96a91489
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLIntegerCellEditorConfiguration.java
@@ -0,0 +1,59 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.config;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.uml2.types.TypesPackage;
+
+/**
+ * The cell editor configuration for the multi UML integer value.
+ */
+public class MultiUMLIntegerCellEditorConfiguration extends MultiIntegerCellEditorConfiguration {
+
+ /**
+ * The id of this editor.
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUMLIntegerCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.config.MultiIntegerCellEditorConfiguration#getConfigurationId()
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.config.MultiIntegerCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ */
+ @Override
+ public boolean handles(final Table table, final Object axisElement) {
+ boolean result = false;
+ Object object = AxisUtils.getRepresentedElement(axisElement);
+ if (object instanceof EStructuralFeature) {
+ EStructuralFeature feature = (EStructuralFeature) object;
+ if (feature.isMany()) {
+ result = feature.getEType() == TypesPackage.eINSTANCE.getInteger();
+ }
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLStringCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLStringCellEditorConfiguration.java
new file mode 100644
index 00000000000..776dedfe118
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLStringCellEditorConfiguration.java
@@ -0,0 +1,59 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.config;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.uml2.types.TypesPackage;
+
+/**
+ * The cell editor configuration for the multi UML string value.
+ */
+public class MultiUMLStringCellEditorConfiguration extends MultiStringCellEditorConfiguration {
+
+ /**
+ * The id of this editor.
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUMLStringCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.config.MultiStringCellEditorConfiguration#getConfigurationId()
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.config.MultiStringCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ */
+ @Override
+ public boolean handles(final Table table, final Object axisElement) {
+ boolean result = false;
+ Object object = AxisUtils.getRepresentedElement(axisElement);
+ if (object instanceof EStructuralFeature) {
+ EStructuralFeature feature = (EStructuralFeature) object;
+ if (feature.isMany()) {
+ result = feature.getEType() == TypesPackage.eINSTANCE.getString();
+ }
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLBooleanCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLBooleanCellEditorConfiguration.java
new file mode 100644
index 00000000000..367b279aac8
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLBooleanCellEditorConfiguration.java
@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.config;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleBooleanCellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.uml2.types.TypesPackage;
+
+/**
+ * The cell editor configuration for the single UML boolean value.
+ */
+public class SingleUMLBooleanCellEditorConfiguration extends SingleBooleanCellEditorConfiguration {
+
+ /**
+ * The id of this editor.
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUMLBooleanCellEditorConfiguration.CheckBox";//$NON-NLS-1$
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleBooleanCellEditorConfiguration#getConfigurationId()
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleBooleanCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ */
+ @Override
+ public boolean handles(final Table table, final Object axisElement) {
+ boolean result = false;
+ Object object = AxisUtils.getRepresentedElement(axisElement);
+ if (object instanceof EStructuralFeature) {
+ EStructuralFeature feature = (EStructuralFeature) object;
+ if (!feature.isMany()) {
+ result = feature.getEType() == TypesPackage.eINSTANCE.getBoolean();
+ }
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLIntegerCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLIntegerCellEditorConfiguration.java
new file mode 100644
index 00000000000..6933fc80268
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLIntegerCellEditorConfiguration.java
@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.config;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleIntegerCellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.uml2.types.TypesPackage;
+
+/**
+ * The cell editor configuration for the single UML integer value.
+ */
+public class SingleUMLIntegerCellEditorConfiguration extends SingleIntegerCellEditorConfiguration {
+
+ /**
+ * The id of this editor.
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUMLIntegerCellEditorConfiguration.Text";//$NON-NLS-1$
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleIntegerCellEditorConfiguration#getConfigurationId()
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleIntegerCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ */
+ @Override
+ public boolean handles(final Table table, final Object axisElement) {
+ boolean result = false;
+ Object object = AxisUtils.getRepresentedElement(axisElement);
+ if (object instanceof EStructuralFeature) {
+ EStructuralFeature feature = (EStructuralFeature) object;
+ if (!feature.isMany()) {
+ result = feature.getEType() == TypesPackage.eINSTANCE.getInteger();
+ }
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLStringCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLStringCellEditorConfiguration.java
new file mode 100644
index 00000000000..dddb80bd0b2
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLStringCellEditorConfiguration.java
@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.config;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleStringCellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.uml2.types.TypesPackage;
+
+/**
+ * The cell editor configuration for the single UML string value.
+ */
+public class SingleUMLStringCellEditorConfiguration extends SingleStringCellEditorConfiguration {
+
+ /**
+ * The id of this editor.
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUMLStringCellEditorConfiguration.MultiLineText";//$NON-NLS-1$
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleStringCellEditorConfiguration#getConfigurationId()
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleStringCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ */
+ @Override
+ public boolean handles(final Table table, final Object axisElement) {
+ boolean result = false;
+ Object object = AxisUtils.getRepresentedElement(axisElement);
+ if (object instanceof EStructuralFeature) {
+ EStructuralFeature feature = (EStructuralFeature) object;
+ if (!feature.isMany()) {
+ result = feature.getEType() == TypesPackage.eINSTANCE.getString();
+ }
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
index c07bbef9f40..ca122a8ca08 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
@@ -44,6 +44,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
import org.eclipse.papyrus.uml.nattable.dataprovider.UMLStereotypeSingleEnumerationComboBoxDataProvider;
import org.eclipse.papyrus.uml.nattable.editor.MultiBooleanCellEditor;
import org.eclipse.papyrus.uml.nattable.editor.MultiEnumCellEditor;
@@ -336,13 +337,13 @@ public class UMLFeatureCellEditorConfig extends EStructuralFeatureEditorConfig {
if (type instanceof DataType) {
if (type instanceof PrimitiveType) {
final String name = type.getName();
- if (PrimitivesTypesUtils.UML_BOOLEAN.equals(name)) {
+ if (PrimitivesTypesUtils.UML_BOOLEAN.equals(name) || TypesConstants.EBOOLEAN.equals(name)) {
if (isMany) {
editorKind = MULTI_BOOLEAN;
} else {
editorKind = SINGLE_BOOLEAN;
}
- } else if (PrimitivesTypesUtils.UML_INTEGER.equals(name)) {
+ } else if (PrimitivesTypesUtils.UML_INTEGER.equals(name) || TypesConstants.EINT.equals(name)) {
if (isMany) {
editorKind = MULTI_INTEGER;
} else {
@@ -354,7 +355,7 @@ public class UMLFeatureCellEditorConfig extends EStructuralFeatureEditorConfig {
} else {
editorKind = SINGLE_REAL;
}
- } else if (PrimitivesTypesUtils.UML_STRING.equals(name)) {
+ } else if (PrimitivesTypesUtils.UML_STRING.equals(name) || TypesConstants.ESTRING.equals(name)) {
if (isMany) {
editorKind = MULTI_STRING;
} else {
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiBooleanCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiBooleanCellEditorConfiguration.java
index 4bd1d20da4d..90a441dbff0 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiBooleanCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiBooleanCellEditorConfiguration.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.uml.nattable.config;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
import org.eclipse.uml2.uml.DataType;
@@ -57,7 +58,7 @@ public class UMLStereotypeMultiBooleanCellEditorConfiguration extends MultiBoole
Type type = prop.getType();
if (type instanceof DataType) {
final String name = type.getName();
- result = PrimitivesTypesUtils.UML_BOOLEAN.equals(name);
+ result = TypesConstants.BOOLEAN.equals(name) || TypesConstants.EBOOLEAN.equals(name);
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiIntegerCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiIntegerCellEditorConfiguration.java
index 0063b9731a6..3d2dcb6d2e4 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiIntegerCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiIntegerCellEditorConfiguration.java
@@ -15,8 +15,8 @@ package org.eclipse.papyrus.uml.nattable.config;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
-import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
@@ -57,7 +57,7 @@ public class UMLStereotypeMultiIntegerCellEditorConfiguration extends MultiInteg
Type type = prop.getType();
if (type instanceof DataType) {
final String name = type.getName();
- result = PrimitivesTypesUtils.UML_INTEGER.equals(name);
+ result = TypesConstants.INTEGER.equals(name) || TypesConstants.EINT.equals(name);
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiRealCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiRealCellEditorConfiguration.java
index 2ddf0e66a30..2957012edeb 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiRealCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiRealCellEditorConfiguration.java
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.PrimitiveType;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
@@ -57,7 +58,7 @@ public class UMLStereotypeMultiRealCellEditorConfiguration extends MultiRealCell
Type type = prop.getType();
if (type instanceof DataType) {
final String name = type.getName();
- result = PrimitivesTypesUtils.UML_REAL.equals(name);
+ result = type instanceof PrimitiveType && PrimitivesTypesUtils.UML_REAL.equals(name);
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiStringCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiStringCellEditorConfiguration.java
index 959b4f4f934..423db7f46a9 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiStringCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiStringCellEditorConfiguration.java
@@ -15,8 +15,8 @@ package org.eclipse.papyrus.uml.nattable.config;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
-import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
@@ -57,7 +57,7 @@ public class UMLStereotypeMultiStringCellEditorConfiguration extends MultiString
Type type = prop.getType();
if (type instanceof DataType) {
final String name = type.getName();
- result = PrimitivesTypesUtils.UML_STRING.equals(name);
+ result = TypesConstants.STRING.equals(name) || TypesConstants.ESTRING.equals(name);
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLBooleanCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLBooleanCellEditorConfiguration.java
new file mode 100644
index 00000000000..16f79bbef13
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLBooleanCellEditorConfiguration.java
@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.config;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * The cell editor configuration for the UML Stereotype multi UML boolean value.
+ */
+public class UMLStereotypeMultiUMLBooleanCellEditorConfiguration extends MultiBooleanCellEditorConfiguration {
+
+ /**
+ * The id of this editor.
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLBooleanCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.config.MultiBooleanCellEditorConfiguration#getConfigurationId()
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.config.MultiBooleanCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ */
+ @Override
+ public boolean handles(final Table table, final Object axisElement) {
+ boolean result = false;
+ final String id = AxisUtils.getPropertyId(axisElement);
+ if (id != null && id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
+ Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), id);
+ if (prop != null && prop.isMultivalued()) {
+ Type type = prop.getType();
+ if (type instanceof DataType) {
+ result = type instanceof PrimitiveType && PrimitivesTypesUtils.UML_BOOLEAN.equals(type.getName());
+ }
+ }
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLIntegerCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLIntegerCellEditorConfiguration.java
new file mode 100644
index 00000000000..50b5a303a5e
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLIntegerCellEditorConfiguration.java
@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.config;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * The cell editor configuration for the UML Stereotype multi UML integer value.
+ */
+public class UMLStereotypeMultiUMLIntegerCellEditorConfiguration extends MultiIntegerCellEditorConfiguration {
+
+ /**
+ * The id of this editor.
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLIntegerCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.config.MultiIntegerCellEditorConfiguration#getConfigurationId()
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.config.MultiIntegerCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ */
+ @Override
+ public boolean handles(final Table table, final Object axisElement) {
+ boolean result = false;
+ final String id = AxisUtils.getPropertyId(axisElement);
+ if (id != null && id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
+ Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), id);
+ if (prop != null && prop.isMultivalued()) {
+ Type type = prop.getType();
+ if (type instanceof DataType) {
+ result = type instanceof PrimitiveType && PrimitivesTypesUtils.UML_INTEGER.equals(type.getName());
+ }
+ }
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLStringCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLStringCellEditorConfiguration.java
new file mode 100644
index 00000000000..bb0030c45eb
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLStringCellEditorConfiguration.java
@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.config;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * The cell editor configuration for the UML Stereotype multi UML string value.
+ */
+public class UMLStereotypeMultiUMLStringCellEditorConfiguration extends MultiStringCellEditorConfiguration {
+
+ /**
+ * The id of this editor.
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLStringCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.config.MultiStringCellEditorConfiguration#getConfigurationId()
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.config.MultiStringCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ */
+ @Override
+ public boolean handles(final Table table, final Object axisElement) {
+ boolean result = false;
+ final String id = AxisUtils.getPropertyId(axisElement);
+ if (id != null && id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
+ Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), id);
+ if (prop != null && prop.isMultivalued()) {
+ Type type = prop.getType();
+ if (type instanceof DataType) {
+ result = type instanceof PrimitiveType && PrimitivesTypesUtils.UML_STRING.equals(type.getName());
+ }
+ }
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration.java
index 8a8c1f40ecd..e79f2645968 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration.java
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.PrimitiveType;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
@@ -57,7 +58,7 @@ public class UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration extends M
Type type = prop.getType();
if (type instanceof DataType) {
final String name = type.getName();
- result = PrimitivesTypesUtils.UML_UNLIMITED_NATURAL.equals(name);
+ result = type instanceof PrimitiveType && PrimitivesTypesUtils.UML_UNLIMITED_NATURAL.equals(name);
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleBooleanCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleBooleanCellEditorConfiguration.java
index 3bd13b98352..ca13a62b496 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleBooleanCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleBooleanCellEditorConfiguration.java
@@ -16,8 +16,8 @@ package org.eclipse.papyrus.uml.nattable.config;
import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleBooleanCellEditorConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
-import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
@@ -58,7 +58,7 @@ public class UMLStereotypeSingleBooleanCellEditorConfiguration extends SingleBoo
Type type = prop.getType();
if (type instanceof DataType) {
final String name = type.getName();
- result = PrimitivesTypesUtils.UML_BOOLEAN.equals(name);
+ result = TypesConstants.BOOLEAN.equals(name) || TypesConstants.EBOOLEAN.equals(name);
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleIntegerCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleIntegerCellEditorConfiguration.java
index 4a80048c103..eb97491750b 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleIntegerCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleIntegerCellEditorConfiguration.java
@@ -16,8 +16,8 @@ package org.eclipse.papyrus.uml.nattable.config;
import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleIntegerCellEditorConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
-import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
@@ -58,7 +58,7 @@ public class UMLStereotypeSingleIntegerCellEditorConfiguration extends SingleInt
Type type = prop.getType();
if (type instanceof DataType) {
final String name = type.getName();
- result = PrimitivesTypesUtils.UML_INTEGER.equals(name);
+ result = TypesConstants.INTEGER.equals(name) || TypesConstants.EINT.equals(name);
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleRealCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleRealCellEditorConfiguration.java
index 15ef2b6c283..967ca180f6e 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleRealCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleRealCellEditorConfiguration.java
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.PrimitiveType;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
@@ -57,7 +58,7 @@ public class UMLStereotypeSingleRealCellEditorConfiguration extends SingleRealCe
Type type = prop.getType();
if (type instanceof DataType) {
final String name = type.getName();
- result = PrimitivesTypesUtils.UML_REAL.equals(name);
+ result = type instanceof PrimitiveType && PrimitivesTypesUtils.UML_REAL.equals(name);
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleStringCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleStringCellEditorConfiguration.java
index 201e8ebb1a3..2d2fc21cb3c 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleStringCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleStringCellEditorConfiguration.java
@@ -16,8 +16,8 @@ package org.eclipse.papyrus.uml.nattable.config;
import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleStringCellEditorConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
-import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
@@ -58,7 +58,7 @@ public class UMLStereotypeSingleStringCellEditorConfiguration extends SingleStri
Type type = prop.getType();
if (type instanceof DataType) {
final String name = type.getName();
- result = PrimitivesTypesUtils.UML_STRING.equals(name);
+ result = TypesConstants.STRING.equals(name) || TypesConstants.ESTRING.equals(name);
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLBooleanCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLBooleanCellEditorConfiguration.java
new file mode 100644
index 00000000000..fd126128d8a
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLBooleanCellEditorConfiguration.java
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.config;
+
+import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleBooleanCellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * The cell editor configuration for the UML Stereotype single UML boolean value.
+ */
+public class UMLStereotypeSingleUMLBooleanCellEditorConfiguration extends SingleBooleanCellEditorConfiguration {
+
+ /**
+ * The id of this editor.
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLBooleanCellEditorConfiguration.CheckBox";//$NON-NLS-1$
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleBooleanCellEditorConfiguration#getConfigurationId()
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleBooleanCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ */
+ @Override
+ public boolean handles(final Table table, final Object axisElement) {
+ boolean result = false;
+ final String id = AxisUtils.getPropertyId(axisElement);
+ if (id != null && id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
+ Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), id);
+ if (prop != null && !prop.isMultivalued()) {
+ Type type = prop.getType();
+ if (type instanceof DataType) {
+ result = type instanceof PrimitiveType && PrimitivesTypesUtils.UML_BOOLEAN.equals(type.getName());
+ }
+ }
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLIntegerCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLIntegerCellEditorConfiguration.java
new file mode 100644
index 00000000000..f6a5190ccca
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLIntegerCellEditorConfiguration.java
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.config;
+
+import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleIntegerCellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * The cell editor configuration for the UML Stereotype single UML integer value.
+ */
+public class UMLStereotypeSingleUMLIntegerCellEditorConfiguration extends SingleIntegerCellEditorConfiguration {
+
+ /**
+ * The id of this editor.
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLIntegerCellEditorConfiguration.Text";//$NON-NLS-1$
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleIntegerCellEditorConfiguration#getConfigurationId()
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleIntegerCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ */
+ @Override
+ public boolean handles(final Table table, final Object axisElement) {
+ boolean result = false;
+ final String id = AxisUtils.getPropertyId(axisElement);
+ if (id != null && id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
+ Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), id);
+ if (prop != null && !prop.isMultivalued()) {
+ Type type = prop.getType();
+ if (type instanceof DataType) {
+ result = type instanceof PrimitiveType && PrimitivesTypesUtils.UML_INTEGER.equals(type.getName());
+ }
+ }
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLStringCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLStringCellEditorConfiguration.java
new file mode 100644
index 00000000000..0d19bd8b66a
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLStringCellEditorConfiguration.java
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.config;
+
+import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleStringCellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * The cell editor configuration for the UML Stereotype single UML string value.
+ */
+public class UMLStereotypeSingleUMLStringCellEditorConfiguration extends SingleStringCellEditorConfiguration {
+
+ /**
+ * The id of this editor.
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLStringCellEditorConfiguration.MultiLineText";//$NON-NLS-1$
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleStringCellEditorConfiguration#getConfigurationId()
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleStringCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+ */
+ @Override
+ public boolean handles(final Table table, final Object axisElement) {
+ boolean result = false;
+ final String id = AxisUtils.getPropertyId(axisElement);
+ if (id != null && id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
+ Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), id);
+ if (prop != null && !prop.isMultivalued()) {
+ Type type = prop.getType();
+ if (type instanceof DataType) {
+ result = type instanceof PrimitiveType && PrimitivesTypesUtils.UML_STRING.equals(type.getName());
+ }
+ }
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration.java
index 21035af7857..b9e59eae53e 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration.java
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.PrimitiveType;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
@@ -57,7 +58,7 @@ public class UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration extends
Type type = prop.getType();
if (type instanceof DataType) {
final String name = type.getName();
- result = PrimitivesTypesUtils.UML_UNLIMITED_NATURAL.equals(name);
+ result = type instanceof PrimitiveType && PrimitivesTypesUtils.UML_UNLIMITED_NATURAL.equals(name);
}
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLBooleanEditorFilterConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLBooleanEditorFilterConfiguration.java
index 510276bd662..118a39fda4a 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLBooleanEditorFilterConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLBooleanEditorFilterConfiguration.java
@@ -1,75 +1,76 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.nattable.filter.configuration;
-
-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
-import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration;
-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
-import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
-import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-
-/**
- * Configuration to filter UML Boolean value
- *
- */
-public class UMLBooleanEditorFilterConfiguration extends AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration {
-
- /**
- * the id for this editor
- */
- private static final String ID = "org.eclipse.papyrus.uml.nattable.boolean.checkboxcombo.with.NA"; //$NON-NLS-1$
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
- *
- * @param registry
- * @param axis
- * @return
- */
- @Override
- public boolean handles(IConfigRegistry registry, Object axis) {
- Object object = AxisUtils.getRepresentedElement(axis);
- if (object instanceof String) {
- String string = (String) object;
- if (string.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
- INattableModelManager manager = registry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
- Table table = manager.getTable();
- final Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), AxisUtils.getPropertyId(string));
- if (prop != null) {
- Type type = prop.getType();
- if (null != type){
- return PrimitivesTypesUtils.UML_BOOLEAN.equals(type.getName());
- }
- }
- }
- }
- return false;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()
- *
- * @return
- */
- @Override
- public String getConfigurationId() {
- return ID;
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.filter.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * Configuration to filter UML Boolean value
+ *
+ */
+public class UMLBooleanEditorFilterConfiguration extends AbstractBooleanFilterRowComboBoxCellEditorFilterConfiguration {
+
+ /**
+ * the id for this editor
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.boolean.checkboxcombo.with.NA"; //$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.IFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param axis
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object axis) {
+ Object object = AxisUtils.getRepresentedElement(axis);
+ if (object instanceof String) {
+ String string = (String) object;
+ if (string.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
+ INattableModelManager manager = registry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ Table table = manager.getTable();
+ final Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), AxisUtils.getPropertyId(string));
+ if (prop != null) {
+ Type type = prop.getType();
+ if (null != type){
+ return PrimitivesTypesUtils.UML_BOOLEAN.equals(type.getName()) || TypesConstants.EBOOLEAN.equals(type.getName());
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLIntegerEditorFilterConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLIntegerEditorFilterConfiguration.java
index 8aa1df990d6..417bab5fc69 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLIntegerEditorFilterConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLIntegerEditorFilterConfiguration.java
@@ -1,87 +1,88 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.nattable.filter.configuration;
-
-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
-import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractIntegerEditorFilterConfiguration;
-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
-import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
-import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-
-/**
- * @author VL222926
- *
- */
-public class UMLIntegerEditorFilterConfiguration extends AbstractIntegerEditorFilterConfiguration {
-
- /**
- * the id for this editor
- */
- private static final String ID = "org.eclipse.papyrus.uml.nattable.integer.text";//$NON-NLS-1$
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
- *
- * @param registry
- * @param columnElement
- * @return
- */
- @Override
- public boolean handles(IConfigRegistry registry, Object columnElement) {
- Object object = AxisUtils.getRepresentedElement(columnElement);
- if (object instanceof String) {
- String string = (String) object;
- if (string.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
- INattableModelManager manager = registry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
- Table table = manager.getTable();
- final Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), AxisUtils.getPropertyId(string));
- if (prop != null) {
- Type type = prop.getType();
- if (null != type){
- return PrimitivesTypesUtils.UML_INTEGER.equals(type.getName());
- }
- }
- }
- }
- return false;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractIntegerEditorFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String, List<Object>)
- *
- * @param configRegistry
- * @param configLabel
- * @param columnElement
- */
- @Override
- public void configureFilter(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
- super.configureFilter(configRegistry, columnElement, configLabel);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getConfigurationId()
- *
- * @return
- */
- @Override
- public String getConfigurationId() {
- return ID;
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.filter.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractIntegerEditorFilterConfiguration;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
+import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * @author VL222926
+ *
+ */
+public class UMLIntegerEditorFilterConfiguration extends AbstractIntegerEditorFilterConfiguration {
+
+ /**
+ * the id for this editor
+ */
+ private static final String ID = "org.eclipse.papyrus.uml.nattable.integer.text";//$NON-NLS-1$
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+ *
+ * @param registry
+ * @param columnElement
+ * @return
+ */
+ @Override
+ public boolean handles(IConfigRegistry registry, Object columnElement) {
+ Object object = AxisUtils.getRepresentedElement(columnElement);
+ if (object instanceof String) {
+ String string = (String) object;
+ if (string.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {
+ INattableModelManager manager = registry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+ Table table = manager.getTable();
+ final Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), AxisUtils.getPropertyId(string));
+ if (prop != null) {
+ Type type = prop.getType();
+ if (null != type){
+ return PrimitivesTypesUtils.UML_INTEGER.equals(type.getName()) || TypesConstants.EINT.equals(type.getName());
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.AbstractIntegerEditorFilterConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String, List<Object>)
+ *
+ * @param configRegistry
+ * @param configLabel
+ * @param columnElement
+ */
+ @Override
+ public void configureFilter(IConfigRegistry configRegistry, Object columnElement, String configLabel) {
+ super.configureFilter(configRegistry, columnElement, configLabel);
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.nattable.filter.configuration.TextEditorFilterConfiguration#getConfigurationId()
+ *
+ * @return
+ */
+ @Override
+ public String getConfigurationId() {
+ return ID;
+ }
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.notation
index 4eec201f866..62dae18d4f2 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.notation
@@ -5,10 +5,10 @@
<prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/genericTable.configuration#_Uz8agHDuEeWh-MssWmCB_A"/>
<tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
<columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_yKVVcIlHEeWBlO5sbr8vYw" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
- <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYgYlHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::singleBoolean">
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_UKVXsMqREeWfb98zdYdNrg" element="property_of_stereotype:/RootElement::TestAllCase::singleUMLBoolean">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
</axis>
- <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYhIlHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::multiBoolean">
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_UKVXscqREeWfb98zdYdNrg" element="property_of_stereotype:/RootElement::TestAllCase::multiUMlBoolean">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
</axis>
<axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYholHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::singleEnum">
@@ -17,16 +17,16 @@
<axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYg4lHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::multiEnum">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
</axis>
- <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYgIlHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::singleInt">
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_UKVXssqREeWfb98zdYdNrg" element="property_of_stereotype:/RootElement::TestAllCase::singleUMlInt">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
</axis>
- <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYhYlHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::multiInt">
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_UKVXs8qREeWfb98zdYdNrg" element="property_of_stereotype:/RootElement::TestAllCase::multiUMLInt">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
</axis>
- <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYgolHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::singleString">
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_UKVXtMqREeWfb98zdYdNrg" element="property_of_stereotype:/RootElement::TestAllCase::singleUMLString">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
</axis>
- <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYh4lHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::multiString">
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_UKVXtcqREeWfb98zdYdNrg" element="property_of_stereotype:/RootElement::TestAllCase::multiUMLString">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
</axis>
<axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiIxcIlHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::singleUnlimitedNatural">
@@ -35,14 +35,38 @@
<axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYiIlHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::multiUnlimitedNatural">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
</axis>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_UKVXtsqREeWfb98zdYdNrg" element="property_of_stereotype:/RootElement::TestAllCase::singleReal">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_UKVXt8qREeWfb98zdYdNrg" element="property_of_stereotype:/RootElement::TestAllCase::multiReal">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
<axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_3bmUUIoDEeWkPvqpW4ikAw" element="property_of_stereotype:/RootElement::TestAllCase::singleUMLReference">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
</axis>
<axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_3bmUUYoDEeWkPvqpW4ikAw" element="property_of_stereotype:/RootElement::TestAllCase::multiUMLReference">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
</axis>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYgYlHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::singleBoolean">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYhIlHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::multiBoolean">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYgIlHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::singleInt">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYhYlHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::multiInt">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYgolHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::singleString">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_yiJYh4lHEeWBlO5sbr8vYw" element="property_of_stereotype:/RootElement::TestAllCase::multiString">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+ </axis>
</columnAxisProvidersHistory>
- <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_yKVVcYlHEeWBlO5sbr8vYw" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
+ <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_yKVVcYlHEeWBlO5sbr8vYw" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider" disconnectSlave="true">
<axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_yhw-AIlHEeWBlO5sbr8vYw">
<manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
<element xmi:type="uml:Class" href="CellEditorsConfiguration.uml#_PaggYIlHEeWBlO5sbr8vYw"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.profile.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.profile.notation
index cef92f4dcdc..4c852e60390 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.profile.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.profile.notation
@@ -56,6 +56,38 @@
<element xmi:type="uml:Property" href="CellEditorsConfiguration.profile.uml#__bISkIlGEeWBlO5sbr8vYw"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_EXqeAYlHEeWBlO5sbr8vYw"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_RRrlAMqQEeWfb98zdYdNrg" type="3002">
+ <element xmi:type="uml:Property" href="CellEditorsConfiguration.profile.uml#_RRYqEMqQEeWfb98zdYdNrg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_RRrlAcqQEeWfb98zdYdNrg"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_RoIWIMqQEeWfb98zdYdNrg" type="3002">
+ <element xmi:type="uml:Property" href="CellEditorsConfiguration.profile.uml#_Rn1bMMqQEeWfb98zdYdNrg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_RoIWIcqQEeWfb98zdYdNrg"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_YiuwwMqQEeWfb98zdYdNrg" type="3002">
+ <element xmi:type="uml:Property" href="CellEditorsConfiguration.profile.uml#_YiNMUMqQEeWfb98zdYdNrg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_YiuwwcqQEeWfb98zdYdNrg"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Y3jKMMqQEeWfb98zdYdNrg" type="3002">
+ <element xmi:type="uml:Property" href="CellEditorsConfiguration.profile.uml#_Y3KIoMqQEeWfb98zdYdNrg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Y3jxQMqQEeWfb98zdYdNrg"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_a4MMQMqQEeWfb98zdYdNrg" type="3002">
+ <element xmi:type="uml:Property" href="CellEditorsConfiguration.profile.uml#_a3-w4MqQEeWfb98zdYdNrg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4MMQcqQEeWfb98zdYdNrg"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_cDndkMqQEeWfb98zdYdNrg" type="3002">
+ <element xmi:type="uml:Property" href="CellEditorsConfiguration.profile.uml#_cDZbIMqQEeWfb98zdYdNrg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_cDndkcqQEeWfb98zdYdNrg"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_dGgd8MqQEeWfb98zdYdNrg" type="3002">
+ <element xmi:type="uml:Property" href="CellEditorsConfiguration.profile.uml#_dGWs8MqQEeWfb98zdYdNrg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_dGgd8cqQEeWfb98zdYdNrg"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_eGOOgMqQEeWfb98zdYdNrg" type="3002">
+ <element xmi:type="uml:Property" href="CellEditorsConfiguration.profile.uml#_eGFEkMqQEeWfb98zdYdNrg"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_eGOOgcqQEeWfb98zdYdNrg"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_puT2QYlFEeWBlO5sbr8vYw"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_puT2QolFEeWBlO5sbr8vYw"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_puT2Q4lFEeWBlO5sbr8vYw"/>
@@ -68,7 +100,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_puT2SYlFEeWBlO5sbr8vYw"/>
</children>
<element xmi:type="uml:Stereotype" href="CellEditorsConfiguration.profile.uml#_puKsUIlFEeWBlO5sbr8vYw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_puO9wYlFEeWBlO5sbr8vYw" x="394" y="247" width="283" height="319"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_puO9wYlFEeWBlO5sbr8vYw" x="394" y="190" width="283" height="376"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_P8nkYIlGEeWBlO5sbr8vYw" type="2006">
<children xmi:type="notation:DecorationNode" xmi:id="_P8oLcIlGEeWBlO5sbr8vYw" type="5023"/>
@@ -100,7 +132,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_UZ_SI4lHEeWBlO5sbr8vYw"/>
</children>
<element xmi:type="uml:Profile" href="CellEditorsConfiguration.profile.uml#_UZ814IlHEeWBlO5sbr8vYw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UZ-rEYlHEeWBlO5sbr8vYw" x="86" y="38" width="312" height="149"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UZ-rEYlHEeWBlO5sbr8vYw" x="60" y="21" width="312" height="149"/>
</children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_d3xtIYlFEeWBlO5sbr8vYw" name="diagram_compatibility_version" stringValue="1.1.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_d3xtIolFEeWBlO5sbr8vYw"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.profile.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.profile.uml
index 3a74c809fd6..847da69a07d 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.profile.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.profile.uml
@@ -1,6 +1,240 @@
<?xml version="1.0" encoding="UTF-8"?>
<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_d1RywIlFEeWBlO5sbr8vYw" name="RootElement" metaclassReference="_n6cE4IlFEeWBlO5sbr8vYw">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GqLTMIlHEeWBlO5sbr8vYw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <contents xmi:type="ecore:EPackage" xmi:id="_ECBQUcqREeWfb98zdYdNrg" name="RootElement" nsURI="http:///schemas/RootElement/_ECBQUMqREeWfb98zdYdNrg/9" nsPrefix="RootElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ECBQUsqREeWfb98zdYdNrg" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_UZ814IlHEeWBlO5sbr8vYw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ECB3ZcqREeWfb98zdYdNrg" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ECB3ZsqREeWfb98zdYdNrg" key="Version" value="0.0.4"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ECB3Z8qREeWfb98zdYdNrg" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ECB3aMqREeWfb98zdYdNrg" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ECB3acqREeWfb98zdYdNrg" key="Date" value="2016-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ECB3asqREeWfb98zdYdNrg" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_ECBQU8qREeWfb98zdYdNrg" name="TestAllCase">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ECBQVMqREeWfb98zdYdNrg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_puKsUIlFEeWBlO5sbr8vYw"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQVcqREeWfb98zdYdNrg" name="singleUMLBoolean" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQV8qREeWfb98zdYdNrg" name="multiUMlBoolean" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQWcqREeWfb98zdYdNrg" name="singleUMLString" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQW8qREeWfb98zdYdNrg" name="multiUMLString" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQXcqREeWfb98zdYdNrg" name="singleUMlInt" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQX8qREeWfb98zdYdNrg" name="multiUMLInt" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQYcqREeWfb98zdYdNrg" name="singleEnum" ordered="false" lowerBound="1" eType="_ECBQf8qREeWfb98zdYdNrg"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQY8qREeWfb98zdYdNrg" name="multiEnum" ordered="false" upperBound="-1" eType="_ECBQf8qREeWfb98zdYdNrg"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQZcqREeWfb98zdYdNrg" name="singleUnlimitedNatural" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//UnlimitedNatural"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQZ8qREeWfb98zdYdNrg" name="multiUnlimitedNatural" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//UnlimitedNatural"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ECBQacqREeWfb98zdYdNrg" name="singleUMLReference" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ECBQa8qREeWfb98zdYdNrg" name="multiUMLReference" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ECBQbcqREeWfb98zdYdNrg" name="base_Class" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQb8qREeWfb98zdYdNrg" name="singleReal" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQccqREeWfb98zdYdNrg" name="multiReal" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQc8qREeWfb98zdYdNrg" name="singleBoolean" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQdcqREeWfb98zdYdNrg" name="multiBoolean" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQd8qREeWfb98zdYdNrg" name="singleString" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQecqREeWfb98zdYdNrg" name="multiString" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQe8qREeWfb98zdYdNrg" name="singleInt" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ECBQfcqREeWfb98zdYdNrg" name="multiInt" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_ECBQf8qREeWfb98zdYdNrg" name="Enum">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ECBQgMqREeWfb98zdYdNrg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_P8j6AIlGEeWBlO5sbr8vYw"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_ECBQgcqREeWfb98zdYdNrg" name="ZERO"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_ECBQgsqREeWfb98zdYdNrg" name="ONE" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_ECBQg8qREeWfb98zdYdNrg" name="TWO" value="2"/>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_BdnZ4MqREeWfb98zdYdNrg" name="RootElement" nsURI="http:///schemas/RootElement/_Bdmy0MqREeWfb98zdYdNrg/8" nsPrefix="RootElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BdnZ4cqREeWfb98zdYdNrg" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_UZ814IlHEeWBlO5sbr8vYw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BdooAsqREeWfb98zdYdNrg" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BdooA8qREeWfb98zdYdNrg" key="Version" value="0.0.3"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BdooBMqREeWfb98zdYdNrg" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BdooBcqREeWfb98zdYdNrg" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BdooBsqREeWfb98zdYdNrg" key="Date" value="2016-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BdooB8qREeWfb98zdYdNrg" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_BdnZ4sqREeWfb98zdYdNrg" name="TestAllCase">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BdnZ48qREeWfb98zdYdNrg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_puKsUIlFEeWBlO5sbr8vYw"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnZ5MqREeWfb98zdYdNrg" name="singleUMLBoolean" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnZ5sqREeWfb98zdYdNrg" name="multiUMlBoolean" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnZ6MqREeWfb98zdYdNrg" name="singleUMLString" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnZ6sqREeWfb98zdYdNrg" name="multiUMLString" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnZ7MqREeWfb98zdYdNrg" name="singleUMlInt" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnZ7sqREeWfb98zdYdNrg" name="multiUMLInt" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnZ8MqREeWfb98zdYdNrg" name="singleEnum" ordered="false" lowerBound="1" eType="_BdnaDsqREeWfb98zdYdNrg"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnZ8sqREeWfb98zdYdNrg" name="multiEnum" ordered="false" upperBound="-1" eType="_BdnaDsqREeWfb98zdYdNrg"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnZ9MqREeWfb98zdYdNrg" name="singleUnlimitedNatural" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//UnlimitedNatural"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnZ9sqREeWfb98zdYdNrg" name="multiUnlimitedNatural" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//UnlimitedNatural"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_BdnZ-MqREeWfb98zdYdNrg" name="singleUMLReference" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_BdnZ-sqREeWfb98zdYdNrg" name="multiUMLReference" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_BdnZ_MqREeWfb98zdYdNrg" name="base_Class" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnZ_sqREeWfb98zdYdNrg" name="singleReal" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnaAMqREeWfb98zdYdNrg" name="multiReal" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnaAsqREeWfb98zdYdNrg" name="singleBoolean" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnaBMqREeWfb98zdYdNrg" name="multiBoolean" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnaBsqREeWfb98zdYdNrg" name="singleString" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnaCMqREeWfb98zdYdNrg" name="multiString" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnaCsqREeWfb98zdYdNrg" name="SingleInt" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdnaDMqREeWfb98zdYdNrg" name="multiInt" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_BdnaDsqREeWfb98zdYdNrg" name="Enum">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BdnaD8qREeWfb98zdYdNrg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_P8j6AIlGEeWBlO5sbr8vYw"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_BdnaEMqREeWfb98zdYdNrg" name="ZERO"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_BdnaEcqREeWfb98zdYdNrg" name="ONE" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_BdnaEsqREeWfb98zdYdNrg" name="TWO" value="2"/>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_6zcn8MqQEeWfb98zdYdNrg" name="RootElement" nsURI="http:///schemas/RootElement/_6zaLsMqQEeWfb98zdYdNrg/7" nsPrefix="RootElement">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6zcn8cqQEeWfb98zdYdNrg" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_UZ814IlHEeWBlO5sbr8vYw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6zhgccqQEeWfb98zdYdNrg" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6zhgcsqQEeWfb98zdYdNrg" key="Version" value="0.0.2"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6zhgc8qQEeWfb98zdYdNrg" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6zhgdMqQEeWfb98zdYdNrg" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6zhgdcqQEeWfb98zdYdNrg" key="Date" value="2016-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6zhgdsqQEeWfb98zdYdNrg" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_6zcn8sqQEeWfb98zdYdNrg" name="TestAllCase">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6zcn88qQEeWfb98zdYdNrg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_puKsUIlFEeWBlO5sbr8vYw"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcn9MqQEeWfb98zdYdNrg" name="singleUMLBoolean" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcn9sqQEeWfb98zdYdNrg" name="multiUMlBoolean" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcn-MqQEeWfb98zdYdNrg" name="singleUMLString" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcn-sqQEeWfb98zdYdNrg" name="multiUMLString" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcn_MqQEeWfb98zdYdNrg" name="singleUMlInt" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcn_sqQEeWfb98zdYdNrg" name="multiUMLInt" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcoAMqQEeWfb98zdYdNrg" name="singleEnum" ordered="false" lowerBound="1" eType="_6zcoHsqQEeWfb98zdYdNrg"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcoAsqQEeWfb98zdYdNrg" name="multiEnum" ordered="false" upperBound="-1" eType="_6zcoHsqQEeWfb98zdYdNrg"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcoBMqQEeWfb98zdYdNrg" name="singleUnlimitedNatural" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//UnlimitedNatural"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcoBsqQEeWfb98zdYdNrg" name="multiUnlimitedNatural" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//UnlimitedNatural"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6zcoCMqQEeWfb98zdYdNrg" name="singleUMLReference" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6zcoCsqQEeWfb98zdYdNrg" name="multiUMLReference" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6zcoDMqQEeWfb98zdYdNrg" name="base_Class" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcoDsqQEeWfb98zdYdNrg" name="singleReal" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcoEMqQEeWfb98zdYdNrg" name="multiReal" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Real"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcoEsqQEeWfb98zdYdNrg" name="singleBoolean" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcoFMqQEeWfb98zdYdNrg" name="multiBoolean" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcoFsqQEeWfb98zdYdNrg" name="singleString" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcoGMqQEeWfb98zdYdNrg" name="multiString" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcoGsqQEeWfb98zdYdNrg" name="SingleInt" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6zcoHMqQEeWfb98zdYdNrg" name="multiInt" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_6zcoHsqQEeWfb98zdYdNrg" name="Enum">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6zcoH8qQEeWfb98zdYdNrg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_P8j6AIlGEeWBlO5sbr8vYw"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_6zcoIMqQEeWfb98zdYdNrg" name="ZERO"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_6zcoIcqQEeWfb98zdYdNrg" name="ONE" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_6zcoIsqQEeWfb98zdYdNrg" name="TWO" value="2"/>
+ </eClassifiers>
+ </contents>
<contents xmi:type="ecore:EPackage" xmi:id="_tYgewYoDEeWkPvqpW4ikAw" name="RootElement" nsURI="http:///schemas/RootElement/_tYgewIoDEeWkPvqpW4ikAw/6" nsPrefix="RootElement">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tYgewooDEeWkPvqpW4ikAw" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_UZ814IlHEeWBlO5sbr8vYw"/>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tYhs5YoDEeWkPvqpW4ikAw" source="PapyrusVersion">
@@ -361,26 +595,26 @@
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
</elementImport>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_puKsUIlFEeWBlO5sbr8vYw" name="TestAllCase">
- <ownedAttribute xmi:type="uml:Property" xmi:id="_q5qPEIlFEeWBlO5sbr8vYw" name="singleBoolean">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_q5qPEIlFEeWBlO5sbr8vYw" name="singleUMLBoolean">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_tEqHAIlFEeWBlO5sbr8vYw" name="multiBoolean">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_tEqHAIlFEeWBlO5sbr8vYw" name="multiUMlBoolean">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wX3kMIlFEeWBlO5sbr8vYw"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wYIp8IlFEeWBlO5sbr8vYw" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_00x0YIlFEeWBlO5sbr8vYw" name="singleString" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_00x0YIlFEeWBlO5sbr8vYw" name="singleUMLString" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_00ybcIlFEeWBlO5sbr8vYw" name="multiString">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_00ybcIlFEeWBlO5sbr8vYw" name="multiUMLString">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_00ybcYlFEeWBlO5sbr8vYw"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_00ybcolFEeWBlO5sbr8vYw" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_6J6GAIlFEeWBlO5sbr8vYw" name="singleInt" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_6J6GAIlFEeWBlO5sbr8vYw" name="singleUMlInt" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_6J6tEIlFEeWBlO5sbr8vYw" name="multiInt">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_6J6tEIlFEeWBlO5sbr8vYw" name="multiUMLInt">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6J6tEYlFEeWBlO5sbr8vYw"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6J6tEolFEeWBlO5sbr8vYw" value="*"/>
@@ -409,6 +643,38 @@
<ownedAttribute xmi:type="uml:Property" xmi:id="_ikMnoIoDEeWkPvqpW4ikAw" name="base_Class" association="_ikKLYIoDEeWkPvqpW4ikAw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_RRYqEMqQEeWfb98zdYdNrg" name="singleReal">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Rn1bMMqQEeWfb98zdYdNrg" name="multiReal">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VpFqIMqQEeWfb98zdYdNrg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VpIGYMqQEeWfb98zdYdNrg" value="*"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_YiNMUMqQEeWfb98zdYdNrg" name="singleBoolean">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBoolean"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Y3KIoMqQEeWfb98zdYdNrg" name="multiBoolean">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBoolean"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pRIAsMqQEeWfb98zdYdNrg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pRJO0MqQEeWfb98zdYdNrg" value="*"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_a3-w4MqQEeWfb98zdYdNrg" name="singleString">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_cDZbIMqQEeWfb98zdYdNrg" name="multiString">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_37TWIMqQEeWfb98zdYdNrg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_37VLUMqQEeWfb98zdYdNrg" value="*"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_dGWs8MqQEeWfb98zdYdNrg" name="singleInt">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_eGFEkMqQEeWfb98zdYdNrg" name="multiInt">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3d1XAMqQEeWfb98zdYdNrg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3d62kMqQEeWfb98zdYdNrg" value="*"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_P8j6AIlGEeWBlO5sbr8vYw" name="Enum">
<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_VS2pQIlGEeWBlO5sbr8vYw" name="ZERO">
@@ -423,6 +689,33 @@
</packagedElement>
<packagedElement xmi:type="uml:Profile" xmi:id="_UZ814IlHEeWBlO5sbr8vYw" name="Profile1">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dcWqgYlHEeWBlO5sbr8vYw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <contents xmi:type="ecore:EPackage" xmi:id="_ECB3YcqREeWfb98zdYdNrg" name="Profile1" nsURI="http://RootElement/schemas/Profile1/_ECB3YMqREeWfb98zdYdNrg/8" nsPrefix="Profile1">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ECB3a8qREeWfb98zdYdNrg" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ECB3bMqREeWfb98zdYdNrg" key="Version" value="0.0.4"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ECB3bcqREeWfb98zdYdNrg" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ECB3bsqREeWfb98zdYdNrg" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ECB3b8qREeWfb98zdYdNrg" key="Date" value="2016-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ECB3cMqREeWfb98zdYdNrg" key="Author" value=""/>
+ </eAnnotations>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_BdoA8cqREeWfb98zdYdNrg" name="Profile1" nsURI="http://RootElement/schemas/Profile1/_BdoA8MqREeWfb98zdYdNrg/7" nsPrefix="Profile1">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BdooCMqREeWfb98zdYdNrg" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BdooCcqREeWfb98zdYdNrg" key="Version" value="0.0.3"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BdooCsqREeWfb98zdYdNrg" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BdooC8qREeWfb98zdYdNrg" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BdooDMqREeWfb98zdYdNrg" key="Date" value="2016-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BdooDcqREeWfb98zdYdNrg" key="Author" value=""/>
+ </eAnnotations>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_6zedIcqQEeWfb98zdYdNrg" name="Profile1" nsURI="http://RootElement/schemas/Profile1/_6zedIMqQEeWfb98zdYdNrg/6" nsPrefix="Profile1">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6ziHgMqQEeWfb98zdYdNrg" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6ziHgcqQEeWfb98zdYdNrg" key="Version" value="0.0.2"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6ziHgsqQEeWfb98zdYdNrg" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6ziHg8qQEeWfb98zdYdNrg" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6ziHhMqQEeWfb98zdYdNrg" key="Date" value="2016-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6ziHhcqQEeWfb98zdYdNrg" key="Author" value=""/>
+ </eAnnotations>
+ </contents>
<contents xmi:type="ecore:EPackage" xmi:id="_tYhs4YoDEeWkPvqpW4ikAw" name="Profile1" nsURI="http://RootElement/schemas/Profile1/_tYhs4IoDEeWkPvqpW4ikAw/5" nsPrefix="Profile1">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tYiT8IoDEeWkPvqpW4ikAw" source="PapyrusVersion">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tYiT8YoDEeWkPvqpW4ikAw" key="Version" value="0.0.1"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.uml
index f840f20a997..62367b1e8a3 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/resources/cellEditors/CellEditorsConfiguration.uml
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:RootElement="http:///schemas/RootElement/_tYgewIoDEeWkPvqpW4ikAw/6" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RootElement/_tYgewIoDEeWkPvqpW4ikAw/6 CellEditorsConfiguration.profile.uml#_tYgewYoDEeWkPvqpW4ikAw">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:RootElement="http:///schemas/RootElement/_ECBQUMqREeWfb98zdYdNrg/9" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RootElement/_ECBQUMqREeWfb98zdYdNrg/9 CellEditorsConfiguration.profile.uml#_ECBQUcqREeWfb98zdYdNrg">
<uml:Model xmi:id="_juvggIlFEeWBlO5sbr8vYw" name="RootElement">
<packagedElement xmi:type="uml:Class" xmi:id="_PaggYIlHEeWBlO5sbr8vYw" name="Class1"/>
<profileApplication xmi:type="uml:ProfileApplication" xmi:id="_0eDlIIoDEeWkPvqpW4ikAw">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0eEMMYoDEeWkPvqpW4ikAw" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0eEMMooDEeWkPvqpW4ikAw" key="Version" value="0.0.1"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0eEMM4oDEeWkPvqpW4ikAw" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0eEMNIoDEeWkPvqpW4ikAw" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0eEMNYoDEeWkPvqpW4ikAw" key="Date" value="2015-11-13"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0eEMNooDEeWkPvqpW4ikAw" key="Author" value=""/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VGPCcMqVEeWU0vBEcKtlYQ" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VGPCccqVEeWU0vBEcKtlYQ" key="Version" value="0.0.4"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VGPCcsqVEeWU0vBEcKtlYQ" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VGPCc8qVEeWU0vBEcKtlYQ" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VGPCdMqVEeWU0vBEcKtlYQ" key="Date" value="2016-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VGPCdcqVEeWU0vBEcKtlYQ" key="Author" value=""/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0eEMMIoDEeWkPvqpW4ikAw" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="CellEditorsConfiguration.profile.uml#_tYgewYoDEeWkPvqpW4ikAw"/>
+ <references xmi:type="ecore:EPackage" href="CellEditorsConfiguration.profile.uml#_ECBQUcqREeWfb98zdYdNrg"/>
</eAnnotations>
<appliedProfile xmi:type="uml:Profile" href="CellEditorsConfiguration.profile.uml#_d1RywIlFEeWBlO5sbr8vYw"/>
</profileApplication>
<profileApplication xmi:type="uml:ProfileApplication" xmi:id="_0eGBYIoDEeWkPvqpW4ikAw">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0eGocIoDEeWkPvqpW4ikAw" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0eGocYoDEeWkPvqpW4ikAw" key="Version" value="0.0.1"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0eGocooDEeWkPvqpW4ikAw" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0eGoc4oDEeWkPvqpW4ikAw" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0eGodIoDEeWkPvqpW4ikAw" key="Date" value="2015-11-13"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0eGodYoDEeWkPvqpW4ikAw" key="Author" value=""/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VGPpgMqVEeWU0vBEcKtlYQ" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VGPpgcqVEeWU0vBEcKtlYQ" key="Version" value="0.0.4"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VGPpgsqVEeWU0vBEcKtlYQ" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VGPpg8qVEeWU0vBEcKtlYQ" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VGPphMqVEeWU0vBEcKtlYQ" key="Date" value="2016-02-03"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VGPphcqVEeWU0vBEcKtlYQ" key="Author" value=""/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0eGBYYoDEeWkPvqpW4ikAw" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="CellEditorsConfiguration.profile.uml#_tYhs4YoDEeWkPvqpW4ikAw"/>
+ <references xmi:type="ecore:EPackage" href="CellEditorsConfiguration.profile.uml#_ECB3YcqREeWfb98zdYdNrg"/>
</eAnnotations>
<appliedProfile xmi:type="uml:Profile" href="CellEditorsConfiguration.profile.uml#_UZ814IlHEeWBlO5sbr8vYw"/>
</profileApplication>
</uml:Model>
- <RootElement:TestAllCase xmi:id="_1ma7YIoDEeWkPvqpW4ikAw" base_Class="_PaggYIlHEeWBlO5sbr8vYw"/>
+ <RootElement:TestAllCase xmi:id="_1ma7YIoDEeWkPvqpW4ikAw" base_Class="_PaggYIlHEeWBlO5sbr8vYw" singleString=""/>
</xmi:XMI>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/CellEditorsConfigurationTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/CellEditorsConfigurationTest.java
deleted file mode 100644
index 0a71fc5c269..00000000000
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/CellEditorsConfigurationTest.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.nattable.generic.tests.bugs;
-
-import java.util.List;
-
-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.TableUtils;
-import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
-import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.uml2.uml.Model;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-/**
- * This allows to test the cell editors containing for all cells.
- */
-@PluginResource("resources/cellEditors/CellEditorsConfiguration.di")
-public class CellEditorsConfigurationTest extends AbstractPapyrusTest {
-
- /**
- * The table name.
- */
- private static final String TABLE_NAME = "GenericTable0"; //$NON-NLS-1$
-
- /**
- * The papyrus fixture.
- */
- @Rule
- public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
-
- /**
- * Constructor.
- */
- public CellEditorsConfigurationTest() {
- super();
- }
-
- /**
- * This allow to initialize the tests.
- */
- @Before
- public void init() {
- final Model model = (Model) fixture.getModel();
- Assert.assertNotNull("RootModel is null", model); //$NON-NLS-1$
-
- // Get the table and open it
- Table mainTable = TableUtils.getNotationFirstTable(fixture.getModelSet(), TABLE_NAME);
- fixture.getPageManager().openPage(mainTable);
- fixture.flushDisplayEvents();
- }
-
- /**
- * The test for the change index of the column.
- *
- * @throws Exception
- * The exception.
- */
- @Test
- public void testCellEditorsConfigruation() throws Exception {
- // Open the table and get the manager
- IPageManager pageManager = fixture.getPageManager();
- List<Object> pages = pageManager.allPages();
- pageManager.openPage(pages.get(0));
- IEditorPart part = fixture.getEditor().getActiveEditor();
- Assert.assertTrue(part instanceof NatTableEditor);
- NatTableEditor editor = (NatTableEditor) part;
- INattableModelManager currentManager = (INattableModelManager) editor.getAdapter(INattableModelManager.class);
- Assert.assertTrue(currentManager instanceof INattableModelManager);
-
- // The first cell must be an UMLStereotypeSingleBooleanCellEditorConfiguration
- ILayerCell cell0 = currentManager.getBodyLayerStack().getCellByPosition(0, 0);
- Assert.assertNotEquals("The first cell must have config labels", null, cell0.getConfigLabels()); //$NON-NLS-1$
- Assert.assertNotEquals("The first cell must have at least one cell editor configuration", 0, cell0.getConfigLabels().getLabels().size()); //$NON-NLS-1$
- Assert.assertEquals("The first cell editor must be an UMLStereotypeSingleBooleanCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleBooleanCellEditorConfiguration.CheckBox0", //$NON-NLS-1$ //$NON-NLS-2$
- cell0.getConfigLabels().getLabels().get(0));
-
- // The second cell must be an UMLStereotypeMultiBooleanCellEditorConfiguration
- ILayerCell cell1 = currentManager.getBodyLayerStack().getCellByPosition(1, 0);
- Assert.assertNotEquals("The second cell must have config labels", null, cell1.getConfigLabels()); //$NON-NLS-1$
- Assert.assertNotEquals("The second cell must have at least one cell editor configuration", 0, cell1.getConfigLabels().getLabels().size()); //$NON-NLS-1$
- Assert.assertEquals("The second cell editor must be an UMLStereotypeMultiBooleanCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiBooleanCellEditorConfiguration.MultiEditor1", //$NON-NLS-1$ //$NON-NLS-2$
- cell1.getConfigLabels().getLabels().get(0));
-
- // The third cell must be an UMLStereotypeSingleUMLEnumerationCellEditorConfiguration
- ILayerCell cell2 = currentManager.getBodyLayerStack().getCellByPosition(2, 0);
- Assert.assertNotEquals("The third cell must have config labels", null, cell2.getConfigLabels()); //$NON-NLS-1$
- Assert.assertNotEquals("The third cell must have at least one cell editor configuration", 0, cell2.getConfigLabels().getLabels().size()); //$NON-NLS-1$
- Assert.assertEquals("The third cell editor must be an UMLStereotypeSingleUMLEnumerationCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLEnumerationCellEditorConfiguration.ComboBox2", //$NON-NLS-1$ //$NON-NLS-2$
- cell2.getConfigLabels().getLabels().get(0));
-
- // The fourth cell must be an UMLStereotypeMultiUMLEnumerationCellEditorConfiguration
- ILayerCell cell3 = currentManager.getBodyLayerStack().getCellByPosition(3, 0);
- Assert.assertNotEquals("The fourth cell must have config labels", null, cell3.getConfigLabels()); //$NON-NLS-1$
- Assert.assertNotEquals("The fourth cell must have at least one cell editor configuration", 0, cell3.getConfigLabels().getLabels().size()); //$NON-NLS-1$
- Assert.assertEquals("The fourth cell editor must be an UMLStereotypeMultiUMLEnumerationCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLEnumerationCellEditorConfiguration.MultiEditor3", //$NON-NLS-1$ //$NON-NLS-2$
- cell3.getConfigLabels().getLabels().get(0));
-
- // The fifth cell must be an UMLStereotypeSingleIntegerCellEditorConfiguration
- ILayerCell cell4 = currentManager.getBodyLayerStack().getCellByPosition(4, 0);
- Assert.assertNotEquals("The fifth cell must have config labels", null, cell4.getConfigLabels()); //$NON-NLS-1$
- Assert.assertNotEquals("The fifth cell must have at least one cell editor configuration", 0, cell4.getConfigLabels().getLabels().size()); //$NON-NLS-1$
- Assert.assertEquals("The fifth cell editor must be an UMLStereotypeSingleIntegerCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleIntegerCellEditorConfiguration.Text4", //$NON-NLS-1$ //$NON-NLS-2$
- cell4.getConfigLabels().getLabels().get(0));
-
- // The sixth cell must be an UMLStereotypeMultiIntegerCellEditorConfiguration
- ILayerCell cell5 = currentManager.getBodyLayerStack().getCellByPosition(5, 0);
- Assert.assertNotEquals("The sixth cell must have config labels", null, cell5.getConfigLabels()); //$NON-NLS-1$
- Assert.assertNotEquals("The sixth cell must have at least one cell editor configuration", 0, cell5.getConfigLabels().getLabels().size()); //$NON-NLS-1$
- Assert.assertEquals("The sixth cell editor must be an UMLStereotypeMultiIntegerCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiIntegerCellEditorConfiguration.MultiEditor5", //$NON-NLS-1$ //$NON-NLS-2$
- cell5.getConfigLabels().getLabels().get(0));
-
- // The seventh cell must be an UMLStereotypeSingleStringCellEditorConfiguration
- ILayerCell cell6 = currentManager.getBodyLayerStack().getCellByPosition(6, 0);
- Assert.assertNotEquals("The seventh cell must have config labels", null, cell6.getConfigLabels()); //$NON-NLS-1$
- Assert.assertNotEquals("The seventh cell must have at least one cell editor configuration", 0, cell6.getConfigLabels().getLabels().size()); //$NON-NLS-1$
- Assert.assertEquals("The seventh cell editor must be an UMLStereotypeSingleStringCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleStringCellEditorConfiguration.MultiLineText6", //$NON-NLS-1$ //$NON-NLS-2$
- cell6.getConfigLabels().getLabels().get(0));
-
- // The height cell must be an UMLStereotypeMultiStringCellEditorConfiguration
- ILayerCell cell7 = currentManager.getBodyLayerStack().getCellByPosition(7, 0);
- Assert.assertNotEquals("The height cell must have config labels", null, cell7.getConfigLabels()); //$NON-NLS-1$
- Assert.assertNotEquals("The height cell must have at least one cell editor configuration", 0, cell7.getConfigLabels().getLabels().size()); //$NON-NLS-1$
- Assert.assertEquals("The height cell editor must be an UMLStereotypeMultiStringCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiStringCellEditorConfiguration.MultiEditor7", //$NON-NLS-1$ //$NON-NLS-2$
- cell7.getConfigLabels().getLabels().get(0));
-
- // The ninth cell must be an UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration
- ILayerCell cell8 = currentManager.getBodyLayerStack().getCellByPosition(8, 0);
- Assert.assertNotEquals("The ninth cell must have config labels", null, cell8.getConfigLabels());
- Assert.assertNotEquals("The ninth cell must have at least one cell editor configuration", 0, cell8.getConfigLabels().getLabels().size());
- Assert.assertEquals("The ninth cell editor must be an UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration.Text8", //$NON-NLS-1$ //$NON-NLS-2$
- cell8.getConfigLabels().getLabels().get(0));
-
- // The tenth cell must be an UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration
- ILayerCell cell9 = currentManager.getBodyLayerStack().getCellByPosition(9, 0);
- Assert.assertNotEquals("The tenth cell must have config labels", null, cell9.getConfigLabels());
- Assert.assertNotEquals("The tenth cell must have at least one cell editor configuration", 0, cell9.getConfigLabels().getLabels().size());
- Assert.assertEquals("The tenth cell editor must be an UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration.MultiEditor9", //$NON-NLS-1$ //$NON-NLS-2$
- cell9.getConfigLabels().getLabels().get(0));
-
- // The eleventh cell must be an UMLStereotypeSingleUMLReferenceCellEditorConfiguration
- ILayerCell cell10 = currentManager.getBodyLayerStack().getCellByPosition(10, 0);
- Assert.assertNotEquals("The eleventh cell must have config labels", null, cell10.getConfigLabels());
- Assert.assertNotEquals("The eleventh cell must have at least one cell editor configuration", 0, cell10.getConfigLabels().getLabels().size());
- Assert.assertEquals("The eleventh cell editor must be an UMLStereotypeSingleUMLReferenceCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLReferenceCellEditorConfiguration.Reference10", //$NON-NLS-1$ //$NON-NLS-2$
- cell10.getConfigLabels().getLabels().get(0));
-
- // The twelveth cell must be an UMLStereotypeMultiUMLReferenceCellEditorConfiguration
- ILayerCell cell11 = currentManager.getBodyLayerStack().getCellByPosition(11, 0);
- Assert.assertNotEquals("The twelveth cell must have config labels", null, cell11.getConfigLabels());
- Assert.assertNotEquals("The twelveth cell must have at least one cell editor configuration", 0, cell11.getConfigLabels().getLabels().size());
- Assert.assertEquals("The twelveth cell editor must be an UMLStereotypeMultiUMLReferenceCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLReferenceCellEditorConfiguration.MultiEditor11", //$NON-NLS-1$ //$NON-NLS-2$
- cell11.getConfigLabels().getLabels().get(0));
- }
-}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java
index fc58e232ae0..f54aaffdaa7 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java
@@ -19,7 +19,6 @@ import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.eclipse.papyrus.uml.nattable.generic.tests.bugs.AddElementsOnConnectedTableTest;
import org.eclipse.papyrus.uml.nattable.generic.tests.bugs.AxisChangeIndexWithConfigurationTest;
import org.eclipse.papyrus.uml.nattable.generic.tests.bugs.AxisChangeIndexWithoutConfigurationTest;
-import org.eclipse.papyrus.uml.nattable.generic.tests.bugs.CellEditorsConfigurationTest;
import org.eclipse.papyrus.uml.nattable.generic.tests.bugs.EnumerationContentItemsTest;
import org.eclipse.papyrus.uml.nattable.generic.tests.bugs.InvertedAxisChangeIndexWithConfigurationTest;
import org.eclipse.papyrus.uml.nattable.generic.tests.bugs.InvertedAxisChangeIndexWithoutConfigurationTest;
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/CellEditorsConfigurationTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/CellEditorsConfigurationTest.java
new file mode 100644
index 00000000000..93fb07e7bad
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/CellEditorsConfigurationTest.java
@@ -0,0 +1,280 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.generic.tests.tests;
+
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.TableUtils;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.uml2.uml.Model;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * This allows to test the cell editors containing for all cells.
+ */
+@PluginResource("resources/cellEditors/CellEditorsConfiguration.di")
+public class CellEditorsConfigurationTest extends AbstractPapyrusTest {
+
+ /**
+ * The table name.
+ */
+ private static final String TABLE_NAME = "GenericTable0"; //$NON-NLS-1$
+
+ /**
+ * The papyrus fixture.
+ */
+ @Rule
+ public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
+
+ /**
+ * Constructor.
+ */
+ public CellEditorsConfigurationTest() {
+ super();
+ }
+
+ /**
+ * This allow to initialize the tests.
+ */
+ @Before
+ public void init() {
+ final Model model = (Model) fixture.getModel();
+ Assert.assertNotNull("RootModel is null", model); //$NON-NLS-1$
+
+ // Get the table and open it
+ Table mainTable = TableUtils.getNotationFirstTable(fixture.getModelSet(), TABLE_NAME);
+ fixture.getPageManager().openPage(mainTable);
+ fixture.flushDisplayEvents();
+ }
+
+ /**
+ * The test for the change index of the column.
+ *
+ * @throws Exception
+ * The exception.
+ */
+ @Test
+ public void testCellEditorsConfigruation() throws Exception {
+ // Open the table and get the manager
+ IPageManager pageManager = fixture.getPageManager();
+ List<Object> pages = pageManager.allPages();
+ pageManager.openPage(pages.get(0));
+ IEditorPart part = fixture.getEditor().getActiveEditor();
+ Assert.assertTrue(part instanceof NatTableEditor);
+ NatTableEditor editor = (NatTableEditor) part;
+ INattableModelManager currentManager = (INattableModelManager) editor.getAdapter(INattableModelManager.class);
+ Assert.assertTrue(currentManager instanceof INattableModelManager);
+
+ int nbUMLCellEditors = checkUMLCellEditors(currentManager, 0);
+ checkEMFCellEditors(currentManager, nbUMLCellEditors);
+ }
+
+ /**
+ * This allows to check the cell editors corresponding to UML Types.
+ *
+ * @param currentManager the current nattable model manager.
+ * @param nbCellsBefore The number of cells before the first one.
+ */
+ private int checkUMLCellEditors(final INattableModelManager currentManager, final int nbCellsBefore) {
+
+ int currentCellNumber = nbCellsBefore;
+
+ // The first cell must be an UMLStereotypeSingleUMLBooleanCellEditorConfiguration
+ final ILayerCell cell0 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The first UML cell must have config labels", null, cell0.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The first UML cell must have at least one cell editor configuration", 0, cell0.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The first UML cell editor must be an UMLStereotypeSingleUMLBooleanCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLBooleanCellEditorConfiguration.CheckBox" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell0.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The second cell must be an UMLStereotypeMultiUMLBooleanCellEditorConfiguration
+ final ILayerCell cell1 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The second UML cell must have config labels", null, cell1.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The second UML cell must have at least one cell editor configuration", 0, cell1.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The second UML cell editor must be an UMLStereotypeMultiUMLBooleanCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLBooleanCellEditorConfiguration.MultiEditor" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell1.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The third cell must be an UMLStereotypeSingleUMLEnumerationCellEditorConfiguration
+ final ILayerCell cell2 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The third UML cell must have config labels", null, cell2.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The third UML cell must have at least one cell editor configuration", 0, cell2.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The third UML cell editor must be an UMLStereotypeSingleUMLEnumerationCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLEnumerationCellEditorConfiguration.ComboBox" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell2.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The fourth cell must be an UMLStereotypeMultiUMLEnumerationCellEditorConfiguration
+ final ILayerCell cell3 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The fourth UML cell must have config labels", null, cell3.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The fourth UML cell must have at least one cell editor configuration", 0, cell3.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The fourth UML cell editor must be an UMLStereotypeMultiUMLEnumerationCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLEnumerationCellEditorConfiguration.MultiEditor" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell3.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The fifth cell must be an UMLStereotypeSingleUMLIntegerCellEditorConfiguration
+ final ILayerCell cell4 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The fifth UML cell must have config labels", null, cell4.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The fifth UML cell must have at least one cell editor configuration", 0, cell4.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The fifth UML cell editor must be an UMLStereotypeSingleUMLIntegerCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLIntegerCellEditorConfiguration.Text" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell4.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The sixth cell must be an UMLStereotypeMultiUMLIntegerCellEditorConfiguration
+ final ILayerCell cell5 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The sixth UML cell must have config labels", null, cell5.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The sixth UML cell must have at least one cell editor configuration", 0, cell5.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The sixth UML cell editor must be an UMLStereotypeMultiUMLIntegerCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLIntegerCellEditorConfiguration.MultiEditor" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell5.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The seventh cell must be an UMLStereotypeSingleUMLStringCellEditorConfiguration
+ final ILayerCell cell6 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The seventh UML cell must have config labels", null, cell6.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The seventh UML cell must have at least one cell editor configuration", 0, cell6.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The seventh UML cell editor must be an UMLStereotypeSingleUMLStringCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLStringCellEditorConfiguration.MultiLineText" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell6.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The height cell must be an UMLStereotypeMultiUMLStringCellEditorConfiguration
+ final ILayerCell cell7 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The height UML cell must have config labels", null, cell7.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The height UML cell must have at least one cell editor configuration", 0, cell7.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The height UML cell editor must be an UMLStereotypeMultiUMLStringCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLStringCellEditorConfiguration.MultiEditor" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell7.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The ninth cell must be an UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration
+ final ILayerCell cell8 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The ninth UML cell must have config labels", null, cell8.getConfigLabels());
+ Assert.assertNotEquals("The ninth UML cell must have at least one cell editor configuration", 0, cell8.getConfigLabels().getLabels().size());
+ Assert.assertEquals("The ninth UML cell editor must be an UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration.Text" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell8.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The tenth cell must be an UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration
+ final ILayerCell cell9 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The tenth UML cell must have config labels", null, cell9.getConfigLabels());
+ Assert.assertNotEquals("The tenth UML cell must have at least one cell editor configuration", 0, cell9.getConfigLabels().getLabels().size());
+ Assert.assertEquals("The tenth UML cell editor must be an UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration.MultiEditor" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell9.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The eleventh cell must be an UMLStereotypeSingleRealCellEditorConfiguration
+ final ILayerCell cell10 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The eleventh UML cell must have config labels", null, cell10.getConfigLabels());
+ Assert.assertNotEquals("The eleventh UML cell must have at least one cell editor configuration", 0, cell10.getConfigLabels().getLabels().size());
+ Assert.assertEquals("The eleventh UML cell editor must be an UMLStereotypeSingleRealCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleRealCellEditorConfiguration.Text" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell10.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The twelveth cell must be an UMLStereotypeSingleRealCellEditorConfiguration
+ final ILayerCell cell11 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The twelveth UML cell must have config labels", null, cell11.getConfigLabels());
+ Assert.assertNotEquals("The twelveth UML cell must have at least one cell editor configuration", 0, cell11.getConfigLabels().getLabels().size());
+ Assert.assertEquals("The twelveth UML cell editor must be an UMLStereotypeMultiRealCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiRealCellEditorConfiguration.MultiEditor" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell11.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The thirteenth cell must be an UMLStereotypeMultiRealCellEditorConfiguration
+ final ILayerCell cell12 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The thirteenth UML cell must have config labels", null, cell12.getConfigLabels());
+ Assert.assertNotEquals("The thirteenth UML cell must have at least one cell editor configuration", 0, cell12.getConfigLabels().getLabels().size());
+ Assert.assertEquals("The thirteenth UML cell editor must be an UMLStereotypeSingleUMLReferenceCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLReferenceCellEditorConfiguration.Reference" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell12.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The fourteenth cell must be an UMLStereotypeMultiUMLReferenceCellEditorConfiguration
+ final ILayerCell cell13 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The fourteenth UML cell must have config labels", null, cell13.getConfigLabels());
+ Assert.assertNotEquals("The fourteenth UML cell must have at least one cell editor configuration", 0, cell13.getConfigLabels().getLabels().size());
+ Assert.assertEquals("The fourteenth UML cell editor must be an UMLStereotypeMultiUMLReferenceCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLReferenceCellEditorConfiguration.MultiEditor" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell13.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ return currentCellNumber;
+ }
+
+ /**
+ * This allows to check the cell editors corresponding to EMF Types.
+ *
+ * @param currentManager The current nattable model manager.
+ * @param nbCellsBefore The number of cells before the first one.
+ */
+ private int checkEMFCellEditors(final INattableModelManager currentManager, final int nbCellsBefore) {
+
+ int currentCellNumber = nbCellsBefore;
+
+ // The first cell must be an UMLStereotypeSingleBooleanCellEditorConfiguration
+ final ILayerCell cell0 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The first EMF cell must have config labels", null, cell0.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The first EMF cell must have at least one cell editor configuration", 0, cell0.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The first EMF cell editor must be an UMLStereotypeSingleBooleanCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleBooleanCellEditorConfiguration.CheckBox" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell0.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The second cell must be an UMLStereotypeMultiBooleanCellEditorConfiguration
+ final ILayerCell cell1 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The second EMF cell must have config labels", null, cell1.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The second EMF cell must have at least one cell editor configuration", 0, cell1.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The second EMF cell editor must be an UMLStereotypeMultiBooleanCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiBooleanCellEditorConfiguration.MultiEditor" +currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell1.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The third cell must be an UMLStereotypeSingleIntegerCellEditorConfiguration
+ final ILayerCell cell2 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The third EMF cell must have config labels", null, cell2.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The third EMF cell must have at least one cell editor configuration", 0, cell2.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The third EMF cell editor must be an UMLStereotypeSingleIntegerCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleIntegerCellEditorConfiguration.Text" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell2.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The fourth cell must be an UMLStereotypeMultiIntegerCellEditorConfiguration
+ final ILayerCell cell3 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The fourth EMF cell must have config labels", null, cell3.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The fourth EMF cell must have at least one cell editor configuration", 0, cell3.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The fourth EMF cell editor must be an UMLStereotypeMultiIntegerCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiIntegerCellEditorConfiguration.MultiEditor" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell3.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The fifth cell must be an UMLStereotypeSingleStringCellEditorConfiguration
+ final ILayerCell cell4 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The fifth EMF cell must have config labels", null, cell4.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The fifth EMF cell must have at least one cell editor configuration", 0, cell4.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The fifth EMF cell editor must be an UMLStereotypeSingleStringCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleStringCellEditorConfiguration.MultiLineText" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell4.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ // The sixth cell must be an UMLStereotypeMultiStringCellEditorConfiguration
+ final ILayerCell cell5 = currentManager.getBodyLayerStack().getCellByPosition(currentCellNumber, 0);
+ Assert.assertNotEquals("The sixth EMF cell must have config labels", null, cell5.getConfigLabels()); //$NON-NLS-1$
+ Assert.assertNotEquals("The sixth EMF cell must have at least one cell editor configuration", 0, cell5.getConfigLabels().getLabels().size()); //$NON-NLS-1$
+ Assert.assertEquals("The sixth EMF cell editor must be an UMLStereotypeMultiStringCellEditorConfiguration", "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiStringCellEditorConfiguration.MultiEditor" + currentCellNumber, //$NON-NLS-1$ //$NON-NLS-2$
+ cell5.getConfigLabels().getLabels().get(0));
+ currentCellNumber++;
+
+ return currentCellNumber;
+
+ }
+}

Back to the top