Browse Source

checkstyle

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@583884 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Reilly 17 years ago
parent
commit
f0244ee350
2 changed files with 21 additions and 13 deletions
  1. +15
    -10
      src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
  2. +6
    -3
      src/main/org/apache/tools/ant/types/Resource.java

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

@@ -83,7 +83,7 @@ public class Javah extends Task {
//private Path extdirs;
private FacadeTaskHelper facade = null;
private Vector files = new Vector();
/**
* No arg constructor.
*/
@@ -137,10 +137,14 @@ public class Javah extends Task {
}
}

/**
* Add a fileset.
* @param fs the fileset to add.
*/
public void addFileSet(FileSet fs) {
files.add(fs);
}
/**
* Names of the classes to process.
* @return the array of classes.
@@ -155,18 +159,19 @@ public class Javah extends Task {
}
}

if(files.size() > 0) {
for(Enumeration e = files.elements(); e.hasMoreElements();){
FileSet fs = (FileSet)e.nextElement();
String[] includedClasses = fs.getDirectoryScanner(getProject()).getIncludedFiles();
for(int i = 0; i < includedClasses.length; i++) {
String className =
includedClasses[i].replace('\\', '.').replace('/', '.').substring(0,includedClasses[i].length()-6);
if (files.size() > 0) {
for (Enumeration e = files.elements(); e.hasMoreElements();) {
FileSet fs = (FileSet) e.nextElement();
String[] includedClasses = fs.getDirectoryScanner(
getProject()).getIncludedFiles();
for (int i = 0; i < includedClasses.length; i++) {
String className =
includedClasses[i].replace('\\', '.').replace('/', '.')
.substring(0,includedClasses[i].length() - 6);
al.add(className);
}
}
}
Enumeration e = classes.elements();
while (e.hasMoreElements()) {
ClassArgument arg = (ClassArgument) e.nextElement();


+ 6
- 3
src/main/org/apache/tools/ant/types/Resource.java View File

@@ -174,9 +174,12 @@ public class Resource extends DataType implements Cloneable, Comparable, Resourc
/**
* Tells the modification time in milliseconds since 01.01.1970 (the "epoch").
*
* @return the modification time, if that is meaningful (e.g. for a file resource which exists);
* 0 if the resource does not exist, to mirror the behavior of {@link java.io.File#lastModified};
* or 0 if the notion of modification time is meaningless for this class of resource (e.g. an inline string)
* @return the modification time, if that is meaningful
* (e.g. for a file resource which exists);
* 0 if the resource does not exist, to mirror the behavior
* of {@link java.io.File#lastModified};
* or 0 if the notion of modification time is meaningless for this class
* of resource (e.g. an inline string)
*/
public long getLastModified() {
if (isReference()) {


Loading…
Cancel
Save