From 6b45d62aa1163e3e88cb29fdf1166c0856c75c79 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 16 Dec 2014 17:18:20 +0100 Subject: [PATCH] - reduced visibility --- .../ui/util/command/CommandResult.java | 20 +++++++++++++++---- .../ui/util/command/CommandRunner.java | 1 + .../ui/util/command/FutureCommandResult.java | 4 ++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/util/command/CommandResult.java b/main/ui/src/main/java/org/cryptomator/ui/util/command/CommandResult.java index 695033e0f..a3d8cf0e5 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/util/command/CommandResult.java +++ b/main/ui/src/main/java/org/cryptomator/ui/util/command/CommandResult.java @@ -20,16 +20,22 @@ import org.cryptomator.ui.util.mount.CommandFailedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class CommandResult { +public final class CommandResult { private static final Logger LOG = LoggerFactory.getLogger(CommandResult.class); private final Process process; - public CommandResult(Process process) { + /** + * @param process An already finished process. + */ + CommandResult(Process process) { this.process = process; } - + + /** + * @return Data written to STDOUT + */ public String getOutput() throws CommandFailedException { try (InputStream in = process.getInputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream()) { copy(in, out); @@ -39,6 +45,9 @@ public class CommandResult { } } + /** + * @return Data written to STDERR + */ public String getError() throws CommandFailedException { try (InputStream in = process.getErrorStream(); ByteArrayOutputStream out = new ByteArrayOutputStream()) { copy(in, out); @@ -48,11 +57,14 @@ public class CommandResult { } } + /** + * @return Exit value of the process + */ public int getExitValue() throws CommandFailedException { return process.exitValue(); } - public void logDebugInfo() { + void logDebugInfo() { if (LOG.isDebugEnabled()) { try { LOG.debug("Command execution finished. Exit code: {}\n" + "Output:\n" + "{}\n" + "Error:\n" + "{}\n", process.exitValue(), getOutput(), getError()); diff --git a/main/ui/src/main/java/org/cryptomator/ui/util/command/CommandRunner.java b/main/ui/src/main/java/org/cryptomator/ui/util/command/CommandRunner.java index f2b568936..b2695cead 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/util/command/CommandRunner.java +++ b/main/ui/src/main/java/org/cryptomator/ui/util/command/CommandRunner.java @@ -5,6 +5,7 @@ * * Contributors: * Markus Kreusch + * Sebastian Stenzel - Refactoring ******************************************************************************/ package org.cryptomator.ui.util.command; diff --git a/main/ui/src/main/java/org/cryptomator/ui/util/command/FutureCommandResult.java b/main/ui/src/main/java/org/cryptomator/ui/util/command/FutureCommandResult.java index 3e38b5c83..6f907b4b6 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/util/command/FutureCommandResult.java +++ b/main/ui/src/main/java/org/cryptomator/ui/util/command/FutureCommandResult.java @@ -19,7 +19,7 @@ import java.util.concurrent.locks.ReentrantLock; import org.cryptomator.ui.util.mount.CommandFailedException; -class FutureCommandResult implements Future, Runnable { +final class FutureCommandResult implements Future, Runnable { private final Process process; private final AtomicBoolean canceled = new AtomicBoolean(); @@ -29,7 +29,7 @@ class FutureCommandResult implements Future, Runnable { private CommandFailedException exception; - public FutureCommandResult(Process process) { + FutureCommandResult(Process process) { this.process = process; }