Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Goldthorpe2011-10-01 20:51:33 +0000
committerChris Goldthorpe2011-10-01 20:51:33 +0000
commit22b6ef6d51a8fd668211456b8c1dd082d71cfe6d (patch)
treebed89993d2c745be0dbfd2b7e85876edba7e900d /org.eclipse.help.base/src/org/eclipse/help/internal/browser
parentbbf81ada3d90867bedf69912828b288151cb61e7 (diff)
downloadeclipse.platform.ua-22b6ef6d51a8fd668211456b8c1dd082d71cfe6d.tar.gz
eclipse.platform.ua-22b6ef6d51a8fd668211456b8c1dd082d71cfe6d.tar.xz
eclipse.platform.ua-22b6ef6d51a8fd668211456b8c1dd082d71cfe6d.zip
Revert "Bug 338845 - [Help] Upgrade org.eclipse.help.base to Java 1.5"
Diffstat (limited to 'org.eclipse.help.base/src/org/eclipse/help/internal/browser')
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java10
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java6
2 files changed, 8 insertions, 8 deletions
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
index 3fc1fd725..1608b0984 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
@@ -65,7 +65,7 @@ public class BrowserManager {
private BrowserDescriptor internalBrowserDesc;
- private Collection<IBrowser> browsers = new ArrayList<IBrowser>();
+ private Collection browsers = new ArrayList();
private boolean alwaysUseExternal = false;
@@ -201,7 +201,7 @@ public class BrowserManager {
private BrowserDescriptor[] createBrowserDescriptors() {
if (this.browsersDescriptors != null)
return this.browsersDescriptors;
- Collection<BrowserDescriptor> bDescriptors = new ArrayList<BrowserDescriptor>();
+ Collection bDescriptors = new ArrayList();
IConfigurationElement configElements[] = Platform
.getExtensionRegistry().getConfigurationElementsFor(
HelpBasePlugin.PLUGIN_ID, "browser"); //$NON-NLS-1$
@@ -231,7 +231,7 @@ public class BrowserManager {
} catch (CoreException ce) {
}
}
- this.browsersDescriptors = bDescriptors
+ this.browsersDescriptors = (BrowserDescriptor[]) bDescriptors
.toArray(new BrowserDescriptor[bDescriptors.size()]);
return this.browsersDescriptors;
}
@@ -378,8 +378,8 @@ public class BrowserManager {
// nothing to do, do not initialize
return;
}
- for (Iterator<IBrowser> it = browsers.iterator(); it.hasNext();) {
- IBrowser browser = it.next();
+ for (Iterator it = browsers.iterator(); it.hasNext();) {
+ IBrowser browser = (IBrowser) it.next();
browser.close();
}
}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java
index 954899a9d..0e9e24eca 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -101,7 +101,7 @@ public class CustomBrowser implements IBrowser {
* @return String[]
*/
private String[] prepareCommand(String path, String url) {
- ArrayList<String> tokenList = new ArrayList<String>();
+ ArrayList tokenList = new ArrayList();
//Divide along quotation marks
StringTokenizer qTokenizer = new StringTokenizer(path.trim(),
"\"", true); //$NON-NLS-1$
@@ -137,7 +137,7 @@ public class CustomBrowser implements IBrowser {
// substitute %1 by url
boolean substituted = false;
for (int i = 0; i < tokenList.size(); i++) {
- String token = tokenList.get(i);
+ String token = (String) tokenList.get(i);
String newToken = doSubstitutions(token, url);
if (newToken != null) {
tokenList.set(i, newToken);

Back to the top