Browse Source

remove reflective toArray calls

PR: 36092
Obtained from: Dave Brosius


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278510 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 20 years ago
parent
commit
abf0a93840
5 changed files with 7 additions and 7 deletions
  1. +2
    -2
      src/main/org/apache/tools/ant/launch/Launcher.java
  2. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/PathConvert.java
  3. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
  4. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
  5. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java

+ 2
- 2
src/main/org/apache/tools/ant/launch/Launcher.java View File

@@ -174,7 +174,7 @@ public class Launcher {
if (libPaths.size() == 0 && cpString == null) {
newArgs = args;
} else {
newArgs = (String[]) argList.toArray(new String[0]);
newArgs = (String[]) argList.toArray(new String[argList.size()]);
}

List libPathURLs = new ArrayList();
@@ -188,7 +188,7 @@ public class Launcher {
addPath(libPath, true, libPathURLs);
}

URL[] libJars = (URL[]) libPathURLs.toArray(new URL[0]);
URL[] libJars = (URL[]) libPathURLs.toArray(new URL[libPathURLs.size()]);

// Now try and find JAVA_HOME
File toolsJar = Locator.getToolsJar();


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/PathConvert.java View File

@@ -341,7 +341,7 @@ public class PathConvert extends Task {
ret.add(mapped[m]);
}
}
elems = (String[]) ret.toArray(new String[] {});
elems = (String[]) ret.toArray(new String[ret.size()]);
}
for (int i = 0; i < elems.length; i++) {
String elem = mapElement(elems[i]); // Apply the path prefix map


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/Javah.java View File

@@ -149,7 +149,7 @@ public class Javah extends Task {
ClassArgument arg = (ClassArgument) e.nextElement();
al.add(arg.getName());
}
return (String[]) al.toArray(new String[0]);
return (String[]) al.toArray(new String[al.size()]);
}

/**


+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java View File

@@ -209,7 +209,7 @@ public final class Extension {
}
}

return (Extension[]) results.toArray(new Extension[0]);
return (Extension[]) results.toArray(new Extension[results.size()]);
}

/**
@@ -580,7 +580,7 @@ public final class Extension {
getExtension(attributes, results, listKey);
}

return (Extension[]) results.toArray(new Extension[ 0 ]);
return (Extension[]) results.toArray(new Extension[results.size()]);
}

/**


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java View File

@@ -183,7 +183,7 @@ public final class Specification {
}

final ArrayList trimmedResults = removeDuplicates(results);
return (Specification[]) trimmedResults.toArray(new Specification[0]);
return (Specification[]) trimmedResults.toArray(new Specification[trimmedResults.size()]);
}

/**


Loading…
Cancel
Save