Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Liem PHAN2017-06-21 14:51:48 +0000
committervincent lorenzo2017-08-03 10:47:25 +0000
commit2615453cdf642d0810a2e6d65c87d088e6eff429 (patch)
tree823a8ab54d1aaae0a77467f3ce37533b89a63b9a /plugins/uml/nattable
parentf0c5a25e069b8cecf3bf7677ae6b2932e23d3a72 (diff)
downloadorg.eclipse.papyrus-2615453cdf642d0810a2e6d65c87d088e6eff429.tar.gz
org.eclipse.papyrus-2615453cdf642d0810a2e6d65c87d088e6eff429.tar.xz
org.eclipse.papyrus-2615453cdf642d0810a2e6d65c87d088e6eff429.zip
Bug 515806: [Table] Provide a preference to choose the string to display
instead of N/A https://bugs.eclipse.org/bugs/show_bug.cgi?id=515806 - Create a cell preference page in which a string can be defined for the cell content of non supported column - Replace the usage of final var ICellManager.NOT_AVALABLE by the method CellHelper.getUnsupportedColumnCellText, which allows the modification of string immediately without having to restart Papyrus - JUnit Test Change-Id: I0ddf37889caf9a7a504a39b16a4df85a1a3a992c Signed-off-by: Thanh Liem PHAN <thanhliem.phan@all4tec.net> Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
Diffstat (limited to 'plugins/uml/nattable')
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF2
-rwxr-xr-xplugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF2
-rwxr-xr-xplugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/src/org/eclipse/papyrus/uml/nattable/matrix/cell/managers/AbstractUMLGenericMatrixRelationshipCellManager.java65
-rwxr-xr-xplugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/META-INF/MANIFEST.MF40
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/StereotypeDisplayTreeTableCellManager.java12
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/TableSelectionProviderCellManager.java20
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java13
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java7
9 files changed, 96 insertions, 67 deletions
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
index ce2591cf4d3..50f33795679 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)",
+Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[4.0.0,5.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)"
Export-Package: org.eclipse.papyrus.uml.nattable.generic.config
Bundle-Vendor: Eclipse Modeling Project
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF
index 201dd415ee5..d2aa5e28243 100755
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable;bundle-version="[4.0.0,5.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.emf.expressions;bundle-version="1.0.0",
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/src/org/eclipse/papyrus/uml/nattable/matrix/cell/managers/AbstractUMLGenericMatrixRelationshipCellManager.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/src/org/eclipse/papyrus/uml/nattable/matrix/cell/managers/AbstractUMLGenericMatrixRelationshipCellManager.java
index e90b2c4b76c..e6f4ee33c3f 100755
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/src/org/eclipse/papyrus/uml/nattable/matrix/cell/managers/AbstractUMLGenericMatrixRelationshipCellManager.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/src/org/eclipse/papyrus/uml/nattable/matrix/cell/managers/AbstractUMLGenericMatrixRelationshipCellManager.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2017 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
@@ -8,7 +8,7 @@
*
* Contributors:
* Vincent Lorenzo (CEA LIST) - vincent.lorenzo@cea.fr - Initial API and implementation
- *
+ * Thanh Liem PHAN (ALL4TEC) - thanhliem.phan@all4tec.net - Bug 515806
*****************************************************************************/
package org.eclipse.papyrus.uml.nattable.matrix.cell.managers;
@@ -45,6 +45,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.Gene
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipDirection;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.CellHelper;
import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
@@ -75,7 +76,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
private IBooleanEObjectExpression defaultFilter = BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression();
/**
- *
+ *
* Constructor.
*
* @param managedElement
@@ -87,7 +88,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @return
* the relationship helper to use
*/
@@ -122,7 +123,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
/**
- *
+ *
* @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#isCellEditable(java.lang.Object, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
*
* @param columnElement
@@ -153,7 +154,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param columnElement
* the column element
* @param rowElement
@@ -175,15 +176,15 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
if (isDirectedRelationship()) {
isEditable = false;
} else {
- isEditable = (matchingSourceFeatureType(realRow) && matchingTargetFeatureType((Element) realColumn))
- && /* or || ?? */ matchingSourceFeatureType(realColumn) && matchingTargetFeatureType((Element) realRow);
+ isEditable = (matchingSourceFeatureType(realRow) && matchingTargetFeatureType(realColumn))
+ && /* or || ?? */ matchingSourceFeatureType(realColumn) && matchingTargetFeatureType(realRow);
}
break;
case FROM_ROW_TO_COLUMN:
- isEditable = matchingSourceFeatureType(realRow) && matchingTargetFeatureType((Element) realColumn);
+ isEditable = matchingSourceFeatureType(realRow) && matchingTargetFeatureType(realColumn);
break;
case FROM_COLUMN_TO_ROW:
- isEditable = matchingSourceFeatureType(realColumn) && matchingTargetFeatureType((Element) realRow);
+ isEditable = matchingSourceFeatureType(realColumn) && matchingTargetFeatureType(realRow);
break;
default:
break;
@@ -192,7 +193,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param axisObject
* @return
* <code>true</code> if the object can be used as source
@@ -202,7 +203,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param axisObject
* @return
* <code>true</code> if the object can be used as target
@@ -212,7 +213,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param elementTypeConfiguration
* the elemen type configruation declared in the table cell editor configuration
* @param source
@@ -229,7 +230,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param configuration
* the cell editor configuration declared in the edited table
* @return
@@ -247,12 +248,12 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param configuration
* the cell editor configuration declared in the edited table
* @return
* the matcher to use, or <code>null</code> if not defined
- *
+ *
*/
protected IElementMatcher getElementTypeMatcher(final GenericRelationshipMatrixCellEditorConfiguration configuration) {
final IElementType elementType = getElementTypeToCreate(configuration);
@@ -260,7 +261,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @return
* <code>true</code> if the managed EClass relationship can have more than 2 ends, and <code>false</code> if not OR if the relationship is not managed
*/
@@ -269,7 +270,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @return
* <code>true</code> if the managed EClass relationship is a directed relationship, and <code>false</code> if not OR if the relationship is not managed
*/
@@ -279,7 +280,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
/**
- *
+ *
* @param manager
* the current edited table
* @return
@@ -291,7 +292,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param elTypeConf
* an element type
* @return
@@ -310,10 +311,10 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param manager
* the matrix widget manager
- *
+ *
* @return
* <code>true</code> if the table owns a {@link GenericRelationshipMatrixCellEditorConfiguration} and <code>false</code> otherwise
*/
@@ -322,7 +323,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param manager
* the matrix widget manager
* @return
@@ -337,7 +338,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param manager
* the current edited table
* @return
@@ -352,7 +353,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param relationship
* a relationship
* @return
@@ -363,7 +364,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param relationship
* a relationship
* @return
@@ -374,7 +375,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param relationship
* a relationship
* @return
@@ -385,7 +386,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param relationship
* a relationship
* @return
@@ -409,11 +410,11 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
// we already know that column and rows are UML Elemenr due to the handles methods
return getMatchingRelationships((Element) AxisUtils.getRepresentedElement(columnElement), (Element) AxisUtils.getRepresentedElement(rowElement), tableManager);
}
- return NOT_AVALAIBLE;
+ return CellHelper.getUnsupportedCellContentsText();
}
/**
- *
+ *
* @param columnElement
* the column element
* @param rowElement
@@ -467,7 +468,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @param relationship
* a relationship
* @return
@@ -478,7 +479,7 @@ public abstract class AbstractUMLGenericMatrixRelationshipCellManager extends Ab
}
/**
- *
+ *
* @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#getSetValueCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, java.lang.Object, java.lang.Object, java.lang.Object,
* org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
*
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF
index 6f82b8f48da..b241401c9b5 100755
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.properties;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0]",
+Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[4.0.0,5.0.0]",
org.eclipse.papyrus.infra.nattable.model;bundle-version="2.0.0",
org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.nattable.properties;bundle-version="[2.2.0,3.0.0)",
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/META-INF/MANIFEST.MF
index fda0e45c275..429a196292b 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.1.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.uml.nattable.richtext.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.richtext;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.nebula.widgets.nattable.extension.nebula;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.nebula.widgets.richtext;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.nattable;bundle-version="[3.0.0,4.0.0)"
-Export-Package: org.eclipse.papyrus.uml.nattable.richtext.celleditor.config
-Bundle-Description: %Bundle-Description
+Manifest-Version: 1.0
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.1.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.uml.nattable.richtext.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.richtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.nebula.widgets.nattable.extension.nebula;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.nebula.widgets.richtext;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.uml.nattable.richtext.celleditor.config
+Bundle-Description: %Bundle-Description
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/StereotypeDisplayTreeTableCellManager.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/StereotypeDisplayTreeTableCellManager.java
index 304643e4ceb..0b873439628 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/StereotypeDisplayTreeTableCellManager.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/StereotypeDisplayTreeTableCellManager.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
+ * Copyright (c) 2015, 2017 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,7 +8,7 @@
*
* Contributors:
* Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
- *
+ * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 515806
*****************************************************************************/
package org.eclipse.papyrus.uml.nattable.stereotype.display.manager.cell;
@@ -19,6 +19,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.CellHelper;
import org.eclipse.papyrus.infra.ui.converter.AbstractStringValueConverter;
import org.eclipse.papyrus.uml.nattable.stereotype.display.utils.StereotypeDisplayTreeTableConstants;
import org.eclipse.papyrus.uml.nattable.stereotype.display.utils.StereotypeDisplayTreeTableHelper;
@@ -215,4 +216,11 @@ public class StereotypeDisplayTreeTableCellManager implements ICellManager {
// Nothing to do
}
+ /**
+ * @return the text of cell to be displayed with unsupported column
+ */
+ @Override
+ public String getUnsupportedCellContentsText() {
+ return CellHelper.getUnsupportedCellContentsText();
+ }
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/TableSelectionProviderCellManager.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/TableSelectionProviderCellManager.java
index 68c4a6c94f9..06eb49865ac 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/TableSelectionProviderCellManager.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/TableSelectionProviderCellManager.java
@@ -1,3 +1,15 @@
+/*****************************************************************************
+ * Copyright (c) 2015, 2017 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
+ * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 515806
+ *****************************************************************************/
package org.eclipse.papyrus.uml.nattable.stereotype.display.manager.cell;
import java.util.Map;
@@ -7,6 +19,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.CellHelper;
import org.eclipse.papyrus.infra.ui.converter.AbstractStringValueConverter;
/**
@@ -146,4 +159,11 @@ public class TableSelectionProviderCellManager implements ICellManager {
}
+ /**
+ * @return the text of cell to be displayed with unsupported column
+ */
+ @Override
+ public String getUnsupportedCellContentsText() {
+ return CellHelper.getUnsupportedCellContentsText();
+ }
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java
index 75e089db1a1..01b75912e15 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java
@@ -1,6 +1,6 @@
/*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
- *
+ * Copyright (c) 2015, 2017 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
@@ -8,7 +8,7 @@
*
* Contributors:
* CEA LIST - Initial API and implementation
- *
+ * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 515806
*****************************************************************************/
package org.eclipse.papyrus.uml.nattable.filter.configuration;
@@ -30,7 +30,6 @@ import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
import org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EEnumFilterCellEditorFilterConfiguration;
import org.eclipse.papyrus.infra.nattable.filter.IFilterValueToMatchManager;
import org.eclipse.papyrus.infra.nattable.filter.IPapyrusMatcherEditorFactory;
-import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
@@ -40,6 +39,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.CellHelper;
import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;
import org.eclipse.uml2.uml.Enumeration;
@@ -104,7 +104,6 @@ public class UMLEnumerationEditorFilterConfiguration extends EEnumFilterCellEdit
*
* @return
*/
- @Override
protected IPapyrusMatcherEditorFactory<Object> createPapyrusMatcherFactory() {
return new IPapyrusMatcherEditorFactory<Object>() {
@@ -181,7 +180,7 @@ public class UMLEnumerationEditorFilterConfiguration extends EEnumFilterCellEdit
List<Object> returnedValues = new ArrayList<Object>();
Collection<String> coll = ((StringListValueStyle) style).getStringListValue();
for (String string : coll) {
- if (ICellManager.NOT_AVALAIBLE.equals(string)) {
+ if (CellHelper.getUnsupportedCellContentsText().equals(string)) {
returnedValues.add(string);
continue;
}
@@ -196,7 +195,7 @@ public class UMLEnumerationEditorFilterConfiguration extends EEnumFilterCellEdit
}
if (style instanceof StringValueStyle) {
String val = ((StringValueStyle) style).getStringValue();
- if (ICellManager.NOT_AVALAIBLE.equals(val)) {
+ if (CellHelper.getUnsupportedCellContentsText().equals(val)) {
return val;
}
for (Enumerator tmp : literals) {
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java
index e8f51e3f1a2..cc2bcf879ea 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2012, 2014 CEA LIST and others.
+ * Copyright (c) 2012, 2017 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
@@ -9,7 +9,7 @@
* Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
* Christian W. Damus (CEA) - bug 402525
- *
+ * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 515806
*****************************************************************************/
package org.eclipse.papyrus.uml.nattable.manager.cell;
@@ -35,6 +35,7 @@ import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
import org.eclipse.papyrus.infra.nattable.paste.PastePostActionRegistry;
import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.CellHelper;
import org.eclipse.papyrus.infra.ui.converter.AbstractStringValueConverter;
import org.eclipse.papyrus.infra.ui.converter.ConvertedValueContainer;
import org.eclipse.papyrus.infra.ui.converter.MultiConvertedValueContainer;
@@ -105,7 +106,7 @@ public class StereotypePropertyCellManager extends UMLFeatureCellManager {
return SEVERAL_STEREOTYPES_WITH_THIS_FEATURE_ARE_APPLIED;
}
}
- return NOT_AVALAIBLE;
+ return CellHelper.getUnsupportedCellContentsText();
}
/**

Back to the top