Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Läubrich2020-06-12 15:15:46 +0000
committerKarsten Thoms2020-06-15 07:02:17 +0000
commitdef099e1cc81f1349f429f70a12374e9f0eaf79b (patch)
treec3102cb50facc434a7ec7dceea68c18540874c87
parentc741a2be1cd618388d64e318f37fedab04321878 (diff)
downloadeclipse.platform.ui-def099e1cc81f1349f429f70a12374e9f0eaf79b.tar.gz
eclipse.platform.ui-def099e1cc81f1349f429f70a12374e9f0eaf79b.tar.xz
eclipse.platform.ui-def099e1cc81f1349f429f70a12374e9f0eaf79b.zip
Bug 538151 - NPE when adding a CompositePart
Change-Id: I302ee3ed85888d14dc66938a053105229adeb0d5 Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de> Also-by: Karsten Thoms <karsten.thoms@karakun.com>
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
index 98ff2cfcf39..2eae0ae6c25 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2019 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -18,6 +18,7 @@
* Dirk Fauth <dirk.fauth@googlemail.com> - Bug 473063
* Stefan Prieschl <stefan.prieschl@gmail.com> - Bug 374132
* Paul Pazderski <paul-eclipse@ppazderski.de> - Bug 549361
+ * Christoph Läubrich - Bug 538151
*******************************************************************************/
package org.eclipse.ui.internal;
@@ -2662,7 +2663,7 @@ public class WorkbenchPage implements IWorkbenchPage {
if (ref instanceof MPart) {
MPart part = (MPart) ref;
String uri = part.getContributionURI();
- if (uri.equals(CompatibilityPart.COMPATIBILITY_VIEW_URI)) {
+ if (CompatibilityPart.COMPATIBILITY_VIEW_URI.equals(uri)) {
createViewReferenceForPart(part, part.getElementId());
}
}

Back to the top