Bug 548851: [Charting] NPE when calling figure()
changed order of elements on query
Change-Id: I7f5dc30aca2a732a27556443138da33276f2aac4
diff --git a/plugins/org.eclipse.ease.modules.platform/src/org/eclipse/ease/modules/platform/UIModelManipulator.java b/plugins/org.eclipse.ease.modules.platform/src/org/eclipse/ease/modules/platform/UIModelManipulator.java
index 6299984..2c9d10b 100644
--- a/plugins/org.eclipse.ease.modules.platform/src/org/eclipse/ease/modules/platform/UIModelManipulator.java
+++ b/plugins/org.eclipse.ease.modules.platform/src/org/eclipse/ease/modules/platform/UIModelManipulator.java
@@ -40,13 +40,13 @@
final List<MPartDescriptor> descriptors = modelService.findElements(mApplication, null, MPartDescriptor.class, null);
for (final MPartDescriptor descriptor : descriptors) {
- if ((descriptor.getElementId().matches(name)) || (descriptor.getLabel().equals(name)))
+ if ((name.equals(descriptor.getElementId())) || (name.equals(descriptor.getLabel())))
return descriptor.getElementId();
}
final List<MPart> partDescriptors = modelService.findElements(mApplication, null, MPart.class, null);
for (final MPart descriptor : partDescriptors) {
- if ((descriptor.getElementId().matches(name)) || (descriptor.getLabel().equals(name)))
+ if ((name.equals(descriptor.getElementId())) || (name.equals(descriptor.getLabel())))
return descriptor.getElementId();
}
@@ -54,7 +54,7 @@
// see Bug 548226: some view IDs are not available in the model
final IViewRegistry viewRegistry = PlatformUI.getWorkbench().getViewRegistry();
for (final IViewDescriptor descriptor : viewRegistry.getViews()) {
- if ((descriptor.getId().equals(name)) || (descriptor.getLabel().equals(name)))
+ if ((name.equals(descriptor.getId())) || (name.equals(descriptor.getLabel())))
return descriptor.getId();
}
