Browse Source

simplify

tags/2.0.1
Jonathan Cobb 5 years ago
parent
commit
38e01668a1
3 changed files with 8 additions and 6 deletions
  1. +5
    -4
      src/main/java/org/cobbzilla/util/daemon/ZillaRuntime.java
  2. +2
    -1
      src/main/java/org/cobbzilla/util/error/ExceptionHandler.java
  3. +1
    -1
      src/main/java/org/cobbzilla/util/main/BaseMain.java

+ 5
- 4
src/main/java/org/cobbzilla/util/daemon/ZillaRuntime.java View File

@@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.SystemUtils;
import org.cobbzilla.util.collection.ToStringTransformer; import org.cobbzilla.util.collection.ToStringTransformer;
import org.cobbzilla.util.error.ExceptionHandler;
import org.cobbzilla.util.error.GeneralErrorHandler; import org.cobbzilla.util.error.GeneralErrorHandler;
import org.cobbzilla.util.io.StreamUtil; import org.cobbzilla.util.io.StreamUtil;
import org.cobbzilla.util.string.StringUtil; 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 java.util.stream.LongStream.range;
import static org.apache.commons.collections.CollectionUtils.collect; import static org.apache.commons.collections.CollectionUtils.collect;
import static org.apache.commons.lang3.exception.ExceptionUtils.getStackTrace; 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.abs;
import static org.cobbzilla.util.io.FileUtil.list; import static org.cobbzilla.util.io.FileUtil.list;
import static org.cobbzilla.util.reflect.ReflectionUtil.instantiate; 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"); return die("sorted: cannot sort a "+o.getClass().getSimpleName()+", can only sort arrays and Collections");
} }
public static <T> List sortedList(T o) {
public static <T> List toList(T o) {
if (o == null) return null; if (o == null) return null;
if (o instanceof Collection) return new ArrayList((Collection) o); if (o instanceof Collection) return new ArrayList((Collection) o);
if (o instanceof Object[]) return Arrays.asList((Object[]) 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() { return SystemUtils.IS_OS_MAC ? "gzcat" : "zcat"; }
public static String zcat(File f) { return (SystemUtils.IS_OS_MAC ? "gzcat" : "zcat") + " " + abs(f); } 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) { 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; return false;
} }




src/main/java/org/cobbzilla/util/daemon/ExceptionHandler.java → src/main/java/org/cobbzilla/util/error/ExceptionHandler.java View File

@@ -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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;



+ 1
- 1
src/main/java/org/cobbzilla/util/main/BaseMain.java View File

@@ -4,7 +4,7 @@ import lombok.AccessLevel;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; 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.cobbzilla.util.daemon.ZillaRuntime;
import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.CmdLineParser;


Loading…
Cancel
Save