[Picross-commit] SF.net SVN: picross: [15] trunk
Status: Pre-Alpha
Brought to you by:
yvan_norsa
Menu
▾
▴
[Picross-commit] SF.net SVN: picross: [15] trunk
|
From: <yva...@us...> - 2007-06-06 14:26:28
|
Revision: 15
http://picross.svn.sourceforge.net/picross/?rev=15&view=rev
Author: yvan_norsa
Date: 2007-06-06 07:26:30 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
bundle added
Modified Paths:
--------------
trunk/build.xml
trunk/src/picross/Picross.java
trunk/src/picross/PicrossMediator.java
trunk/src/picross/grid/Box.java
trunk/src/picross/grid/PicrossGridModel.java
trunk/src/picross/menus/MainMenuUI.java
Added Paths:
-----------
trunk/images/en/
trunk/images/en/button-exit.png
trunk/images/en/button-play.png
trunk/images/fr/
trunk/images/fr/button-exit.png
trunk/images/fr/button-play.png
trunk/lib/bundleHelper.jar
trunk/src/picross/properties/
trunk/src/picross/properties/messages_picross.properties
trunk/src/picross/properties/messages_picross_en.properties
trunk/src/picross/properties/messages_picross_fr.properties
Removed Paths:
-------------
trunk/images/button-exit.png
trunk/images/button-play.png
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-06-06 13:47:38 UTC (rev 14)
+++ trunk/build.xml 2007-06-06 14:26:30 UTC (rev 15)
@@ -10,6 +10,8 @@
<property name="src.dir"
value="src" />
+ <property name="bundleHelper.jar"
+ value="${lib.dir}/bundleHelper.jar" />
<property name="mmvcs.jar"
value="${lib.dir}/mmvcs.jar" />
<property name="log4j.jar"
@@ -43,6 +45,7 @@
<path id="classpath">
<pathelement location="${build.dir}" />
+ <pathelement location="${bundleHelper.jar}" />
<pathelement location="${log4j.jar}" />
<pathelement location="${mmvcs.jar}" />
</path>
@@ -58,6 +61,12 @@
<classpath refid="classpath" />
</javac>
+
+ <copy todir="${build.dir}/picross/properties"
+ failonerror="false">
+ <fileset dir="${src.dir}/picross/properties" />
+ </copy>
+
</target>
<target name="run"
Deleted: trunk/images/button-exit.png
===================================================================
(Binary files differ)
Deleted: trunk/images/button-play.png
===================================================================
(Binary files differ)
Added: trunk/images/en/button-exit.png
===================================================================
(Binary files differ)
Property changes on: trunk/images/en/button-exit.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/images/en/button-play.png
===================================================================
(Binary files differ)
Property changes on: trunk/images/en/button-play.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: trunk/images/fr/button-exit.png (from rev 13, trunk/images/button-exit.png)
===================================================================
(Binary files differ)
Copied: trunk/images/fr/button-play.png (from rev 13, trunk/images/button-play.png)
===================================================================
(Binary files differ)
Added: trunk/lib/bundleHelper.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/bundleHelper.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/picross/Picross.java
===================================================================
--- trunk/src/picross/Picross.java 2007-06-06 13:47:38 UTC (rev 14)
+++ trunk/src/picross/Picross.java 2007-06-06 14:26:30 UTC (rev 15)
@@ -33,6 +33,11 @@
package picross;
+import java.io.File;
+
+import java.util.Locale;
+
+import javax.swing.ImageIcon;
import javax.swing.SwingUtilities;
import org.apache.log4j.PropertyConfigurator;
@@ -42,12 +47,19 @@
*
* @author Y. Norsa
*/
-final class Picross {
- /*** Constant ***/
+public final class Picross {
+ /*** Constants ***/
/** Log4j config file. */
private static final String LOG4J_CONFIG = "log4j.properties";
+ /** Images directory. */
+ private static final String IMAGES_DIR = "images" + File.separator;
+
+ /** Images directory corresponding to the default locale. */
+ private static final String LOCAL_IMAGES_PATH = Picross.IMAGES_DIR
+ + Locale.getDefault().getLanguage() + File.separator;
+
/*** Constructor ***/
/** Constructor. */
@@ -71,5 +83,27 @@
}
});
}
+
+ /*** Static methods ***/
+
+ /**
+ * Returns an image.
+ *
+ * @param name image filename
+ * @return the image
+ */
+ public static ImageIcon getImage(String name) {
+ return new ImageIcon(Picross.IMAGES_DIR + name);
+ }
+
+ /**
+ * Returns the localized version of an image.
+ *
+ * @param name image filename
+ * @return the image
+ */
+ public static ImageIcon getLocalizedImage(String name) {
+ return new ImageIcon(Picross.LOCAL_IMAGES_PATH + name);
+ }
}
Modified: trunk/src/picross/PicrossMediator.java
===================================================================
--- trunk/src/picross/PicrossMediator.java 2007-06-06 13:47:38 UTC (rev 14)
+++ trunk/src/picross/PicrossMediator.java 2007-06-06 14:26:30 UTC (rev 15)
@@ -33,6 +33,8 @@
package picross;
+import bundleHelper.BundleHelper;
+
import fr.cle.mmvcs.Mediateur;
import fr.cle.mmvcs.SimpleEvent;
@@ -67,6 +69,8 @@
/** Constructor. */
PicrossMediator() {
+ BundleHelper.loadBundle("picross.properties.messages_picross");
+
this.controller = new PicrossController();
this.addSimpleListener(this.controller);
@@ -105,7 +109,7 @@
if (cmd.equals(PicrossGridController.GRID_FILLED_CMD)) {
this.fireEventPerformed(PicrossController.MESSAGE_CMD,
- "Congratulations");
+ BundleHelper.getString(this, "victory"));
return;
}
}
Modified: trunk/src/picross/grid/Box.java
===================================================================
--- trunk/src/picross/grid/Box.java 2007-06-06 13:47:38 UTC (rev 14)
+++ trunk/src/picross/grid/Box.java 2007-06-06 14:26:30 UTC (rev 15)
@@ -47,16 +47,14 @@
import java.awt.Image;
-import java.io.File;
-
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
-import javax.swing.ImageIcon;
-
//import org.apache.log4j.Logger;
+import picross.Picross;
+
/**
* Representation of a box in the grid.
*
@@ -77,11 +75,8 @@
CROSSED
}
- /*** Constants ***/
+ /*** Constant ***/
- /** Directory containing the images. */
- private static final String IMAGES_DIR = "images";
-
/** Images files extension. */
private static final String IMAGES_EXT = ".png";
@@ -112,13 +107,10 @@
Box.images = new HashMap<Box.BoxState, Image>();
- String path = Box.IMAGES_DIR + File.separator;
-
for (Box.BoxState state : Box.BoxState.values()) {
- Box.images.put(state, new ImageIcon(path
- + state.toString()
- .toLowerCase()
- + Box.IMAGES_EXT).getImage());
+ Box.images.put(state, Picross
+ .getImage(state.toString().toLowerCase()
+ + Box.IMAGES_EXT).getImage());
}
}
Modified: trunk/src/picross/grid/PicrossGridModel.java
===================================================================
--- trunk/src/picross/grid/PicrossGridModel.java 2007-06-06 13:47:38 UTC (rev 14)
+++ trunk/src/picross/grid/PicrossGridModel.java 2007-06-06 14:26:30 UTC (rev 15)
@@ -36,7 +36,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+//import org.apache.log4j.Logger;
/**
* The grid model.
@@ -52,7 +52,7 @@
/*** Static field ***/
/** The class' logger. */
- private static Logger log = Logger.getLogger(PicrossGridModel.class);
+ //private static Logger log = Logger.getLogger(PicrossGridModel.class);
/*** Fields ***/
@@ -234,7 +234,7 @@
* @param column column of the box
*/
void checkBox(int row, int column, int type) {
- PicrossGridModel.log.debug("checkBox(" + row + ", " + column + ")");
+ //PicrossGridModel.log.debug("checkBox(" + row + ", " + column + ")");
//PicrossGridModel.log.debug("lastModified == null : "
// + (lastModified == null));
Modified: trunk/src/picross/menus/MainMenuUI.java
===================================================================
--- trunk/src/picross/menus/MainMenuUI.java 2007-06-06 13:47:38 UTC (rev 14)
+++ trunk/src/picross/menus/MainMenuUI.java 2007-06-06 14:26:30 UTC (rev 15)
@@ -39,12 +39,12 @@
import java.awt.event.ActionListener;
-import java.io.File;
-
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JPanel;
+import picross.Picross;
+
/**
* UI for the main menu.
*
@@ -56,9 +56,6 @@
/** Serialisation ID. */
private static final long serialVersionUID = -505088917693050187L;
- /** Images directory. */
- private static final String IMAGES_DIR = "images";
-
/** Background image. */
private static final String BACKGROUND_IMAGE = "background.png";
@@ -93,30 +90,29 @@
* @param controller controller for the buttons
*/
MainMenuUI(ActionListener controller) {
- ImageIcon icon = new ImageIcon(MainMenuUI.IMAGES_DIR + File.separator
- + MainMenuUI.BACKGROUND_IMAGE);
+ ImageIcon icon = Picross.getImage(MainMenuUI.BACKGROUND_IMAGE);
this.setPreferredSize(new Dimension(icon.getIconWidth(),
icon.getIconHeight()));
this.image = icon.getImage();
this.setLayout(null);
- ImageIcon playIcon = new ImageIcon(MainMenuUI.IMAGES_DIR
- + File.separator
- + MainMenuUI.PLAY_BUTTON_IMAGE);
+ ImageIcon playIcon =
+ Picross.getLocalizedImage(MainMenuUI.PLAY_BUTTON_IMAGE);
JButton playButton = new JButton(playIcon);
playButton.setActionCommand(MainMenuController.PLAY_CMD);
playButton.addActionListener(controller);
+ playButton.setBorder(null);
playButton.setBounds(MainMenuUI.PLAY_BUTTON_X, MainMenuUI.PLAY_BUTTON_Y,
playIcon.getIconWidth(), playIcon.getIconHeight());
this.add(playButton);
- ImageIcon exitIcon = new ImageIcon(MainMenuUI.IMAGES_DIR
- + File.separator
- + MainMenuUI.EXIT_BUTTON_IMAGE);
+ ImageIcon exitIcon =
+ Picross.getLocalizedImage(MainMenuUI.EXIT_BUTTON_IMAGE);
JButton exitButton = new JButton(exitIcon);
exitButton.setActionCommand(MainMenuController.EXIT_CMD);
exitButton.addActionListener(controller);
+ exitButton.setBorder(null);
exitButton.setBounds(MainMenuUI.EXIT_BUTTON_X, MainMenuUI.EXIT_BUTTON_Y,
exitIcon.getIconWidth(), exitIcon.getIconHeight());
this.add(exitButton);
Added: trunk/src/picross/properties/messages_picross.properties
===================================================================
--- trunk/src/picross/properties/messages_picross.properties (rev 0)
+++ trunk/src/picross/properties/messages_picross.properties 2007-06-06 14:26:30 UTC (rev 15)
@@ -0,0 +1 @@
+victory = Congratulations !
Added: trunk/src/picross/properties/messages_picross_en.properties
===================================================================
--- trunk/src/picross/properties/messages_picross_en.properties (rev 0)
+++ trunk/src/picross/properties/messages_picross_en.properties 2007-06-06 14:26:30 UTC (rev 15)
@@ -0,0 +1 @@
+link messages_picross.properties
\ No newline at end of file
Property changes on: trunk/src/picross/properties/messages_picross_en.properties
___________________________________________________________________
Name: svn:special
+ *
Added: trunk/src/picross/properties/messages_picross_fr.properties
===================================================================
--- trunk/src/picross/properties/messages_picross_fr.properties (rev 0)
+++ trunk/src/picross/properties/messages_picross_fr.properties 2007-06-06 14:26:30 UTC (rev 15)
@@ -0,0 +1,2 @@
+# picross.PicrossMediator
+victory = F\xE9licitations !
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
