Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2014-03-28 11:33:49 -0400
committerVincent Lorenzo2014-03-28 11:33:49 -0400
commite030997a556eb1fd481248e7945bbad7e7a1c303 (patch)
tree92767d7cb4ba1121d64163f5bed864c37cbc9e3a /plugins
parent2524134c6db616a699f392d919e286d8fe25b762 (diff)
downloadorg.eclipse.papyrus-e030997a556eb1fd481248e7945bbad7e7a1c303.tar.gz
org.eclipse.papyrus-e030997a556eb1fd481248e7945bbad7e7a1c303.tar.xz
org.eclipse.papyrus-e030997a556eb1fd481248e7945bbad7e7a1c303.zip
431150: [Table 2] Paste/Import from Excel does not work with additional columns corresponding to stereotype application attributes.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java5
1 files changed, 4 insertions, 1 deletions
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 fe2e1b40a1f..a7279a39c2b 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
@@ -291,7 +291,10 @@ public class StereotypePropertyCellManager extends UMLFeatureCellManager {
}
}
}
-
+ //if the stereotype is not applied, we return null.
+ if(stereotypeApplication == null) {
+ return null;
+ }
solvedValue = valueSolver.deduceValueFromString(prop, newValue);
steApFeature = stereotypeApplication.eClass().getEStructuralFeature(prop.getName());
if(prop.getType() instanceof Enumeration) {//Enumeration AND not EnumerationLiteral

Back to the top