Add static logger access

ME1312 · Dec 11, 2021 · d42418c · d42418c
1 parent 0fa2099
commit d42418c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/GalaxiAPI/global/src/net/ME1312/Galaxi/Library/Util.java b/GalaxiAPI/global/src/net/ME1312/Galaxi/Library/Util.java
@@ -31,12 +31,15 @@ public static <T> T nullpo(T value) {
      *
      * @param values Values to check
      * @throws NullPointerException if any are null
+     * @return Values
      */
-    public static void nullpo(Object... values) {
+    @SafeVarargs
+    public static <T> T[] nullpo(T... values) {
         if (values == null) throw new NullPointerException("Illegal null array");
         for (int i = 0; i < values.length; ++i) {
             if (values[i] == null) throw new NullPointerException("Illegal null value at position: [" + i + "]");
         }
+        return values;
     }
 
     /**
@@ -57,10 +60,8 @@ public static boolean isNull(Object value) {
      */
     public static boolean isNull(Object... values) {
         if (values == null) return true;
-        for (Object value : values) {
-            if (value == null) {
-                return true;
-            }
+        for (int i = 0; i < values.length; ++i) {
+            if (values[i] == null) return true;
         }
         return false;
     }

diff --git a/GalaxiAPI/src/net/ME1312/Galaxi/Log/Logger.java b/GalaxiAPI/src/net/ME1312/Galaxi/Log/Logger.java
@@ -5,6 +5,7 @@
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.PrimitiveIterator;
 import java.util.concurrent.ExecutorService;
@@ -19,19 +20,29 @@ public final class Logger {
     private static ExecutorService service = null;
     static LogStream.MessageHandler writer = null;
 
+    private static final HashMap<String, Logger> loggers = new HashMap<String, Logger>();
     private static final LinkedList<LogFilter> gFilters = new LinkedList<LogFilter>();
     private final LinkedList<LogFilter> lFilters = new LinkedList<LogFilter>();
     private final java.util.logging.Logger primitive;
     final String prefix;
 
     /**
-     * Gets a new Logger
+     * Get a static logger
+     *
+     * @param prefix Log Prefix
+     * @return Logger
+     */
+    public static Logger get(String prefix) {
+        return loggers.computeIfAbsent(prefix, Logger::new);
+    }
+
+    /**
+     * Creates a new Logger
      *
      * @param prefix Log Prefix
      */
     public Logger(String prefix) {
-        Util.nullpo(prefix);
-        if (prefix.length() == 0) throw new StringIndexOutOfBoundsException("Cannot use an empty prefix");
+        if (Util.nullpo(prefix).length() == 0) throw new StringIndexOutOfBoundsException("Cannot use an empty prefix");
         debug = new LogStream(this, DEBUG);
         message = new LogStream(this, MESSAGE);
         info = new LogStream(this, INFO);

diff --git a/GalaxiAPI/src/net/ME1312/Galaxi/Plugin/PluginManager.java b/GalaxiAPI/src/net/ME1312/Galaxi/Plugin/PluginManager.java
@@ -144,11 +144,11 @@ public final <T extends Event> void registerListener(PluginInfo plugin, Class<T>
      * @param listeners Listeners
      * @param <T> Event Type
      */
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings("rawtypes")
     @SafeVarargs
     public final <T extends Event> void registerListener(PluginInfo plugin, Class<T> event, Number order, Listener<? extends T>... listeners) {
-        Util.nullpo(plugin, event, listeners);
-        Util.nullpo((Object[]) listeners);
+        Util.nullpo(plugin, event);
+        Util.nullpo(listeners);
         synchronized (this.listeners) {
             for (Listener listener : listeners) {
                 try {
@@ -199,7 +199,7 @@ public void unregisterListeners(PluginInfo plugin) {
      * @param listeners Listeners
      */
     public void unregisterListeners(PluginInfo plugin, Object... listeners) {
-        Util.nullpo(plugin, listeners);
+        Util.nullpo(plugin);
         Util.nullpo(listeners);
         synchronized (this.listeners) {
             LinkedList<Class<? extends Event>> update = new LinkedList<>();

diff --git a/GalaxiRT/UI/src/net/ME1312/Galaxi/Engine/Runtime/ConsoleWindow.java b/GalaxiRT/UI/src/net/ME1312/Galaxi/Engine/Runtime/ConsoleWindow.java
@@ -852,7 +852,7 @@ public void run() {
 
                                         "If this is not happening, for whatever reason,\n" +
                                         "you can terminate the program from this screen.\n" +
-                                        "Terminating a program can cause some undersirable consequences,\n" +
+                                        "Terminating a program can cause some undesirable consequences,\n" +
                                         "however, such as data loss or corruption.\n\n" +
 
                                         "You can also choose to finish running the program in the background,\u00A0\u00A0\n" +