Commit: 17b15692b7cd768400ce1fbe914d2b8576152f58 - ants.chlorofilsender (hg)

最古版。新版→https://osdn.jp/users/tacticsrealize/pf/ChlorophyllUploader/wiki/FrontPage

Commit MetaInfo

• Revision: 17b15692b7cd768400ce1fbe914d2b8576152f58 (tree)
• Time: 2015-07-14 21:18:02
• Author: MirrgieRiana Kurilab
• Commiter: MirrgieRiana Kurilab

Log Message

HLog: LoggerMirrgに実装を委譲

Change Summary

• modified: mirrg/mirrg/ants/util/HLog.java
• add: mirrg/mirrg/ants/util/LoggerMirrg.java

Incremental Difference

diff -r 52ebb64843cf -r 17b15692b7cd mirrg/mirrg/ants/util/HLog.java
--- a/mirrg/mirrg/ants/util/HLog.java	Tue Jul 14 21:05:30 2015 +0900
+++ b/mirrg/mirrg/ants/util/HLog.java	Tue Jul 14 21:18:02 2015 +0900
@@ -1,184 +1,73 @@
 package mirrg.ants.util;
 
-import java.io.IOException;
-import java.io.OutputStream;
 import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.function.Consumer;
 import java.util.function.Predicate;
 
+import mirrg.ants.util.LoggerMirrg.EnumTypeLog;
+
 public class HLog
 {
 
+	public static final LoggerMirrg logger = new LoggerMirrg();
+
 	public static void fine(String string)
 	{
-		log(EnumTypeLog.FINE, string);
+		logger.fine(string);
 	}
 
 	public static void warning(String string)
 	{
-		log(EnumTypeLog.WARNING, string);
+		logger.warning(string);
 	}
 
 	public static void error(String string)
 	{
-		log(EnumTypeLog.ERROR, string);
+		logger.error(string);
 	}
 
 	public static void info(String string)
 	{
-		log(EnumTypeLog.INFO, string);
-	}
-
-	///////////////////////////////////////////////
-
-	private static PrintStream outFine;
-
-	public static PrintStream fine()
-	{
-		if (outFine == null) {
-			outFine = createPrintStream(HLog::fine);
-		}
-		return outFine;
-	}
-
-	private static PrintStream outWarning;
-
-	public static PrintStream warning()
-	{
-		if (outWarning == null) {
-			outWarning = createPrintStream(HLog::warning);
-		}
-		return outWarning;
+		logger.info(string);
 	}
 
-	private static PrintStream outError;
-
-	public static PrintStream error()
-	{
-		if (outError == null) {
-			outError = createPrintStream(HLog::error);
-		}
-		return outError;
-	}
-
-	private static PrintStream outInfo;
-
-	public static PrintStream info()
-	{
-		if (outInfo == null) {
-			outInfo = createPrintStream(HLog::info);
-		}
-		return outInfo;
-	}
-
-	///////////////////////////////////////////////
-
-	private static PrintStream createPrintStream(Consumer<String> consumer)
-	{
-		try {
-			return new PrintStream(new OutputStreamLogger(consumer), true, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private static ArrayList<Tuple<EnumTypeLog, String>> messages = new ArrayList<>();
-
-	private static ArrayList<Predicate<Tuple<EnumTypeLog, String>>> listeners = new ArrayList<>();
-
 	public static void log(EnumTypeLog typeLog, String string)
 	{
-		Tuple<EnumTypeLog, String> message = new Tuple<>(typeLog, string);
-
-		messages.add(message);
-
-		Iterator<Predicate<Tuple<EnumTypeLog, String>>> iterator = listeners.iterator();
-		while (iterator.hasNext()) {
-			Predicate<Tuple<EnumTypeLog, String>> next = iterator.next();
-
-			if (next.test(message)) {
-				iterator.remove();
-			}
-		}
-	}
-
-	/**
-	 * @param listener
-	 *            イベントハンドラを削除する場合にtrueを返す。
-	 */
-	public static void registerListener(Predicate<Tuple<EnumTypeLog, String>> listener)
-	{
-		listeners.add(listener);
-	}
-
-	public static enum EnumTypeLog
-	{
-		FINE,
-		WARNING,
-		ERROR,
-		INFO,
+		logger.log(typeLog, string);
 	}
 
-	private static class OutputStreamLogger extends OutputStream
+	public static PrintStream fine()
 	{
-
-		private static final Charset charset = Charset.forName("UTF-8");
-
-		private Consumer<String> consumer;
-
-		public OutputStreamLogger(Consumer<String> consumer)
-		{
-			this.consumer = consumer;
-		}
-
-		private ArrayList<Byte> buffer = new ArrayList<>();
-		private boolean afterR = false;
+		return logger.fine();
+	}
 
-		@Override
-		public void write(int b) throws IOException
-		{
-			if (b == '\r') {
-				flush2();
-			} else {
-				if (b == '\n') {
-					if (afterR) {
+	public static PrintStream warning()
+	{
+		return logger.warning();
+	}
 
-					} else {
-						flush2();
-					}
-				} else {
-					buffer.add(Byte.valueOf((byte) b));
-				}
-			}
-
-			afterR = b == '\r';
-		}
+	public static PrintStream error()
+	{
+		return logger.error();
+	}
 
-		private void flush2()
-		{
-			byte[] bytes = new byte[buffer.size()];
-			for (int i = 0; i < buffer.size(); i++) {
-				bytes[i] = buffer.get(i);
-			}
-
-			consumer.accept(new String(bytes, charset));
-			buffer.clear();
-		}
-
+	public static PrintStream info()
+	{
+		return logger.info();
 	}
 
 	public static int getMessageCount()
 	{
-		return messages.size();
+		return logger.getMessageCount();
 	}
 
 	public static Tuple<EnumTypeLog, String> getMessage(int index)
 	{
-		return messages.get(index);
+		return logger.getMessage(index);
+	}
+
+	public static void registerListener(Predicate<Tuple<EnumTypeLog, String>> listener)
+	{
+		logger.registerListener(listener);
 	}
 
 }

diff -r 52ebb64843cf -r 17b15692b7cd mirrg/mirrg/ants/util/LoggerMirrg.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirrg/mirrg/ants/util/LoggerMirrg.java	Tue Jul 14 21:18:02 2015 +0900
@@ -0,0 +1,184 @@
+package mirrg.ants.util;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+public class LoggerMirrg
+{
+
+	public void fine(String string)
+	{
+		log(EnumTypeLog.FINE, string);
+	}
+
+	public void warning(String string)
+	{
+		log(EnumTypeLog.WARNING, string);
+	}
+
+	public void error(String string)
+	{
+		log(EnumTypeLog.ERROR, string);
+	}
+
+	public void info(String string)
+	{
+		log(EnumTypeLog.INFO, string);
+	}
+
+	public void log(EnumTypeLog typeLog, String string)
+	{
+		Tuple<EnumTypeLog, String> message = new Tuple<>(typeLog, string);
+
+		messages.add(message);
+
+		Iterator<Predicate<Tuple<EnumTypeLog, String>>> iterator = listeners.iterator();
+		while (iterator.hasNext()) {
+			Predicate<Tuple<EnumTypeLog, String>> next = iterator.next();
+
+			if (next.test(message)) {
+				iterator.remove();
+			}
+		}
+	}
+
+	///////////////////////////////////////////////
+
+	private PrintStream outFine;
+
+	public PrintStream fine()
+	{
+		if (outFine == null) {
+			outFine = createPrintStream(this::fine);
+		}
+		return outFine;
+	}
+
+	private PrintStream outWarning;
+
+	public PrintStream warning()
+	{
+		if (outWarning == null) {
+			outWarning = createPrintStream(this::warning);
+		}
+		return outWarning;
+	}
+
+	private PrintStream outError;
+
+	public PrintStream error()
+	{
+		if (outError == null) {
+			outError = createPrintStream(this::error);
+		}
+		return outError;
+	}
+
+	private PrintStream outInfo;
+
+	public PrintStream info()
+	{
+		if (outInfo == null) {
+			outInfo = createPrintStream(this::info);
+		}
+		return outInfo;
+	}
+
+	private PrintStream createPrintStream(Consumer<String> consumer)
+	{
+		try {
+			return new PrintStream(new OutputStreamLogger(consumer), true, "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	///////////////////////////////////////////////
+
+	private ArrayList<Tuple<EnumTypeLog, String>> messages = new ArrayList<>();
+
+	public int getMessageCount()
+	{
+		return messages.size();
+	}
+
+	public Tuple<EnumTypeLog, String> getMessage(int index)
+	{
+		return messages.get(index);
+	}
+
+	private ArrayList<Predicate<Tuple<EnumTypeLog, String>>> listeners = new ArrayList<>();
+
+	/**
+	 * @param listener
+	 *            イベントハンドラを削除する場合にtrueを返す。
+	 */
+	public void registerListener(Predicate<Tuple<EnumTypeLog, String>> listener)
+	{
+		listeners.add(listener);
+	}
+
+	public static enum EnumTypeLog
+	{
+		FINE,
+		WARNING,
+		ERROR,
+		INFO,
+	}
+
+	private static class OutputStreamLogger extends OutputStream
+	{
+
+		private static final Charset charset = Charset.forName("UTF-8");
+
+		private Consumer<String> consumer;
+
+		public OutputStreamLogger(Consumer<String> consumer)
+		{
+			this.consumer = consumer;
+		}
+
+		private ArrayList<Byte> buffer = new ArrayList<>();
+		private boolean afterR = false;
+
+		@Override
+		public void write(int b) throws IOException
+		{
+			if (b == '\r') {
+				flush2();
+			} else {
+				if (b == '\n') {
+					if (afterR) {
+
+					} else {
+						flush2();
+					}
+				} else {
+					buffer.add(Byte.valueOf((byte) b));
+				}
+			}
+
+			afterR = b == '\r';
+		}
+
+		private void flush2()
+		{
+			byte[] bytes = new byte[buffer.size()];
+			for (int i = 0; i < buffer.size(); i++) {
+				bytes[i] = buffer.get(i);
+			}
+
+			consumer.accept(new String(bytes, charset));
+			buffer.clear();
+		}
+
+	}
+
+}