Browse Source

Use StringUtils.removeSuffix()

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@578773 13f79535-47bb-0310-9956-ffa450edef68
master
Jan Materne 18 years ago
parent
commit
440cd71622
2 changed files with 4 additions and 4 deletions
  1. +2
    -1
      src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
  2. +2
    -3
      src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java

+ 2
- 1
src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java View File

@@ -29,6 +29,7 @@ import org.apache.tools.ant.taskdefs.Rmic;
import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.FileNameMapper;
import org.apache.tools.ant.util.StringUtils;


/** /**
* This is the default implementation for the RmicAdapter interface. * This is the default implementation for the RmicAdapter interface.
@@ -365,7 +366,7 @@ public abstract class DefaultRmicAdapter implements RmicAdapter {
} }


// we know that name.endsWith(".class") // we know that name.endsWith(".class")
String base = name.substring(0, name.length() - ".class".length());
String base = StringUtils.removeSuffix(name, ".class");


String classname = base.replace(File.separatorChar, '.'); String classname = base.replace(File.separatorChar, '.');
if (attributes.getVerify() if (attributes.getVerify()


+ 2
- 3
src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java View File

@@ -22,6 +22,7 @@ import java.util.Enumeration;
import org.apache.tools.ant.Project; import org.apache.tools.ant.Project;
import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.util.StringUtils;


/** /**
* A ClassfileSet is a FileSet that enlists all classes that depend on a * A ClassfileSet is a FileSet that enlists all classes that depend on a
@@ -125,9 +126,7 @@ public class ClassfileSet extends FileSet {
String[] files = additionalScanner.getIncludedFiles(); String[] files = additionalScanner.getIncludedFiles();
for (int i = 0; i < files.length; ++i) { for (int i = 0; i < files.length; ++i) {
if (files[i].endsWith(".class")) { if (files[i].endsWith(".class")) {
String classFilePath
= files[i].substring(
0, files[i].length() - ".class".length());
String classFilePath = StringUtils.removeSuffix(files[i], ".class");
String className String className
= classFilePath.replace('/', '.').replace('\\', '.'); = classFilePath.replace('/', '.').replace('\\', '.');
allRootClasses.addElement(className); allRootClasses.addElement(className);


Loading…
Cancel
Save