Browse Source

Changes after static code analysis.

new Long...longValue  new Int...intValue -> Long.parseLong(..)
and arraycopy to copy arrays

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@526548 13f79535-47bb-0310-9956-ffa450edef68
master
Jacobus Martinus Kruithof 18 years ago
parent
commit
20e8233e70
8 changed files with 12 additions and 18 deletions
  1. +2
    -2
      src/main/org/apache/tools/ant/filters/HeadFilter.java
  2. +1
    -2
      src/main/org/apache/tools/ant/filters/TabsToSpaces.java
  3. +2
    -2
      src/main/org/apache/tools/ant/filters/TailFilter.java
  4. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
  5. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  6. +2
    -4
      src/main/org/apache/tools/ant/types/selectors/DateSelector.java
  7. +1
    -2
      src/main/org/apache/tools/ant/types/selectors/SizeSelector.java
  8. +2
    -4
      src/main/org/apache/tools/ant/util/DeweyDecimal.java

+ 2
- 2
src/main/org/apache/tools/ant/filters/HeadFilter.java View File

@@ -182,11 +182,11 @@ public final class HeadFilter extends BaseParamFilterReader
if (params != null) {
for (int i = 0; i < params.length; i++) {
if (LINES_KEY.equals(params[i].getName())) {
lines = new Long(params[i].getValue()).longValue();
lines = Long.parseLong(params[i].getValue());
continue;
}
if (SKIP_KEY.equals(params[i].getName())) {
skip = new Long(params[i].getValue()).longValue();
skip = Long.parseLong(params[i].getValue());
continue;
}
}


+ 1
- 2
src/main/org/apache/tools/ant/filters/TabsToSpaces.java View File

@@ -144,8 +144,7 @@ public final class TabsToSpaces
for (int i = 0; i < params.length; i++) {
if (params[i] != null) {
if (TAB_LENGTH_KEY.equals(params[i].getName())) {
tabLength =
new Integer(params[i].getValue()).intValue();
tabLength = Integer.parseInt(params[i].getValue());
break;
}
}


+ 2
- 2
src/main/org/apache/tools/ant/filters/TailFilter.java View File

@@ -188,11 +188,11 @@ public final class TailFilter extends BaseParamFilterReader
if (params != null) {
for (int i = 0; i < params.length; i++) {
if (LINES_KEY.equals(params[i].getName())) {
setLines(new Long(params[i].getValue()).longValue());
setLines(Long.parseLong(params[i].getValue()));
continue;
}
if (SKIP_KEY.equals(params[i].getName())) {
skip = new Long(params[i].getValue()).longValue();
skip = Long.parseLong(params[i].getValue());
continue;
}
}


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

@@ -472,7 +472,7 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
throw new BuildException(msg, se);
} catch (IOException ioe) {
String msg = "IOException while parsing'"
+ descriptorFileName.toString()
+ descriptorFileName
+ "'. This probably indicates that the descriptor"
+ " doesn't exist. Details: "
+ ioe.getMessage();


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

@@ -2201,7 +2201,7 @@ public class FTP
if (dir.indexOf("/") == 0) {
ftp.changeWorkingDirectory("/");
}
String subdir = new String();
String subdir = "";
StringTokenizer st = new StringTokenizer(dir, "/");
while (st.hasMoreTokens()) {
subdir = st.nextToken();


+ 2
- 4
src/main/org/apache/tools/ant/types/selectors/DateSelector.java View File

@@ -173,8 +173,7 @@ public class DateSelector extends BaseExtendSelector {
String paramname = parameters[i].getName();
if (MILLIS_KEY.equalsIgnoreCase(paramname)) {
try {
setMillis(new Long(parameters[i].getValue()
).longValue());
setMillis(Long.parseLong(parameters[i].getValue()));
} catch (NumberFormatException nfe) {
setError("Invalid millisecond setting "
+ parameters[i].getValue());
@@ -185,8 +184,7 @@ public class DateSelector extends BaseExtendSelector {
setCheckdirs(Project.toBoolean(parameters[i].getValue()));
} else if (GRANULARITY_KEY.equalsIgnoreCase(paramname)) {
try {
setGranularity(new Integer(parameters[i].getValue()
).intValue());
setGranularity(Integer.parseInt(parameters[i].getValue()));
} catch (NumberFormatException nfe) {
setError("Invalid granularity setting "
+ parameters[i].getValue());


+ 1
- 2
src/main/org/apache/tools/ant/types/selectors/SizeSelector.java View File

@@ -153,8 +153,7 @@ public class SizeSelector extends BaseExtendSelector {
String paramname = parameters[i].getName();
if (SIZE_KEY.equalsIgnoreCase(paramname)) {
try {
setValue(new Long(parameters[i].getValue()
).longValue());
setValue(Long.parseLong(parameters[i].getValue()));
} catch (NumberFormatException nfe) {
setError("Invalid size setting "
+ parameters[i].getValue());


+ 2
- 4
src/main/org/apache/tools/ant/util/DeweyDecimal.java View File

@@ -18,6 +18,7 @@
package org.apache.tools.ant.util;

import java.util.StringTokenizer;
import java.util.Arrays;

/**
* Utility class to contain version numbers in "Dewey Decimal"
@@ -40,10 +41,7 @@ public class DeweyDecimal {
*/
public DeweyDecimal(final int[] components) {
this.components = new int[components.length];

for (int i = 0; i < components.length; i++) {
this.components[i] = components[i];
}
System.arraycopy(components, 0, this.components, 0, components.length);
}

/**


Loading…
Cancel
Save