Fixed some issues for Linux systems and bumped version.

jcbvm · Nov 15, 2015 · 0369c10 · 0369c10
1 parent 2a1f3fe
commit 0369c10
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/.classpath b/.classpath
@@ -6,7 +6,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.jvms</groupId>
 	<artifactId>i18n-editor</artifactId>
-	<version>0.3.0</version>
+	<version>0.3.1</version>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.commons</groupId>

diff --git a/src/main/java/com/jvms/i18neditor/Editor.java b/src/main/java/com/jvms/i18neditor/Editor.java
@@ -51,7 +51,7 @@ public class Editor extends JFrame {
 
 	public static final Path SETTINGS_PATH = Paths.get(System.getProperty("user.home"), ".i18n-editor");
 	public static final String TITLE = "i18n Editor";
-	public static final String VERSION = "0.3.0";
+	public static final String VERSION = "0.3.1";
 	public static final int DEFAULT_WIDTH = 1024;
 	public static final int DEFAULT_HEIGHT = 768;
 
@@ -352,7 +352,7 @@ public boolean closeCurrentSession() {
 	}
 
 	public void launch() {
-		settings.load(Editor.SETTINGS_PATH);
+		settings.load(SETTINGS_PATH);
 
 		// Try to load previously loaded resources
 		List<String> dirs = settings.getListProperty("history");

diff --git a/src/main/java/com/jvms/i18neditor/Main.java b/src/main/java/com/jvms/i18neditor/Main.java
@@ -4,6 +4,8 @@
 
 import javax.swing.UIManager;
 
+import org.apache.commons.lang3.SystemUtils;
+
 /**
  * The main entry class of the program.
  * 
@@ -19,7 +21,9 @@ public static void main(String[] args) {
 
 	private static void setupLookAndFeel() {
 		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+			if (!SystemUtils.IS_OS_LINUX) {
+				UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());				
+			}
 		} catch (Exception e) {
 			//
 		}

diff --git a/src/main/java/com/jvms/i18neditor/TranslationTree.java b/src/main/java/com/jvms/i18neditor/TranslationTree.java
@@ -173,10 +173,8 @@ private void duplicateNodeByKey(String key, String newKey, boolean keepOld) {
 	}
 
 	private class TranslationTreeMouseListener extends MouseAdapter {
-		@Override
-		public void mouseReleased(MouseEvent e) {
-			if (!e.isPopupTrigger() || !isEditable()) return;
-	    	TreePath path = getPathForLocation(e.getX(), e.getY());
+		private void showPopupMenu(MouseEvent e) {
+			TreePath path = getPathForLocation(e.getX(), e.getY());
 	    	if (path == null) {
 	    		setSelectionPath(null);
 	    		TranslationTreeMenu menu = new TranslationTreeMenu(editor, TranslationTree.this);
@@ -187,6 +185,18 @@ public void mouseReleased(MouseEvent e) {
 	    		TranslationTreeNodeMenu menu = new TranslationTreeNodeMenu(editor, node);
 	    		menu.show(e.getComponent(), e.getX(), e.getY());
 	    	}
+		}
+
+		@Override
+		public void mouseReleased(MouseEvent e) {
+			if (!e.isPopupTrigger() || !isEditable()) return;
+			showPopupMenu(e);
+	    }
+
+		@Override
+		public void mousePressed(MouseEvent e) {
+			if (!e.isPopupTrigger() || !isEditable()) return;
+			showPopupMenu(e);
 	    }
 	}
 }