Author: ggregory
Date: Fri Jan 10 21:47:50 2014
New Revision: 1557265
URL: http://svn.apache.org/r1557265
Log:
Add missing '@Override' annotations.
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteException.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/LogOutputStream.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ShutdownHookProcessDestroyer.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/OpenVmsProcessingEnvironment.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/CommandLauncherProxy.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/Java13CommandLauncher.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/OS2CommandLauncher.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/VmsCommandLauncher.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/WinNTCommandLauncher.java
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/LogOutputStreamTest.java
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/TutorialTest.java
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java?rev=1557265&r1=1557264&r2=1557265&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java
Fri Jan 10 21:47:50 2014
@@ -306,6 +306,7 @@ public class CommandLine {
*
* @return the command line as single string
*/
+ @Override
public String toString() {
return "[" + StringUtils.toString(toStrings(), ", ") + "]";
}
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteException.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteException.java?rev=1557265&r1=1557264&r2=1557265&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteException.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteException.java
Fri Jan 10 21:47:50 2014
@@ -73,6 +73,7 @@ public class ExecuteException extends IO
/**
* Return the underlying cause of this exception (if any).
*/
+ @Override
public Throwable getCause() {
return this.cause;
}
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/LogOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/LogOutputStream.java?rev=1557265&r1=1557264&r2=1557265&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/LogOutputStream.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/LogOutputStream.java
Fri Jan 10 21:47:50 2014
@@ -74,6 +74,7 @@ public abstract class LogOutputStream
* @param cc data to log (byte).
* @see java.io.OutputStream#write(int)
*/
+ @Override
public void write(final int cc) throws IOException {
final byte c = (byte) cc;
if (c == '\n' || c == '\r') {
@@ -91,6 +92,7 @@ public abstract class LogOutputStream
*
* @see java.io.OutputStream#flush()
*/
+ @Override
public void flush() {
if (buffer.size() > 0) {
processBuffer();
@@ -102,6 +104,7 @@ public abstract class LogOutputStream
*
* @see java.io.OutputStream#close()
*/
+ @Override
public void close() throws IOException {
if (buffer.size() > 0) {
processBuffer();
@@ -125,6 +128,7 @@ public abstract class LogOutputStream
* @throws java.io.IOException if the data cannot be written into the
stream.
* @see java.io.OutputStream#write(byte[], int, int)
*/
+ @Override
public void write(final byte[] b, final int off, final int len)
throws IOException {
// find the line breaks and pass other chars through in blocks
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ShutdownHookProcessDestroyer.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ShutdownHookProcessDestroyer.java?rev=1557265&r1=1557264&r2=1557265&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ShutdownHookProcessDestroyer.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ShutdownHookProcessDestroyer.java
Fri Jan 10 21:47:50 2014
@@ -50,6 +50,7 @@ public class ShutdownHookProcessDestroye
super("ProcessDestroyer Shutdown Hook");
}
+ @Override
public void run() {
if (shouldDestroy) {
ShutdownHookProcessDestroyer.this.run();
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/OpenVmsProcessingEnvironment.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/OpenVmsProcessingEnvironment.java?rev=1557265&r1=1557264&r2=1557265&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/OpenVmsProcessingEnvironment.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/OpenVmsProcessingEnvironment.java
Fri Jan 10 21:47:50 2014
@@ -38,6 +38,7 @@ public class OpenVmsProcessingEnvironmen
* @return a map containing the environment variables
* @throws IOException the operation failed
*/
+ @Override
protected Map createProcEnvironment() throws IOException {
if (procEnvironment == null) {
final BufferedReader in = runProcEnvCommand();
@@ -53,6 +54,7 @@ public class OpenVmsProcessingEnvironmen
*
* @return the command line
*/
+ @Override
protected CommandLine getProcEnvCommand() {
final CommandLine commandLine = new CommandLine("show");
commandLine.addArgument("symbol/global"); // the parser assumes
symbols are global
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/CommandLauncherProxy.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/CommandLauncherProxy.java?rev=1557265&r1=1557264&r2=1557265&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/CommandLauncherProxy.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/CommandLauncherProxy.java
Fri Jan 10 21:47:50 2014
@@ -48,6 +48,7 @@ public abstract class CommandLauncherPro
* @throws IOException
* forwarded from the exec method of the command launcher
*/
+ @Override
public Process exec(final CommandLine cmd, final Map env)
throws IOException {
return myLauncher.exec(cmd, env);
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/Java13CommandLauncher.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/Java13CommandLauncher.java?rev=1557265&r1=1557264&r2=1557265&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/Java13CommandLauncher.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/Java13CommandLauncher.java
Fri Jan 10 21:47:50 2014
@@ -52,6 +52,7 @@ public class Java13CommandLauncher exten
* @throws IOException
* probably forwarded from Runtime#exec
*/
+ @Override
public Process exec(final CommandLine cmd, final Map env,
final File workingDir) throws IOException {
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/OS2CommandLauncher.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/OS2CommandLauncher.java?rev=1557265&r1=1557264&r2=1557265&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/OS2CommandLauncher.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/OS2CommandLauncher.java
Fri Jan 10 21:47:50 2014
@@ -55,6 +55,7 @@ public class OS2CommandLauncher extends
* @throws IOException
* forwarded from the exec method of the command launcher
*/
+ @Override
public Process exec(final CommandLine cmd, final Map env,
final File workingDir) throws IOException {
if (workingDir == null) {
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/VmsCommandLauncher.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/VmsCommandLauncher.java?rev=1557265&r1=1557264&r2=1557265&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/VmsCommandLauncher.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/VmsCommandLauncher.java
Fri Jan 10 21:47:50 2014
@@ -42,6 +42,7 @@ public class VmsCommandLauncher extends
/**
* Launches the given command in a new process.
*/
+ @Override
public Process exec(final CommandLine cmd, final Map env)
throws IOException {
final CommandLine vmsCmd = new CommandLine(
@@ -57,6 +58,7 @@ public class VmsCommandLauncher extends
* only works if <code>workingDir</code> is null or the logical
* JAVA$FORK_SUPPORT_CHDIR needs to be set to TRUE.
*/
+ @Override
public Process exec(final CommandLine cmd, final Map env,
final File workingDir) throws IOException {
final CommandLine vmsCmd = new CommandLine(
@@ -67,6 +69,7 @@ public class VmsCommandLauncher extends
}
/** @see org.apache.commons.exec.launcher.CommandLauncher#isFailure(int) */
+ @Override
public boolean isFailure(final int exitValue) {
// even exit value signals failure
return exitValue % 2 == 0;
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/WinNTCommandLauncher.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/WinNTCommandLauncher.java?rev=1557265&r1=1557264&r2=1557265&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/WinNTCommandLauncher.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/launcher/WinNTCommandLauncher.java
Fri Jan 10 21:47:50 2014
@@ -48,6 +48,7 @@ public class WinNTCommandLauncher extend
* @throws IOException
* forwarded from the exec method of the command launcher
*/
+ @Override
public Process exec(final CommandLine cmd, final Map env,
final File workingDir) throws IOException {
if (workingDir == null) {
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/LogOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/LogOutputStreamTest.java?rev=1557265&r1=1557264&r2=1557265&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/LogOutputStreamTest.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/LogOutputStreamTest.java
Fri Jan 10 21:47:50 2014
@@ -78,6 +78,7 @@ public class LogOutputStreamTest {
super(level);
}
+ @Override
protected void processLine(final String line, final int level) {
System.out.println(line);
}
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/TutorialTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/TutorialTest.java?rev=1557265&r1=1557264&r2=1557265&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/TutorialTest.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/TutorialTest.java
Fri Jan 10 21:47:50 2014
@@ -135,11 +135,13 @@ public class TutorialTest {
super.onProcessComplete(exitValue);
}
+ @Override
public void onProcessComplete(final int exitValue) {
super.onProcessComplete(exitValue);
System.out.println("[resultHandler] The document was successfully
printed ...");
}
+ @Override
public void onProcessFailed(final ExecuteException e) {
super.onProcessFailed(e);
if (watchdog != null && watchdog.killedProcess()) {
