You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by ke...@apache.org on 2007/05/22 11:31:10 UTC
svn commit: r540506 - in
/ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian:
AbstractDpkgTask.java BuildDpkg.java ControlFileTask.java
Author: kevj
Date: Tue May 22 02:31:09 2007
New Revision: 540506
URL: http://svn.apache.org/viewvc?view=rev&rev=540506
Log:
-remove tabs
Modified:
ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/AbstractDpkgTask.java
ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/BuildDpkg.java
ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java
Modified: ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/AbstractDpkgTask.java
URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/AbstractDpkgTask.java?view=diff&rev=540506&r1=540505&r2=540506
==============================================================================
--- ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/AbstractDpkgTask.java (original)
+++ ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/AbstractDpkgTask.java Tue May 22 02:31:09 2007
@@ -127,7 +127,7 @@
if (this.executeStreamHandler == null) {
setExecuteStreamHandler(new PumpStreamHandler(getOutputStream(),
- getErrorStream()));
+ getErrorStream()));
}
return this.executeStreamHandler;
@@ -157,10 +157,10 @@
if (output != null) {
try {
setOutputStream(new PrintStream(
- new BufferedOutputStream(
- new FileOutputStream(output
- .getPath(),
- append))));
+ new BufferedOutputStream(
+ new FileOutputStream(output
+ .getPath(),
+ append))));
} catch (IOException e) {
throw new BuildException(e, getLocation());
}
@@ -197,9 +197,9 @@
try {
setErrorStream(new PrintStream(
- new BufferedOutputStream(
- new FileOutputStream(error.getPath(),
- append))));
+ new BufferedOutputStream(
+ new FileOutputStream(error.getPath(),
+ append))));
} catch (IOException e) {
throw new BuildException(e, getLocation());
}
@@ -246,10 +246,10 @@
/*Throw an exception if svn exited with error. (Iulian)*/
if (failOnError && Execute.isFailure(retCode)) {
throw new BuildException("svn exited with error code "
- + retCode
- + StringUtils.LINE_SEP
- + "Command line was ["
- + actualCommandLine + "]", getLocation());
+ + retCode
+ + StringUtils.LINE_SEP
+ + "Command line was ["
+ + actualCommandLine + "]", getLocation());
}
} catch (IOException e) {
if (failOnError) {
@@ -316,7 +316,7 @@
StringBuffer stringBuffer =
new StringBuffer(Commandline.describeCommand(execute
- .getCommandline()));
+ .getCommandline()));
String newLine = StringUtils.LINE_SEP;
String[] variableArray = execute.getEnvironment();
@@ -478,30 +478,30 @@
return;
}
c.setExecutable(EXECUTABLE);
-// if (quiet) {
-// c.createArgument(true).setValue("--quiet");
-// }
-// if (verbose) {
-// c.createArgument(true).setValue("--verbose");
-// }
-// if (file != null) {
-// c.createArgument(true).setValue("--file");
-// c.createArgument(true).setFile(file);
-// }
-// if (force) {
-// c.createArgument(true).setValue("--force");
-// }
-// if (recursive != null) {
-// if (recursive.booleanValue()) {
-// c.createArgument(true).setValue("--recursive");
-// } else {
-// c.createArgument(true).setValue("--non-recursive");
-// }
-// }
-// if (targets != null) {
-// c.createArgument(true).setValue("--targets");
-// c.createArgument(true).setFile(targets);
-// }
+// if (quiet) {
+// c.createArgument(true).setValue("--quiet");
+// }
+// if (verbose) {
+// c.createArgument(true).setValue("--verbose");
+// }
+// if (file != null) {
+// c.createArgument(true).setValue("--file");
+// c.createArgument(true).setFile(file);
+// }
+// if (force) {
+// c.createArgument(true).setValue("--force");
+// }
+// if (recursive != null) {
+// if (recursive.booleanValue()) {
+// c.createArgument(true).setValue("--recursive");
+// } else {
+// c.createArgument(true).setValue("--non-recursive");
+// }
+// }
+// if (targets != null) {
+// c.createArgument(true).setValue("--targets");
+// c.createArgument(true).setFile(targets);
+// }
}
/**
@@ -525,9 +525,9 @@
* @param c commandline to insert
* @param insertAtStart If true, c is
* inserted at the beginning of the vector of command lines
- */
+ */
public void addConfiguredCommandline(Commandline c,
- boolean insertAtStart) {
+ boolean insertAtStart) {
if (c == null) {
return;
}
Modified: ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/BuildDpkg.java
URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/BuildDpkg.java?view=diff&rev=540506&r1=540505&r2=540506
==============================================================================
--- ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/BuildDpkg.java (original)
+++ ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/BuildDpkg.java Tue May 22 02:31:09 2007
@@ -52,7 +52,7 @@
throw new BuildException("Cannot read contents of ["+dir+"].");
}
if (null == packageName || packageName.length() == 0) {
- log("You haven't specified a package name, the file will be created under ["+dir+"].");
+ log("You haven't specified a package name, the file will be created under ["+dir+"].");
}
//TODO add checks for missing control file, and package name checks
}
Modified: ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java
URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java?view=diff&rev=540506&r1=540505&r2=540506
==============================================================================
--- ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java (original)
+++ ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java Tue May 22 02:31:09 2007
@@ -62,9 +62,9 @@
controlFile.write(w);
} catch (IOException e) {
throw new BuildException("Failed to write " + file,
- e, getLocation());
+ e, getLocation());
} finally {
- FileUtils.close(w);
+ FileUtils.close(w);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org