Merge branch '2013' into 2014: Implement localization

Author: Thach Nguyen

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>pes.compulsion</groupId>
 	<artifactId>pes-editor</artifactId>
-	<version>2014-1.0</version>
+	<version>2014-1.1</version>
 	<packaging>jar</packaging>
 
 	<!-- Generic properties -->
@@ -21,7 +21,7 @@
 	</properties>
 
 	<build>
-		<finalName>PES2014Editor-1.0</finalName>
+		<finalName>PES2014Editor-1.1</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

src/main/java/editor/data/OptionFile.java

@@ -115,9 +115,9 @@ public synchronized boolean load(File file) {
 
 				checksum(data, true);
 				decrypt(data);
-			}
 
-			log.info("Loading of {} save game file succeeded", format);
+				log.info("Loading of {} save game file succeeded", format);
+			}
 		} catch (Exception e) {
 			log.error("Failed to load save game file:", e);
 			format = null;
@@ -525,8 +525,8 @@ private static void checksum(byte[] data, boolean validate) {
 			// 4 bytes checksum before each blocks
 			if (validate) {
 				int crc = Bits.toInt(data, adr);
-				if (crc != chk) {
-					throw new IllegalStateException(String.format("Invalid checksum 0x%X, expected: 0x%X", crc, chk));
+				if (crc != 0 && crc != chk) {
+					throw new IllegalStateException(String.format("Invalid block@%d checksum 0x%X, expected: 0x%X", block[0], crc, chk));
 				}
 			} else {
 				Bits.toBytes(chk, data, adr);

src/main/java/editor/data/Stats.java

@@ -267,8 +267,8 @@ private Stats() {
 			"Syria",
 			"New Caledonia",
 
-			"[ - ]",// Black * NOTE: Nation IDs [100-101] must not be used
-			"[   ]",// White
+			"[  -  ]",// Black * NOTE: Nation IDs [100-101] must not be used
+			"[     ]",// White
 			"[ M ]",// Master-League country
 
 			"Albania",

src/main/java/editor/lang/NullHostnameVerifier.java

@@ -18,6 +18,7 @@
 import java.awt.event.WindowEvent;
 import java.io.*;
 import java.net.URL;
+import java.util.Locale;
 
 public class Editor extends JFrame implements ActionListener {
 	private static final long serialVersionUID = 212475114885790986L;
@@ -28,15 +29,19 @@ public class Editor extends JFrame implements ActionListener {
 	private final CsvMaker csvMaker;
 
 	public Editor() {
-		super(Resources.getMessage("editor.title"));
+		super();
 
 		of = new OptionFile();
 		of2 = new OptionFile();
 		csvMaker = new CsvMaker();
 
-		initComponents();
+		setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+		initIcon();
 
-		tabbedPane.setVisible(false);
+		File lastDir = loadSettings();
+		setTitle(Resources.getMessage("editor.title"));
+
+		initComponents(lastDir);
 	}
 
 	//region Initialize the GUI components
@@ -60,10 +65,7 @@ public Editor() {
 	private/* final*/ CsvSwitchPanel csvSwitch;
 	private/* final*/ JFileChooser csvChooser;
 
-	private void initComponents() {
-		setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-		initIcon();
-
+	private void initComponents(File lastDir) {
 		csvSwitch = new CsvSwitchPanel();
 
 		csvChooser = new JFileChooser();
@@ -110,18 +112,22 @@ private void initComponents() {
 		tabbedPane.addTab(Resources.getMessage("editor.tab8"), null, globalPan, null);
 		tabbedPane.addTab(Resources.getMessage("editor.tab9"), null, importPanel, null);
 
-		buildMenu();
-		getContentPane().add(tabbedPane);
-
 		opFileFilter = new OptionFileFilter();
 		//
-		opFileChooser = new JFileChooser(loadSettings());
+		opFileChooser = new JFileChooser(lastDir);
 		opFileChooser.setAcceptAllFileFilterUsed(false);
 		opFileChooser.addChoosableFileFilter(opFileFilter);
 		opFileChooser.setAccessory(new OptionPreviewPanel(opFileChooser));
 
+		buildMenu();
+
+		setResizable(true);
+		getContentPane().add(tabbedPane);
+
 		setResizable(false);
 		pack();
+
+		tabbedPane.setVisible(false);
 	}
 
 	private JMenuItem open2Item;
@@ -172,6 +178,9 @@ private void buildMenu() {
 		tool.add(csvItem);
 		tool.add(convertItem);
 
+		JMenu language = new JMenu(Resources.getMessage("menu.language"));
+		buildLanguageMenu(language);
+
 		JMenuItem helpItem = new JMenuItem(Resources.getMessage("menu.helpPage"));
 		helpItem.setActionCommand("Help");
 		helpItem.addActionListener(this);
@@ -187,17 +196,21 @@ private void buildMenu() {
 		JMenuBar mb = new JMenuBar();
 		mb.add(file);
 		mb.add(tool);
+		mb.add(language);
 		mb.add(help);
 
 		setJMenuBar(mb);
 
-		csvItem.setEnabled(false);
-		open2Item.setEnabled(false);
-		saveItem.setEnabled(false);
-		saveAsItem.setEnabled(false);
-		convertItem.setEnabled(false);
+		enableMenuItems(false);
+		log.debug("Building of menu-bar is succeeded");
+	}
 
-		log.debug("Building of menu-bar succeeded");
+	private void enableMenuItems(boolean enable) {
+		csvItem.setEnabled(enable);
+		open2Item.setEnabled(enable);
+		saveItem.setEnabled(enable);
+		saveAsItem.setEnabled(enable);
+		convertItem.setEnabled(enable && of2.isLoaded());
 	}
 
 	private void initIcon() {
@@ -208,6 +221,20 @@ private void initIcon() {
 		}
 	}
 
+	private void buildLanguageMenu(JMenu language) {
+		Locale loc;
+		JMenuItem mi;
+		for (int i = 0; i < Resources.SUPPORTED_LOCALES.length; i++) {
+			loc = Resources.SUPPORTED_LOCALES[i];
+
+			mi = new JMenuItem(loc.getDisplayLanguage(loc));
+			mi.setActionCommand("Language" + i);
+			mi.addActionListener(this);
+
+			language.add(mi);
+		}
+	}
+
 	//endregion
 
 	private void refreshTitle(String filename) {
@@ -239,6 +266,10 @@ public void actionPerformed(ActionEvent evt) {
 			exportCsv();
 		} else if ("Convert".equalsIgnoreCase(evt.getActionCommand())) {
 			importFromOF2();
+		} else if (null != evt.getActionCommand() && evt.getActionCommand().startsWith("Language")) {
+			int i = Integer.parseInt(evt.getActionCommand().substring(8));
+			switchLanguage(Resources.SUPPORTED_LOCALES[i]);
+
 		} else if ("Help".equalsIgnoreCase(evt.getActionCommand())) {
 			helpDia.setVisible(true);
 		} else if ("About".equalsIgnoreCase(evt.getActionCommand())) {
@@ -275,40 +306,51 @@ private void openFile(String filePath) {
 
 			Squads.fixAll(of);
 
-			flagPanel.refresh();
-			imagePanel.refresh();
-			transferPan.refresh();
-			wenShop.getWenPanel().refresh();
-			wenShop.getShopPanel().refresh();
-			stadiumPan.refresh();
-			teamPan.refresh();
-			leaguePan.refresh();
-			importPanel.refresh();
-
-			tabbedPane.setVisible(true);
-
-			csvItem.setEnabled(true);
-			open2Item.setEnabled(true);
-			saveItem.setEnabled(true);
-			saveAsItem.setEnabled(true);
-			convertItem.setEnabled(of2.isLoaded());
+			refreshComponents();
+			enableMenuItems(true);
 
 			log.debug("Open succeeded on input file: {}", fs.getName());
 		} else {
 			refreshTitle(null);
 			tabbedPane.setVisible(false);
 
-			csvItem.setEnabled(false);
-			open2Item.setEnabled(false);
-			saveItem.setEnabled(false);
-			saveAsItem.setEnabled(false);
-			convertItem.setEnabled(false);
+			enableMenuItems(false);
 
 			log.debug("Failed to open file: {}", fs);
 			showOpenFailMsg();
 		}
 	}
 
+	private void refreshComponents() {
+		flagPanel.refresh();
+		imagePanel.refresh();
+		transferPan.refresh();
+		wenShop.getWenPanel().refresh();
+		wenShop.getShopPanel().refresh();
+		stadiumPan.refresh();
+		teamPan.refresh();
+		leaguePan.refresh();
+		importPanel.refresh();
+
+		tabbedPane.setVisible(true);
+	}
+
+	private void switchLanguage(Locale locale) {
+		Locale.setDefault(locale);
+		saveSettings();
+
+		getContentPane().remove(tabbedPane);
+		initComponents(opFileChooser.getCurrentDirectory());
+
+		if (null != currentFile) {
+			refreshTitle(currentFile.getName());
+			refreshComponents();
+			enableMenuItems(true);
+		} else {
+			refreshTitle(null);
+		}
+	}
+
 	/**
 	 * Imports OptionFile from OF2.
 	 */
@@ -505,14 +547,14 @@ private void showIllegalNameMsg() {
 
 	private boolean saveSettings() {
 		File dir = opFileChooser.getCurrentDirectory();
-		if (null == dir) {
+		/*if (null == dir) {
 			return true;
-		}
+		}*/
 
 		ObjectOutputStream sw = null;
 		try {
 			sw = new ObjectOutputStream(new FileOutputStream(settingsFile, false));
-			sw.writeObject(dir);
+			sw.writeObject(new Object[]{dir, Locale.getDefault()});
 
 		} catch (IOException e) {
 			log.warn("Failed to save settings: {}", e.toString());
@@ -540,11 +582,13 @@ private File loadSettings() {
 			sr = new ObjectInputStream(new FileInputStream(settingsFile));
 			Object o = sr.readObject();
 
-			if (o instanceof File) {
-				dir = (File) o;
-				if (!dir.exists()) {
+			if (o instanceof Object[]) {
+				Object[] settings = (Object[]) o;
+				dir = (File) settings[0];
+				if (null != dir && !dir.exists()) {
 					dir = null;
 				}
+				Locale.setDefault((Locale) settings[1]);
 			}
 		} catch (Exception e) {
 			log.warn("Failed to load settings: {}", e.toString());

src/main/java/editor/lang/TrustAllManager.java

@@ -303,10 +303,10 @@ private void insertName(int index1, int index2) throws BadLocationException {
 		StyleConstants.setForeground(attr, Color.WHITE);
 
 		if (index1 > 0) {
-			doc.insertString(doc.getLength(), Player.getName(of, index1), attr);
+			doc.insertString(doc.getLength(), Player.getName(of, index1) + "  [" + index1 + ']', attr);
 		}
 		if (index2 > 0) {
-			doc.insertString(doc.getLength(), "\t" + Player.getName(of, index2), attr);
+			doc.insertString(doc.getLength(), "\t" + Player.getName(of, index2) + "  [" + index2 + ']', attr);
 		}
 	}
 

src/main/java/editor/ui/Editor.java

@@ -764,7 +764,7 @@ private void detectSafeTransferSide(
 				transferFree.set(false);
 			}
 
-			if (!autoRelease.isSelected() && squadFrom >= Squads.FIRST_CLUB && squadFrom <= Squads.TOTAL) {
+			if (!autoRelease.isSelected() && squadFrom >= Squads.FIRST_CLUB/* && squadFrom <= Squads.TOTAL*/) {
 				int s = clubRelease(indexTo, false);
 				if (s >= 0) {
 					transferTo.set(false);

src/main/java/editor/ui/InfoPanel.java

@@ -16,9 +16,9 @@ private Resources() {
 
 	private static volatile ResourceBundle messages = null;
 
-	public static ResourceBundle getMessages(boolean reload) {
-		if (null == messages || reload) {
-			messages = ResourceBundle.getBundle("META-INF/i18n/messages", Locale.getDefault());
+	public static ResourceBundle getMessages(Locale locale) {
+		if (null == messages || !locale.equals(messages.getLocale())) {
+			messages = ResourceBundle.getBundle("META-INF/i18n/messages", locale);
 			if (null == messages) {
 				throw new IllegalStateException("messages must not be null.");
 			}
@@ -27,7 +27,7 @@ public static ResourceBundle getMessages(boolean reload) {
 	}
 
 	public static ResourceBundle getMessages() {
-		return getMessages(false);
+		return getMessages(Locale.getDefault());
 	}
 
 	private static String getMessage(String key, boolean nullable, Object... args) {
@@ -61,4 +61,9 @@ public static String getNullableMessage(String key, Object... args) {
 		return getMessage(key, true, args);
 	}
 
+	public static final Locale[] SUPPORTED_LOCALES = {
+			Locale.ENGLISH,
+			new Locale("vi"),
+	};
+
 }