peterreilly 2003/07/25 09:26:52
Modified: src/main/org/apache/tools/ant/taskdefs DefaultExcludes.java
Copydir.java
Log:
checkstyle
Revision Changes Path
1.6 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java
Index: DefaultExcludes.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultExcludes.java 21 Jul 2003 10:52:19 -0000 1.5
+++ DefaultExcludes.java 25 Jul 2003 16:26:49 -0000 1.6
@@ -83,12 +83,12 @@
* @exception BuildException if someting goes wrong with the build
*/
public void execute() throws BuildException {
- if (defaultrequested == false && add.equals("") && remove.equals("")
&& (echo == false)) {
+ if (!defaultrequested && add.equals("") && remove.equals("") &&
!echo) {
throw new BuildException("<defaultexcludes> task must set "
+ "at least one attribute (echo=\"false\""
+ " doesn't count since that is the default");
}
- if (defaultrequested == true) {
+ if (defaultrequested) {
DirectoryScanner.resetDefaultExcludes();
}
if (!add.equals("")) {
@@ -97,7 +97,7 @@
if (!remove.equals("")) {
DirectoryScanner.removeDefaultExclude(remove);
}
- if (echo == true) {
+ if (echo) {
StringBuffer message
= new StringBuffer("Current Default Excludes:\n");
String[] excludes = DirectoryScanner.getDefaultExcludes();
1.29 +11 -1 ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java
Index: Copydir.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Copydir.java 19 Jul 2003 11:20:12 -0000 1.28
+++ Copydir.java 25 Jul 2003 16:26:51 -0000 1.29
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000,2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000,2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,10 +81,20 @@
private boolean forceOverwrite = false;
private Hashtable filecopyList = new Hashtable();
+ /**
+ * The src attribute
+ *
+ * @param src the source file
+ */
public void setSrc(File src) {
srcDir = src;
}
+ /**
+ * The dest attribute
+ *
+ * @param dest the destination file
+ */
public void setDest(File dest) {
destDir = dest;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
