1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-05 00:36:16 +02:00

cosmetics: generics etc

This commit is contained in:
Andrew Gvozdev 2010-01-19 15:02:16 +00:00
parent 9f09d04566
commit de0e955c0f

View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007 Symbian Software Limited and others. * Copyright (c) 2010 Symbian Software Limited and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -47,8 +47,8 @@ import org.w3c.dom.NamedNodeMap;
public class TemplateEngineTestsHelper { public class TemplateEngineTestsHelper {
public static final String LOGGER_FILE_NAME="TemplateEngineTests"; //$NON-NLS-1$ public static final String LOGGER_FILE_NAME="TemplateEngineTests"; //$NON-NLS-1$
private static List projectTypes = new ArrayList(); private static List<IProjectType> projectTypes = new ArrayList<IProjectType>();
private static List projectTypeNames = new ArrayList(); private static List<String> projectTypeNames = new ArrayList<String>();
/** /**
* get the url of a xml template, by passing the xml file name. * get the url of a xml template, by passing the xml file name.
@ -70,9 +70,9 @@ public class TemplateEngineTestsHelper {
} }
public static int getChildCount(TemplateDescriptor templateDescriptor, String propertyGroupID){ public static int getChildCount(TemplateDescriptor templateDescriptor, String propertyGroupID){
List list = templateDescriptor.getPropertyGroupList(); List<Element> list = templateDescriptor.getPropertyGroupList();
for (int i = 0, l = list.size(); i < l; i++) { for (int i = 0, l = list.size(); i < l; i++) {
Element element = (Element) list.get(i); Element element = list.get(i);
NamedNodeMap attributes = element.getAttributes(); NamedNodeMap attributes = element.getAttributes();
for (int j = 0, l1 = attributes.getLength(); j < l1; j++) { for (int j = 0, l1 = attributes.getLength(); j < l1; j++) {
String value = attributes.item(j).getNodeValue(); String value = attributes.item(j).getNodeValue();
@ -108,12 +108,12 @@ public class TemplateEngineTestsHelper {
workspace.setDescription(workspaceDesc); workspace.setDescription(workspaceDesc);
} }
public static List getProjectTypes() { public static List<IProjectType> getProjectTypes() {
populateProjectTypes(); populateProjectTypes();
return projectTypes; return projectTypes;
} }
public static List getProjectTypeNames() { public static List<String> getProjectTypeNames() {
populateProjectTypes(); populateProjectTypes();
return projectTypeNames; return projectTypeNames;
} }
@ -138,9 +138,9 @@ public class TemplateEngineTestsHelper {
IConfiguration[] configs = type.getConfigurations(); IConfiguration[] configs = type.getConfigurations();
for (int j = 0; j < configs.length; ++j) { for (int j = 0; j < configs.length; ++j) {
IToolChain tc = configs[j].getToolChain(); IToolChain tc = configs[j].getToolChain();
List osList = Arrays.asList(tc.getOSList()); List<String> osList = Arrays.asList(tc.getOSList());
if (osList.contains("all") || osList.contains(os)) { //$NON-NLS-1$ if (osList.contains("all") || osList.contains(os)) { //$NON-NLS-1$
List archList = Arrays.asList(tc.getArchList()); List<String> archList = Arrays.asList(tc.getArchList());
if (archList.contains("all") || archList.contains(arch)) { //$NON-NLS-1$ if (archList.contains("all") || archList.contains(arch)) { //$NON-NLS-1$
projectTypes.add(type); projectTypes.add(type);
break; break;
@ -151,8 +151,8 @@ public class TemplateEngineTestsHelper {
} }
} }
for (Iterator iter = projectTypes.iterator(); iter.hasNext();) { for (Iterator<IProjectType> iter = projectTypes.iterator(); iter.hasNext();) {
projectTypeNames.add(((IProjectType)iter.next()).getName()); projectTypeNames.add(iter.next().getName());
} }
} }