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

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

Revision: 116
          http://sourceforge.net/p/picross/code/116
Author:   yvan_norsa
Date:     2013-01-14 10:48:50 +0000 (Mon, 14 Jan 2013)
Log Message:
-----------
android version

Modified Paths:
--------------
    branches/engine_split/android/custom_rules.xml
    branches/engine_split/android/src/picross/specific/game/simple/ui/LevelMenuUI.java
    branches/engine_split/android/src/picross/specific/ui/MenuUI.java
    branches/engine_split/android/src/picross/specific/ui/PicrossButton.java
    branches/engine_split/build.xml
    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/ui/AbstractPicrossMediator.java

Added Paths:
-----------
    branches/engine_split/android/src/picross/specific/ui/PicrossLabel.java
    branches/engine_split/android/src/picross/specific/ui/WaitMenuMediator.java
    branches/engine_split/android/src/picross/specific/ui/WaitMenuUI.java
    branches/engine_split/common/src/picross/common/ui/AbstractWaitMenuMediator.java
    branches/engine_split/common/src/picross/specific/ui/WaitMenuMediator.java
    branches/engine_split/properties/
    branches/engine_split/swing/src/picross/specific/ui/WaitMenuMediator.java

Removed Paths:
-------------
    branches/engine_split/android/extraData/META-INF/
    branches/engine_split/common/src/picross/common/ui/WaitMenuMediator.java
    branches/engine_split/src/picross/properties/

Modified: branches/engine_split/android/custom_rules.xml
===================================================================
--- branches/engine_split/android/custom_rules.xml	2013-01-14 09:30:39 UTC (rev 115)
+++ branches/engine_split/android/custom_rules.xml	2013-01-14 10:48:50 UTC (rev 116)
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project name="PicrossDroid-custom">
-  <target name="-post-compile">
-    <copy todir="${out.classes.absolute.dir}/picross">
-      <fileset dir="extraData/picross" />
-    </copy>
-  </target>
-
   <target name="-post-package">
-
     <jar destfile="${out.packaged.file}" update="true">
       <fileset dir="extraData/gameModes"/>
     </jar>

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-14 09:30:39 UTC (rev 115)
+++ branches/engine_split/android/src/picross/specific/game/simple/ui/LevelMenuUI.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -118,10 +118,11 @@
      */
     public void displayLevels(MenuController listener, List<String> levels) {
         // FIXME
+        this.removeAllButtons();
+
+        // FIXME
         /*
-        this.removeAll();
 
-
         JPanel panel = new JPanel();
         panel.setOpaque(false);
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
@@ -137,7 +138,10 @@
             /*
             panel.add(this.createSimpleButton(level, event, listener)
                       .getButton());
+            */
 
+            this.add(this.createSimpleButton(level, event, listener));
+            /*
             if (i != (nbLevels - 1)) {
                 panel.add(Box.createRigidArea(new Dimension(0, 20)));
                 }*/

Modified: branches/engine_split/android/src/picross/specific/ui/MenuUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/MenuUI.java	2013-01-14 09:30:39 UTC (rev 115)
+++ branches/engine_split/android/src/picross/specific/ui/MenuUI.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -62,6 +62,9 @@
 
 import android.view.MotionEvent;
 
+import android.graphics.Color;
+import android.graphics.Paint;
+
 /**
  * Base class for menus.
  *
@@ -95,7 +98,7 @@
     protected Context context;
     private SurfaceHolder surface;
 
-    private List<PicrossButton> buttons;
+    private List<PicrossLabel> buttons;
 
     /*** Constructor ***/
 
@@ -108,23 +111,6 @@
 
         this.context = context;
 
-        // FIXME
-        /*
-        try {
-            ImageIcon icon = PicrossUIHelper.getImage(MenuUI.BACKGROUND_IMAGE);
-            this.setPreferredSize(new Dimension(icon.getIconWidth(),
-                                                icon.getIconHeight()));
-            this.image = icon.getImage();
-        } catch (MissingImageException imageEx) {
-            MenuUI.log.info(imageEx.getMessage());
-            this.setPreferredSize(new Dimension(MenuUI.DEFAULT_WIDTH,
-                                                MenuUI.DEFAULT_HEIGHT));
-        }
-
-        this.setLayout(null);
-        */
-
-
         Resources res = context.getResources();
 
         this.image = PicrossUIHelper.getImage(res, R.drawable.background);
@@ -134,7 +120,7 @@
         this.surface = this.getHolder();
         this.surface.addCallback(this);
 
-        this.buttons = new ArrayList<PicrossButton>();
+        this.buttons = new ArrayList<PicrossLabel>();
     }
 
 
@@ -198,10 +184,19 @@
             return;
         }
 
+        Paint paint = new Paint();
+        paint.setColor(Color.WHITE);
+        paint.setTextSize(20);
+
         canvas.drawBitmap(this.image, 0, 0, null);
 
-        for (PicrossButton button : this.buttons) {
+        for (PicrossLabel button : this.buttons) {
             canvas.drawBitmap(button.getIcon(), button.getX(), button.getY(), null);
+
+            if (button instanceof PicrossButton && ((PicrossButton) button).getText() != null) {
+                canvas.drawText(((PicrossButton) button).getText(), button.getX() + (button.getWidth() / 2), button.getY()
+                                + (button.getHeight() / 2), paint);
+            }
         }
 	}
 
@@ -250,12 +245,9 @@
                                          SimpleListener listener,
                                          int x, int y) {
         MenuUI.log.debug("addSimpleButton(" + label + ", " + event + ", listener, " + x + ", " + y + ")");
-        // FIXME
-        /*
         PicrossButton button =
             this.createSimpleButton(label, event, listener);
-        this.putButton(button.getButton(), x, y, 150, 50);
-        */
+        this.putButton(button/*.getButton()*/, x, y, 150, 50);
     }
 
     /**
@@ -266,17 +258,18 @@
      * @param listener listener for the button
      * @return the created button
      */
-        // FIXME
-        /*
     protected final PicrossButton createSimpleButton(String label,
                                                      SimpleEvent event,
                                                      SimpleListener listener) {
         PicrossButton button =
             new PicrossButton(label,
-                              PicrossUIHelper.getImage("empty-button.png"),
+                              PicrossUIHelper.getImage(this.context.getResources(), R.drawable.empty_button),
 															event);
-        button.addSimpleListener(listener);
+        //button.addSimpleListener(listener);
+        button.setListener(listener);
 
+        // FIXME
+        /*
         JButton realButton = button.getButton();
 
         realButton.setHorizontalTextPosition(JButton.CENTER);
@@ -290,11 +283,14 @@
         realButton.setMinimumSize(dim);
         realButton.setMaximumSize(dim);
         realButton.setPreferredSize(dim);
+        */
+        button.setWidth(150);
+        button.setHeight(50);
 
         return button;
 
     }
-        */
+
     /**
      * Helper method to add a button.
      *
@@ -386,7 +382,7 @@
 
     //312 267
 
-    private void add(PicrossButton button) {
+    protected void add(PicrossLabel button) {
         this.buttons.add(button);
     }
 
@@ -397,7 +393,13 @@
 
         MenuUI.log.debug("x = " + x + ", y = " + y);
 
-        for (PicrossButton button : buttons) {
+        for (PicrossLabel label : buttons) {
+            if (!(label instanceof PicrossButton)) {
+                continue;
+            }
+
+            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()));
             /*
@@ -426,6 +428,23 @@
         return false;
     }
 
+    public void removeAllButtons() {
+        this.buttons.clear();
+    }
+
+    protected void addLabel(int resID, int x, int y) {
+        Bitmap icon =
+            PicrossUIHelper.getImage(this.context.getResources(), resID);
+        //JLabel label = new JLabel(labelIcon);
+        //label.setBorder(null);
+        //label.setBounds(75, 225,
+        //              labelIcon.getIconWidth(), labelIcon.getIconHeight());
+
+
+        PicrossLabel label = new PicrossLabel(icon, x, y, icon.getWidth(), icon.getHeight());
+        this.add(label);
+    }
+
     public static class PicrossEvent {
         private String actionCommand;
 

Modified: branches/engine_split/android/src/picross/specific/ui/PicrossButton.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/PicrossButton.java	2013-01-14 09:30:39 UTC (rev 115)
+++ branches/engine_split/android/src/picross/specific/ui/PicrossButton.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -38,14 +38,9 @@
 
 import android.graphics.Bitmap;
 
-public class PicrossButton {
-    private Bitmap icon;
+public class PicrossButton extends PicrossLabel {
     private MenuController controller;
     private String command;
-    private int x;
-    private int y;
-    private int width;
-    private int height;
 
     PicrossButton(Bitmap buttonIcon, MenuController buttonController, String cmd) {
         this.icon = buttonIcon;
@@ -59,6 +54,18 @@
         this.event = event;
     }
 
+    public PicrossButton(String label, Bitmap buttonIcon, SimpleEvent event) {
+        this.text = label;
+        this.icon = buttonIcon;
+        this.event = event;
+    }
+
+    private String text;
+
+    public String getText() {
+        return this.text;
+    }
+
     private int resID;
     private SimpleEvent event;
 
@@ -70,14 +77,6 @@
         return this.resID;
     }
 
-    public Bitmap getIcon() {
-        return this.icon;
-    }
-
-    public void setIcon(Bitmap buttonIcon) {
-        this.icon = buttonIcon;
-    }
-
     public MenuController getController() {
         return this.controller;
     }
@@ -95,36 +94,4 @@
     public String getCommand() {
         return this.command;
     }
-
-    public int getX() {
-        return this.x;
-    }
-
-    public void setX(int xValue) {
-        this.x = xValue;
-    }
-
-    public int getY() {
-        return this.y;
-    }
-
-    public void setY(int yValue) {
-        this.y = yValue;
-    }
-
-    public int getWidth() {
-        return this.width;
-    }
-
-    public void setWidth(int w) {
-        this.width = w;
-    }
-
-    public int getHeight() {
-        return this.height;
-    }
-
-    public void setHeight(int h) {
-        this.height = h;
-    }
 }

Added: branches/engine_split/android/src/picross/specific/ui/PicrossLabel.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/PicrossLabel.java	                        (rev 0)
+++ branches/engine_split/android/src/picross/specific/ui/PicrossLabel.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -0,0 +1,94 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.ui;
+
+import android.graphics.Bitmap;
+
+public class PicrossLabel {
+    protected Bitmap icon;
+    protected int x;
+    protected int y;
+    protected int width;
+    protected int height;
+
+    public PicrossLabel() { }
+
+    public PicrossLabel(Bitmap icon, int x, int y, int width, int height) {
+        this.icon = icon;
+        this.x = x;
+        this.y = y;
+        this.width = width;
+        this.height = height;
+    }
+
+    public Bitmap getIcon() {
+        return this.icon;
+    }
+
+    public void setIcon(Bitmap buttonIcon) {
+        this.icon = buttonIcon;
+    }
+
+    public int getX() {
+        return this.x;
+    }
+
+    public void setX(int xValue) {
+        this.x = xValue;
+    }
+
+    public int getY() {
+        return this.y;
+    }
+
+    public void setY(int yValue) {
+        this.y = yValue;
+    }
+
+    public int getWidth() {
+        return this.width;
+    }
+
+    public void setWidth(int w) {
+        this.width = w;
+    }
+
+    public int getHeight() {
+        return this.height;
+    }
+
+    public void setHeight(int h) {
+        this.height = h;
+    }
+}


Property changes on: branches/engine_split/android/src/picross/specific/ui/PicrossLabel.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: branches/engine_split/android/src/picross/specific/ui/WaitMenuMediator.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/WaitMenuMediator.java	                        (rev 0)
+++ branches/engine_split/android/src/picross/specific/ui/WaitMenuMediator.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -0,0 +1,57 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.ui;
+
+import android.content.Context;
+
+import picross.common.ui.AbstractWaitMenuMediator;
+import picross.common.ui.PicrossUI;
+
+import picross.engine.PicrossException;
+
+public final class WaitMenuMediator extends AbstractWaitMenuMediator {
+    private Context context;
+
+    public WaitMenuMediator(Context androidContext) {
+        this.context = androidContext;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected MenuUI initView(PicrossUI ui, MenuController controller)
+        throws PicrossException {
+
+        return new WaitMenuUI(this.context);
+    }
+}


Property changes on: branches/engine_split/android/src/picross/specific/ui/WaitMenuMediator.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: branches/engine_split/android/src/picross/specific/ui/WaitMenuUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/WaitMenuUI.java	                        (rev 0)
+++ branches/engine_split/android/src/picross/specific/ui/WaitMenuUI.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -0,0 +1,71 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.ui;
+
+import picross.specific.activities.R;
+
+import android.content.Context;
+
+/**
+ * Displays a wait message.
+ *
+ * @author Y. Norsa
+ */
+public final class WaitMenuUI extends MenuUI {
+    /*** Constant ***/
+
+    /** Serialisation ID. */
+    static final long serialVersionUID = -6083373008192848638L;
+
+    /*** Constructor ***/
+
+    /**
+     * Constructor.
+     */
+    public WaitMenuUI(Context androidContext) {
+        super(androidContext);
+
+        /*
+        ImageIcon labelIcon =
+						PicrossUIHelper.getLocalizedImage("label_wait.png");
+        JLabel label = new JLabel(labelIcon);
+        label.setBorder(null);
+        label.setBounds(75, 225,
+                        labelIcon.getIconWidth(), labelIcon.getIconHeight());
+        this.add(label);
+        */
+        this.addLabel(R.drawable.label_wait, 75, 225);
+    }
+}
+


Property changes on: branches/engine_split/android/src/picross/specific/ui/WaitMenuUI.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: branches/engine_split/build.xml
===================================================================
--- branches/engine_split/build.xml	2013-01-14 09:30:39 UTC (rev 115)
+++ branches/engine_split/build.xml	2013-01-14 10:48:50 UTC (rev 116)
@@ -236,6 +236,10 @@
       <fileset dir="data" />
     </copy>
 
+    <copy todir="${game.build.dir}/picross/properties">
+      <fileset dir="properties" />
+    </copy>
+
     <copy todir="${game.build.dir}/META-INF/services">
       <fileset dir="services" />
     </copy>
@@ -451,10 +455,14 @@
 
   <target name="android-dist"
           depends="common-dist">
-    <copy todir="${android.dir}/servicesData/META-INF/services">
+    <copy todir="${android.dir}/extraData/gameModes/META-INF/services">
       <fileset dir="services" />
     </copy>
 
+    <copy todir="${android.dir}/src/picross/properties">
+      <fileset dir="properties" />
+    </copy>
+
     <copy todir="${android.dir}/libs"
           file="${common.jar.name}" />
     <copy todir="${android.dir}/libs"
@@ -474,6 +482,10 @@
                includes="*.png" />
     </copy>
 
+    <copy todir="${android.dir}/src/picross/data">
+      <fileset dir="data" />
+    </copy>
+
     <ant antfile="build.xml"
          dir="${android.dir}"
          target="debug" />

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-14 09:30:39 UTC (rev 115)
+++ branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuMediator.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -71,7 +71,7 @@
 
     /** {@inheritDoc} */
     @Override
-    protected MenuController initController() {
+    protected final MenuController initController() {
         MenuController controller = new LevelMenuController();
         this.addSimpleListener(controller);
 
@@ -95,7 +95,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public void eventPerformed(SimpleEvent e) {
+    public final void eventPerformed(SimpleEvent e) {
         LevelMenuMediator.log.debug("eventPerformed(" + e + ")");
         LevelMenuMediator.log.debug("this : " + this);
         LevelMenuMediator.log.debug("this.model : " + this.model);

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-14 09:30:39 UTC (rev 115)
+++ branches/engine_split/common/src/picross/common/game/simple/ui/LevelMenuModel.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -44,6 +44,7 @@
 
 import picross.engine.Picross;
 import picross.engine.PicrossException;
+import picross.engine.PicrossLogHelper;
 
 import picross.engine.game.simple.Dimensions;
 import picross.engine.game.simple.FileInfos;
@@ -119,12 +120,15 @@
             String line = null;
 
             while ((line = in.readLine()) != null) {
+                PicrossLogHelper.getLogger().debug("read line: \"" + line + "\"");
                 list.add(FileInfos.readFileInfos(line));
             }
         } catch (IOException ioEx) {
             throw ioEx;
         } finally {
-            in.close();
+            if (in != null) {
+                in.close();
+            }
         }
 
         return list;

Modified: branches/engine_split/common/src/picross/common/ui/AbstractPicrossMediator.java
===================================================================
--- branches/engine_split/common/src/picross/common/ui/AbstractPicrossMediator.java	2013-01-14 09:30:39 UTC (rev 115)
+++ branches/engine_split/common/src/picross/common/ui/AbstractPicrossMediator.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -54,7 +54,7 @@
 
 import picross.common.grid.ui.GridCommands;
 import picross.common.ui.PicrossController;
-import picross.common.ui.WaitMenuMediator;
+import picross.specific.ui.WaitMenuMediator;
 import picross.specific.ui.GameMenuMediator;
 import picross.common.ui.MenuCommand;
 import picross.specific.ui.MainMenuMediator;

Copied: branches/engine_split/common/src/picross/common/ui/AbstractWaitMenuMediator.java (from rev 109, branches/engine_split/common/src/picross/common/ui/WaitMenuMediator.java)
===================================================================
--- branches/engine_split/common/src/picross/common/ui/AbstractWaitMenuMediator.java	                        (rev 0)
+++ branches/engine_split/common/src/picross/common/ui/AbstractWaitMenuMediator.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -0,0 +1,56 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.common.ui;
+
+import picross.engine.PicrossException;
+
+import picross.specific.ui.MenuController;
+import picross.specific.ui.MenuUI;
+import picross.specific.ui.WaitMenuUI;
+
+/**
+ * @author Y. Norsa
+ */
+public abstract class AbstractWaitMenuMediator extends MenuMediator {
+    /*** Method overriden from MenuMediator ***/
+
+    /** {@inheritDoc} */
+    @Override
+    protected MenuUI initView(PicrossUI ui, MenuController controller)
+        throws PicrossException {
+
+        return new WaitMenuUI();
+    }
+}
+

Deleted: branches/engine_split/common/src/picross/common/ui/WaitMenuMediator.java
===================================================================
--- branches/engine_split/common/src/picross/common/ui/WaitMenuMediator.java	2013-01-14 09:30:39 UTC (rev 115)
+++ branches/engine_split/common/src/picross/common/ui/WaitMenuMediator.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -1,56 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (c) 2008
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/ or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-
-
-package picross.common.ui;
-
-import picross.engine.PicrossException;
-
-import picross.specific.ui.MenuController;
-import picross.specific.ui.MenuUI;
-import picross.specific.ui.WaitMenuUI;
-
-/**
- * @author Y. Norsa
- */
-public final class WaitMenuMediator extends MenuMediator {
-    /*** Method overriden from MenuMediator ***/
-
-    /** {@inheritDoc} */
-    @Override
-    protected MenuUI initView(PicrossUI ui, MenuController controller)
-        throws PicrossException {
-
-        return new WaitMenuUI();
-    }
-}
-

Added: branches/engine_split/common/src/picross/specific/ui/WaitMenuMediator.java
===================================================================
--- branches/engine_split/common/src/picross/specific/ui/WaitMenuMediator.java	                        (rev 0)
+++ branches/engine_split/common/src/picross/specific/ui/WaitMenuMediator.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -0,0 +1,38 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.ui;
+
+import picross.common.ui.AbstractWaitMenuMediator;
+
+public final class WaitMenuMediator extends AbstractWaitMenuMediator { }


Property changes on: branches/engine_split/common/src/picross/specific/ui/WaitMenuMediator.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: branches/engine_split/swing/src/picross/specific/ui/WaitMenuMediator.java
===================================================================
--- branches/engine_split/swing/src/picross/specific/ui/WaitMenuMediator.java	                        (rev 0)
+++ branches/engine_split/swing/src/picross/specific/ui/WaitMenuMediator.java	2013-01-14 10:48:50 UTC (rev 116)
@@ -0,0 +1,38 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.ui;
+
+import picross.common.ui.AbstractWaitMenuMediator;
+
+public final class WaitMenuMediator extends AbstractWaitMenuMediator { }


Property changes on: branches/engine_split/swing/src/picross/specific/ui/WaitMenuMediator.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.