diff options
| author | adaussy | 2013-04-05 15:04:33 +0000 |
|---|---|---|
| committer | adaussy | 2013-04-05 15:04:33 +0000 |
| commit | 8e27b0ea00574d60388eb194d878fd94321da510 (patch) | |
| tree | 32273ca30a7b37064fc226689ad2e53c5aeab756 | |
| parent | dc02f9c2850d5127d3ec9c62a037945b8806471e (diff) | |
| download | org.eclipse.papyrus-8e27b0ea00574d60388eb194d878fd94321da510.tar.gz org.eclipse.papyrus-8e27b0ea00574d60388eb194d878fd94321da510.tar.xz org.eclipse.papyrus-8e27b0ea00574d60388eb194d878fd94321da510.zip | |
Bug 405011 - [ProfilDiagram] NPE in Profile Diagram
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndEditPolicy.java index d69ff5295f8..1d0a633329a 100644 --- a/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndEditPolicy.java +++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndEditPolicy.java @@ -154,16 +154,16 @@ public class DisplayAssociationEndEditPolicy extends AbstractMaskManagedEditPoli }
//in order to find the role to display we need to now target of the edge, so it is important to have a notification about the change of the target
- if((notification.getFeature().equals(NotationPackage.eINSTANCE.getEdge_Target())) || (notification.getFeature().equals(NotationPackage.eINSTANCE.getEdge_Source()))) {
+ if((NotationPackage.eINSTANCE.getEdge_Target().equals(notification.getFeature()) || NotationPackage.eINSTANCE.getEdge_Source().equals(notification.getFeature()))) {
refreshDisplay();
}
if(object == null) {
return;
}
- if(notification.getFeature().equals(UMLPackage.eINSTANCE.getLiteralInteger_Value())) {
+ if(UMLPackage.eINSTANCE.getLiteralInteger_Value().equals(notification.getFeature())) {
refreshDisplay();
- } else if(notification.getFeature().equals(UMLPackage.eINSTANCE.getLiteralUnlimitedNatural_Value())) {
+ } else if(UMLPackage.eINSTANCE.getLiteralUnlimitedNatural_Value().equals(notification.getFeature())) {
refreshDisplay();
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/PropertyLabelEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/PropertyLabelEditPolicy.java index 75f3bf388bd..edfe7bd2917 100644 --- a/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/PropertyLabelEditPolicy.java +++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/PropertyLabelEditPolicy.java @@ -149,9 +149,9 @@ public class PropertyLabelEditPolicy extends AbstractMaskManagedEditPolicy { return;
}
- if(notification.getFeature().equals(UMLPackage.eINSTANCE.getLiteralInteger_Value())) {
+ if(UMLPackage.eINSTANCE.getLiteralInteger_Value().equals(notification.getFeature())) {
refreshDisplay();
- } else if(notification.getFeature().equals(UMLPackage.eINSTANCE.getLiteralUnlimitedNatural_Value())) {
+ } else if(UMLPackage.eINSTANCE.getLiteralUnlimitedNatural_Value().equals(notification.getFeature())) {
refreshDisplay();
}
if(object.equals(property)) {
|