diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java index 25202c917..feb25413d 100644 --- a/src/main/org/apache/tools/ant/Main.java +++ b/src/main/org/apache/tools/ant/Main.java @@ -549,7 +549,7 @@ public class Main implements AntMain { * to help or not, so we simply look for the equals sign. */ final String arg = args[argPos]; - String name = arg.substring(2, arg.length()); + String name = arg.substring(2); String value; final int posEq = name.indexOf('='); if (posEq > 0) { diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java index 02868d316..8441a5849 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java @@ -171,7 +171,7 @@ class ChangeLogParser { private void processFile(final String line) { if (!remote && line.startsWith("Working file:")) { // CheckStyle:MagicNumber OFF - file = line.substring(14, line.length()); + file = line.substring(14); // CheckStyle:MagicNumber ON status = GET_REVISION; } else if (remote && line.startsWith("RCS file:")) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index 3db3d5653..69e224a1e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -202,23 +202,17 @@ public class BorlandDeploymentTool extends GenericDeploymentTool * @return the descriptor. */ protected DescriptorHandler getBorlandDescriptorHandler(final File srcDir) { - DescriptorHandler handler = - new DescriptorHandler(getTask(), srcDir) { - @Override - protected void processElement() { - if ("type-storage".equals(currentElement)) { - // Get the filename of vendor specific descriptor - String fileNameWithMETA = currentText; - //trim the META_INF\ off of the file name - String fileName - = fileNameWithMETA.substring(META_DIR.length(), - fileNameWithMETA.length()); - File descriptorFile = new File(srcDir, fileName); - - ejbFiles.put(fileNameWithMETA, descriptorFile); - } - } - }; + DescriptorHandler handler = new DescriptorHandler(getTask(), srcDir) { + @Override + protected void processElement() { + if ("type-storage".equals(currentElement)) { + // Get the filename of vendor specific descriptor + // trim the META_INF\ off of the file name + ejbFiles.put(currentText, new File(srcDir, + currentText.substring(META_DIR.length()))); + } + } + }; handler.registerDTD(PUBLICID_BORLAND_EJB, borlandDTD == null ? DEFAULT_BAS_DTD_LOCATION : borlandDTD); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index 5961eca22..3c9416ca7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -401,23 +401,17 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { * @return the descriptor. */ protected DescriptorHandler getWeblogicDescriptorHandler(final File srcDir) { - DescriptorHandler handler = - new DescriptorHandler(getTask(), srcDir) { - @Override - protected void processElement() { - if ("type-storage".equals(currentElement)) { - // Get the filename of vendor specific descriptor - String fileNameWithMETA = currentText; - //trim the META_INF\ off of the file name - String fileName - = fileNameWithMETA.substring(META_DIR.length(), - fileNameWithMETA.length()); - File descriptorFile = new File(srcDir, fileName); - - ejbFiles.put(fileNameWithMETA, descriptorFile); - } + DescriptorHandler handler = new DescriptorHandler(getTask(), srcDir) { + @Override + protected void processElement() { + if ("type-storage".equals(currentElement)) { + // Get the filename of vendor specific descriptor + // trim the META_INF\ off of the file name + ejbFiles.put(currentText, new File(srcDir, + currentText.substring(META_DIR.length()))); } - }; + } + }; handler.registerDTD(PUBLICID_WEBLOGIC_EJB510, DEFAULT_WL51_DTD_LOCATION); handler.registerDTD(PUBLICID_WEBLOGIC_EJB510, DEFAULT_WL60_51_DTD_LOCATION); diff --git a/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java b/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java index 9ce721b71..04554c6b8f 100644 --- a/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java +++ b/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java @@ -47,7 +47,7 @@ public class JavaConstantResource extends AbstractClasspathResource { throw new IOException("No class name in " + constant); } String classname = constant.substring(0, index); - String fieldname = constant.substring(index + 1, constant.length()); + String fieldname = constant.substring(index + 1); try { Class clazz = cl != null diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java index 433590645..7764cebc5 100644 --- a/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/src/main/org/apache/tools/ant/util/FileUtils.java @@ -858,7 +858,7 @@ public class FileUtils { if (isDirectory) { directory = new StringBuilder(path.substring(index).replace(File.separatorChar, '.')); } else { - int dirEnd = path.lastIndexOf(File.separatorChar, path.length()); + int dirEnd = path.lastIndexOf(File.separatorChar); if (dirEnd == -1 || dirEnd < index) { file = path.substring(index); } else { diff --git a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java index fb36933c7..2f2397a26 100644 --- a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java +++ b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java @@ -724,7 +724,7 @@ public class LayoutPreservingProperties extends Properties { setValue(null); } else { name = text.substring(0, pos); - setValue(text.substring(pos + 1, text.length())); + setValue(text.substring(pos + 1)); } // trim leading whitespace only name = stripStart(name, " \t\f"); diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java index 9d03c5ad7..fc1658c7a 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java @@ -229,7 +229,7 @@ public class XmlPropertyTest { assertNotEquals(assertMsg + " Object ID does not exist.", null, obj); // What is the property supposed to be? - propertyValue = propertyValue.substring(3, propertyValue.length()); + propertyValue = propertyValue.substring(3); if (propertyValue.equals("path")) { assertThat(assertMsg + " Path ID is a " + obj.getClass().getName(), obj, instanceOf(Path.class)); @@ -243,8 +243,7 @@ public class XmlPropertyTest { // The property is the name of a file. We are testing // a location attribute, so we need to resolve the given // file name in the provided folder. - String fileName = - propertyValue.substring(5, propertyValue.length()); + String fileName = propertyValue.substring(5); File f = new File(workingDir, fileName); propertyValue = f.getAbsolutePath(); }