Inlined VersionIdentifier reference for compatibility
diff --git a/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/Workbench.java b/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/Workbench.java
index 3e027c4..ca19799 100644
--- a/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/Workbench.java
+++ b/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/Workbench.java
@@ -1045,7 +1045,14 @@
return success;
}
- private VersionedIdentifier[] collectFeatures() {
+
+ /**
+ * Reads the about info for all the configured features.
+ */
+ private void readFeaturesInfo() {
+
+ // get the previous features
+ VersionedIdentifier featureEntries[];
try {
ArrayList result = new ArrayList();
ILocalSite localSite = SiteManager.getLocalSite();
@@ -1064,18 +1071,11 @@
}
}
}
- return (VersionedIdentifier[])result.toArray(new VersionedIdentifier[result.size()]);
+ featureEntries = (VersionedIdentifier[])result.toArray(new VersionedIdentifier[result.size()]);
} catch (CoreException e) {
- return new VersionedIdentifier[0];
- }
- }
-
- /**
- * Reads the about info for all the configured features.
- */
- private void readFeaturesInfo() {
- // get the previous features
- VersionedIdentifier featureEntries[] = collectFeatures();
+ featureEntries = new VersionedIdentifier[0];
+ }
+
IDialogSettings settings = WorkbenchPlugin.getDefault().getDialogSettings();
String[] oldFeaturesArray = settings.getArray(INSTALLED_FEATURES);
List oldFeatures = null;
