diff --git a/src/main/java/org/cobbzilla/util/daemon/ZillaRuntime.java b/src/main/java/org/cobbzilla/util/daemon/ZillaRuntime.java index 5d9f7e6..8eca410 100644 --- a/src/main/java/org/cobbzilla/util/daemon/ZillaRuntime.java +++ b/src/main/java/org/cobbzilla/util/daemon/ZillaRuntime.java @@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.SystemUtils; import org.cobbzilla.util.collection.ToStringTransformer; +import org.cobbzilla.util.error.ExceptionHandler; import org.cobbzilla.util.error.GeneralErrorHandler; import org.cobbzilla.util.io.StreamUtil; import org.cobbzilla.util.string.StringUtil; @@ -31,7 +32,7 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.LongStream.range; import static org.apache.commons.collections.CollectionUtils.collect; import static org.apache.commons.lang3.exception.ExceptionUtils.getStackTrace; -import static org.cobbzilla.util.daemon.ExceptionHandler.DEFAULT_EX_RUNNABLE; +import static org.cobbzilla.util.error.ExceptionHandler.DEFAULT_EX_RUNNABLE; import static org.cobbzilla.util.io.FileUtil.abs; import static org.cobbzilla.util.io.FileUtil.list; import static org.cobbzilla.util.reflect.ReflectionUtil.instantiate; @@ -235,7 +236,7 @@ public class ZillaRuntime { } return die("sorted: cannot sort a "+o.getClass().getSimpleName()+", can only sort arrays and Collections"); } - public static List sortedList(T o) { + public static List toList(T o) { if (o == null) return null; if (o instanceof Collection) return new ArrayList((Collection) o); if (o instanceof Object[]) return Arrays.asList((Object[]) o); @@ -343,10 +344,10 @@ public class ZillaRuntime { public static String zcat() { return SystemUtils.IS_OS_MAC ? "gzcat" : "zcat"; } public static String zcat(File f) { return (SystemUtils.IS_OS_MAC ? "gzcat" : "zcat") + " " + abs(f); } - public static final String[] OMIT_DEBUG_OPTIONS = {"-Xdebug", "-agentlib", "-Xrunjdwp"}; + public static final String[] JAVA_DEBUG_OPTIONS = {"-Xdebug", "-agentlib", "-Xrunjdwp"}; public static boolean isDebugOption (String arg) { - for (String opt : OMIT_DEBUG_OPTIONS) if (arg.startsWith(opt)) return true; + for (String opt : JAVA_DEBUG_OPTIONS) if (arg.startsWith(opt)) return true; return false; } diff --git a/src/main/java/org/cobbzilla/util/daemon/ExceptionHandler.java b/src/main/java/org/cobbzilla/util/error/ExceptionHandler.java similarity index 90% rename from src/main/java/org/cobbzilla/util/daemon/ExceptionHandler.java rename to src/main/java/org/cobbzilla/util/error/ExceptionHandler.java index 90fe188..81f44fd 100644 --- a/src/main/java/org/cobbzilla/util/daemon/ExceptionHandler.java +++ b/src/main/java/org/cobbzilla/util/error/ExceptionHandler.java @@ -1,5 +1,6 @@ -package org.cobbzilla.util.daemon; +package org.cobbzilla.util.error; +import org.cobbzilla.util.daemon.ZillaRuntime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/cobbzilla/util/main/BaseMain.java b/src/main/java/org/cobbzilla/util/main/BaseMain.java index a354382..3bd1318 100644 --- a/src/main/java/org/cobbzilla/util/main/BaseMain.java +++ b/src/main/java/org/cobbzilla/util/main/BaseMain.java @@ -4,7 +4,7 @@ import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.cobbzilla.util.daemon.ExceptionHandler; +import org.cobbzilla.util.error.ExceptionHandler; import org.cobbzilla.util.daemon.ZillaRuntime; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser;