From 029801e2e8914f99383efb17964a2495c914c0e4 Mon Sep 17 00:00:00 2001
From: galaxyoyo <yohann.danello@gmail.com>
Date: Wed, 7 Jan 2015 17:48:53 +0100
Subject: [PATCH] =?UTF-8?q?Mis=20=C3=A0=20jour=20Logger=20+=20javadoc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .classpath                                    |  1 +
 .../galaxyoyo/unknown/client/main/Main.java   | 25 ++++++++++++++++---
 src/main/resources/log4j2.xml                 |  7 ++++++
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/log4j2.xml

diff --git a/.classpath b/.classpath
index 61f3bb9..b2ff1d1 100644
--- a/.classpath
+++ b/.classpath
@@ -12,6 +12,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/src/main/java/galaxyoyo/unknown/client/main/Main.java b/src/main/java/galaxyoyo/unknown/client/main/Main.java
index 0b00d1e..71b4917 100644
--- a/src/main/java/galaxyoyo/unknown/client/main/Main.java
+++ b/src/main/java/galaxyoyo/unknown/client/main/Main.java
@@ -1,8 +1,10 @@
 /**
- * 
+ * @author galaxyoyo
  */
 package galaxyoyo.unknown.client.main;
 
+import galaxyoyo.unknown.frame.MainFrame;
+
 import java.io.IOException;
 
 import joptsimple.OptionParser;
@@ -17,8 +19,8 @@ import org.apache.logging.log4j.core.appender.FileAppender;
 import org.apache.logging.log4j.core.layout.PatternLayout;
 
 /**
- * @author galaxyoyo
  * Class principale qui lance le jeu
+ * @author galaxyoyo
  * @see #main(String...)
  */
 public class Main
@@ -50,7 +52,9 @@ public class Main
 		
 		Logger LOGGER = (Logger) LogManager.getRootLogger();
 		ConsoleAppender console = ConsoleAppender.newBuilder().setLayout(PatternLayout.newBuilder().withPattern("[%d{dd/MM/yyyy}] [%d{HH:mm:ss}] [%t] [%c] [%p] %m%n").build()).setName("Console").build();
-		FileAppender file = FileAppender.createAppender("Console.log", "false", "false", "File", "true", "true", "true", "8192", console.getLayout(), null, "false", "false", null);
+		FileAppender file = FileAppender.createAppender("Console.log", "false", "false", "File", "true", "true", "true", "8192", PatternLayout.newBuilder().withPattern("[%d{dd/MM/yyyy}] [%d{HH:mm:ss}] [%t] [%c] [%p] %m%n").build(), null, "false", "false", null);
+		console.start();
+		file.start();
 		LOGGER.addAppender(console);
 		LOGGER.addAppender(file);
 		LOGGER.setLevel(Level.INFO);
@@ -87,7 +91,7 @@ public class Main
 			
 			if (DEBUG)
 			{
-				LOGGER.setLevel(Level.DEBUG);
+				LOGGER.setLevel(Level.ALL);
 			}
 		}
 		
@@ -96,11 +100,24 @@ public class Main
 			launchEditMode();
 			return;
 		}
+		
+		launchFrame();
 	}
 	
+	/**
+	 * Lance la fen&ecirc;tre principale
+	 * @see #main(String...)
+	 * @see #launchEditMode()
+	 */
+	private static void launchFrame()
+	{
+		MainFrame.getInstance().setVisible(true);
+	}
+
 	/**
 	 * Permet de lancer l'&eacute;diteur de carte
 	 * @see #main(String...)
+	 * @see #launchFrame()
 	 * @since 0.1-aplha
 	 */
 	private static void launchEditMode()
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..9a809f8
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration package="log4j.test" status="INFO">
+<Loggers>
+    <Root level="INFO">
+    </Root>
+</Loggers>
+</Configuration>
\ No newline at end of file