From 523a8032594400f1bf11eb163ce8a30ab4a5e1af Mon Sep 17 00:00:00 2001 From: Georg Seibt <seibt@fim.uni-passau.de> Date: Wed, 13 Apr 2016 14:33:54 +0200 Subject: [PATCH] move ExecRes to more generic class ProcessExecutor --- .../seibt/gitwrapper/process/ProcessExecutor.java | 12 ++++++++++++ .../uni_passau/fim/seibt/gitwrapper/repo/Commit.java | 2 +- .../fim/seibt/gitwrapper/repo/GitWrapper.java | 9 +-------- .../fim/seibt/gitwrapper/repo/Repository.java | 2 +- 4 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 src/de/uni_passau/fim/seibt/gitwrapper/process/ProcessExecutor.java diff --git a/src/de/uni_passau/fim/seibt/gitwrapper/process/ProcessExecutor.java b/src/de/uni_passau/fim/seibt/gitwrapper/process/ProcessExecutor.java new file mode 100644 index 0000000..a4b78c1 --- /dev/null +++ b/src/de/uni_passau/fim/seibt/gitwrapper/process/ProcessExecutor.java @@ -0,0 +1,12 @@ +package de.uni_passau.fim.seibt.gitwrapper.process; + +public class ProcessExecutor { + + /** + * The result of a command line execution. + */ + public static class ExecRes { + public int code; + public String output; + } +} diff --git a/src/de/uni_passau/fim/seibt/gitwrapper/repo/Commit.java b/src/de/uni_passau/fim/seibt/gitwrapper/repo/Commit.java index add05d0..7a3a95d 100644 --- a/src/de/uni_passau/fim/seibt/gitwrapper/repo/Commit.java +++ b/src/de/uni_passau/fim/seibt/gitwrapper/repo/Commit.java @@ -9,7 +9,7 @@ import java.util.function.Function; import java.util.logging.Logger; import java.util.stream.Collectors; -import de.uni_passau.fim.seibt.gitwrapper.repo.GitWrapper.ExecRes; +import de.uni_passau.fim.seibt.gitwrapper.process.ProcessExecutor.ExecRes; /** * A {@link Commit} made in a {@link Repository}. diff --git a/src/de/uni_passau/fim/seibt/gitwrapper/repo/GitWrapper.java b/src/de/uni_passau/fim/seibt/gitwrapper/repo/GitWrapper.java index 7e0e404..bdd0792 100644 --- a/src/de/uni_passau/fim/seibt/gitwrapper/repo/GitWrapper.java +++ b/src/de/uni_passau/fim/seibt/gitwrapper/repo/GitWrapper.java @@ -10,6 +10,7 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; +import de.uni_passau.fim.seibt.gitwrapper.process.ProcessExecutor.ExecRes; import org.apache.commons.io.IOUtils; /** @@ -25,14 +26,6 @@ public class GitWrapper { private static final Pattern CLONING_INTO = Pattern.compile("Cloning into '(.*)'\\.\\.\\."); private static final Pattern ALREADY_EXISTS = Pattern.compile("fatal: destination path '(.*)' already exists and is not an empty directory\\."); - /** - * The result of a command line execution. - */ - static class ExecRes { - int code; - String output; - } - private String git; /** diff --git a/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java b/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java index 5fc556f..9436933 100644 --- a/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java +++ b/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java @@ -14,7 +14,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; -import de.uni_passau.fim.seibt.gitwrapper.repo.GitWrapper.ExecRes; +import de.uni_passau.fim.seibt.gitwrapper.process.ProcessExecutor.ExecRes; /** * A git {@link Repository}. -- GitLab