From 48d8d3a411e0d73eedef5bdb0c7a4d81284b6207 Mon Sep 17 00:00:00 2001
From: Andy Chabalier <Andy@chabalier.com>
Date: Thu, 27 Sep 2018 17:28:53 +0200
Subject: [PATCH] Adding internationalizing classes, with french, english,
 spanish and default local. Adding Icon

---
 .../util/languages/StringSources.java         |  39 ++++++++++++++++++
 .../util/languages/stringsources.properties   |   9 ++++
 .../languages/stringsources_en_GB.properties  |   9 ++++
 .../languages/stringsources_es_ES.properties  |   9 ++++
 .../languages/stringsources_fr_FR.properties  |   9 ++++
 .../fr/uha/gabalier/util/ressources/logo.jpg  | Bin 0 -> 4107 bytes
 .../java/fr/uha/gabalier/view/Preview.java    |  17 ++++----
 7 files changed, 85 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/fr/uha/gabalier/util/languages/StringSources.java
 create mode 100644 src/main/java/fr/uha/gabalier/util/languages/stringsources.properties
 create mode 100644 src/main/java/fr/uha/gabalier/util/languages/stringsources_en_GB.properties
 create mode 100644 src/main/java/fr/uha/gabalier/util/languages/stringsources_es_ES.properties
 create mode 100644 src/main/java/fr/uha/gabalier/util/languages/stringsources_fr_FR.properties
 create mode 100644 src/main/java/fr/uha/gabalier/util/ressources/logo.jpg

diff --git a/src/main/java/fr/uha/gabalier/util/languages/StringSources.java b/src/main/java/fr/uha/gabalier/util/languages/StringSources.java
new file mode 100644
index 0000000..ef484bd
--- /dev/null
+++ b/src/main/java/fr/uha/gabalier/util/languages/StringSources.java
@@ -0,0 +1,39 @@
+package fr.uha.gabalier.util.languages;
+
+import java.beans.Beans;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class StringSources {
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// Constructor
+	//
+	////////////////////////////////////////////////////////////////////////////
+	private StringSources() {
+		// do not instantiate
+	}
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// Bundle access
+	//
+	////////////////////////////////////////////////////////////////////////////
+	private static final String BUNDLE_NAME = "fr.uha.gabalier.util.languages.stringsources"; //$NON-NLS-1$
+	private static final ResourceBundle RESOURCE_BUNDLE = loadBundle();
+	private static ResourceBundle loadBundle() {
+		return ResourceBundle.getBundle(BUNDLE_NAME);
+	}
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// Strings access
+	//
+	////////////////////////////////////////////////////////////////////////////
+	public static String getString(String key) {
+		try {
+			ResourceBundle bundle = Beans.isDesignTime() ? loadBundle() : RESOURCE_BUNDLE;
+			return bundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";
+		}
+	}
+}
diff --git a/src/main/java/fr/uha/gabalier/util/languages/stringsources.properties b/src/main/java/fr/uha/gabalier/util/languages/stringsources.properties
new file mode 100644
index 0000000..d55a42e
--- /dev/null
+++ b/src/main/java/fr/uha/gabalier/util/languages/stringsources.properties
@@ -0,0 +1,9 @@
+#Eclipse messages class
+#Thu Sep 27 17:27:39 CEST 2018
+Preview.cancelItem.text=Cancel
+Preview.exitItem.text=Exit
+Preview.fileMenu.text=File
+Preview.loadItem.text=Load
+Preview.other.text=status \:
+Preview.statusText.text=0000 images loaded
+Preview.this.title=Image Loader
diff --git a/src/main/java/fr/uha/gabalier/util/languages/stringsources_en_GB.properties b/src/main/java/fr/uha/gabalier/util/languages/stringsources_en_GB.properties
new file mode 100644
index 0000000..d55a42e
--- /dev/null
+++ b/src/main/java/fr/uha/gabalier/util/languages/stringsources_en_GB.properties
@@ -0,0 +1,9 @@
+#Eclipse messages class
+#Thu Sep 27 17:27:39 CEST 2018
+Preview.cancelItem.text=Cancel
+Preview.exitItem.text=Exit
+Preview.fileMenu.text=File
+Preview.loadItem.text=Load
+Preview.other.text=status \:
+Preview.statusText.text=0000 images loaded
+Preview.this.title=Image Loader
diff --git a/src/main/java/fr/uha/gabalier/util/languages/stringsources_es_ES.properties b/src/main/java/fr/uha/gabalier/util/languages/stringsources_es_ES.properties
new file mode 100644
index 0000000..81c0e54
--- /dev/null
+++ b/src/main/java/fr/uha/gabalier/util/languages/stringsources_es_ES.properties
@@ -0,0 +1,9 @@
+#Eclipse messages class
+#Thu Sep 27 17:27:40 CEST 2018
+Preview.cancelItem.text=Cancelar
+Preview.exitItem.text=Salir
+Preview.fileMenu.text=Archivo
+Preview.loadItem.text=Carga
+Preview.other.text=Estatus \:
+Preview.statusText.text=0000 im\u00E1genes cargadas
+Preview.this.title=Cargador de im\u00E1genes
diff --git a/src/main/java/fr/uha/gabalier/util/languages/stringsources_fr_FR.properties b/src/main/java/fr/uha/gabalier/util/languages/stringsources_fr_FR.properties
new file mode 100644
index 0000000..cd2d24c
--- /dev/null
+++ b/src/main/java/fr/uha/gabalier/util/languages/stringsources_fr_FR.properties
@@ -0,0 +1,9 @@
+#Eclipse messages class
+#Thu Sep 27 17:27:39 CEST 2018
+Preview.cancelItem.text=Annuler
+Preview.exitItem.text=Quitter
+Preview.fileMenu.text=Fichier
+Preview.loadItem.text=Charger
+Preview.other.text=Status \:
+Preview.statusText.text=0000 images charg\u00E9es
+Preview.this.title=Visionneuse d'image
diff --git a/src/main/java/fr/uha/gabalier/util/ressources/logo.jpg b/src/main/java/fr/uha/gabalier/util/ressources/logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a6f532929cde309db159cbfd233ce933adb95340
GIT binary patch
literal 4107
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
ac#^}2`A?7IC)t-!8kGSp<+?ve|MD-d4~516

literal 0
HcmV?d00001

diff --git a/src/main/java/fr/uha/gabalier/view/Preview.java b/src/main/java/fr/uha/gabalier/view/Preview.java
index ad9dc90..13ecded 100644
--- a/src/main/java/fr/uha/gabalier/view/Preview.java
+++ b/src/main/java/fr/uha/gabalier/view/Preview.java
@@ -9,6 +9,7 @@ import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.List;
+import fr.uha.gabalier.util.languages.StringSources;
 
 public class Preview extends JFrame {
 
@@ -33,6 +34,8 @@ public class Preview extends JFrame {
     private final JTextField statusText;
 
     public Preview() throws HeadlessException {
+    	setIconImage(Toolkit.getDefaultToolkit().getImage(Preview.class.getResource("/fr/uha/gabalier/util/ressources/logo.jpg")));
+    	setTitle(StringSources.getString("Preview.this.title")); //$NON-NLS-1$
         model = new ArrayList<>();
         
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -40,21 +43,21 @@ public class Preview extends JFrame {
         // UI elements
         JMenuBar menuBar = new JMenuBar();
         setJMenuBar(menuBar);
-        JMenu fileMenu = new JMenu("File");
+        JMenu fileMenu = new JMenu(StringSources.getString("Preview.fileMenu.text")); //$NON-NLS-1$
         menuBar.add(fileMenu);
 
-        loadItem = new JMenuItem("Load");
+        loadItem = new JMenuItem(StringSources.getString("Preview.loadItem.text")); //$NON-NLS-1$
         fileMenu.add(loadItem);
         loadItem.addActionListener(actionEvent -> doLoad());
-        cancelItem = new JMenuItem("Cancel");
+        cancelItem = new JMenuItem(StringSources.getString("Preview.cancelItem.text")); //$NON-NLS-1$
         fileMenu.add(cancelItem);
         cancelItem.addActionListener(actionEvent -> doCancel());
-        final JMenuItem exitItem = new JMenuItem("Exit");
+        final JMenuItem exitItem = new JMenuItem(StringSources.getString("Preview.exitItem.text")); //$NON-NLS-1$
         exitItem.addActionListener(actionEvent -> doExit());
         exitItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, InputEvent.CTRL_DOWN_MASK));
         fileMenu.add(exitItem);
 
-        setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));
+        getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));
 
         imageView = new ImageView(model);
         final ImageController controller = new ImageController(model);
@@ -73,8 +76,8 @@ public class Preview extends JFrame {
 
         final JPanel statusPanel = new JPanel();
         getContentPane().add(statusPanel);
-        statusText = new JTextField("0000 images loaded");
-        statusPanel.add(new JLabel("status :"));
+        statusText = new JTextField(StringSources.getString("Preview.statusText.text")); //$NON-NLS-1$
+        statusPanel.add(new JLabel(StringSources.getString("Preview.other.text"))); //$NON-NLS-1$
         statusPanel.add(statusText);
 
         pack();