Adapt to BundleLauncherHelper API changes
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentProvider.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentProvider.java
index cb6c321..6e48578 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentProvider.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentProvider.java
@@ -27,7 +27,7 @@
import org.eclipse.libra.framework.editor.core.model.IPackageImport;
import org.eclipse.libra.framework.editor.core.model.IServiceReference;
import org.eclipse.libra.framework.editor.ui.internal.SearchControl;
-import org.eclipse.ui.internal.ide.StringMatcher;
+import org.eclipse.ui.dialogs.SearchPattern;
import org.eclipse.zest.core.viewers.GraphViewer;
import org.eclipse.zest.core.viewers.IGraphContentProvider;
@@ -59,7 +59,9 @@
private boolean showServices = false;
private final GraphViewer viewer;
-
+
+ private final SearchPattern matcher = new SearchPattern();
+
public BundleDependencyContentProvider(GraphViewer viewer, SearchControl control) {
this.viewer = viewer;
this.searchControl = control;
@@ -102,13 +104,15 @@
if (!"type filter text".equals(searchControl.getSearchText().getText())
&& searchControl.getSearchText().getText().trim().length() > 0) {
String searchText = searchControl.getSearchText().getText().trim() + "*";
- StringMatcher matcher = new StringMatcher(searchText, true, false);
+
+ matcher.setPattern(searchText);
+
for (IBundle dep : new HashSet<IBundle>(bundleset)) {
boolean filter = true;
- if (matcher.match(dep.getSymbolicName())) {
+ if (matcher.matches(dep.getSymbolicName())) {
filter = false;
}
- if (matcher.match(dep.getSymbolicName() + " (" + dep.getVersion() + ")")) {
+ if (matcher.matches(dep.getSymbolicName() + " (" + dep.getVersion() + ")")) {
filter = false;
}
if (filter) {
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/overview/BundleInformationMasterPart.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/overview/BundleInformationMasterPart.java
index 6feee5a..fe850f0 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/overview/BundleInformationMasterPart.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/overview/BundleInformationMasterPart.java
@@ -64,10 +64,10 @@
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.ui.IWorkbenchCommandConstants;
import org.eclipse.ui.commands.ICommandImageService;
+import org.eclipse.ui.dialogs.SearchPattern;
import org.eclipse.ui.forms.SectionPart;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.internal.ide.StringMatcher;
/**
@@ -164,13 +164,14 @@
}
});
bundleTableViewer.addFilter(new ViewerFilter() {
+ private final SearchPattern matcher = new SearchPattern();
@Override
public boolean select(Viewer viewer, Object parentElement, Object element) {
if (element instanceof IBundle && filterText.getText().length() > 0
&& !TYPE_FILTER_TEXT.equals(filterText.getText())) {
- StringMatcher matcher = new StringMatcher(filterText.getText() + "*", true, false);
- return (matcher.match(((IBundle) element).getSymbolicName()));
+ matcher.setPattern(filterText.getText() + "*");
+ return (matcher.matches(((IBundle) element).getSymbolicName()));
}
return true;
}
diff --git a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/newwizard/WARProductFromConfigOperation.java b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/newwizard/WARProductFromConfigOperation.java
index fd55819..adde509 100644
--- a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/newwizard/WARProductFromConfigOperation.java
+++ b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/newwizard/WARProductFromConfigOperation.java
@@ -111,6 +111,10 @@
throws CoreException
{
// fetch the plug-ins models
+
+ /*
+ * workspaceId and targetId are no more necessary
+ *
String workspaceId = IPDELauncherConstants.SELECTED_WORKSPACE_PLUGINS;
String targetId = IPDELauncherConstants.SELECTED_TARGET_PLUGINS;
String configType = launchConfig.getType().getIdentifier();
@@ -120,13 +124,12 @@
workspaceId = IPDELauncherConstants.WORKSPACE_BUNDLES;
targetId = IPDELauncherConstants.TARGET_BUNDLES;
}
+ */
+
Set<String> set = new HashSet<String>();
- Map<IPluginModelBase, String> map = BundleLauncherHelper.getWorkspaceBundleMap(launchConfig,
- set,
- workspaceId );
- map.putAll( BundleLauncherHelper.getTargetBundleMap( launchConfig,
- set,
- targetId ) );
+ Map<IPluginModelBase, String> map = BundleLauncherHelper.getWorkspaceBundleMap( launchConfig, set /*, workspaceId */ );
+ map.putAll( BundleLauncherHelper.getTargetBundleMap( launchConfig, set /*,targetId */ ) );
+
addPlugins( factory, product, map );
handleDefaultConfig( product, factory );
}
