Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2013-09-03 11:40:42 +0000
committerCamille Letavernier2013-09-03 11:40:42 +0000
commit97b82d35c6b7be0627e252b239da2ae0ad1a980d (patch)
treea654e01341cdbd6bad970553f18103a47c5bff05 /plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml
parent1b04bde0cb07035e01bca26ff77918e394812d67 (diff)
parent2b64acf42cf7aec51d749f216314480268a5d68b (diff)
downloadorg.eclipse.papyrus-97b82d35c6b7be0627e252b239da2ae0ad1a980d.tar.gz
org.eclipse.papyrus-97b82d35c6b7be0627e252b239da2ae0ad1a980d.tar.xz
org.eclipse.papyrus-97b82d35c6b7be0627e252b239da2ae0ad1a980d.zip
Merge branch 'master' of ssh://cletavernie@git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git
Diffstat (limited to 'plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml')
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java.rej9
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java2
3 files changed, 11 insertions, 2 deletions
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java.rej b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java.rej
new file mode 100644
index 00000000000..3a19c611dae
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java.rej
@@ -0,0 +1,9 @@
+@@ -116,7 +116,7 @@
+ // Create targetProperty
+ Property targetProperty = UMLFactory.eINSTANCE.createProperty();
+ targetProperty.setType(sourceType);
+- targetProperty.setName(sourceType.getName().toLowerCase()); // all elements in UML must have a qualified name
++ targetProperty.setName(sourceType.getName() != null ? sourceType.getName().toLowerCase() : "null");
+
+ Association association = UMLFactory.eINSTANCE.createAssociation();
+ association.getMemberEnds().add(sourcePart);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java
index 285655e0866..473a9534cd7 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java
@@ -119,7 +119,7 @@ public class PartPropertyEditHelperAdvice extends AbstractPropertyEditHelperAdvi
// Create targetProperty
Property targetProperty = UMLFactory.eINSTANCE.createProperty();
targetProperty.setType(sourceType);
- targetProperty.setName("");
+ targetProperty.setName(sourceType.getName() != null ? sourceType.getName().toLowerCase() : "null");
Association association = UMLFactory.eINSTANCE.createAssociation();
association.getMemberEnds().add(sourcePart);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java
index ef33c792a83..d6507b5e382 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java
@@ -117,7 +117,7 @@ public class ReferencePropertyEditHelperAdvice extends AbstractPropertyEditHelpe
// Create targetProperty
Property targetProperty = UMLFactory.eINSTANCE.createProperty();
targetProperty.setType(sourceType);
- targetProperty.setName("");
+ targetProperty.setName(sourceType.getName() != null ? sourceType.getName().toLowerCase() : "null");
Association association = UMLFactory.eINSTANCE.createAssociation();
association.getMemberEnds().add(sourcePart);

Back to the top