mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

cleanup: generics

Browse source
This commit is contained in:
Andrew Gvozdev 2010-01-06 23:12:09 +00:00
parent f404fd845c
commit abebef93b4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java
View file

@ -249,7 +249,7 @@ public class ManagedBuildMacrosTests extends TestCase {
opt = cfgs[0].setOption(t, opt, set1); opt = cfgs[0].setOption(t, opt, set1);
assertNotNull(opt); assertNotNull(opt);
ArrayList ar = new ArrayList(1); ArrayList<String> ar = new ArrayList<String>(1);
for (int i=0; i<set1.length; i++) { for (int i=0; i<set1.length; i++) {
try { try {
String[] aus = mp.resolveStringListValue(set1[i], UNKNOWN, LISTSEP, IBuildMacroProvider.CONTEXT_OPTION, new OptionContextData(opt,t)); String[] aus = mp.resolveStringListValue(set1[i], UNKNOWN, LISTSEP, IBuildMacroProvider.CONTEXT_OPTION, new OptionContextData(opt,t));
@ -257,7 +257,7 @@ public class ManagedBuildMacrosTests extends TestCase {
for (int j=0; j<aus.length; j++) ar.add(aus[j]); for (int j=0; j<aus.length; j++) ar.add(aus[j]);
} catch (BuildMacroException e) { fail(e.getLocalizedMessage()); } } catch (BuildMacroException e) { fail(e.getLocalizedMessage()); }
} }
String[] res = (String[])ar.toArray(new String[0]); String[] res = ar.toArray(new String[0]);
assertEquals(res.length, res1.length); assertEquals(res.length, res1.length);
for (int i=0; i<res.length; i++) assertEquals(res[i], res1[i]); for (int i=0; i<res.length; i++) assertEquals(res[i], res1[i]);
} catch (BuildException e) { fail(e.getLocalizedMessage()); } } catch (BuildException e) { fail(e.getLocalizedMessage()); }
@ -472,7 +472,7 @@ public class ManagedBuildMacrosTests extends TestCase {
boolean exceptionRaised = false; boolean exceptionRaised = false;
try { // ZERO is undefined macro try { // ZERO is undefined macro
String a = mp.resolveValue("${ONE} - ${ZERO}", null, null, //$NON-NLS-1$ mp.resolveValue("${ONE} - ${ZERO}", null, null, //$NON-NLS-1$
IBuildMacroProvider.CONTEXT_CONFIGURATION, cfgs[0]); IBuildMacroProvider.CONTEXT_CONFIGURATION, cfgs[0]);
} catch (BuildMacroException e) { } catch (BuildMacroException e) {
exceptionRaised = true; exceptionRaised = true;
@ -481,7 +481,7 @@ public class ManagedBuildMacrosTests extends TestCase {
exceptionRaised = false; exceptionRaised = false;
try { // delimiter is undefined for list try { // delimiter is undefined for list
String a = mp.resolveValue("${LST}", null, null, //$NON-NLS-1$ mp.resolveValue("${LST}", null, null, //$NON-NLS-1$
IBuildMacroProvider.CONTEXT_CONFIGURATION, cfgs[0]); IBuildMacroProvider.CONTEXT_CONFIGURATION, cfgs[0]);
} catch (BuildMacroException e) { } catch (BuildMacroException e) {
exceptionRaised = true; exceptionRaised = true;
@ -671,7 +671,7 @@ public class ManagedBuildMacrosTests extends TestCase {
// returns a list of macro's NAMES (not values). // returns a list of macro's NAMES (not values).
private String[] printMacros(IBuildMacro[] vars, String head) { private String[] printMacros(IBuildMacro[] vars, String head) {
ArrayList ar = new ArrayList(0); ArrayList<String> ar = new ArrayList<String>(0);
if (vars != null) { if (vars != null) {
if (vars.length > 0) { if (vars.length > 0) {
for (int i=0; i < vars.length; i++) { for (int i=0; i < vars.length; i++) {
@ -697,7 +697,7 @@ public class ManagedBuildMacrosTests extends TestCase {
} }
} else { if (print) System.out.println(head + ": array is empty"); } //$NON-NLS-1$ } else { if (print) System.out.println(head + ": array is empty"); } //$NON-NLS-1$
} else { if (print) System.out.println(head + ": array is null"); } //$NON-NLS-1$ } else { if (print) System.out.println(head + ": array is null"); } //$NON-NLS-1$
return (String[])ar.toArray(new String[0]); return ar.toArray(new String[0]);
} }
private void printStrings(String[] vars, String head) { private void printStrings(String[] vars, String head) {