From 99756b5d0a74c8f804d614e1dc928be100b61a26 Mon Sep 17 00:00:00 2001
From: "jason@long.name" <jason@long.name@d9718cc8-9f43-0410-858b-315f434eb58c>
Date: Tue, 21 May 2013 13:28:32 +0000
Subject: [PATCH] translations: merge in my older work on the translation tool

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@662 d9718cc8-9f43-0410-858b-315f434eb58c
---
 src/micropolisj/gui/MainWindow.java       |  1 +
 src/micropolisj/gui/TranslationTool.java  | 17 -----------------
 src/micropolisj/util/TranslationTool.java | 15 +++++++++++----
 3 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 src/micropolisj/gui/TranslationTool.java

diff --git a/src/micropolisj/gui/MainWindow.java b/src/micropolisj/gui/MainWindow.java
index 0e89767..e556089 100644
--- a/src/micropolisj/gui/MainWindow.java
+++ b/src/micropolisj/gui/MainWindow.java
@@ -23,6 +23,7 @@ import javax.swing.Timer;
 import javax.swing.filechooser.FileNameExtensionFilter;
 
 import micropolisj.engine.*;
+import micropolisj.util.TranslationTool;
 
 public class MainWindow extends JFrame
 	implements Micropolis.Listener, EarthquakeListener
diff --git a/src/micropolisj/gui/TranslationTool.java b/src/micropolisj/gui/TranslationTool.java
deleted file mode 100644
index 3f82f31..0000000
--- a/src/micropolisj/gui/TranslationTool.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package micropolisj.gui;
-
-import java.awt.*;
-import javax.swing.*;
-
-public class TranslationTool extends JFrame
-{
-	public TranslationTool()
-	{
-		JButton btn = new JButton("Hello World!");
-		add(btn, BorderLayout.CENTER);
-
-		pack();
-		setLocationRelativeTo(null);
-		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-	}
-}
diff --git a/src/micropolisj/util/TranslationTool.java b/src/micropolisj/util/TranslationTool.java
index 8933f39..b60ce50 100644
--- a/src/micropolisj/util/TranslationTool.java
+++ b/src/micropolisj/util/TranslationTool.java
@@ -16,13 +16,20 @@ public class TranslationTool extends JFrame
 	String lastVariant;
 
 	public TranslationTool()
-		throws IOException
 	{
 		setTitle("MicropolisJ Translation Tool");
 
+		try {
 		stringsModel = new StringsModel();
 		stringsModel.addLocale(null);
 
+		}
+		catch (IOException e) {
+			JOptionPane.showMessageDialog(this,
+				e, "Error", JOptionPane.ERROR_MESSAGE);
+			System.exit(1);
+		}
+
 		stringsTable = new JTable(stringsModel);
 		stringsTable.setDefaultEditor(String.class, new DefaultCellEditor(new JTextField()));
 		JScrollPane scrollPane = new JScrollPane(stringsTable);
@@ -167,12 +174,12 @@ public class TranslationTool extends JFrame
 	static class StringsModel extends AbstractTableModel
 	{
 		StringInfo [] strings;
-		ArrayList<MyLocaleInfo> locales = new ArrayList<>();
+		ArrayList<MyLocaleInfo> locales = new ArrayList<MyLocaleInfo>();
 
 		static class MyLocaleInfo
 		{
 			String code;
-			HashMap<String,Properties> propsMap = new HashMap<>();
+			HashMap<String,Properties> propsMap = new HashMap<String,Properties>();
 			boolean dirty;
 
 			MyLocaleInfo(String code) {
@@ -201,7 +208,7 @@ public class TranslationTool extends JFrame
 
 		StringsModel() throws IOException
 		{
-			ArrayList<StringInfo> ss = new ArrayList<>();
+			ArrayList<StringInfo> ss = new ArrayList<StringInfo>();
 			for (String f : FILES) {
 				loadStrings(f, ss);
 			}