From 6cfbdd87261c39bf8a49280d710d108ea7c0ce5c Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Fri, 17 Sep 2010 21:43:05 +0000 Subject: [PATCH] bug 319512: Missing type arguments on managedbuilder.core --- .../AppendToMBSStringListOptionValues.java | 14 ++++++-------- .../processes/NewManagedProject.java | 5 +++-- .../cdt/core/templateengine/TemplateInfo.java | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringListOptionValues.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringListOptionValues.java index 5e0de487707..18d174cf576 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringListOptionValues.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringListOptionValues.java @@ -134,12 +134,11 @@ public class AppendToMBSStringListOptionValues extends ProcessRunner { case IOption.LIBRARY_PATHS: case IOption.LIBRARY_FILES: case IOption.MACRO_FILES: - List list= (List) option.getValue(); - String[] newValue= concat((String[]) list.toArray(new String[list.size()]), value); + @SuppressWarnings("unchecked") + List list= (List) option.getValue(); + String[] newValue= concat(list.toArray(new String[list.size()]), value); ManagedBuildManager.setOption(resourceConfig, optionHolder, option, newValue); modified = true; - default: - continue; } } } @@ -162,12 +161,11 @@ public class AppendToMBSStringListOptionValues extends ProcessRunner { case IOption.LIBRARY_PATHS: case IOption.LIBRARY_FILES: case IOption.MACRO_FILES: - List list= (List) option.getValue(); - String[] newValue= concat((String[]) list.toArray(new String[list.size()]), value); + @SuppressWarnings("unchecked") + List list= (List) option.getValue(); + String[] newValue= concat(list.toArray(new String[list.size()]), value); ManagedBuildManager.setOption(config, optionHolder, option, newValue); modified = true; - default: - continue; } } } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/NewManagedProject.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/NewManagedProject.java index bf538ed9ef2..fe1dc041abb 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/NewManagedProject.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/NewManagedProject.java @@ -69,14 +69,15 @@ public class NewManagedProject extends ProcessRunner { locationPath = Path.fromPortableString(location); } - List configs = template.getTemplateInfo().getConfigurations(); + @SuppressWarnings("unchecked") + List configs = (List) template.getTemplateInfo().getConfigurations(); if (configs == null || configs.size() == 0) { throw new ProcessFailureException(Messages.getString("NewManagedProject.4") + projectName); //$NON-NLS-1$ } pca.setProject(project); pca.setProjectLocation(locationPath); - pca.setConfigs((IConfiguration[]) configs.toArray(new IConfiguration[configs.size()])); + pca.setConfigs(configs.toArray(new IConfiguration[configs.size()])); pca.setArtifactExtension(artifactExtension); info = pca.createProject(monitor, CCorePlugin.DEFAULT_INDEXER, isCProject); diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateInfo.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateInfo.java index 8fe3dbbb880..287b9d1730b 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateInfo.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateInfo.java @@ -26,7 +26,7 @@ public class TemplateInfo { private boolean isCategory; private String icon; private String templateId; - private List configs; /*This seems to be used for storing build-system specific configurations*/ + private List configs; /*IConfiguration This seems to be used for storing build-system specific configurations*/ /** * @@ -106,11 +106,11 @@ public class TemplateInfo { this.toolChainIdSet = toolChainIdSet; } - public List getConfigurations() { + public List getConfigurations() { return configs; } - public void setConfigurations(List configs) { + public void setConfigurations(List configs) { this.configs = configs; }