Bug 486243 - Remove remaining references to
org.eclipse.ui.workbench.compatibility
Change-Id: Ibbe9ccc62e24b14489cedd9e9b93c1d1b5148283
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/UtilTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/UtilTests.java
index 52720ea..9a97531 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/UtilTests.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/UtilTests.java
@@ -556,7 +556,6 @@
"org.eclipse.ui.win32", //$NON-NLS-1$
"org.eclipse.pde.core", //$NON-NLS-1$
"org.eclipse.pde.build", //$NON-NLS-1$
- "org.eclipse.ui.workbench.compatibility", //$NON-NLS-1$
"org.eclipse.ltk.ui.refactoring", //$NON-NLS-1$
"org.eclipse.jface.text", //$NON-NLS-1$
"org.apache.commons.el", //$NON-NLS-1$
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BaseApiAnalyzer.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BaseApiAnalyzer.java
index 0711815..6bb28ab 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BaseApiAnalyzer.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BaseApiAnalyzer.java
@@ -1106,14 +1106,14 @@
IJavaElement[] children = parent.getChildren();
for (IJavaElement javaElement : children) {
scanSource(javaElement, tags, annotations, monitor);
- Util.updateMonitor(monitor, 0);
+ Util.updateMonitor(monitor);
}
break;
}
case IJavaElement.COMPILATION_UNIT: {
ICompilationUnit unit = (ICompilationUnit) element;
processType(unit, tags, annotations);
- Util.updateMonitor(monitor, 0);
+ Util.updateMonitor(monitor);
break;
}
default:
@@ -1121,7 +1121,6 @@
}
} finally {
if (monitor != null) {
- Util.updateMonitor(monitor);
monitor.done();
}
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginSection.java
index c7fbadf..8c45401 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginSection.java
@@ -359,8 +359,7 @@
BundleDescription[] bundles = TargetPlatformHelper.getState().getBundles();
for (int i = 0; i < bundles.length; i++) {
HostSpecification host = bundles[i].getHost();
- if (host != null && !("org.eclipse.ui.workbench.compatibility".equals(bundles[i].getSymbolicName())) //$NON-NLS-1$
- && calculator.containsPluginId(host.getName())) {
+ if (host != null && calculator.containsPluginId(host.getName())) {
calculator.findDependency(bundles[i]);
}
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java
index d40472f..3bc0db6 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java
@@ -792,8 +792,7 @@
if (checked[i] instanceof IPluginModelBase)
toCheck.add(checked[i]);
- // exclude "org.eclipse.ui.workbench.compatibility" - it is only needed for pre-3.0 bundles
- Set<?> additionalIds = DependencyManager.getDependencies(checked, fIncludeOptionalButton.getSelection(), new String[] {"org.eclipse.ui.workbench.compatibility"}); //$NON-NLS-1$
+ Set<?> additionalIds = DependencyManager.getDependencies(checked, fIncludeOptionalButton.getSelection(), null);
Iterator<?> it = additionalIds.iterator();
while (it.hasNext()) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyCalculator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyCalculator.java
index 578cbf9..cdaf031 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyCalculator.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyCalculator.java
@@ -120,7 +120,7 @@
protected void addFragments(BundleDescription desc) {
BundleDescription[] fragments = desc.getFragments();
for (int i = 0; i < fragments.length; i++)
- if (fragments[i].isResolved() && !fragments[i].getSymbolicName().equals("org.eclipse.ui.workbench.compatibility")) { //$NON-NLS-1$
+ if (fragments[i].isResolved()) {
findDependencies(fragments[i]);
}
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java
index 33715d4..9e3541e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java
@@ -807,11 +807,8 @@
subMonitor.worked(10);
// Get all dependency bundles
- // exclude "org.eclipse.ui.workbench.compatibility" - it is only
- // needed for pre-3.0 bundles
dependencies.addAll(DependencyManager.getDependencies(checkedModels.toArray(),
- implicitIDs.toArray(new String[implicitIDs.size()]), state.getState(),
- new String[] { "org.eclipse.ui.workbench.compatibility" })); //$NON-NLS-1$
+ implicitIDs.toArray(new String[implicitIDs.size()]), state.getState(), null));
subMonitor.worked(50);
}
};
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java
index 5b45ac7..c7c3469 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java
@@ -635,8 +635,7 @@
IPluginModelBase[] models = new IPluginModelBase[selection.size()];
System.arraycopy(selection.toArray(), 0, models, 0, selection.size());
- // exclude "org.eclipse.ui.workbench.compatibility" - it is only needed for pre-3.0 bundles
- Set<?> set = DependencyManager.getSelfandDependencies(models, new String[] {"org.eclipse.ui.workbench.compatibility"}); //$NON-NLS-1$
+ Set<?> set = DependencyManager.getSelfandDependencies(models, null);
Object[] symbolicNames = set.toArray();
ArrayList<IPluginModelBase> result = new ArrayList<>(set.size());
for (int i = 0; i < symbolicNames.length; i++) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseLaunchShortcut.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseLaunchShortcut.java
index b65bc34..7b57e4f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseLaunchShortcut.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseLaunchShortcut.java
@@ -87,7 +87,7 @@
// bug 180043
project = ((IFile) object).getProject();
} else if (object instanceof IAdaptable) {
- project = (IProject) ((IAdaptable) object).getAdapter(IProject.class);
+ project = ((IAdaptable) object).getAdapter(IProject.class);
}
if (project != null && project.isOpen())
model = PluginRegistry.findModel(project);
@@ -283,8 +283,7 @@
private void initializePluginsList(ILaunchConfigurationWorkingCopy wc) {
StringBuffer wsplugins = new StringBuffer();
StringBuffer explugins = new StringBuffer();
- // exclude "org.eclipse.ui.workbench.compatibility" - it is only needed for pre-3.0 bundles
- Set<?> plugins = DependencyManager.getSelfAndDependencies(fModel, new String[] {"org.eclipse.ui.workbench.compatibility"}); //$NON-NLS-1$
+ Set<?> plugins = DependencyManager.getSelfAndDependencies(fModel, null);
Iterator<?> iter = plugins.iterator();
while (iter.hasNext()) {
String id = iter.next().toString();
