picross-commit Mailing List for picross (Page 4)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 66
          http://picross.svn.sourceforge.net/picross/?rev=66&view=rev
Author:   yvan_norsa
Date:     2008-04-28 02:07:21 -0700 (Mon, 28 Apr 2008)

Log Message:
-----------
clean-up

Modified Paths:
--------------
    trunk/src/picross/PicrossMediator.java
    trunk/src/picross/game/simple/SimpleGameMode.java
    trunk/src/picross/menus/MenuController.java
    trunk/src/picross/menus/MenuMediator.java
    trunk/src/picross/menus/MenuUI.java

Added Paths:
-----------
    trunk/src/picross/game/simple/LevelMenuController.java
    trunk/src/picross/game/simple/LevelMenuMediator.java
    trunk/src/picross/game/simple/LevelMenuModel.java
    trunk/src/picross/game/simple/LevelMenuUI.java
    trunk/src/picross/game/simple/LevelsListCommand.java
    trunk/src/picross/game/simple/SelectSizeCommand.java

Removed Paths:
-------------
    trunk/src/picross/menus/LevelMenuController.java
    trunk/src/picross/menus/LevelMenuMediator.java
    trunk/src/picross/menus/LevelMenuModel.java
    trunk/src/picross/menus/LevelMenuUI.java
    trunk/src/picross/menus/LevelsListCommand.java
    trunk/src/picross/menus/SelectSizeCommand.java

Modified: trunk/src/picross/PicrossMediator.java
===================================================================

--- trunk/src/picross/PicrossMediator.java	2008-04-28 08:58:35 UTC (rev 65)
+++ trunk/src/picross/PicrossMediator.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -54,7 +54,7 @@
 import picross.grid.GridController;
 
 import picross.menus.GameMenuMediator;
-import picross.menus.LevelMenuMediator;
+//import picross.menus.LevelMenuMediator;
 import picross.menus.MainMenuMediator;
 import picross.menus.MenuCommand;
 import picross.menus.MenuMediator;
@@ -121,10 +121,12 @@
             return;
         }
 
+        /*
         if (cmd.equals(PicrossController.SELECT_LEVEL_CMD)) {
             this.displaySelectLevelMenu();
             return;
         }
+        */
 
         /*
         if (cmd.equals(PicrossController.LEVEL_CMD)) {
@@ -176,9 +178,11 @@
     }
 
     /** Displays the level selection menu. */
+    /*
     private void displaySelectLevelMenu() {
         this.displayMenu(LevelMenuMediator.class);
     }
+    */
 
     private void displayWaitScreen() {
         this.displayMenu(WaitMenuMediator.class);

Copied: trunk/src/picross/game/simple/LevelMenuController.java (from rev 63, trunk/src/picross/menus/LevelMenuController.java)
===================================================================
--- trunk/src/picross/game/simple/LevelMenuController.java	                        (rev 0)
+++ trunk/src/picross/game/simple/LevelMenuController.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -0,0 +1,89 @@
+/*
+ * $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.game.simple;
+
+import fr.cle.mmvcs.SimpleEvent;
+
+import picross.menus.MenuController;
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author Y. Norsa
+ */
+class LevelMenuController extends MenuController {
+    /*** Constante ***/
+
+    static final String SIZE_CMD = "SIZE_CMD";
+
+    static final String LEVELS_LIST_CMD = "LEVELS_LIST_CMD";
+
+    /*** Champ statique ***/
+
+    private static Logger log = Logger.getLogger(LevelMenuController.class);
+
+    /*** Champ ***/
+
+    /*** Constructeur ***/
+
+    /**
+     * Constructeur.
+     */
+    /*
+    LevelMenuController() {
+    }
+    */
+
+    /*** M\xE9thode ***/
+
+    public void eventPerformed(SimpleEvent e) {
+        LevelMenuController.log.debug("eventPerformed(" + e + ")");
+
+        String cmd = e.getCommandName();
+
+        if (cmd.equals(picross.game.GameCommand.GAME_CMD)) {
+            return;
+        }
+
+        if (cmd.equals(LevelMenuController.LEVELS_LIST_CMD)) {
+            LevelsListCommand command = (LevelsListCommand) e.getCommand();
+            ((LevelMenuUI) this.getView()).displayLevels(this, command.getList());
+
+            return;
+        }
+
+        super.eventPerformed(e);
+    }
+}
+

Copied: trunk/src/picross/game/simple/LevelMenuMediator.java (from rev 63, trunk/src/picross/menus/LevelMenuMediator.java)
===================================================================
--- trunk/src/picross/game/simple/LevelMenuMediator.java	                        (rev 0)
+++ trunk/src/picross/game/simple/LevelMenuMediator.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -0,0 +1,114 @@
+/*
+ * $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.game.simple;
+
+import fr.cle.mmvcs.SimpleEvent;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+import picross.PicrossException;
+import picross.PicrossUI;
+
+import picross.menus.MenuController;
+import picross.menus.MenuMediator;
+import picross.menus.MenuUI;
+
+/**
+ * Level selection menu.
+ *
+ * @author Y. Norsa
+ */
+public class LevelMenuMediator extends MenuMediator {
+    private static Logger log = Logger.getLogger(LevelMenuMediator.class);
+
+    private LevelMenuModel model;
+
+    /*** Constructor ***/
+
+    /**
+     * Constructor.
+     *
+     * @param ui reference to the main UI
+     * @throws PicrossException if the instantiation of the view fails
+     */
+    public LevelMenuMediator(PicrossUI ui) throws PicrossException {
+        super(ui);
+    }
+
+    /*** Method overloaded from the class MenuMediator ***/
+
+    protected MenuController initController() {
+        MenuController controller = new LevelMenuController();
+        this.addSimpleListener(controller);
+
+        return controller;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected MenuUI initView(PicrossUI ui, MenuController controller)
+        throws PicrossException {
+
+        this.model = new LevelMenuModel();
+        //return new LevelMenuUI(controller, model.getLevelsList());
+        return new LevelMenuUI(controller, this.model.getSizesList());
+    }
+
+    public void eventPerformed(SimpleEvent e) {
+        LevelMenuMediator.log.debug("eventPerformed(" + e + ")");
+
+        String cmd = e.getCommandName();
+
+        if (cmd.equals(LevelMenuController.SIZE_CMD)) {
+            SelectSizeCommand command = (SelectSizeCommand) e.getCommand();
+            this.displayLevels(this.model.getLevels(command.getSize()));
+
+            return;
+        }
+
+        if (cmd.equals(picross.PicrossController.LEVEL_CMD)) {
+            this.fireEventPerformed(new picross.game.GameCommand(new picross.game.simple.SimpleGameMediator(e.getComment())));
+            return;
+        }
+
+        super.eventPerformed(e);
+    }
+
+    private void displayLevels(List<String> levels) {
+        this.fireEventPerformed(new LevelsListCommand(levels));
+    }
+}
+

Copied: trunk/src/picross/game/simple/LevelMenuModel.java (from rev 63, trunk/src/picross/menus/LevelMenuModel.java)
===================================================================
--- trunk/src/picross/game/simple/LevelMenuModel.java	                        (rev 0)
+++ trunk/src/picross/game/simple/LevelMenuModel.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -0,0 +1,110 @@
+/*
+ * $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.game.simple;
+
+import java.awt.Dimension;
+
+import java.io.IOException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import picross.Picross;
+import picross.PicrossException;
+
+import picross.game.simple.LevelInfo;
+
+/**
+ * Model for the level selection menu.
+ *
+ * @author Y. Norsa
+ */
+class LevelMenuModel {
+    /*** Field ***/
+
+    /** Level list. */
+    //private List<String> levels;
+
+    private Map<Dimension, List<String>> levels;
+
+    /*** Constructor ***/
+
+    /**
+     * Constructor.
+     *
+     * @throws PicrossException if an error arises during the levels listing
+     */
+    LevelMenuModel() throws PicrossException {
+        this.levels = new HashMap<Dimension, List<String>>();
+
+        List<LevelInfo> infos = null;
+
+        try {
+            //this.levels = Picross.listDataFiles();
+            infos = Picross.listDataFiles();
+        } catch (IOException ioEx) {
+            throw new PicrossException(ioEx);
+        }
+
+        for (LevelInfo info : infos) {
+            Dimension levelSize = info.getDimension();
+            List<String> levelsList = this.levels.get(levelSize);
+
+            if (levelsList == null) {
+                levelsList = new ArrayList<String>();
+                this.levels.put(levelSize, levelsList);
+            }
+
+            levelsList.add(info.getName());
+        }
+    }
+
+    /*** Method ***/
+
+    /**
+     * Returns the levels list.
+     *
+     * @return list of the level files
+     */
+    List<String> getLevels(Dimension size) {
+        return this.levels.get(size);
+    }
+
+    List<Dimension> getSizesList() {
+        return new ArrayList<Dimension>(this.levels.keySet());
+    }
+}
+

Copied: trunk/src/picross/game/simple/LevelMenuUI.java (from rev 64, trunk/src/picross/menus/LevelMenuUI.java)
===================================================================
--- trunk/src/picross/game/simple/LevelMenuUI.java	                        (rev 0)
+++ trunk/src/picross/game/simple/LevelMenuUI.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -0,0 +1,113 @@
+/*
+ * $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.game.simple;
+
+import fr.cle.mmvcs.SimpleEvent;
+import fr.cle.mmvcs.SimpleListener;
+
+import java.awt.Dimension;
+
+import java.util.List;
+
+import picross.PicrossController;
+
+import picross.menus.MenuUI;
+
+/**
+ * UI for the level selection menu.
+ *
+ * @author Y. Norsa
+ */
+class LevelMenuUI extends MenuUI {
+    /*** Constant ***/
+
+    /** Serialisation ID. */
+    private static final long serialVersionUID = 6178785913505637523L;
+
+    /*** Constructor ***/
+
+    /**
+     * Constructor.
+     *
+     * @param listener listener for the buttons
+     * @param levels levels list
+     */
+    //LevelMenuUI(SimpleListener listener, List<String> levels) {
+    LevelMenuUI(SimpleListener listener, List<Dimension> sizes) {
+        super();
+
+        int x = 150;
+        int y = 150;
+
+        int nbSizes = sizes.size();
+
+        for (int i = 0; i < nbSizes; i++) {
+            Dimension currentDim = sizes.get(i);
+            String size = (int) currentDim.getWidth() + "x"
+                + (int) currentDim.getHeight();
+
+            SimpleEvent event = new SimpleEvent(new SelectSizeCommand(currentDim));
+            this.addSimpleButton(size, event, listener, x, y);
+
+            y += 75;
+
+            if (y == 375) {
+                x = 250;
+                y = 150;
+            }
+        }
+    }
+
+    void displayLevels(SimpleListener listener, List<String> levels) {
+        this.removeAll();
+
+        int x = 50;
+        int y = 150;
+
+        for (String level : levels) {
+            SimpleEvent event = new SimpleEvent(PicrossController.LEVEL_CMD, level);
+            this.addSimpleButton(level, event, listener, x, y);
+
+            y += 75;
+
+            if (y == 375) {
+                x = 250;
+                y = 150;
+            }
+        }
+
+        this.repaint();
+    }
+}
+

Copied: trunk/src/picross/game/simple/LevelsListCommand.java (from rev 63, trunk/src/picross/menus/LevelsListCommand.java)
===================================================================
--- trunk/src/picross/game/simple/LevelsListCommand.java	                        (rev 0)
+++ trunk/src/picross/game/simple/LevelsListCommand.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -0,0 +1,69 @@
+/*
+ * $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.game.simple;
+
+import fr.cle.mmvcs.NamedCommand;
+
+import java.util.List;
+
+/**
+ * @author Y. Norsa
+ */
+class LevelsListCommand extends NamedCommand {
+    /*** Constante ***/
+
+    /*** Champ statique ***/
+
+    /*** Champ ***/
+
+    private List<String> list;
+
+    /*** Constructeur ***/
+
+    /**
+     * Constructeur.
+     */
+    LevelsListCommand(List<String> levels) {
+        super(LevelMenuController.LEVELS_LIST_CMD);
+
+        this.list = levels;
+    }
+
+    /*** M\xE9thode ***/
+
+    List<String> getList() {
+        return this.list;
+    }
+}
+

Copied: trunk/src/picross/game/simple/SelectSizeCommand.java (from rev 63, trunk/src/picross/menus/SelectSizeCommand.java)
===================================================================
--- trunk/src/picross/game/simple/SelectSizeCommand.java	                        (rev 0)
+++ trunk/src/picross/game/simple/SelectSizeCommand.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -0,0 +1,69 @@
+/*
+ * $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.game.simple;
+
+import fr.cle.mmvcs.NamedCommand;
+
+import java.awt.Dimension;
+
+/**
+ * @author Y. Norsa
+ */
+class SelectSizeCommand extends NamedCommand {
+    /*** Constante ***/
+
+    /*** Champ statique ***/
+
+    /*** Champ ***/
+
+    private Dimension size;
+
+    /*** Constructeur ***/
+
+    /**
+     * Constructeur.
+     */
+    SelectSizeCommand(Dimension dim) {
+        super(LevelMenuController.SIZE_CMD);
+
+        this.size = dim;
+    }
+
+    /*** M\xE9thode ***/
+
+    Dimension getSize() {
+        return this.size;
+    }
+}
+

Modified: trunk/src/picross/game/simple/SimpleGameMode.java
===================================================================
--- trunk/src/picross/game/simple/SimpleGameMode.java	2008-04-28 08:58:35 UTC (rev 65)
+++ trunk/src/picross/game/simple/SimpleGameMode.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -78,7 +78,7 @@
     public SimpleButton<JButton> getButton() {
         ImageIcon icon =
             Picross.getLocalizedImage(SimpleGameMode.SELECT_BUTTON_IMAGE);
-        SimpleEvent event = new SimpleEvent(new picross.menus.MenuCommand(picross.menus.LevelMenuMediator.class));
+        SimpleEvent event = new SimpleEvent(new picross.menus.MenuCommand(LevelMenuMediator.class));
         SimpleButton<JButton> button = new SimpleButton<JButton>("", event) { };
         button.getButton().setIcon(icon);
 

Deleted: trunk/src/picross/menus/LevelMenuController.java
===================================================================
--- trunk/src/picross/menus/LevelMenuController.java	2008-04-28 08:58:35 UTC (rev 65)
+++ trunk/src/picross/menus/LevelMenuController.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -1,87 +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.menus;
-
-import fr.cle.mmvcs.SimpleEvent;
-
-import org.apache.log4j.Logger;
-
-/**
- * @author Y. Norsa
- */
-class LevelMenuController extends MenuController {
-    /*** Constante ***/
-
-    static final String SIZE_CMD = "SIZE_CMD";
-
-    static final String LEVELS_LIST_CMD = "LEVELS_LIST_CMD";
-
-    /*** Champ statique ***/
-
-    private static Logger log = Logger.getLogger(LevelMenuController.class);
-
-    /*** Champ ***/
-
-    /*** Constructeur ***/
-
-    /**
-     * Constructeur.
-     */
-    /*
-    LevelMenuController() {
-    }
-    */
-
-    /*** M\xE9thode ***/
-
-    public void eventPerformed(SimpleEvent e) {
-        LevelMenuController.log.debug("eventPerformed(" + e + ")");
-
-        String cmd = e.getCommandName();
-
-        if (cmd.equals(picross.game.GameCommand.GAME_CMD)) {
-            return;
-        }
-
-        if (cmd.equals(LevelMenuController.LEVELS_LIST_CMD)) {
-            LevelsListCommand command = (LevelsListCommand) e.getCommand();
-            ((LevelMenuUI) this.getView()).displayLevels(this, command.getList());
-
-            return;
-        }
-
-        super.eventPerformed(e);
-    }
-}
-

Deleted: trunk/src/picross/menus/LevelMenuMediator.java
===================================================================
--- trunk/src/picross/menus/LevelMenuMediator.java	2008-04-28 08:58:35 UTC (rev 65)
+++ trunk/src/picross/menus/LevelMenuMediator.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -1,110 +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.menus;
-
-import fr.cle.mmvcs.SimpleEvent;
-
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-import picross.PicrossException;
-import picross.PicrossUI;
-
-/**
- * Level selection menu.
- *
- * @author Y. Norsa
- */
-public class LevelMenuMediator extends MenuMediator {
-    private static Logger log = Logger.getLogger(LevelMenuMediator.class);
-
-    private LevelMenuModel model;
-
-    /*** Constructor ***/
-
-    /**
-     * Constructor.
-     *
-     * @param ui reference to the main UI
-     * @throws PicrossException if the instantiation of the view fails
-     */
-    public LevelMenuMediator(PicrossUI ui) throws PicrossException {
-        super(ui);
-    }
-
-    /*** Method overloaded from the class MenuMediator ***/
-
-    protected MenuController initController() {
-        MenuController controller = new LevelMenuController();
-        this.addSimpleListener(controller);
-
-        return controller;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected MenuUI initView(PicrossUI ui, MenuController controller)
-        throws PicrossException {
-
-        this.model = new LevelMenuModel();
-        //return new LevelMenuUI(controller, model.getLevelsList());
-        return new LevelMenuUI(controller, this.model.getSizesList());
-    }
-
-    public void eventPerformed(SimpleEvent e) {
-        LevelMenuMediator.log.debug("eventPerformed(" + e + ")");
-
-        String cmd = e.getCommandName();
-
-        if (cmd.equals(LevelMenuController.SIZE_CMD)) {
-            SelectSizeCommand command = (SelectSizeCommand) e.getCommand();
-            this.displayLevels(this.model.getLevels(command.getSize()));
-
-            return;
-        }
-
-        if (cmd.equals(picross.PicrossController.LEVEL_CMD)) {
-            this.fireEventPerformed(new picross.game.GameCommand(new picross.game.simple.SimpleGameMediator(e.getComment())));
-            return;
-        }
-
-        super.eventPerformed(e);
-    }
-
-    private void displayLevels(List<String> levels) {
-        this.fireEventPerformed(new LevelsListCommand(levels));
-    }
-}
-

Deleted: trunk/src/picross/menus/LevelMenuModel.java
===================================================================
--- trunk/src/picross/menus/LevelMenuModel.java	2008-04-28 08:58:35 UTC (rev 65)
+++ trunk/src/picross/menus/LevelMenuModel.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -1,110 +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.menus;
-
-import java.awt.Dimension;
-
-import java.io.IOException;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import picross.Picross;
-import picross.PicrossException;
-
-import picross.game.simple.LevelInfo;
-
-/**
- * Model for the level selection menu.
- *
- * @author Y. Norsa
- */
-class LevelMenuModel {
-    /*** Field ***/
-
-    /** Level list. */
-    //private List<String> levels;
-
-    private Map<Dimension, List<String>> levels;
-
-    /*** Constructor ***/
-
-    /**
-     * Constructor.
-     *
-     * @throws PicrossException if an error arises during the levels listing
-     */
-    LevelMenuModel() throws PicrossException {
-        this.levels = new HashMap<Dimension, List<String>>();
-
-        List<LevelInfo> infos = null;
-
-        try {
-            //this.levels = Picross.listDataFiles();
-            infos = Picross.listDataFiles();
-        } catch (IOException ioEx) {
-            throw new PicrossException(ioEx);
-        }
-
-        for (LevelInfo info : infos) {
-            Dimension levelSize = info.getDimension();
-            List<String> levelsList = this.levels.get(levelSize);
-
-            if (levelsList == null) {
-                levelsList = new ArrayList<String>();
-                this.levels.put(levelSize, levelsList);
-            }
-
-            levelsList.add(info.getName());
-        }
-    }
-
-    /*** Method ***/
-
-    /**
-     * Returns the levels list.
-     *
-     * @return list of the level files
-     */
-    List<String> getLevels(Dimension size) {
-        return this.levels.get(size);
-    }
-
-    List<Dimension> getSizesList() {
-        return new ArrayList<Dimension>(this.levels.keySet());
-    }
-}
-

Deleted: trunk/src/picross/menus/LevelMenuUI.java
===================================================================
--- trunk/src/picross/menus/LevelMenuUI.java	2008-04-28 08:58:35 UTC (rev 65)
+++ trunk/src/picross/menus/LevelMenuUI.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -1,111 +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.menus;
-
-import fr.cle.mmvcs.SimpleEvent;
-import fr.cle.mmvcs.SimpleListener;
-
-import java.awt.Dimension;
-
-import java.util.List;
-
-import picross.PicrossController;
-
-/**
- * UI for the level selection menu.
- *
- * @author Y. Norsa
- */
-class LevelMenuUI extends MenuUI {
-    /*** Constant ***/
-
-    /** Serialisation ID. */
-    private static final long serialVersionUID = 6178785913505637523L;
-
-    /*** Constructor ***/
-
-    /**
-     * Constructor.
-     *
-     * @param listener listener for the buttons
-     * @param levels levels list
-     */
-    //LevelMenuUI(SimpleListener listener, List<String> levels) {
-    LevelMenuUI(SimpleListener listener, List<Dimension> sizes) {
-        super();
-
-        int x = 150;
-        int y = 150;
-
-        int nbSizes = sizes.size();
-
-        for (int i = 0; i < nbSizes; i++) {
-            Dimension currentDim = sizes.get(i);
-            String size = (int) currentDim.getWidth() + "x"
-                + (int) currentDim.getHeight();
-
-            SimpleEvent event = new SimpleEvent(new SelectSizeCommand(currentDim));
-            this.addSimpleButton(size, event, listener, x, y);
-
-            y += 75;
-
-            if (y == 375) {
-                x = 250;
-                y = 150;
-            }
-        }
-    }
-
-    void displayLevels(SimpleListener listener, List<String> levels) {
-        this.removeAll();
-
-        int x = 50;
-        int y = 150;
-
-        for (String level : levels) {
-            SimpleEvent event = new SimpleEvent(PicrossController.LEVEL_CMD, level);
-            this.addSimpleButton(level, event, listener, x, y);
-
-            y += 75;
-
-            if (y == 375) {
-                x = 250;
-                y = 150;
-            }
-        }
-
-        this.repaint();
-    }
-}
-

Deleted: trunk/src/picross/menus/LevelsListCommand.java
===================================================================
--- trunk/src/picross/menus/LevelsListCommand.java	2008-04-28 08:58:35 UTC (rev 65)
+++ trunk/src/picross/menus/LevelsListCommand.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -1,69 +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.menus;
-
-import fr.cle.mmvcs.NamedCommand;
-
-import java.util.List;
-
-/**
- * @author Y. Norsa
- */
-class LevelsListCommand extends NamedCommand {
-    /*** Constante ***/
-
-    /*** Champ statique ***/
-
-    /*** Champ ***/
-
-    private List<String> list;
-
-    /*** Constructeur ***/
-
-    /**
-     * Constructeur.
-     */
-    LevelsListCommand(List<String> levels) {
-        super(LevelMenuController.LEVELS_LIST_CMD);
-
-        this.list = levels;
-    }
-
-    /*** M\xE9thode ***/
-
-    List<String> getList() {
-        return this.list;
-    }
-}
-

Modified: trunk/src/picross/menus/MenuController.java
===================================================================
--- trunk/src/picross/menus/MenuController.java	2008-04-28 08:58:35 UTC (rev 65)
+++ trunk/src/picross/menus/MenuController.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -44,7 +44,7 @@
 /**
  * @author Y. Norsa
  */
-class MenuController extends Controller implements ActionListener {
+public class MenuController extends Controller implements ActionListener {
     private static Logger log = Logger.getLogger(MenuController.class);
 
     private MenuUI view;

Modified: trunk/src/picross/menus/MenuMediator.java
===================================================================
--- trunk/src/picross/menus/MenuMediator.java	2008-04-28 08:58:35 UTC (rev 65)
+++ trunk/src/picross/menus/MenuMediator.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -65,7 +65,7 @@
      * @param ui reference to the main UI
      * @throws PicrossException if the instantiation of the view fails
      */
-    MenuMediator(PicrossUI ui) throws PicrossException {
+    public MenuMediator(PicrossUI ui) throws PicrossException {
         //MenuController controller = new MenuController();
         MenuController controller = this.initController();
         controller.addSimpleListener(this);

Modified: trunk/src/picross/menus/MenuUI.java
===================================================================
--- trunk/src/picross/menus/MenuUI.java	2008-04-28 08:58:35 UTC (rev 65)
+++ trunk/src/picross/menus/MenuUI.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -60,7 +60,7 @@
  *
  * @author Y. Norsa
  */
-abstract class MenuUI extends JPanel {
+public abstract class MenuUI extends JPanel {
     /*** Constants ***/
 
     /** Background image. */
@@ -85,7 +85,7 @@
     /*** Constructor ***/
 
     /** Constructor. */
-    MenuUI() {
+    public MenuUI() {
         try {
             ImageIcon icon = Picross.getImage(MenuUI.BACKGROUND_IMAGE);
             this.setPreferredSize(new Dimension(icon.getIconWidth(),

Deleted: trunk/src/picross/menus/SelectSizeCommand.java
===================================================================
--- trunk/src/picross/menus/SelectSizeCommand.java	2008-04-28 08:58:35 UTC (rev 65)
+++ trunk/src/picross/menus/SelectSizeCommand.java	2008-04-28 09:07:21 UTC (rev 66)
@@ -1,69 +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.menus;
-
-import fr.cle.mmvcs.NamedCommand;
-
-import java.awt.Dimension;
-
-/**
- * @author Y. Norsa
- */
-class SelectSizeCommand extends NamedCommand {
-    /*** Constante ***/
-
-    /*** Champ statique ***/
-
-    /*** Champ ***/
-
-    private Dimension size;
-
-    /*** Constructeur ***/
-
-    /**
-     * Constructeur.
-     */
-    SelectSizeCommand(Dimension dim) {
-        super(LevelMenuController.SIZE_CMD);
-
-        this.size = dim;
-    }
-
-    /*** M\xE9thode ***/
-
-    Dimension getSize() {
-        return this.size;
-    }
-}
-


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




2007	Jan	Feb	Mar	Apr	May	Jun (40)	Jul	Aug	Sep	Oct	Nov	Dec
2008	Jan	Feb	Mar	Apr (30)	May (15)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan	Feb	Mar	Apr	May	Jun (10)	Jul (3)	Aug	Sep	Oct	Nov	Dec
2013	Jan (38)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb	Mar (1)	Apr (2)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

picross-commit Mailing List for picross (Page 4)

picross-commit — Picross commit messages