Changed duplicate/rename behaviour and cleaned up some code.

Author: jcbvm

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.jvms</groupId>
 	<artifactId>i18n-editor</artifactId>
-	<version>0.5.0</version>
+	<version>0.6.0</version>
 	<packaging>jar</packaging>
 	<dependencies>
 		<dependency>
@@ -51,7 +51,7 @@
 						<configuration>
 							<archive>
 								<manifest>
-									<mainClass>com.jvms.i18neditor.Main</mainClass>
+									<mainClass>com.jvms.i18neditor.Editor</mainClass>
 								</manifest>
 							</archive>
 							<descriptorRefs>
@@ -78,7 +78,7 @@
 							<jar>${project.build.directory}/${project.artifactId}-${project.version}-jar-with-dependencies.jar</jar>
 							<errTitle>i18n Editor</errTitle>
 							<classPath>
-								<mainClass>com.jvms.i18neditor.Main</mainClass>
+								<mainClass>com.jvms.i18neditor.Editor</mainClass>
 							</classPath>
 							<jre>
 								<minVersion>1.8.0</minVersion>

src/main/java/com/jvms/i18neditor/Editor.java

@@ -29,9 +29,12 @@
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 
+import org.apache.commons.lang3.SystemUtils;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jvms.i18neditor.Resource.ResourceType;
@@ -52,7 +55,7 @@ public class Editor extends JFrame {
 
 	public final static Path SETTINGS_PATH = Paths.get(System.getProperty("user.home"), ".i18n-editor");
 	public final static String TITLE = "i18n Editor";
-	public final static String VERSION = "0.5.0";
+	public final static String VERSION = "0.6.0";
 	public final static String COPYRIGHT_YEAR = "2016";
 	public final static int DEFAULT_WIDTH = 1024;
 	public final static int DEFAULT_HEIGHT = 768;
@@ -112,7 +115,7 @@ public void importResources(Path dir) {
 			Map<String,String> keys = Maps.newTreeMap();
 			resources.forEach(resource -> keys.putAll(resource.getTranslations()));
 			List<String> keyList = Lists.newArrayList(keys.keySet());
-			translationTree.setModel(new TranslationTreeModel(MessageBundle.get("translations.model.name"), keyList));
+			translationTree.setModel(new TranslationTreeModel(keyList));
 
 			updateUI();
 		} catch (IOException e) {
@@ -364,6 +367,41 @@ public boolean closeCurrentSession() {
 		return true;
 	}
 
+	public void reset() {
+		translationTree.clear();
+		resources.clear();
+		resourceFields.clear();
+		setDirty(false);
+		updateUI();
+	}
+	
+	public void updateUI() {
+		TranslationTreeNode selectedNode = translationTree.getSelectedNode();
+		
+		resourcesPanel.removeAll();
+		resourceFields.stream().sorted().forEach(field -> {
+			field.setEditable(selectedNode != null && selectedNode.isEditable());
+			resourcesPanel.add(Box.createVerticalStrut(5));
+			resourcesPanel.add(new JLabel(field.getResource().getLocale().getDisplayName()));
+			resourcesPanel.add(Box.createVerticalStrut(5));
+			resourcesPanel.add(field);
+			resourcesPanel.add(Box.createVerticalStrut(5));
+		});
+		if (!resourceFields.isEmpty()) {
+			resourcesPanel.remove(0);
+			resourcesPanel.remove(resourcesPanel.getComponentCount()-1);
+		}
+		
+		editorMenu.setEnabled(resourcesDir != null);
+		editorMenu.setEditable(!resources.isEmpty());
+		translationTree.setEditable(!resources.isEmpty());
+		translationField.setEditable(!resources.isEmpty());
+		
+		updateTitle();
+		validate();
+		repaint();
+	}
+	
 	public void launch() {
 		settings.load(SETTINGS_PATH);
 
@@ -398,39 +436,18 @@ public void launch() {
     	}
 	}
 
-	public void reset() {
-		translationTree.clear();
-		resources.clear();
-		resourceFields.clear();
-		setDirty(false);
-		updateUI();
-	}
-	
-	public void updateUI() {
-		TranslationTreeNode selectedNode = translationTree.getSelectedNode();
-		
-		resourcesPanel.removeAll();
-		resourceFields.stream().sorted().forEach(field -> {
-			field.setEditable(selectedNode != null && selectedNode.isEditable());
-			resourcesPanel.add(Box.createVerticalStrut(5));
-			resourcesPanel.add(new JLabel(field.getResource().getLocale().getDisplayName()));
-			resourcesPanel.add(Box.createVerticalStrut(5));
-			resourcesPanel.add(field);
-			resourcesPanel.add(Box.createVerticalStrut(5));
+	public static void main(String[] args) {
+		SwingUtilities.invokeLater(() -> {
+			try {
+				// Only use native look an feel when not running Linux, Linux might cause visual issues
+				if (!SystemUtils.IS_OS_LINUX) {
+					UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());				
+				}
+			} catch (Exception e) {
+				//
+			}
+			new Editor().launch();
 		});
-		if (!resourceFields.isEmpty()) {
-			resourcesPanel.remove(0);
-			resourcesPanel.remove(resourcesPanel.getComponentCount()-1);
-		}
-		
-		editorMenu.setEnabled(resourcesDir != null);
-		editorMenu.setEditable(!resources.isEmpty());
-		translationTree.setEditable(!resources.isEmpty());
-		translationField.setEditable(!resources.isEmpty());
-		
-		updateTitle();
-		validate();
-		repaint();
 	}
 
 	private boolean loadResourcesFromHistory() {
@@ -479,7 +496,8 @@ private void setupUI() {
 		translationsPanel = new JPanel(new BorderLayout());
         translationTree = new TranslationTree(this);
         translationTree.addTreeSelectionListener(new TranslationTreeNodeSelectionListener());
-		translationField = new TranslationField(this, translationTree);
+		translationField = new TranslationField();
+		translationField.addKeyListener(new TranslationFieldKeyListener());
 		translationsPanel.add(new JScrollPane(translationTree));
 		translationsPanel.add(translationField, BorderLayout.SOUTH);
 
@@ -571,11 +589,29 @@ private class ResourceFieldKeyListener extends KeyAdapter {
 		public void keyReleased(KeyEvent e) {
 			ResourceField field = (ResourceField) e.getSource();
 			String key = translationTree.getSelectedNode().getKey();
-			String value = field.getText().trim();
+			String value = field.getValue();
 			field.getResource().storeTranslation(key, value);
 		}
 	}
 
+	private class TranslationFieldKeyListener extends KeyAdapter {
+		@Override
+		public void keyReleased(KeyEvent e) {
+			if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+				TranslationField field = (TranslationField) e.getSource();
+				String key = field.getValue();
+				if (TranslationKeys.isValid(key)) {
+					TranslationTreeNode node = translationTree.getNodeByKey(key);
+					if (node == null) {
+						addTranslationKey(key);						
+					} else {
+						translationTree.setSelectedNode(node);
+					}
+				}
+			}
+		}
+	}
+	
 	private class EditorWindowListener extends WindowAdapter {
 		@Override
 		public void windowClosing(WindowEvent e) {

src/main/java/com/jvms/i18neditor/EditorMenu.java

@@ -24,10 +24,8 @@
  */
 public class EditorMenu extends JMenuBar {
 	private final static long serialVersionUID = -101788804096708514L;
-	
 	private final Editor editor;
 	private final TranslationTree tree;
-	
 	private JMenuItem saveMenuItem;
 	private JMenuItem reloadMenuItem;
 	private JMenuItem addTranslationMenuItem;

src/main/java/com/jvms/i18neditor/Main.java

@@ -18,7 +18,7 @@
  * <li>{@code type} the type of the resource, either {@code JSON} or {@code ES6}.</li>
  * <li>{@code path}	the path to the translation file on disk.</li>
  * <li>{@code locale} the locale of the translations.</li>
- * <li>{@code translations} a sorted map containing the translations.</li>
+ * <li>{@code translations} a sorted map containing the translations by key value pair.</li>
  * </ul>
  * 
  * <p>Objects can listen to a resource by adding a {@link ResourceListener} which 
@@ -102,6 +102,16 @@ public SortedMap<String,String> getTranslations() {
 		return ImmutableSortedMap.copyOf(translations);
 	}
 
+	/**
+	 * Gets a translation from the resource's translations.
+	 * 
+	 * @param	key the key of the translation to get.
+	 * @return 	value of the translation or <code>null</code> if there is no translation for the given key.
+	 */
+	public String getTranslation(String key) {
+		return translations.get(key);
+	}
+	
 	/**
 	 * Stores a translation to the resource's translations.
 	 * 
@@ -118,7 +128,6 @@ public SortedMap<String,String> getTranslations() {
 	public void storeTranslation(String key, String value) {
 		String existing = translations.get(key);
 		if (existing != null && existing.equals(value)) return;
-		//if (existing == null && value.isEmpty()) return;
 		removeParents(key);
 		removeChildren(key);
 		if (value.isEmpty()) {
@@ -194,13 +203,11 @@ private void duplicateTranslation(String key, String newKey, boolean keepOld) {
 		if (translations.containsKey(key)) {
 			newTranslations.put(newKey, translations.get(key));
 		}
-		removeChildren(newKey);
-		translations.remove(newKey);
 		if (!keepOld) {
 			removeChildren(key);
 			translations.remove(key);
 		}
-		translations.putAll(newTranslations);
+		newTranslations.forEach(this::storeTranslation);
 	}
 
 	private void removeChildren(String key) {

src/main/java/com/jvms/i18neditor/Resource.java

@@ -18,7 +18,6 @@
  */
 public class ResourceField extends JTextArea implements Comparable<ResourceField> {
 	private final static long serialVersionUID = 2034814490878477055L;
-	
 	private final Resource resource;
 	private final UndoManager undoManager = new UndoManager();
 
@@ -28,8 +27,12 @@ public ResourceField(Resource resource) {
 		setupUI();
 	}
 
+	public String getValue() {
+		return getText().trim();
+	}
+	
 	public void updateValue(String key) {
-		setText(resource.getTranslations().get(key));
+		setText(resource.getTranslation(key));
 		undoManager.discardAllEdits();
 	}
 
@@ -56,7 +59,6 @@ private void setupUI() {
 		getInputMap().put(KeyStroke.getKeyStroke('Y', Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "redo");
 	}
 
-	@SuppressWarnings("serial")
 	private class UndoAction extends AbstractAction {
 		@Override
 		public void actionPerformed(ActionEvent e) {
@@ -66,7 +68,6 @@ public void actionPerformed(ActionEvent e) {
 		}
 	}
 
-	@SuppressWarnings("serial")
 	private class RedoAction extends AbstractAction {
 		@Override
 		public void actionPerformed(ActionEvent e) {
@@ -78,6 +79,8 @@ public void actionPerformed(ActionEvent e) {
 
 	@Override
 	public int compareTo(ResourceField o) {
-		return getResource().getLocale().getDisplayName().compareTo(o.getResource().getLocale().getDisplayName());
+		String a = getResource().getLocale().getDisplayName();
+		String b = o.getResource().getLocale().getDisplayName();
+		return a.compareTo(b);
 	}
 }

src/main/java/com/jvms/i18neditor/ResourceField.java

@@ -1,54 +1,28 @@
 package com.jvms.i18neditor;
 
 import java.awt.Insets;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
 
 import javax.swing.JTextField;
 
-import com.jvms.i18neditor.util.TranslationKeys;
-
 /**
  * This class represents a text field for adding a new translation key.
  * 
- * <p>When the entered value targets an existing translation, instead of adding a new
- * translation key the existing translation key will be selected.</p>
- * 
  * @author Jacob
  */
 public class TranslationField extends JTextField {
 	private final static long serialVersionUID = -3951187528785224704L;
 
-	private final TranslationTree tree;
-	private final Editor editor;
-	
-	public TranslationField(Editor editor, TranslationTree tree) {
+	public TranslationField() {
 		super();
-		this.tree = tree;
-		this.editor = editor;
 		setupUI();
 	}
 
+	public String getValue() {
+		return getText().trim();
+	}
+	
 	private void setupUI() {
 		setMargin(new Insets(4,4,4,4));
-		addKeyListener(new TranslationFieldKeyListener());
 		setEditable(false);
 	}
-	
-	private class TranslationFieldKeyListener extends KeyAdapter {
-		@Override
-		public void keyReleased(KeyEvent e) {
-			if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-				String key = getText().trim();
-				if (TranslationKeys.isValid(key)) {
-					TranslationTreeNode node = tree.getNodeByKey(key);
-					if (node == null) {
-						editor.addTranslationKey(key);						
-					} else {
-						tree.setSelectedNode(node);
-					}
-				}
-			}
-		}
-	}
 }