Bug 484969: Find contribution class dialog errors on *
URL: https://bugs.eclipse.org/bugs/show_bug.cgi?id=484969
Use PatternConstructor.createPattern instead of Pattern.compile to avoid
PatternSyntaxException
Change-Id: Ib960a1b2150b5159ef7c3f4adf3771fe067629c7
Signed-off-by: bkuntz <benedikt.kuntz@airbus.com>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
index b4337ac..665b349 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FilteredContributionDialog.java
@@ -999,7 +999,9 @@
currentSearchThread.cancel();
if (bJoin) {
try {
- currentSearchThread.join();
+ if (currentSearchThread != null) {
+ currentSearchThread.join();
+ }
} catch (final InterruptedException e) {
} finally {
currentSearchThread = null;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
index 6cb9d88..fbd81df 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/TargetPlatformContributionCollector.java
@@ -64,6 +64,7 @@
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.pde.internal.core.TargetPlatformHelper;
+import org.eclipse.pde.internal.core.util.PatternConstructor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -118,7 +119,7 @@
@Override
public void findContribution(Filter filter, ContributionResultHandler handler) {
- final Pattern patternName = Pattern.compile(filter.namePattern, Pattern.CASE_INSENSITIVE);
+ final Pattern patternName = PatternConstructor.createPattern(filter.namePattern, false);
reloadCache(false, filter.getProviderStatusCallback());
@@ -211,6 +212,7 @@
}
}
}
+
});
addModelElementContributor(new IModelElementProvider() {
