From 20e8233e7067e6734ae16da0c45ea2e300d8d60d Mon Sep 17 00:00:00 2001 From: Jacobus Martinus Kruithof Date: Sun, 8 Apr 2007 12:43:36 +0000 Subject: [PATCH] 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 --- src/main/org/apache/tools/ant/filters/HeadFilter.java | 4 ++-- src/main/org/apache/tools/ant/filters/TabsToSpaces.java | 3 +-- src/main/org/apache/tools/ant/filters/TailFilter.java | 4 ++-- .../ant/taskdefs/optional/ejb/GenericDeploymentTool.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/net/FTP.java | 2 +- .../org/apache/tools/ant/types/selectors/DateSelector.java | 6 ++---- .../org/apache/tools/ant/types/selectors/SizeSelector.java | 3 +-- src/main/org/apache/tools/ant/util/DeweyDecimal.java | 6 ++---- 8 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/main/org/apache/tools/ant/filters/HeadFilter.java b/src/main/org/apache/tools/ant/filters/HeadFilter.java index 01ef332e3..8e579e5d6 100644 --- a/src/main/org/apache/tools/ant/filters/HeadFilter.java +++ b/src/main/org/apache/tools/ant/filters/HeadFilter.java @@ -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; } } diff --git a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java b/src/main/org/apache/tools/ant/filters/TabsToSpaces.java index e8b7b7277..453899c90 100644 --- a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java +++ b/src/main/org/apache/tools/ant/filters/TabsToSpaces.java @@ -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; } } diff --git a/src/main/org/apache/tools/ant/filters/TailFilter.java b/src/main/org/apache/tools/ant/filters/TailFilter.java index 04dbb9634..09281f336 100644 --- a/src/main/org/apache/tools/ant/filters/TailFilter.java +++ b/src/main/org/apache/tools/ant/filters/TailFilter.java @@ -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; } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index 828af1594..ec2006c31 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -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(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 9399222a0..0a86e3523 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -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(); diff --git a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java index 3763f7b54..76c1d167f 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java @@ -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()); diff --git a/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java b/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java index 5a25753b4..36eef75df 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java @@ -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()); diff --git a/src/main/org/apache/tools/ant/util/DeweyDecimal.java b/src/main/org/apache/tools/ant/util/DeweyDecimal.java index f13cf2b39..e00f0dc44 100644 --- a/src/main/org/apache/tools/ant/util/DeweyDecimal.java +++ b/src/main/org/apache/tools/ant/util/DeweyDecimal.java @@ -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); } /**