[Picross-commit] SF.net SVN: picross:[123] branches/engine_split

[<yva...@us...>]

Revision: 123
          http://sourceforge.net/p/picross/code/123
Author:   yvan_norsa
Date:     2013-01-16 09:37:19 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
better logging

Modified Paths:
--------------
    branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java
    branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java
    branches/engine_split/android/src/picross/specific/activities/PicrossMainActivity.java
    branches/engine_split/android/src/picross/specific/game/simple/ui/AndroidLevelMenuMediator.java
    branches/engine_split/android/src/picross/specific/game/simple/ui/LevelMenuUI.java
    branches/engine_split/android/src/picross/specific/game/ui/GameController.java
    branches/engine_split/android/src/picross/specific/game/ui/GameMediator.java
    branches/engine_split/android/src/picross/specific/grid/ui/GridUI.java
    branches/engine_split/android/src/picross/specific/ui/AbstractAndroidView.java
    branches/engine_split/android/src/picross/specific/ui/GameMenuMediator.java
    branches/engine_split/android/src/picross/specific/ui/GameMenuUI.java
    branches/engine_split/android/src/picross/specific/ui/MainMenuMediator.java
    branches/engine_split/android/src/picross/specific/ui/MenuUI.java
    branches/engine_split/android/src/picross/specific/ui/PicrossAndroidLogger.java
    branches/engine_split/android/src/picross/specific/ui/PicrossMediator.java
    branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuController.java
    branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuMediator.java
    branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuModel.java
    branches/engine_split/common/src/picross/common/grid/ui/AbstractGridMediator.java
    branches/engine_split/common/src/picross/common/ui/AbstractMenuController.java
    branches/engine_split/common/src/picross/common/ui/MenuMediator.java
    branches/engine_split/engine/src/picross/engine/AbstractPicrossLogger.java
    branches/engine_split/engine/src/picross/engine/PicrossLogHelper.java
    branches/engine_split/engine/src/picross/engine/game/random/RandomPicrossModel.java
    branches/engine_split/engine/src/picross/engine/game/simple/XBMModel.java
    branches/engine_split/engine/src/picross/engine/grid/GridModel.java
    branches/engine_split/log4j.properties
    branches/engine_split/swing/src/picross/specific/game/simple/ui/LevelMenuUI.java
    branches/engine_split/swing/src/picross/specific/game/ui/GameController.java
    branches/engine_split/swing/src/picross/specific/game/ui/GameMediator.java
    branches/engine_split/swing/src/picross/specific/ui/GameMenuUI.java
    branches/engine_split/swing/src/picross/specific/ui/MenuUI.java
    branches/engine_split/swing/src/picross/specific/ui/PicrossLog4jLogger.java
    branches/engine_split/swing/src/picross/specific/ui/PicrossMediator.java

Modified: branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -33,6 +33,9 @@
 
 package picross.specific.activities;
 
+import picross.engine.PicrossLogger;
+import picross.engine.PicrossLogHelper;
+
 import picross.specific.ui.MainMenuUI;
 
 import android.content.Context;
@@ -54,10 +57,12 @@
     /** "Play" button Y coordinate. */
     private static final int PLAY_BUTTON_Y = 225;
 
+    private static PicrossLogger log = PicrossLogHelper.getLogger(MainMenuActivityUI.class);
+
     public MainMenuActivityUI(Context androidContext) {
         super(androidContext);
 
-        picross.engine.PicrossLogHelper.getLogger().debug("MainMenuActivityUI(" + androidContext + ")");
+        MainMenuActivityUI.log.debug("MainMenuActivityUI(" + androidContext + ")");
     }
 
     /** {@inheritDoc} */

Modified: branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -34,6 +34,7 @@
 package picross.specific.activities;
 
 import picross.engine.PicrossLogHelper;
+import picross.engine.PicrossLogger;
 
 import android.app.Activity;
 
@@ -53,10 +54,12 @@
     /** Main menu class. */
     private static final String MAIN_MENU_CLASS = "picross.specific.activities.MainMenuActivityUI";
 
+    private static PicrossLogger log = PicrossLogHelper.getLogger(PicrossActivityUI.class);
+
     private Activity activity;
 
     PicrossActivityUI(Activity picrossActivity) {
-        PicrossLogHelper.getLogger().debug("PicrossActivityUI(" + picrossActivity + ")");
+        PicrossActivityUI.log.debug("PicrossActivityUI(" + picrossActivity + ")");
         this.activity = picrossActivity;
     }
 
@@ -65,14 +68,14 @@
     /** {@inheritDoc} */
     @Override
     public void setContent(PicrossView content) {
-        PicrossLogHelper.getLogger().debug("setContent(" + content + ")");
+        PicrossActivityUI.log.debug("setContent(" + content + ")");
         this.activity.setContentView((picross.specific.ui.AbstractAndroidView) content);
     }
 
     /** {@inheritDoc} */
     @Override
     public void displayMessage(String msg) {
-        PicrossLogHelper.getLogger().debug("displayMessage(" + msg + ")");
+        PicrossActivityUI.log.debug("displayMessage(" + msg + ")");
 
         // FIXME
         /*
@@ -97,7 +100,7 @@
     /** {@inheritDoc} */
     @Override
     public void showUI() {
-        PicrossLogHelper.getLogger().debug("TODO showUI()");
+        PicrossActivityUI.log.debug("TODO showUI()");
         //this.setVisible(true);
     }
 

Modified: branches/engine_split/android/src/picross/specific/activities/PicrossMainActivity.java
===================================================================
--- branches/engine_split/android/src/picross/specific/activities/PicrossMainActivity.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/activities/PicrossMainActivity.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -42,13 +42,14 @@
 import picross.engine.PicrossLogHelper;
 
 public class PicrossMainActivity extends Activity {
+    static {
+        PicrossLogHelper.setLoggerClass(PicrossAndroidLogger.class);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        PicrossLogHelper.setLogger(new PicrossAndroidLogger());
-        PicrossLogHelper.getLogger().debug("TEST ##################");
-
         new PicrossMediator(this, new PicrossActivityUI(this));
     }
 }

Modified: branches/engine_split/android/src/picross/specific/game/simple/ui/AndroidLevelMenuMediator.java
===================================================================
--- branches/engine_split/android/src/picross/specific/game/simple/ui/AndroidLevelMenuMediator.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/game/simple/ui/AndroidLevelMenuMediator.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -52,7 +52,6 @@
         this.context = context;
     }
 
-
     @Override
     protected GameCommand newSimpleGameCommand(String selectedLevel) {
             return new
@@ -60,13 +59,12 @@
                             AndroidSimpleGameMediator(this.context, selectedLevel));
     }
 
-
     /** {@inheritDoc} */
     @Override
     protected MenuUI initView(PicrossUI ui, MenuController controller)
         throws PicrossException {
 
-        LevelMenuMediator.log.debug("initView()");
+        LevelMenuMediator.log.debug("initView(" + ui + ", " + controller + ")");
 
         this.model = new LevelMenuModel();
 

Modified: branches/engine_split/android/src/picross/specific/game/simple/ui/LevelMenuUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/game/simple/ui/LevelMenuUI.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/game/simple/ui/LevelMenuUI.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -81,7 +81,7 @@
      * @param listener listener for the buttons
      * @param sizes grid sizes
      */
-    void displaySizes(MenuController listener, List<Dimensions> sizes) {
+    public void displaySizes(MenuController listener, List<Dimensions> sizes) {
         // FIXME
         //this.removeAll();
 
@@ -127,6 +127,11 @@
         panel.setOpaque(false);
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
         */
+
+        int x = 150;
+        int y = 150;
+
+
         int nbLevels = levels.size();
 
         for (int i = 0; i < nbLevels; i++) {
@@ -140,11 +145,14 @@
                       .getButton());
             */
 
-            this.add(this.createSimpleButton(level, event, listener));
+            this.add(this.createSimpleButton(level, event, listener));//, x, y);//);
             /*
             if (i != (nbLevels - 1)) {
                 panel.add(Box.createRigidArea(new Dimension(0, 20)));
                 }*/
+
+
+            y += 75;
         }
         // FIXME
         /*

Modified: branches/engine_split/android/src/picross/specific/game/ui/GameController.java
===================================================================
--- branches/engine_split/android/src/picross/specific/game/ui/GameController.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/game/ui/GameController.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -52,7 +52,7 @@
     /*** Static field ***/
 
     /** The class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(GameController.class);
 
     /*** Method overloaded from the class Controller ***/
 

Modified: branches/engine_split/android/src/picross/specific/game/ui/GameMediator.java
===================================================================
--- branches/engine_split/android/src/picross/specific/game/ui/GameMediator.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/game/ui/GameMediator.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -56,7 +56,7 @@
     /*** Static field ***/
 
     /** The class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(GameMediator.class);
 
     /*** Fields ***/
 

Modified: branches/engine_split/android/src/picross/specific/grid/ui/GridUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/grid/ui/GridUI.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/grid/ui/GridUI.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -118,7 +118,7 @@
     /** A block height. */
     private static final int BLOCK_HEIGHT = 5;
 
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(GridUI.class);
 
     /*** Fields ***/
 

Modified: branches/engine_split/android/src/picross/specific/ui/AbstractAndroidView.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/AbstractAndroidView.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/ui/AbstractAndroidView.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -18,7 +18,7 @@
 import picross.engine.PicrossLogHelper;
 
 public abstract class AbstractAndroidView extends SurfaceView implements PicrossView, SurfaceHolder.Callback, Runnable {
-    protected static PicrossLogger log = PicrossLogHelper.getLogger();
+    protected static PicrossLogger log = PicrossLogHelper.getLogger(AbstractAndroidView.class);
 
     private SurfaceHolder surface;
     private boolean running;

Modified: branches/engine_split/android/src/picross/specific/ui/GameMenuMediator.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/GameMenuMediator.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/ui/GameMenuMediator.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -35,6 +35,9 @@
 
 import picross.engine.PicrossException;
 
+import picross.engine.PicrossLogger;
+import picross.engine.PicrossLogHelper;
+
 import picross.common.ui.MenuMediator;
 import picross.common.ui.PicrossUI;
 import picross.common.ui.GameMenuModel;
@@ -47,10 +50,12 @@
  * @author Y. Norsa
  */
 public final class GameMenuMediator extends MenuMediator {
+    private static PicrossLogger log = PicrossLogHelper.getLogger(GameMenuMediator.class);
+
     private Context context;
 
     public GameMenuMediator(Context androidContext) {
-        picross.engine.PicrossLogHelper.getLogger().debug("GameMenuMediator(" + androidContext + ")");
+        GameMenuMediator.log.debug("GameMenuMediator(" + androidContext + ")");
 
         if (androidContext == null) {
             throw new IllegalArgumentException("\"androidContext\" cannot be null");

Modified: branches/engine_split/android/src/picross/specific/ui/GameMenuUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/GameMenuUI.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/ui/GameMenuUI.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -58,7 +58,7 @@
     /*** Static field ***/
 
     /** The class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(GameMenuUI.class);
 
     /*** Constructor ***/
 

Modified: branches/engine_split/android/src/picross/specific/ui/MainMenuMediator.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/MainMenuMediator.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/ui/MainMenuMediator.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -43,16 +43,21 @@
 
 import android.content.Context;
 
+import picross.engine.PicrossLogger;
+import picross.engine.PicrossLogHelper;
+
 /**
  * Mediator for the main menu.
  *
  * @author Y. Norsa
  */
 public final class MainMenuMediator extends MenuMediator {
+    private static PicrossLogger log = PicrossLogHelper.getLogger(MainMenuMediator.class);
+
     private Context context;
 
     public MainMenuMediator(Context androidContext) {
-        picross.engine.PicrossLogHelper.getLogger().debug("MainMenuMediator(" + androidContext + ")");
+        MainMenuMediator.log.debug("MainMenuMediator(" + androidContext + ")");
 
         if (androidContext == null) {
             throw new IllegalArgumentException("\"androidContext\" cannot be null");
@@ -68,7 +73,7 @@
     protected MenuUI initView(PicrossUI ui, MenuController controller)
         throws PicrossException {
 
-        picross.engine.PicrossLogHelper.getLogger().debug("initView(" + ui + ", " + controller + ")");
+        MainMenuMediator.log.debug("initView(" + ui + ", " + controller + ")");
 
         MainMenuUI view = null;
 

Modified: branches/engine_split/android/src/picross/specific/ui/MenuUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/MenuUI.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/ui/MenuUI.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -351,10 +351,10 @@
             }
 
             PicrossButton button = (PicrossButton) label;
-
+            /*
             MenuUI.log.debug("Testing with X between " + button.getX() + " and " + (button.getX() + button.getWidth())
                              + ", and Y between " + button.getY() + " and " + (button.getY() + button.getHeight()));
-            /*
+
             MenuUI.log.debug(x >= button.x);
             MenuUI.log.debug(x <= (button.x + button.width));
             MenuUI.log.debug(y >= button.y);

Modified: branches/engine_split/android/src/picross/specific/ui/PicrossAndroidLogger.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/PicrossAndroidLogger.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/ui/PicrossAndroidLogger.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -38,17 +38,26 @@
 import picross.engine.AbstractPicrossLogger;
 
 public final class PicrossAndroidLogger extends AbstractPicrossLogger {
-    private static final String TAG = "PicrossAndroid";
+    private String tag;
 
+    public PicrossAndroidLogger(Class<?> clazz) {
+        super(clazz);
+
+        this.tag = clazz.getSimpleName();
+    }
+
+    @Override
     public void debug(String msg) {
-        Log.d(PicrossAndroidLogger.TAG, msg);
+        Log.d(this.tag, msg);
     }
 
+    @Override
     public void info(String msg) {
-        Log.i(PicrossAndroidLogger.TAG, msg);
+        Log.i(this.tag, msg);
     }
 
+    @Override
     public void error(String msg) {
-        Log.e(PicrossAndroidLogger.TAG, msg);
+        Log.e(this.tag, msg);
     }
 }

Modified: branches/engine_split/android/src/picross/specific/ui/PicrossMediator.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/PicrossMediator.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/android/src/picross/specific/ui/PicrossMediator.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -46,13 +46,18 @@
 
 import java.lang.reflect.InvocationTargetException;
 
+import picross.engine.PicrossLogger;
+import picross.engine.PicrossLogHelper;
+
 public final class PicrossMediator extends AbstractPicrossMediator {
+    private static PicrossLogger log = PicrossLogHelper.getLogger(PicrossMediator.class);
+
     private Context context;
 
     public PicrossMediator(Context androidContext, PicrossUI view) {
         super(view, false);
 
-        picross.engine.PicrossLogHelper.getLogger().debug("PicrossMediator(" + androidContext + ", " + view + ")");
+        PicrossMediator.log.debug("PicrossMediator(" + androidContext + ", " + view + ")");
         this.context = androidContext;
 
         this.init();
@@ -60,8 +65,8 @@
 
     @Override
     protected void displayMenu(Class<? extends MenuMediator> menuClass) {
-        picross.engine.PicrossLogHelper.getLogger().debug("displayMenu(" + menuClass + ")");
-        picross.engine.PicrossLogHelper.getLogger().debug("this.context: " + this.context);
+        PicrossMediator.log.debug("displayMenu(" + menuClass + ")");
+        PicrossMediator.log.debug("this.context: " + this.context);
 
         MenuMediator menu = null;
 

Modified: branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuController.java
===================================================================
--- branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuController.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuController.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -66,7 +66,7 @@
     /*** Static field ***/
 
     /** The class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(LevelMenuController.class);
 
     /*** Method overloaded from the class LevelMenuController ***/
 

Modified: branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuMediator.java
===================================================================
--- branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuMediator.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuMediator.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -60,7 +60,7 @@
     /*** Static field ***/
 
     /** The class' logger. */
-    protected static PicrossLogger log = PicrossLogHelper.getLogger();
+    protected static PicrossLogger log = PicrossLogHelper.getLogger(LevelMenuMediator.class);
 
     /*** Field ***/
 
@@ -83,7 +83,7 @@
     protected MenuUI initView(PicrossUI ui, MenuController controller)
         throws PicrossException {
 
-        LevelMenuMediator.log.debug("initView()");
+        LevelMenuMediator.log.debug("initView(" + ui + ", " + controller + ")");
 
         this.model = new LevelMenuModel();
 

Modified: branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuModel.java
===================================================================
--- branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuModel.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuModel.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -44,6 +44,7 @@
 
 import picross.engine.Picross;
 import picross.engine.PicrossException;
+import picross.engine.PicrossLogger;
 import picross.engine.PicrossLogHelper;
 
 import picross.engine.game.simple.Dimensions;
@@ -61,6 +62,8 @@
     /** File containing the data files list. */
     private static final String DATA_LIST = "contents.txt";
 
+    private static PicrossLogger log = PicrossLogHelper.getLogger(LevelMenuModel.class);
+
     /*** Field ***/
 
     /** Levels list. */
@@ -120,7 +123,7 @@
             String line = null;
 
             while ((line = in.readLine()) != null) {
-                PicrossLogHelper.getLogger().debug("read line: \"" + line + "\"");
+                LevelMenuModel.log.debug("read line: \"" + line + "\"");
                 list.add(FileInfos.readFileInfos(line));
             }
         } catch (IOException ioEx) {

Modified: branches/engine_split/common/src/picross/common/grid/ui/AbstractGridMediator.java
===================================================================
--- branches/engine_split/common/src/picross/common/grid/ui/AbstractGridMediator.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/common/src/picross/common/grid/ui/AbstractGridMediator.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -61,7 +61,7 @@
     /*** Static field ***/
 
     /** Class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(AbstractGridMediator.class);
 
     /*** Fields ***/
 

Modified: branches/engine_split/common/src/picross/common/ui/AbstractMenuController.java
===================================================================
--- branches/engine_split/common/src/picross/common/ui/AbstractMenuController.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/common/src/picross/common/ui/AbstractMenuController.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -55,7 +55,7 @@
     /*** Static field ***/
 
     /** The class' logger. */
-    protected static PicrossLogger log = PicrossLogHelper.getLogger();
+    protected static PicrossLogger log = PicrossLogHelper.getLogger(AbstractMenuController.class);
 
     /*** Field ***/
 

Modified: branches/engine_split/common/src/picross/common/ui/MenuMediator.java
===================================================================
--- branches/engine_split/common/src/picross/common/ui/MenuMediator.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/common/src/picross/common/ui/MenuMediator.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -52,7 +52,7 @@
     /*** Static field ***/
 
     /** This class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(MenuMediator.class);
 
     /*** Field ***/
 
@@ -91,6 +91,8 @@
      * @throws PicrossException if the instantiation of the view fails
      */
     public final void init(PicrossUI ui) throws PicrossException {
+        MenuMediator.log.debug("init(" + ui + ")");
+
         MenuController controller = this.initController();
         controller.addSimpleListener(this);
 

Modified: branches/engine_split/engine/src/picross/engine/AbstractPicrossLogger.java
===================================================================
--- branches/engine_split/engine/src/picross/engine/AbstractPicrossLogger.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/engine/src/picross/engine/AbstractPicrossLogger.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -6,6 +6,12 @@
 package picross.engine;
 
 public abstract class AbstractPicrossLogger implements PicrossLogger {
+    protected Class<?> clazz;
+
+    protected AbstractPicrossLogger(Class<?> clazz) {
+        this.clazz = clazz;
+    }
+
     @Override
     public final void debug(Object msg) {
         this.debug(msg.toString());

Modified: branches/engine_split/engine/src/picross/engine/PicrossLogHelper.java
===================================================================
--- branches/engine_split/engine/src/picross/engine/PicrossLogHelper.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/engine/src/picross/engine/PicrossLogHelper.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -33,33 +33,58 @@
 
 package picross.engine;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public final class PicrossLogHelper {
-    private static PicrossLogger logger = new DefaultPicrossLogger();
+    private static Class<? extends PicrossLogger> loggerClass = null;
+    private static Map<Class<?>, PicrossLogger> loggers = new HashMap<Class<?>, PicrossLogger>();
 
-    public static PicrossLogger getLogger() {
-        return PicrossLogHelper.logger;
+    public static PicrossLogger getLogger(Class<?> clazz) {
+        PicrossLogger logger = PicrossLogHelper.loggers.get(clazz);
+
+        if (logger == null) {
+            try {
+                if (loggerClass == null) {
+                    return DefaultPicrossLogger.class.getConstructor(Class.class).newInstance(clazz);
+                }
+
+                logger = PicrossLogHelper.loggerClass.getConstructor(Class.class).newInstance(clazz);
+            // FIXME
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+
+            PicrossLogHelper.loggers.put(clazz, logger);
+        }
+
+        return logger;
     }
 
-    public static void setLogger(PicrossLogger picrossLogger) {
-        PicrossLogHelper.logger = picrossLogger;
+    public static void setLoggerClass(Class<? extends PicrossLogger> picrossLoggerClass) {
+        PicrossLogHelper.loggerClass = picrossLoggerClass;
     }
 
     private PicrossLogHelper() { }
 
     private static final class DefaultPicrossLogger extends AbstractPicrossLogger {
+        public DefaultPicrossLogger(Class<?> clazz) {
+            super(clazz);
+        }
+
         @Override
         public void debug(String msg) {
-            System.out.println("DEBUG " + msg);
+            System.out.println(this.clazz + " - DEBUG " + msg);
         }
 
         @Override
         public void info(String msg) {
-            System.out.println("INFO " + msg);
+            System.out.println(this.clazz + " - INFO " + msg);
         }
 
         @Override
         public void error(String msg) {
-            System.out.println("ERROR " + msg);
+            System.out.println(this.clazz + " - ERROR " + msg);
         }
     }
 }

Modified: branches/engine_split/engine/src/picross/engine/game/random/RandomPicrossModel.java
===================================================================
--- branches/engine_split/engine/src/picross/engine/game/random/RandomPicrossModel.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/engine/src/picross/engine/game/random/RandomPicrossModel.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -49,7 +49,7 @@
     /*** Static field ***/
 
     /** The class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(RandomPicrossModel.class);
 
     /*** Constructor ***/
 

Modified: branches/engine_split/engine/src/picross/engine/game/simple/XBMModel.java
===================================================================
--- branches/engine_split/engine/src/picross/engine/game/simple/XBMModel.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/engine/src/picross/engine/game/simple/XBMModel.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -93,7 +93,7 @@
     /*** Static field ***/
 
     /** The class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(XBMModel.class);
 
     /*** Constructor ***/
 

Modified: branches/engine_split/engine/src/picross/engine/grid/GridModel.java
===================================================================
--- branches/engine_split/engine/src/picross/engine/grid/GridModel.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/engine/src/picross/engine/grid/GridModel.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -53,7 +53,7 @@
     /*** Static field ***/
 
     /** The class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(GridModel.class);
 
     /*** Fields ***/
 

Modified: branches/engine_split/log4j.properties
===================================================================
--- branches/engine_split/log4j.properties	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/log4j.properties	2013-01-16 09:37:19 UTC (rev 123)
@@ -1,4 +1,4 @@
 log4j.rootCategory=debug, stdout,
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p (%F:%L) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%5p - %m%n

Modified: branches/engine_split/swing/src/picross/specific/game/simple/ui/LevelMenuUI.java
===================================================================
--- branches/engine_split/swing/src/picross/specific/game/simple/ui/LevelMenuUI.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/swing/src/picross/specific/game/simple/ui/LevelMenuUI.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -92,7 +92,7 @@
      * @param listener listener for the buttons
      * @param sizes grid sizes
      */
-    void displaySizes(MenuController listener, List<Dimensions> sizes) {
+    public void displaySizes(MenuController listener, List<Dimensions> sizes) {
         this.removeAll();
 
         int x = 150;

Modified: branches/engine_split/swing/src/picross/specific/game/ui/GameController.java
===================================================================
--- branches/engine_split/swing/src/picross/specific/game/ui/GameController.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/swing/src/picross/specific/game/ui/GameController.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -53,7 +53,7 @@
     /*** Static field ***/
 
     /** The class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(GameController.class);
 
     /*** Method overloaded from the class Controller ***/
 

Modified: branches/engine_split/swing/src/picross/specific/game/ui/GameMediator.java
===================================================================
--- branches/engine_split/swing/src/picross/specific/game/ui/GameMediator.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/swing/src/picross/specific/game/ui/GameMediator.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -61,7 +61,7 @@
     /*** Static field ***/
 
     /** The class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(GameMediator.class);
 
     /*** Fields ***/
 

Modified: branches/engine_split/swing/src/picross/specific/ui/GameMenuUI.java
===================================================================
--- branches/engine_split/swing/src/picross/specific/ui/GameMenuUI.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/swing/src/picross/specific/ui/GameMenuUI.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -56,7 +56,7 @@
     /*** Static field ***/
 
     /** The class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(GameMenuUI.class);
 
     /*** Constructor ***/
 

Modified: branches/engine_split/swing/src/picross/specific/ui/MenuUI.java
===================================================================
--- branches/engine_split/swing/src/picross/specific/ui/MenuUI.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/swing/src/picross/specific/ui/MenuUI.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -82,7 +82,7 @@
     /*** Static field ***/
 
     /** This class' logger. */
-    private static PicrossLogger log = PicrossLogHelper.getLogger();
+    private static PicrossLogger log = PicrossLogHelper.getLogger(MenuUI.class);
 
     /*** Field ***/
 

Modified: branches/engine_split/swing/src/picross/specific/ui/PicrossLog4jLogger.java
===================================================================
--- branches/engine_split/swing/src/picross/specific/ui/PicrossLog4jLogger.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/swing/src/picross/specific/ui/PicrossLog4jLogger.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -38,17 +38,26 @@
 import picross.engine.AbstractPicrossLogger;
 
 public final class PicrossLog4jLogger extends AbstractPicrossLogger {
-    private static Logger log = Logger.getLogger(PicrossLog4jLogger.class);
+    private Logger log;
 
+    public PicrossLog4jLogger(Class<?> clazz) {
+        super(clazz);
+
+        this.log = Logger.getLogger(this.clazz);
+    }
+
+    @Override
     public void debug(String msg) {
-        PicrossLog4jLogger.log.debug(msg);
+        this.log.debug(this.clazz.getSimpleName() + " - " + msg);
     }
 
+    @Override
     public void info(String msg) {
-        PicrossLog4jLogger.log.info(msg);
+        this.log.info(this.clazz.getSimpleName() + " - " + msg);
     }
 
+    @Override
     public void error(String msg) {
-        PicrossLog4jLogger.log.error(msg);
+        this.log.error(this.clazz.getSimpleName() + " - " + msg);
     }
 }

Modified: branches/engine_split/swing/src/picross/specific/ui/PicrossMediator.java
===================================================================
--- branches/engine_split/swing/src/picross/specific/ui/PicrossMediator.java	2013-01-16 08:29:03 UTC (rev 122)
+++ branches/engine_split/swing/src/picross/specific/ui/PicrossMediator.java	2013-01-16 09:37:19 UTC (rev 123)
@@ -44,10 +44,12 @@
 import picross.specific.game.ui.GameMediator;
 
 public final class PicrossMediator extends AbstractPicrossMediator {
+    static {
+        PicrossLogHelper.setLoggerClass(PicrossLog4jLogger.class);
+    }
+
     public PicrossMediator(PicrossUI view) {
         super(view);
-
-        PicrossLogHelper.setLogger(new PicrossLog4jLogger());
     }
 
     @Override

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.