aboutsummaryrefslogtreecommitdiffstats
path: root/test/java/org/apache/fop/visual/ConvertUtils.java
diff options
context:
space:
mode:
authorVincent Hennebert <vhennebert@apache.org>2008-07-25 10:55:49 +0000
committerVincent Hennebert <vhennebert@apache.org>2008-07-25 10:55:49 +0000
commitd058e870151a49af34ec1e7204edd0ffc64aaefc (patch)
tree14c346af79c0d2207f98b17e1e9f0212c8c32f44 /test/java/org/apache/fop/visual/ConvertUtils.java
parentcc5d6604bde87fca098633ceccd66fc92808bddc (diff)
downloadxmlgraphics-fop-d058e870151a49af34ec1e7204edd0ffc64aaefc.tar.gz
xmlgraphics-fop-d058e870151a49af34ec1e7204edd0ffc64aaefc.zip
Merged revisions 679052-679352 via svnmerge from
https://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk ........ r679060 | acumiskey | 2008-07-23 11:39:11 +0100 (Wed, 23 Jul 2008) | 2 lines My bad.. copy paste error I introduced which broke forrest. ........ r679164 | jeremias | 2008-07-23 20:33:24 +0100 (Wed, 23 Jul 2008) | 1 line Only update the generated files if any source file is newer than the generated ones. ........ r679326 | vhennebert | 2008-07-24 10:35:34 +0100 (Thu, 24 Jul 2008) | 2 lines Fed up with all those trailing whitespaces. Let's remove them all (once... and for all?) ........ git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@679758 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/java/org/apache/fop/visual/ConvertUtils.java')
-rw-r--r--test/java/org/apache/fop/visual/ConvertUtils.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/test/java/org/apache/fop/visual/ConvertUtils.java b/test/java/org/apache/fop/visual/ConvertUtils.java
index cdfa0efb1..e83322f90 100644
--- a/test/java/org/apache/fop/visual/ConvertUtils.java
+++ b/test/java/org/apache/fop/visual/ConvertUtils.java
@@ -32,14 +32,14 @@ public class ConvertUtils {
/**
* Calls an external converter application (GhostScript, for example).
* @param cmd the full command
- * @param envp array of strings, each element of which has environment variable settings
+ * @param envp array of strings, each element of which has environment variable settings
* in format name=value.
- * @param workDir the working directory of the subprocess, or null if the subprocess should
+ * @param workDir the working directory of the subprocess, or null if the subprocess should
* inherit the working directory of the current process.
* @param log the logger to log output by the external application to
* @throws IOException in case the external call fails
*/
- public static void convert(String cmd, String[] envp, File workDir, final Log log)
+ public static void convert(String cmd, String[] envp, File workDir, final Log log)
throws IOException {
log.debug(cmd);
@@ -53,7 +53,7 @@ public class ConvertUtils {
log.error("ERR> " + line);
}
};
- StreamRedirector errorRedirector
+ StreamRedirector errorRedirector
= new StreamRedirector(process.getErrorStream(), errorHandler);
//Redirect stdout output
@@ -62,11 +62,11 @@ public class ConvertUtils {
log.debug("OUT> " + line);
}
};
- StreamRedirector outputRedirector
+ StreamRedirector outputRedirector
= new StreamRedirector(process.getInputStream(), outputHandler);
new Thread(errorRedirector).start();
new Thread(outputRedirector).start();
-
+
process.waitFor();
} catch (java.lang.InterruptedException ie) {
throw new IOException("The call to the external converter failed: " + ie.getMessage());
@@ -76,11 +76,11 @@ public class ConvertUtils {
int exitValue = process.exitValue();
if (exitValue != 0) {
- throw new IOException("The call to the external converter failed. Result: "
+ throw new IOException("The call to the external converter failed. Result: "
+ exitValue);
}
}
-
-
+
+
}