diff options
| author | bkuntz | 2019-07-09 10:40:36 +0000 |
|---|---|---|
| committer | bkuntz | 2019-07-09 10:40:36 +0000 |
| commit | 4d3e41285cbb7791705c7df40206bb1bc81506e8 (patch) | |
| tree | e684cb3e8c16340693666655d50d0fe3831a0a67 /bundles | |
| parent | a4adcbef55685df23219c1a4f4de03f67e23bd9e (diff) | |
| download | eclipse.platform.ui.tools-4d3e41285cbb7791705c7df40206bb1bc81506e8.tar.gz eclipse.platform.ui.tools-4d3e41285cbb7791705c7df40206bb1bc81506e8.tar.xz eclipse.platform.ui.tools-4d3e41285cbb7791705c7df40206bb1bc81506e8.zip | |
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>
Diffstat (limited to 'bundles')
2 files changed, 6 insertions, 2 deletions
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 b4337ac1..665b3490 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 @@ public abstract class FilteredContributionDialog extends SaveDialogBoundsSetting 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 6cb9d88c..fbd81df5 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.IPluginBase; 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 @@ public abstract class TargetPlatformContributionCollector extends ClassContribut @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 @@ public abstract class TargetPlatformContributionCollector extends ClassContribut } } } + }); addModelElementContributor(new IModelElementProvider() { |