@@ -71,7 +71,7 @@ import org.apache.tools.ant.Project;
* <p>Moved out of MatchingTask to make it a standalone object that * <p>Moved out of MatchingTask to make it a standalone object that
* could be referenced (by scripts for example). * could be referenced (by scripts for example).
* *
* @author Arnout J. Kuiper <a href="mailto:ajkuiper@wxs.nl">ajkuiper@wxs.nl</a>
* @author Arnout J. Kuiper <a href="mailto:ajkuiper@wxs.nl">ajkuiper@wxs.nl</a>
* @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a> * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
* @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a> * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
* @author Jon S. Stevens <a href="mailto:jon@clearink.com">jon@clearink.com</a> * @author Jon S. Stevens <a href="mailto:jon@clearink.com">jon@clearink.com</a>
@@ -85,7 +85,7 @@ public class PatternSet extends DataType {
/** /**
* inner class to hold a name on list. "If" and "Unless" attributes * inner class to hold a name on list. "If" and "Unless" attributes
* may be used to invalidate the entry based on the existence of a
* may be used to invalidate the entry based on the existence of a
* property (typically set thru the use of the Available task). * property (typically set thru the use of the Available task).
*/ */
public class NameEntry { public class NameEntry {
@@ -93,8 +93,8 @@ public class PatternSet extends DataType {
private String ifCond; private String ifCond;
private String unlessCond; private String unlessCond;
public void setName(String name) {
this.name = name;
public void setName(String name) {
this.name = name;
} }
public void setIf(String cond) { public void setIf(String cond) {
@@ -109,8 +109,8 @@ public class PatternSet extends DataType {
return name; return name;
} }
public String evalName(Project p) {
return valid(p) ? name : null;
public String evalName(Project p) {
return valid(p) ? name : null;
} }
private boolean valid(Project p) { private boolean valid(Project p) {
@@ -127,7 +127,7 @@ public class PatternSet extends DataType {
if ((ifCond != null) || (unlessCond != null)) { if ((ifCond != null) || (unlessCond != null)) {
buf.append(":"); buf.append(":");
String connector = ""; String connector = "";
if (ifCond != null) { if (ifCond != null) {
buf.append("if->"); buf.append("if->");
buf.append(ifCond); buf.append(ifCond);
@@ -153,7 +153,7 @@ public class PatternSet extends DataType {
* instance. * instance.
* *
* <p>You must not set another attribute or nest elements inside * <p>You must not set another attribute or nest elements inside
* this element if you make it a reference.</p>
* this element if you make it a reference.</p>
*/ */
public void setRefid(Reference r) throws BuildException { public void setRefid(Reference r) throws BuildException {
if (!includeList.isEmpty() || !excludeList.isEmpty()) { if (!includeList.isEmpty() || !excludeList.isEmpty()) {
@@ -202,7 +202,7 @@ public class PatternSet extends DataType {
} }
return addPatternToList(includesFileList); return addPatternToList(includesFileList);
} }
/** /**
* add a name entry on the exclude list * add a name entry on the exclude list
*/ */
@@ -212,7 +212,7 @@ public class PatternSet extends DataType {
} }
return addPatternToList(excludeList); return addPatternToList(excludeList);
} }
/** /**
* add a name entry on the exclude files list * add a name entry on the exclude files list
*/ */
@@ -224,7 +224,7 @@ public class PatternSet extends DataType {
} }
/** /**
* Appends <code>includes</code> to the current list of include patterns.
* Appends <code>includes</code> to the current list of include patterns.
* Patterns may be separated by a comma or a space. * Patterns may be separated by a comma or a space.
* *
* @param includes the string containing the include patterns * @param includes the string containing the include patterns
@@ -242,7 +242,7 @@ public class PatternSet extends DataType {
} }
/** /**
* Appends <code>excludes</code> to the current list of exclude patterns.
* Appends <code>excludes</code> to the current list of exclude patterns.
* Patterns may be separated by a comma or a space. * Patterns may be separated by a comma or a space.
* *
* @param excludes the string containing the exclude patterns * @param excludes the string containing the exclude patterns
@@ -271,7 +271,7 @@ public class PatternSet extends DataType {
/** /**
* Sets the name of the file containing the includes patterns. * Sets the name of the file containing the includes patterns.
* *
* @param includesFile The file to fetch the include patterns from.
* @param includesFile The file to fetch the include patterns from.
*/ */
public void setIncludesfile(File includesFile) throws BuildException { public void setIncludesfile(File includesFile) throws BuildException {
if (isReference()) { if (isReference()) {
@@ -283,7 +283,7 @@ public class PatternSet extends DataType {
/** /**
* Sets the name of the file containing the excludes patterns. * Sets the name of the file containing the excludes patterns.
* *
* @param excludesFile The file to fetch the exclude patterns from.
* @param excludesFile The file to fetch the exclude patterns from.
*/ */
public void setExcludesfile(File excludesFile) throws BuildException { public void setExcludesfile(File excludesFile) throws BuildException {
if (isReference()) { if (isReference()) {
@@ -291,21 +291,21 @@ public class PatternSet extends DataType {
} }
createExcludesFile().setName(excludesFile.getAbsolutePath()); createExcludesFile().setName(excludesFile.getAbsolutePath());
} }
/** /**
* Reads path matching patterns from a file and adds them to the * Reads path matching patterns from a file and adds them to the
* includes or excludes list (as appropriate).
* includes or excludes list (as appropriate).
*/ */
private void readPatterns(File patternfile, Vector patternlist, Project p) private void readPatterns(File patternfile, Vector patternlist, Project p)
throws BuildException { throws BuildException {
BufferedReader patternReader = null; BufferedReader patternReader = null;
try { try {
// Get a FileReader // Get a FileReader
patternReader =
new BufferedReader(new FileReader(patternfile));
// Create one NameEntry in the appropriate pattern list for each
patternReader =
new BufferedReader(new FileReader(patternfile));
// Create one NameEntry in the appropriate pattern list for each
// line in the file. // line in the file.
String line = patternReader.readLine(); String line = patternReader.readLine();
while (line != null) { while (line != null) {
@@ -316,14 +316,14 @@ public class PatternSet extends DataType {
line = patternReader.readLine(); line = patternReader.readLine();
} }
} catch (IOException ioe) { } catch (IOException ioe) {
String msg = "An error occured while reading from pattern file: "
String msg = "An error occured while reading from pattern file: "
+ patternfile; + patternfile;
throw new BuildException(msg, ioe); throw new BuildException(msg, ioe);
} finally { } finally {
if (null != patternReader) { if (null != patternReader) {
try { try {
patternReader.close(); patternReader.close();
} catch (IOException ioe) {
} catch (IOException ioe) {
//Ignore exception //Ignore exception
} }
} }
@@ -344,7 +344,7 @@ public class PatternSet extends DataType {
createInclude().setName(incl[i]); createInclude().setName(incl[i]);
} }
} }
String[] excl = other.getExcludePatterns(p); String[] excl = other.getExcludePatterns(p);
if (excl != null) { if (excl != null) {
for (int i = 0; i < excl.length; i++) { for (int i = 0; i < excl.length; i++) {
@@ -384,14 +384,14 @@ public class PatternSet extends DataType {
if (isReference()) { if (isReference()) {
return getRef(p).hasPatterns(p); return getRef(p).hasPatterns(p);
} else { } else {
return includesFileList.size() > 0 || excludesFileList.size() > 0
return includesFileList.size() > 0 || excludesFileList.size() > 0
|| includeList.size() > 0 || excludeList.size() > 0; || includeList.size() > 0 || excludeList.size() > 0;
} }
} }
/** /**
* Performs the check for circular references and returns the * Performs the check for circular references and returns the
* referenced PatternSet.
* referenced PatternSet.
*/ */
private PatternSet getRef(Project p) { private PatternSet getRef(Project p) {
if (!isChecked()) { if (!isChecked()) {
@@ -399,7 +399,7 @@ public class PatternSet extends DataType {
stk.push(this); stk.push(this);
dieOnCircularReference(stk, p); dieOnCircularReference(stk, p);
} }
Object o = getRefid().getReferencedObject(p); Object o = getRefid().getReferencedObject(p);
if (!(o instanceof PatternSet)) { if (!(o instanceof PatternSet)) {
String msg = getRefid().getRefId() + " doesn\'t denote a patternset"; String msg = getRefid().getRefId() + " doesn\'t denote a patternset";
@@ -418,7 +418,7 @@ public class PatternSet extends DataType {
} }
Vector tmpNames = new Vector(); Vector tmpNames = new Vector();
for (Enumeration e = list.elements() ; e.hasMoreElements() ;) {
for (Enumeration e = list.elements(); e.hasMoreElements();) {
NameEntry ne = (NameEntry) e.nextElement(); NameEntry ne = (NameEntry) e.nextElement();
String pattern = ne.evalName(p); String pattern = ne.evalName(p);
if (pattern != null && pattern.length() > 0) { if (pattern != null && pattern.length() > 0) {
@@ -430,7 +430,7 @@ public class PatternSet extends DataType {
tmpNames.copyInto(result); tmpNames.copyInto(result);
return result; return result;
} }
/** /**
* Read includesfile ot excludesfile if not already done so. * Read includesfile ot excludesfile if not already done so.
*/ */
@@ -473,8 +473,8 @@ public class PatternSet extends DataType {
} }
public String toString() { public String toString() {
return "patternSet{ includes: " + includeList +
" excludes: " + excludeList + " }";
return "patternSet{ includes: " + includeList
+ " excludes: " + excludeList + " }";
} }
} }
Conor MacNeill