Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2014-10-08 17:09:31 +0000
committerVikas Chandra2014-11-07 09:34:56 +0000
commit0268d7fc6bf9f1d7223cf096aeab58f2251f4001 (patch)
tree8cd44956e7bfb93a75c9f7f5b747991b5844e7e6
parent7190e4a854d543f301f51e616476800f003c7cfe (diff)
downloadeclipse.pde.ui-0268d7fc6bf9f1d7223cf096aeab58f2251f4001.tar.gz
eclipse.pde.ui-0268d7fc6bf9f1d7223cf096aeab58f2251f4001.tar.xz
eclipse.pde.ui-0268d7fc6bf9f1d7223cf096aeab58f2251f4001.zip
Bug 446418 - Update org.eclipse.pde.ui.templates to Java 1.6
Fixes all generics warning messages introduce with the update Change-Id: Ic827da54c00cd2aeb49409d6d3f94410a78d5495 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat
-rw-r--r--ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java4
-rw-r--r--ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java6
-rw-r--r--ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java4
-rw-r--r--ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java4
-rw-r--r--ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java6
-rw-r--r--ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java4
-rw-r--r--ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java6
-rw-r--r--ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java4
8 files changed, 22 insertions, 16 deletions
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java
index 6e2bbad6ff..af1b29fe9e 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java
@@ -56,7 +56,7 @@ public abstract class PDETemplateSection extends OptionTemplateSection {
private String[] getDirectoryCandidates() {
double version = getTargetVersion();
- ArrayList result = new ArrayList();
+ ArrayList<String> result = new ArrayList<String>();
if (version >= 3.6)
result.add("templates_3.6" + "/" + getSectionId() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
if (version >= 3.5)
@@ -71,7 +71,7 @@ public abstract class PDETemplateSection extends OptionTemplateSection {
result.add("templates_3.1" + "/" + getSectionId() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
if (version >= 3.0)
result.add("templates_3.0" + "/" + getSectionId() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return (String[]) result.toArray(new String[result.size()]);
+ return result.toArray(new String[result.size()]);
}
/* (non-Javadoc)
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java
index 27f4c7cb40..c0ea1079cb 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.pde.internal.ui.templates.ide;
+import org.eclipse.pde.ui.templates.PluginReference;
+
import java.io.File;
import java.util.ArrayList;
import org.eclipse.core.runtime.CoreException;
@@ -312,7 +314,7 @@ public class BuilderTemplate extends PDETemplateSection {
*/
@Override
public IPluginReference[] getDependencies(String schemaVersion) {
- ArrayList result = new ArrayList();
+ ArrayList<PluginReference> result = new ArrayList<PluginReference>();
result.add(new PluginReference("org.eclipse.core.resources", null, 0)); //$NON-NLS-1$
if (schemaVersion != null)
result.add(new PluginReference("org.eclipse.core.runtime", null, //$NON-NLS-1$
@@ -320,7 +322,7 @@ public class BuilderTemplate extends PDETemplateSection {
if (actionOption.isSelected())
result.add(new PluginReference("org.eclipse.ui", null, 0)); //$NON-NLS-1$
- return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
+ return result.toArray(new IPluginReference[result.size()]);
}
/*
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java
index e6db2239ac..b56c0c4265 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java
@@ -186,11 +186,11 @@ public class CommonNavigatorTemplate extends PDETemplateSection {
*/
@Override
public IPluginReference[] getDependencies(String schemaVersion) {
- ArrayList result = new ArrayList();
+ ArrayList<PluginReference> result = new ArrayList<PluginReference>();
result.add(new PluginReference("org.eclipse.core.resources", null, 0)); //$NON-NLS-1$
result.add(new PluginReference("org.eclipse.ui.navigator", null, 0)); //$NON-NLS-1$
result.add(new PluginReference("org.eclipse.ui.navigator.resources", null, 0)); //$NON-NLS-1$
- return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
+ return result.toArray(new IPluginReference[result.size()]);
}
}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java
index d3b19e04c6..f6417f87d4 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java
@@ -85,14 +85,14 @@ public class NewWizardTemplate extends PDETemplateSection {
*/
@Override
public IPluginReference[] getDependencies(String schemaVersion) {
- ArrayList result = new ArrayList();
+ ArrayList<PluginReference> result = new ArrayList<PluginReference>();
result.add(new PluginReference("org.eclipse.core.resources", null, 0)); //$NON-NLS-1$
result.add(new PluginReference("org.eclipse.ui", null, 0)); //$NON-NLS-1$
if (schemaVersion != null) {
result.add(new PluginReference("org.eclipse.ui.ide", null, 0)); //$NON-NLS-1$
result.add(new PluginReference("org.eclipse.core.runtime", null, 0)); //$NON-NLS-1$
}
- return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
+ return result.toArray(new IPluginReference[result.size()]);
}
@Override
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java
index 75d45863bc..18eef6efd6 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java
@@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.pde.internal.ui.templates.ide;
+import org.eclipse.pde.ui.templates.PluginReference;
+
import java.util.ArrayList;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -131,13 +133,13 @@ public class PropertyPageTemplate extends PDETemplateSection {
*/
@Override
public IPluginReference[] getDependencies(String schemaVersion) {
- ArrayList result = new ArrayList();
+ ArrayList<PluginReference> result = new ArrayList<PluginReference>();
result.add(new PluginReference("org.eclipse.core.resources", null, 0)); //$NON-NLS-1$
if (schemaVersion != null)
result.add(new PluginReference("org.eclipse.core.runtime", null, 0)); //$NON-NLS-1$
result.add(new PluginReference("org.eclipse.ui", null, 0)); //$NON-NLS-1$
- return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
+ return result.toArray(new IPluginReference[result.size()]);
}
/* (non-Javadoc)
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java
index 59aa8aea01..a557891ccd 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java
@@ -127,7 +127,7 @@ public class UniversalWelcomeTemplate extends PDETemplateSection {
@Override
public IPluginReference[] getDependencies(String schemaVersion) {
- ArrayList result = new ArrayList();
+ ArrayList<PluginReference> result = new ArrayList<PluginReference>();
// We really need Eclipse 3.2 or higher but since Universal
// appears in 3.2 for the first time, just depending on
@@ -136,7 +136,7 @@ public class UniversalWelcomeTemplate extends PDETemplateSection {
result.add(new PluginReference("org.eclipse.ui.intro.universal", null, 0)); //$NON-NLS-1$
result.add(new PluginReference("org.eclipse.ui", null, 0)); //$NON-NLS-1$
- return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
+ return result.toArray(new IPluginReference[result.size()]);
}
@Override
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java
index ee0c585e09..9baf416347 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java
@@ -11,6 +11,8 @@
package org.eclipse.pde.internal.ui.templates.ide;
+import org.eclipse.pde.ui.templates.PluginReference;
+
import java.io.File;
import java.util.ArrayList;
import org.eclipse.core.runtime.CoreException;
@@ -207,11 +209,11 @@ public class ViewTemplate extends PDETemplateSection {
*/
@Override
public IPluginReference[] getDependencies(String schemaVersion) {
- ArrayList result = new ArrayList();
+ ArrayList<PluginReference> result = new ArrayList<PluginReference>();
if (schemaVersion != null)
result.add(new PluginReference("org.eclipse.core.runtime", null, 0)); //$NON-NLS-1$
result.add(new PluginReference("org.eclipse.ui", null, 0)); //$NON-NLS-1$
- return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
+ return result.toArray(new IPluginReference[result.size()]);
}
/* (non-Javadoc)
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java
index b85503b2b0..a681b6067b 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java
@@ -246,7 +246,7 @@ public class IntroTemplate extends PDETemplateSection {
@Override
public IPluginReference[] getDependencies(String schemaVersion) {
- ArrayList result = new ArrayList();
+ ArrayList<PluginReference> result = new ArrayList<PluginReference>();
result.add(new PluginReference("org.eclipse.ui.intro", null, 0)); //$NON-NLS-1$
result.add(new PluginReference("org.eclipse.core.runtime", null, 0)); //$NON-NLS-1$
@@ -257,7 +257,7 @@ public class IntroTemplate extends PDETemplateSection {
result.add(new PluginReference("org.eclipse.swt", null, 0)); //$NON-NLS-1$
}
- return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
+ return result.toArray(new IPluginReference[result.size()]);
}
@Override

Back to the top