[Picross-commit] SF.net SVN: picross: [14] trunk
Status: Pre-Alpha
Brought to you by:
yvan_norsa
Menu
▾
▴
[Picross-commit] SF.net SVN: picross: [14] trunk
|
From: <yva...@us...> - 2007-06-06 13:47:38
|
Revision: 14
http://picross.svn.sourceforge.net/picross/?rev=14&view=rev
Author: yvan_norsa
Date: 2007-06-06 06:47:38 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
cleanup
Modified Paths:
--------------
trunk/src/picross/PicrossMediator.java
trunk/src/picross/PicrossUI.java
trunk/src/picross/menus/MainMenuController.java
trunk/src/picross/menus/MainMenuMediator.java
trunk/src/picross/menus/MainMenuUI.java
Added Paths:
-----------
trunk/images/background.png
trunk/src/picross/menus/package.html
Removed Paths:
-------------
trunk/images/mainMenu.png
Copied: trunk/images/background.png (from rev 13, trunk/images/mainMenu.png)
===================================================================
(Binary files differ)
Deleted: trunk/images/mainMenu.png
===================================================================
(Binary files differ)
Modified: trunk/src/picross/PicrossMediator.java
===================================================================
--- trunk/src/picross/PicrossMediator.java 2007-06-06 13:22:59 UTC (rev 13)
+++ trunk/src/picross/PicrossMediator.java 2007-06-06 13:47:38 UTC (rev 14)
@@ -55,7 +55,12 @@
/** Class' logger. */
private static Logger log = Logger.getLogger(PicrossMediator.class);
+ /*** Fields ***/
+
+ /** The view's controller. */
private PicrossController controller;
+
+ /** Main view. */
private PicrossUI view;
/*** Constructor ***/
@@ -87,7 +92,6 @@
model.getData());
grid.addSimpleListener(this);
- //PicrossUI view = new PicrossUI(grid.getView());
this.view.setContent(grid.getView());
this.controller.setView(this.view);
Modified: trunk/src/picross/PicrossUI.java
===================================================================
--- trunk/src/picross/PicrossUI.java 2007-06-06 13:22:59 UTC (rev 13)
+++ trunk/src/picross/PicrossUI.java 2007-06-06 13:47:38 UTC (rev 14)
@@ -62,6 +62,11 @@
/*** Method ***/
+ /**
+ * Sets the frame panel and resizes the window.
+ *
+ * @param content new content panel
+ */
void setContent(JPanel content) {
this.setContentPane(content);
this.pack();
Modified: trunk/src/picross/menus/MainMenuController.java
===================================================================
--- trunk/src/picross/menus/MainMenuController.java 2007-06-06 13:22:59 UTC (rev 13)
+++ trunk/src/picross/menus/MainMenuController.java 2007-06-06 13:47:38 UTC (rev 14)
@@ -33,46 +33,51 @@
package picross.menus;
+import fr.cle.mmvcs.Controller;
+import fr.cle.mmvcs.SimpleEvent;
+
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import fr.cle.mmvcs.Controller;
-import fr.cle.mmvcs.SimpleEvent;
-
import org.apache.log4j.Logger;
/**
+ * Controller for the main menu.
+ *
* @author Y. Norsa
*/
public class MainMenuController extends Controller implements ActionListener {
- /*** Constante ***/
+ /*** Constants ***/
+ /** Play command. */
public static final String PLAY_CMD = "PLAY_CMD";
+
+ /** Exit command. */
public static final String EXIT_CMD = "EXIT_CMD";
- /*** Champ statique ***/
+ /*** Static field ***/
+ /** The class' logger. */
private static Logger log = Logger.getLogger(MainMenuController.class);
- /*** Champ ***/
+ /*** Method overloaded from the class Controller ***/
- /*** M\xE9thode ***/
-
+ /** {@inheritDoc} */
public void eventPerformed(SimpleEvent e) {
MainMenuController.log.debug("eventPerformed(" + e + ")");
}
+ /*** Method implanted from the interface ActionListener ***/
+
+ /** {@inheritDoc} */
public void actionPerformed(ActionEvent e) {
//MainMenuController.log.debug("actionPerformed(" + e + ")");
String cmd = e.getActionCommand();
- if (cmd.equals(MainMenuController.PLAY_CMD)) {
- this.fireEventPerformed(cmd);
- return;
- }
+ if (cmd.equals(MainMenuController.PLAY_CMD)
+ || cmd.equals(MainMenuController.EXIT_CMD)) {
- if (cmd.equals(MainMenuController.EXIT_CMD)) {
this.fireEventPerformed(cmd);
return;
}
Modified: trunk/src/picross/menus/MainMenuMediator.java
===================================================================
--- trunk/src/picross/menus/MainMenuMediator.java 2007-06-06 13:22:59 UTC (rev 13)
+++ trunk/src/picross/menus/MainMenuMediator.java 2007-06-06 13:47:38 UTC (rev 14)
@@ -39,24 +39,24 @@
import org.apache.log4j.Logger;
/**
+ * Mediator for the main menu.
+ *
* @author Y. Norsa
*/
public class MainMenuMediator extends Mediateur {
- /*** Constante ***/
+ /*** Static field ***/
- /*** Champ statique ***/
-
+ /** The class' logger. */
private static Logger log = Logger.getLogger(MainMenuMediator.class);
- /*** Champ ***/
+ /*** Field ***/
+ /** The menu view. */
private MainMenuUI view;
- /*** Constructeur ***/
+ /*** Constructor ***/
- /**
- * Constructeur.
- */
+ /** Constructor. */
public MainMenuMediator() {
MainMenuController controller = new MainMenuController();
controller.addSimpleListener(this);
@@ -64,13 +64,21 @@
this.view = new MainMenuUI(controller);
}
- /*** M\xE9thode ***/
+ /*** Method overloaded from the class Mediateur ***/
+ /** {@inheritDoc} */
public void eventPerformed(SimpleEvent e) {
MainMenuMediator.log.debug("eventPerformed(" + e + ")");
this.fireEventPerformed(e);
}
+ /*** Accessor ***/
+
+ /**
+ * Returns the view.
+ *
+ * @return the view
+ */
public MainMenuUI getView() {
return this.view;
}
Modified: trunk/src/picross/menus/MainMenuUI.java
===================================================================
--- trunk/src/picross/menus/MainMenuUI.java 2007-06-06 13:22:59 UTC (rev 13)
+++ trunk/src/picross/menus/MainMenuUI.java 2007-06-06 13:47:38 UTC (rev 14)
@@ -39,55 +39,92 @@
import java.awt.event.ActionListener;
+import java.io.File;
+
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JPanel;
/**
+ * UI for the main menu.
+ *
* @author Y. Norsa
*/
class MainMenuUI extends JPanel {
- /*** Constante ***/
+ /*** Constants ***/
+
+ /** Serialisation ID. */
private static final long serialVersionUID = -505088917693050187L;
- /*** Champ statique ***/
+ /** Images directory. */
+ private static final String IMAGES_DIR = "images";
- /*** Champ ***/
+ /** Background image. */
+ private static final String BACKGROUND_IMAGE = "background.png";
+ /** Image for the "play" button. */
+ private static final String PLAY_BUTTON_IMAGE = "button-play.png";
+
+ /** "Play" button X coordinate. */
+ private static final int PLAY_BUTTON_X = 50;
+
+ /** "Play" button Y coordinate. */
+ private static final int PLAY_BUTTON_Y = 225;
+
+ /** Image for the "exit" button. */
+ private static final String EXIT_BUTTON_IMAGE = "button-exit.png";
+
+ /** "Exit" button X coordinate. */
+ private static final int EXIT_BUTTON_X = 250;
+
+ /** "Exit" button Y coordinate. */
+ private static final int EXIT_BUTTON_Y = 225;
+
+ /*** Field ***/
+
+ /** Background image. */
private Image image;
- /*** Constructeur ***/
+ /*** Constructor ***/
/**
- * Constructeur.
+ * Constructor.
+ *
+ * @param controller controller for the buttons
*/
MainMenuUI(ActionListener controller) {
- ImageIcon icon = new ImageIcon("images/mainMenu.png");
+ ImageIcon icon = new ImageIcon(MainMenuUI.IMAGES_DIR + File.separator
+ + MainMenuUI.BACKGROUND_IMAGE);
this.setPreferredSize(new Dimension(icon.getIconWidth(),
icon.getIconHeight()));
this.image = icon.getImage();
this.setLayout(null);
- ImageIcon playIcon = new ImageIcon("images/button-play.png");
+ ImageIcon playIcon = new ImageIcon(MainMenuUI.IMAGES_DIR
+ + File.separator
+ + MainMenuUI.PLAY_BUTTON_IMAGE);
JButton playButton = new JButton(playIcon);
playButton.setActionCommand(MainMenuController.PLAY_CMD);
playButton.addActionListener(controller);
- playButton.setBounds(50, 225,
+ playButton.setBounds(MainMenuUI.PLAY_BUTTON_X, MainMenuUI.PLAY_BUTTON_Y,
playIcon.getIconWidth(), playIcon.getIconHeight());
this.add(playButton);
- ImageIcon exitIcon = new ImageIcon("images/button-exit.png");
+ ImageIcon exitIcon = new ImageIcon(MainMenuUI.IMAGES_DIR
+ + File.separator
+ + MainMenuUI.EXIT_BUTTON_IMAGE);
JButton exitButton = new JButton(exitIcon);
exitButton.setActionCommand(MainMenuController.EXIT_CMD);
exitButton.addActionListener(controller);
- exitButton.setBounds(250, 225,
+ exitButton.setBounds(MainMenuUI.EXIT_BUTTON_X, MainMenuUI.EXIT_BUTTON_Y,
exitIcon.getIconWidth(), exitIcon.getIconHeight());
this.add(exitButton);
}
- /*** M\xE9thode ***/
+ /*** Method overloaded from the class JPanel ***/
+ /** {@inheritDoc} */
public void paintComponent(Graphics g) {
super.paintComponent(g);
Added: trunk/src/picross/menus/package.html
===================================================================
--- trunk/src/picross/menus/package.html (rev 0)
+++ trunk/src/picross/menus/package.html 2007-06-06 13:47:38 UTC (rev 14)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+ <head>
+ <!--
+ $Id$
+ -->
+ </head>
+
+ <body bgcolor="white">
+ Classes for the menus.
+ </body>
+</html>
Property changes on: trunk/src/picross/menus/package.html
___________________________________________________________________
Name: svn:keywords
+ Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
