new class : ExecuterStreamFormatter , for sake of readability and encapsulation, this class encapsulates the output-related code that was in the Executer class, modified other classes for compatibilty with this new class, Appender interface now has a method for standard output and a method for error output, removed no-more neccessary exceptions

Author: Muhammad Hashim

README.md

@@ -8,7 +8,10 @@ Command cmd = new Command();
 cmd.setClient("adb");
 cmd.setCommand("devices -l");
 //optional : cmd.setCommand("devices", "-l"):
-Executer executer = new Executer(line -> System.out.println(line)); //redirecting output of execution.
+ExecuterStreamFormatter streamFormatter = new ExecuterStreamFormatter(); //redirecting output of execution to the console,
+//optional: implement the Appender interface to redirect the standard and error outputs your way.
+
+Executer executer = new Executer(streamFormatter);
 try{
 executer.execute(cmd);
 }catch(IOException e){

src/mhashem6/commander/Appender.java

@@ -35,11 +35,18 @@
 public interface Appender {
 
 	/**
-	 * appends a new line of output
+	 * appends a new line of standard output
 	 * 
 	 * @param outputLine
 	 */
 	void appendLine(String outputLine);
+	// ============================================================
 
+	/**
+	 * appends a new line of error output
+	 * 
+	 * @param errOutputLine
+	 */
+	void appendErrLine(String errOutputLine);
+	// ============================================================
 }
-// ============================================================

src/mhashem6/commander/Command.java

@@ -119,6 +119,21 @@ public Command(String client, ArrayList<String> cmd) {
 		setCommand(cmd);
 	}
 	// ============================================================
+
+	/**
+	 * A copy Constructor
+	 * 
+	 * @param commandObject
+	 */
+	@SuppressWarnings("unchecked")
+	public Command(Command commandObject) {
+		this();
+		client = commandObject.getClient();
+		command = (ArrayList<String>) command.clone();
+		commandArgs = (ArrayList<String>) commandArgs.clone();
+		finalCommand = (ArrayList<String>) finalCommand.clone();
+	}
+	// ============================================================
 	// ============================================================
 
 	// CLIENT >>>>
@@ -293,4 +308,11 @@ public void clearAll() {
 	// ============================================================
 	// ============================================================
 
+		@Override
+	public boolean equals(Object otherObject) {
+		if (otherObject instanceof Command)
+			if (this.toString().equals(otherObject.toString()))
+				return true;
+		return false;
+	}
 }

src/mhashem6/commander/Executer.java

@@ -18,25 +18,21 @@
 * 
 * this library is the base of Simple-ADB program : http://forum.xda-developers.com/android/software/revive-simple-adb-tool-t3417155
 * you can contact me @ [email protected]
-* Source : https://github.com/mhashim6/Commander
+* Source : 
 *
 */
 
 package mhashem6.commander;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 
 import mhashem6.commander.exceptions.*;
 
 /**
- * The class the can execute/abort a command, with ability of
- * producing(automatically) and writing (not automatically) an output.
+ * The class the can execute/abort a command, with ability of producing and
+ * writing output.
  * 
  * @see Command
- * @see SpecificCommand
- * @see ExecuterAndWriter
  * @author mhashem6 (Muhammad Hashim)
  */
 public class Executer {
@@ -46,33 +42,40 @@ public class Executer {
 	protected ProcessBuilder pb;
 	protected Process process;
 
-	protected InputStreamReader stdReader;
-	protected InputStreamReader errReader;
+	protected ExecuterStreamFormatter eStreamFormatter;
 
-	protected BufferedReader stdOutputBr;
-	protected BufferedReader errOutputBr;
-
-	protected String outputStdStr;
-	protected String outputErrStr;
-	protected boolean hasError;
-
-	protected StringBuilder outputToSave;
-
-	private Appender appendrObject;
+	protected int exitval = 777;
 
 	/**
 	 * 
-	 * The public constructor that requires a Appender implementing object to
-	 * display the output, if null is passed, the output will be written in the
-	 * console.
+	 * A constructor that requires a pre-initialized ExecuterStreamFormatter
+	 * object to display the output.
+	 * 
+	 * @param eStreamFormatter
+	 * 
+	 * @see ExecuterStreamFormatter
+	 */
+	public Executer(ExecuterStreamFormatter eStreamFormatter) {
+		setStreamFormatter(eStreamFormatter);
+	}
+	// ============================================================
+
+	/**
 	 * 
-	 * @param appendrObject
+	 * @return the ExecuterStreamFormatter instance of this instance.
+	 */
+	public ExecuterStreamFormatter getStreamFormatter() {
+		return eStreamFormatter;
+	}
+	// ============================================================
+
+	/**
+	 * changes the current instance of ExecuterStreamFormatter.
 	 * 
-	 * @see Appender
+	 * @param eStreamFormatter
 	 */
-	public Executer(Appender appendrObject) {
-		clearOutput();
-		this.appendrObject = appendrObject;
+	public void setStreamFormatter(ExecuterStreamFormatter eStreamFormatter) {
+		this.eStreamFormatter = eStreamFormatter;
 	}
 	// ============================================================
 
@@ -83,12 +86,12 @@ public Executer(Appender appendrObject) {
 	 * @throws IOException
 	 */
 	public void execute(Command command) throws IOException {
-
-		clearOutput();
+		exitval = 777;
 		executeSilently(command);
-
 		recordOutput();
 
+		abort();
+
 	}
 	// ============================================================
 
@@ -114,92 +117,36 @@ protected void executeSilently(Command cmd) throws UnrecognisedCmdException {
 	// ============================================================
 
 	/**
-	 * the method responsible for recording the output of the command line
+	 * the method responsible for passing the output to the ExecuterStreamReader
+	 * object.
 	 * 
 	 * @throws IOException
 	 * 
 	 */
 	protected void recordOutput() throws IOException {
 
-		try {
-
-			/** Get input streams */
-			stdReader = new InputStreamReader(process.getInputStream());
-			errReader = new InputStreamReader(process.getErrorStream());
-
-			stdOutputBr = new BufferedReader(stdReader);
-			errOutputBr = new BufferedReader(errReader);
-
-			outputToSave = new StringBuilder();
-			/** Read command standard output */
-			while ((outputStdStr = stdOutputBr.readLine()) != null) {
-
-				store(outputStdStr);
-				outputStdStr = null;
-			}
-
-			/** Read command error output */
-			while ((outputErrStr = errOutputBr.readLine()) != null) {
-				store(outputErrStr);
-				hasError = true;
-				outputErrStr = null;
-			}
-
-		}
-
-		finally {
-
-			if (hasError == true)
-				throw new OutputIsErrorException(cmd.getClient() != "" ? cmd.getClient() : "System");
-			closeResources();
-
-		}
-
-	}
-	// ============================================================
-
-	/**
-	 * to store the output line by line.
-	 * 
-	 * @param line
-	 */
-	protected void store(String line) {
-
-		outputToSave.append((line + System.getProperty("line.separator")));
-		showOutputLine(line);
-
-		line = null;
-	}
-	// ============================================================
-
-	/**
-	 * displays the output line by line
-	 * 
-	 * @param line
-	 */
-	protected void showOutputLine(String line) {
-
-		appendrObject.appendLine(line + System.getProperty("line.separator"));
-
-		line = null;
+		eStreamFormatter.FormatStdStream(process.getInputStream());
+		eStreamFormatter.FormatErrStream(process.getErrorStream());
 
 	}
 	// ============================================================
 
 	/**
 	 * a method that aborts the current command process
 	 * 
-	 * @throws CmdAbortedException
+	 * @return
+	 * 
 	 * @throws IOException
 	 * 
 	 * @see Executer#isAlive()
 	 */
 	public void abort() throws IOException {
 		if (isAlive()) {
-			// closeResources();
 			process.destroyForcibly();
-
+			exitval = process.exitValue();
 		}
+		eStreamFormatter.closeResources();
+
 	}
 	// ============================================================
 
@@ -216,66 +163,21 @@ public boolean isAlive() {
 	}
 	// ============================================================
 
-	/**
-	 * returns a String representing the full output of the execution
-	 * 
-	 * @throws NoOutputException
-	 * @throws ExecNotFinishedException
-	 */
-	public String getOutput() throws NoOutputException, ExecNotFinishedException {
-
-		if (isAlive())
-			throw new ExecNotFinishedException();
-
-		if (outputToSave == null || outputToSave.equals(""))
-			throw new NoOutputException();
-
-		return outputToSave.toString();
-	}
-	// ============================================================
-
 	/**
 	 * @return the previously executed Command object stored in the Executer
 	 */
 	public Command getCommand() {
-		if (cmd == null)
-			throw new NullPointerException();
 		return cmd;
 	}
 
 	/**
-	 * clears the output of the execution
-	 */
-	public void clearOutput() {
-		outputToSave = null;
-		outputStdStr = null;
-		outputErrStr = null;
-		hasError = false;
-	}
-	// ============================================================
-
-	/**
-	 * closes the used resources objects used to obtain the output
 	 * 
-	 * @throws IOException
+	 * @return exit value of the process, or 777 if the exit value couldn't be
+	 *         retrieved successfully.
 	 */
-	protected void closeResources() throws IOException {
-
-		cmd = null;
-		pb = null;
-		process = null;
-
-		stdReader.close();
-		stdOutputBr.close();
-		stdReader = null;
-		stdOutputBr = null;
-
-		errReader.close();
-		errOutputBr.close();
-		errReader = null;
-		errOutputBr = null;
+	public int getExitValue() {
+		return exitval;
 
 	}
-	// ============================================================
 
 }