bodewig 2003/08/27 03:08:25
Modified: src/main/org/apache/tools/ant/taskdefs Redirector.java
src/main/org/apache/tools/ant/taskdefs/optional/ssh Scp.java
Log:
whitespace changes only
Revision Changes Path
1.9 +8 -8
ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java
Index: Redirector.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Redirector.java 26 Aug 2003 12:32:57 -0000 1.8
+++ Redirector.java 27 Aug 2003 10:08:25 -0000 1.9
@@ -269,10 +269,10 @@
errorStream = new LogOutputStream(managingTask,
Project.MSG_WARN);
} else {
if (out != null) {
- outputStream
- = new DelayedFileOutputStream(out, append);
- managingTask.log("Output redirected to " + out,
- Project.MSG_VERBOSE);
+ outputStream
+ = new DelayedFileOutputStream(out, append);
+ managingTask.log("Output redirected to " + out,
+ Project.MSG_VERBOSE);
}
if (outputProperty != null) {
@@ -296,10 +296,10 @@
}
if (error != null) {
- errorStream
- = new DelayedFileOutputStream(error, append);
- managingTask.log("Error redirected to " + error,
- Project.MSG_VERBOSE);
+ errorStream
+ = new DelayedFileOutputStream(error, append);
+ managingTask.log("Error redirected to " + error,
+ Project.MSG_VERBOSE);
}
if (errorProperty != null) {
1.9 +17 -19
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
Index: Scp.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Scp.java 27 Aug 2003 10:07:11 -0000 1.8
+++ Scp.java 27 Aug 2003 10:08:25 -0000 1.9
@@ -206,12 +206,10 @@
}
}
if (!list.isEmpty()) {
- session = openSession();
- ScpToMessage message = new ScpToMessage(session,
- list,
- file);
- message.setLogListener(this);
- message.execute();
+ session = openSession();
+ ScpToMessage message = new ScpToMessage(session, list, file);
+ message.setLogListener(this);
+ message.execute();
}
} finally {
if (session != null) {
@@ -281,21 +279,21 @@
Directory root = new Directory(scanner.getBasedir());
String[] files = scanner.getIncludedFiles();
if (files.length != 0) {
- for (int j = 0; j < files.length; j++) {
- String[] path = Directory.getPath(files[j]);
- Directory current = root;
- File currentParent = scanner.getBasedir();
- for (int i = 0; i < path.length; i++) {
- File file = new File(currentParent, path[i]);
- if (file.isDirectory()) {
- current.addDirectory(new Directory(file));
- current = current.getChild(file);
- currentParent = current.getDirectory();
- } else if (file.isFile()) {
- current.addFile(file);
+ for (int j = 0; j < files.length; j++) {
+ String[] path = Directory.getPath(files[j]);
+ Directory current = root;
+ File currentParent = scanner.getBasedir();
+ for (int i = 0; i < path.length; i++) {
+ File file = new File(currentParent, path[i]);
+ if (file.isDirectory()) {
+ current.addDirectory(new Directory(file));
+ current = current.getChild(file);
+ currentParent = current.getDirectory();
+ } else if (file.isFile()) {
+ current.addFile(file);
+ }
}
}
- }
} else {
// skip
root = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
