Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2016-05-27 11:12:02 +0000
committerGerrit Code Review @ Eclipse.org2016-05-27 13:00:50 +0000
commit099d89f83f8dc826b473f6d7449fcf0ab6e7e8fd (patch)
tree7fd1909b0177015d2b77ae37cf8d74b3b304b56d /plugins
parent5a1636c8922c25d47a56c5a112668d129346352f (diff)
downloadorg.eclipse.papyrus-099d89f83f8dc826b473f6d7449fcf0ab6e7e8fd.tar.gz
org.eclipse.papyrus-099d89f83f8dc826b473f6d7449fcf0ab6e7e8fd.tar.xz
org.eclipse.papyrus-099d89f83f8dc826b473f6d7449fcf0ab6e7e8fd.zip
bug 494740: [Table] JUnit tests of class org.eclipse.papyrus.uml.nattable.generic.tests.bugs.StereotypeInheritDisplayTest.testStereotypePropeties don't work
Change-Id: I50a46f6581830b011a4683451f83384c255c1bf0 Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml24
-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/MultiEEnumCellEditorConfiguration.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/MultiRealCellEditorConfiguration.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.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLIntegerCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLReferenceCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLStringCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUnlimitedNaturalCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleRealCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLBooleanCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLIntegerCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLReferenceCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLStringCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUnlimitedNaturalCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLMultiReferenceTextualCellEditorWithButtonConfiguration.java12
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLSingleReferenceTextualCellEditorWithButtonConfiguration.java7
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiBooleanCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiIntegerCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiRealCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiStringCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLBooleanCellEditorConfiguration.java84
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLEnumerationCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLIntegerCellEditorConfiguration.java86
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLReferenceCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLStringCellEditorConfiguration.java84
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleBooleanCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleIntegerCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleRealCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleStringCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLBooleanCellEditorConfiguration.java83
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLEnumerationCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLIntegerCellEditorConfiguration.java87
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLReferenceCellEditorConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLStringCellEditorConfiguration.java89
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration.java2
39 files changed, 278 insertions, 338 deletions
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 ac8958a747f..f7e557177a3 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
@@ -16,14 +16,6 @@
order="401">
</configuration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleUMLBooleanCellEditorConfiguration"
- order="410">
- </cellAxisConfiguration>
- <cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeMultiUMLBooleanCellEditorConfiguration"
- order="411">
- </cellAxisConfiguration>
- <cellAxisConfiguration
class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleUMLEnumerationCellEditorConfiguration"
order="420">
</cellAxisConfiguration>
@@ -32,14 +24,6 @@
order="421">
</cellAxisConfiguration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleUMLIntegerCellEditorConfiguration"
- order="430">
- </cellAxisConfiguration>
- <cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeMultiUMLIntegerCellEditorConfiguration"
- order="431">
- </cellAxisConfiguration>
- <cellAxisConfiguration
class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleRealCellEditorConfiguration"
order="440">
</cellAxisConfiguration>
@@ -56,14 +40,6 @@
order="451">
</cellAxisConfiguration>
<cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleUMLStringCellEditorConfiguration"
- order="460">
- </cellAxisConfiguration>
- <cellAxisConfiguration
- class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeMultiUMLStringCellEditorConfiguration"
- order="461">
- </cellAxisConfiguration>
- <cellAxisConfiguration
class="org.eclipse.papyrus.uml.nattable.config.UMLStereotypeSingleBooleanCellEditorConfiguration"
order="500">
</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 b27fa2a996b..ee2c958e394 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
@@ -38,7 +38,7 @@ public class MultiBooleanCellEditorConfiguration implements ICellAxisConfigurati
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiBooleanCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiBooleanCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiEEnumCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiEEnumCellEditorConfiguration.java
index 017968a7099..bb4f4f39f1c 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiEEnumCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiEEnumCellEditorConfiguration.java
@@ -36,7 +36,7 @@ public class MultiEEnumCellEditorConfiguration implements ICellAxisConfiguration
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiEEnumCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiEEnumCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
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 5198514d885..948a4b96405 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
@@ -38,7 +38,7 @@ public class MultiIntegerCellEditorConfiguration implements ICellAxisConfigurati
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiIntegerCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiIntegerCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiRealCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiRealCellEditorConfiguration.java
index 9c05580222f..b9f1f51331f 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiRealCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiRealCellEditorConfiguration.java
@@ -36,7 +36,7 @@ public class MultiRealCellEditorConfiguration implements ICellAxisConfiguration
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiRealCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiRealCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
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 73af603d89a..6a184141089 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
@@ -38,7 +38,7 @@ public class MultiStringCellEditorConfiguration implements ICellAxisConfiguratio
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiStringCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiStringCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
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
index 02794c9002a..568af6c66e0 100644
--- 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
@@ -26,7 +26,7 @@ public class MultiUMLBooleanCellEditorConfiguration extends MultiBooleanCellEdit
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUMLBooleanCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUMLBooleanCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
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
index 08b96a91489..3e8be5ec2a2 100644
--- 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
@@ -26,7 +26,7 @@ public class MultiUMLIntegerCellEditorConfiguration extends MultiIntegerCellEdit
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUMLIntegerCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUMLIntegerCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLReferenceCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLReferenceCellEditorConfiguration.java
index c60c3ecb45e..c0740d766e7 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLReferenceCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUMLReferenceCellEditorConfiguration.java
@@ -39,7 +39,7 @@ public class MultiUMLReferenceCellEditorConfiguration implements ICellAxisConfig
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUMLReferenceCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUMLReferenceCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
* {@inheritDoc}
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
index 776dedfe118..92748f0e039 100644
--- 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
@@ -26,7 +26,7 @@ public class MultiUMLStringCellEditorConfiguration extends MultiStringCellEditor
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUMLStringCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUMLStringCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUnlimitedNaturalCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUnlimitedNaturalCellEditorConfiguration.java
index 2a9c91bb0a1..a5a3317be7f 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUnlimitedNaturalCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/MultiUnlimitedNaturalCellEditorConfiguration.java
@@ -36,7 +36,7 @@ public class MultiUnlimitedNaturalCellEditorConfiguration implements ICellAxisCo
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUnlimitedNaturalCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.MultiUnlimitedNaturalCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleRealCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleRealCellEditorConfiguration.java
index 3f598407a3a..0c0de193038 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleRealCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleRealCellEditorConfiguration.java
@@ -36,7 +36,7 @@ public class SingleRealCellEditorConfiguration implements ICellAxisConfiguration
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleRealCellEditorConfiguration.Text";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleRealCellEditorConfiguration.Text";//$NON-NLS-1$
/**
* {@inheritDoc}
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
index 367b279aac8..7b641514ca1 100644
--- 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
@@ -27,7 +27,7 @@ public class SingleUMLBooleanCellEditorConfiguration extends SingleBooleanCellEd
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUMLBooleanCellEditorConfiguration.CheckBox";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUMLBooleanCellEditorConfiguration.CheckBox";//$NON-NLS-1$
/**
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
index 6933fc80268..fd2fc25f242 100644
--- 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
@@ -27,7 +27,7 @@ public class SingleUMLIntegerCellEditorConfiguration extends SingleIntegerCellEd
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUMLIntegerCellEditorConfiguration.Text";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUMLIntegerCellEditorConfiguration.Text";//$NON-NLS-1$
/**
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLReferenceCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLReferenceCellEditorConfiguration.java
index bdedabbd894..8bf1cc66dd2 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLReferenceCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLReferenceCellEditorConfiguration.java
@@ -39,7 +39,7 @@ public class SingleUMLReferenceCellEditorConfiguration implements ICellAxisConfi
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUMLReferenceCellEditorConfiguration.Text";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUMLReferenceCellEditorConfiguration.Text";//$NON-NLS-1$
/**
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
index dddb80bd0b2..54e598dedc1 100644
--- 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
@@ -27,7 +27,7 @@ public class SingleUMLStringCellEditorConfiguration extends SingleStringCellEdit
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUMLStringCellEditorConfiguration.MultiLineText";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUMLStringCellEditorConfiguration.MultiLineText";//$NON-NLS-1$
/**
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUnlimitedNaturalCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUnlimitedNaturalCellEditorConfiguration.java
index dce9eadcbd4..bfa95808e72 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUnlimitedNaturalCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUnlimitedNaturalCellEditorConfiguration.java
@@ -36,7 +36,7 @@ public class SingleUnlimitedNaturalCellEditorConfiguration implements ICellAxisC
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUnlimitedNaturalCellEditorConfiguration.Text";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.SingleUnlimitedNaturalCellEditorConfiguration.Text";//$NON-NLS-1$
/**
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLMultiReferenceTextualCellEditorWithButtonConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLMultiReferenceTextualCellEditorWithButtonConfiguration.java
index 9a55ad884cd..31f337c7fc2 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLMultiReferenceTextualCellEditorWithButtonConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLMultiReferenceTextualCellEditorWithButtonConfiguration.java
@@ -13,7 +13,6 @@
*****************************************************************************/
package org.eclipse.papyrus.uml.nattable.config;
-import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.jface.viewers.ILabelProvider;
@@ -24,16 +23,13 @@ import org.eclipse.nebula.widgets.nattable.edit.gui.AbstractDialogCellEditor;
import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;
import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
-import org.eclipse.papyrus.infra.nattable.celleditor.AbstractPapyrusStyledTextCellEditor;
import org.eclipse.papyrus.infra.nattable.celleditor.AbstractOpenDialogCellEditorButtonAction;
import org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration;
import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
import org.eclipse.papyrus.uml.nattable.converter.UMLMultiReferenceDisplayConverter;
-import org.eclipse.papyrus.uml.nattable.converter.UMLSingleReferenceDisplayConverter;
import org.eclipse.papyrus.uml.nattable.editor.MultiReferenceCellEditor;
-import org.eclipse.papyrus.uml.nattable.editor.SingleReferenceValueCellEditor;
import org.eclipse.papyrus.uml.nattable.manager.cell.editor.UMLReferenceTextWithCompletionCellEditor;
import org.eclipse.papyrus.uml.nattable.messages.Messages;
import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
@@ -41,7 +37,6 @@ import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLPackage;
/**
*
@@ -51,6 +46,11 @@ import org.eclipse.uml2.uml.UMLPackage;
public class UMLMultiReferenceTextualCellEditorWithButtonConfiguration implements IAxisCellEditorConfiguration {
/**
+ * The id of this editor.
+ */
+ public static final String ID = "org.eclipse.papyrus.uml.reference.text.with.completion.editor.and.dialog"; //$NON-NLS-1$
+
+ /**
*
* @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
*
@@ -189,7 +189,7 @@ public class UMLMultiReferenceTextualCellEditorWithButtonConfiguration implement
*/
@Override
public String getEditorConfigId() {
- return "org.eclipse.papyrus.uml.reference.text.with.completion.editor.and.dialog"; //$NON-NLS-1$
+ return ID;
}
/**
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLSingleReferenceTextualCellEditorWithButtonConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLSingleReferenceTextualCellEditorWithButtonConfiguration.java
index 0bf91a90169..c9b44b20604 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLSingleReferenceTextualCellEditorWithButtonConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLSingleReferenceTextualCellEditorWithButtonConfiguration.java
@@ -49,6 +49,11 @@ import org.eclipse.uml2.uml.UMLPackage;
public class UMLSingleReferenceTextualCellEditorWithButtonConfiguration implements IAxisCellEditorConfiguration {
/**
+ * The id of this editor.
+ */
+ public static final String ID = "org.eclipse.papyrus.uml.reference.text.with.completion.editor.and.dialog"; //$NON-NLS-1$
+
+ /**
*
* @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
*
@@ -182,7 +187,7 @@ public class UMLSingleReferenceTextualCellEditorWithButtonConfiguration implemen
*/
@Override
public String getEditorConfigId() {
- return "org.eclipse.papyrus.uml.reference.text.with.completion.editor.and.dialog"; //$NON-NLS-1$
+ return ID;
}
/**
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 872620b025d..ecc3e4ac1a7 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
@@ -30,7 +30,7 @@ public class UMLStereotypeMultiBooleanCellEditorConfiguration extends MultiBoole
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiBooleanCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiBooleanCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
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 017d44b4b29..27838dcf0db 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
@@ -30,7 +30,7 @@ public class UMLStereotypeMultiIntegerCellEditorConfiguration extends MultiInteg
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiIntegerCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiIntegerCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
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 2957012edeb..e562243b32d 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
@@ -30,7 +30,7 @@ public class UMLStereotypeMultiRealCellEditorConfiguration extends MultiRealCell
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiRealCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiRealCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
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 6fca70130ef..f44bcd30ecb 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
@@ -30,7 +30,7 @@ public class UMLStereotypeMultiStringCellEditorConfiguration extends MultiString
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiStringCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiStringCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
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
index 16f79bbef13..27a4c0de4ee 100644
--- 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
@@ -13,54 +13,48 @@
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.
+ *
+ * @deprecated since 2.0, the super class works fine for DataType and Primitives Types
*/
+@Deprecated
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;
- }
+// /**
+// * 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/UMLStereotypeMultiUMLEnumerationCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLEnumerationCellEditorConfiguration.java
index 006d46f5223..18dc5baf9b9 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLEnumerationCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLEnumerationCellEditorConfiguration.java
@@ -37,7 +37,7 @@ public class UMLStereotypeMultiUMLEnumerationCellEditorConfiguration implements
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLEnumerationCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLEnumerationCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
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
index 50b5a303a5e..64da61616ae 100644
--- 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
@@ -13,54 +13,48 @@
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.
+ *
+ * @deprecated since 2.0, the super class works fine for DataType and Primitives Types
*/
-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;
- }
+@Deprecated
+public class UMLStereotypeMultiUMLIntegerCellEditorConfiguration extends UMLStereotypeMultiIntegerCellEditorConfiguration {
- /**
- * {@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;
- }
+ // /**
+ // * 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/UMLStereotypeMultiUMLReferenceCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLReferenceCellEditorConfiguration.java
index f7571b68a26..447354a76d3 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLReferenceCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeMultiUMLReferenceCellEditorConfiguration.java
@@ -29,7 +29,7 @@ public class UMLStereotypeMultiUMLReferenceCellEditorConfiguration extends Multi
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLReferenceCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUMLReferenceCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
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
index bb0030c45eb..ae856831b11 100644
--- 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
@@ -13,54 +13,48 @@
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.
+ *
+ * @deprecated since 2.0, the super class works fine for UML String
*/
+@Deprecated
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;
- }
+ // /**
+ // * 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 e79f2645968..12543a3e7d7 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
@@ -30,7 +30,7 @@ public class UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration extends M
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeMultiUnlimitedNaturalCellEditorConfiguration.MultiEditor";//$NON-NLS-1$
/**
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 993e7ef5225..0b4ca56d1ed 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
@@ -31,7 +31,7 @@ public class UMLStereotypeSingleBooleanCellEditorConfiguration extends SingleBoo
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleBooleanCellEditorConfiguration.CheckBox";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleBooleanCellEditorConfiguration.CheckBox";//$NON-NLS-1$
/**
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 dd8ed1342d3..7046680ad8a 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
@@ -31,7 +31,7 @@ public class UMLStereotypeSingleIntegerCellEditorConfiguration extends SingleInt
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleIntegerCellEditorConfiguration.Text";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleIntegerCellEditorConfiguration.Text";//$NON-NLS-1$
/**
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 967ca180f6e..ba34d6221e5 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
@@ -30,7 +30,7 @@ public class UMLStereotypeSingleRealCellEditorConfiguration extends SingleRealCe
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleRealCellEditorConfiguration.Text";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleRealCellEditorConfiguration.Text";//$NON-NLS-1$
/**
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 b01e93f94a3..309d70a03e1 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
@@ -31,7 +31,7 @@ public class UMLStereotypeSingleStringCellEditorConfiguration extends SingleStri
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleStringCellEditorConfiguration.MultiLineText";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleStringCellEditorConfiguration.MultiLineText";//$NON-NLS-1$
/**
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
index fd126128d8a..4bce132d611 100644
--- 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
@@ -13,55 +13,46 @@
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.
+ *
+ * @deprecated since 2.0, the super class works fine for Boolean DataType and UML Primitives Types, called Boolean
*/
-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$
-
+@Deprecated
+public class UMLStereotypeSingleUMLBooleanCellEditorConfiguration extends UMLStereotypeMultiBooleanCellEditorConfiguration {
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleBooleanCellEditorConfiguration#getConfigurationId()
- */
- @Override
- public String getConfigurationId() {
- return ID;
- }
+ // 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#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;
- }
+ //
+ //
+ // /**
+ // * {@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/UMLStereotypeSingleUMLEnumerationCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLEnumerationCellEditorConfiguration.java
index 573460d4b86..e3589847b05 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLEnumerationCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLEnumerationCellEditorConfiguration.java
@@ -41,7 +41,7 @@ public class UMLStereotypeSingleUMLEnumerationCellEditorConfiguration implements
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLEnumerationCellEditorConfiguration.ComboBox";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLEnumerationCellEditorConfiguration.ComboBox";//$NON-NLS-1$
/**
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
index f6a5190ccca..82d724956ca 100644
--- 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
@@ -13,55 +13,48 @@
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.
+ *
+ * @deprecated since 2.0, the super class works fine for Integer DataType and UML Primitives Types, called Integer
*/
-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;
- }
+@Deprecated
+public class UMLStereotypeSingleUMLIntegerCellEditorConfiguration extends UMLStereotypeSingleIntegerCellEditorConfiguration {
- /**
- * {@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;
- }
+ // /**
+ // * 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/UMLStereotypeSingleUMLReferenceCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLReferenceCellEditorConfiguration.java
index b88ad890fef..5abd0b29550 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLReferenceCellEditorConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLStereotypeSingleUMLReferenceCellEditorConfiguration.java
@@ -29,7 +29,7 @@ public class UMLStereotypeSingleUMLReferenceCellEditorConfiguration extends Sing
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLReferenceCellEditorConfiguration.Reference";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUMLReferenceCellEditorConfiguration.Reference";//$NON-NLS-1$
/**
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
index 0d19bd8b66a..67b774bf01a 100644
--- 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
@@ -13,55 +13,48 @@
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.
+ *
+ * @deprecated since 2.0, the super class works fine for Integer DataType and UML Primitives Types, called Integer
*/
-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;
- }
+@Deprecated
+public class UMLStereotypeSingleUMLStringCellEditorConfiguration extends UMLStereotypeSingleStringCellEditorConfiguration {
+//
+// /**
+// * 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 b9e59eae53e..a8cfbd7e038 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
@@ -30,7 +30,7 @@ public class UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration extends
/**
* The id of this editor.
*/
- private static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration.Text";//$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.uml.nattable.celleditor.configuration.UMLStereotypeSingleUnlimitedNaturalCellEditorConfiguration.Text";//$NON-NLS-1$
/**

Back to the top