Author: bbrodt
Date: 2010-10-06 15:35:51 -0400 (Wed, 06 Oct 2010)
New Revision: 25536
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetConstraintCommand.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayAccessibleEditPart.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LinkEditPart.java
Log:
https://jira.jboss.org/browse/JBIDE-7250
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetConstraintCommand.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetConstraintCommand.java 2010-10-06
19:19:53 UTC (rev 25535)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetConstraintCommand.java 2010-10-06
19:35:51 UTC (rev 25536)
@@ -53,7 +53,8 @@
@Override
public String getLabel() {
- if (newSize == null || oldSize.equals(newSize))
+ //
https://jira.jboss.org/browse/JBIDE-7250
+ if (newSize == null || newSize.equals(oldSize))
return IBPELUIConstants.CMD_REPOSITION_NODE;
return IBPELUIConstants.CMD_RESIZE_NODE;
}
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayAccessibleEditPart.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayAccessibleEditPart.java 2010-10-06
19:19:53 UTC (rev 25535)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayAccessibleEditPart.java 2010-10-06
19:35:51 UTC (rev 25536)
@@ -31,7 +31,9 @@
if (labeledElement != null) {
childType = labeledElement.getTypeLabel(part.getModel());
displayName = labeledElement.getLabel(part.getModel());
- if (childType != null && displayName.equals(childType)) {
+ //
https://jira.jboss.org/browse/JBIDE-7250
+ // prevent possible NPE
+ if (childType != null && childType.equals(displayName)) {
childType = null;
}
} else {
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LinkEditPart.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LinkEditPart.java 2010-10-06
19:19:53 UTC (rev 25535)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LinkEditPart.java 2010-10-06
19:35:51 UTC (rev 25536)
@@ -385,7 +385,9 @@
if (labeledElement != null) {
childType = labeledElement.getTypeLabel(thisPart.getModel());
displayName = labeledElement.getLabel(thisPart.getModel());
- if (childType != null && displayName.equals(childType)) {
+ //
https://jira.jboss.org/browse/JBIDE-7250
+ // prevent possible NPE
+ if (childType != null && childType.equals(displayName)) {
childType = null;
}
} else {