Added ability to (not) minify json output. #2

jcbvm · Apr 27, 2016 · 1dba435 · 1dba435
1 parent ef43851
commit 1dba435
Show file tree

Hide file tree

Showing 50 changed files with 1,044 additions and 112 deletions.
diff --git a/editor/.classpath → .classpath b/editor/.classpath → .classpath
diff --git a/editor/.project → .project b/editor/.project → .project
diff --git a/editor/.settings/org.eclipse.jdt.core.prefs → .settings/org.eclipse.jdt.core.prefs b/editor/.settings/org.eclipse.jdt.core.prefs → .settings/org.eclipse.jdt.core.prefs
diff --git a/editor/.settings/org.eclipse.m2e.core.prefs → .settings/org.eclipse.m2e.core.prefs b/editor/.settings/org.eclipse.m2e.core.prefs → .settings/org.eclipse.m2e.core.prefs
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
 language: java
-install: cd parent && mvn install && cd ../editor && mvn compile
+install: cd editor && mvn compile
 jdk:
   - oraclejdk8
diff --git a/parent/.project b/parent/.project
diff --git a/parent/.settings/org.eclipse.m2e.core.prefs b/parent/.settings/org.eclipse.m2e.core.prefs
diff --git a/parent/lib/filedrop-1.1.jar b/parent/lib/filedrop-1.1.jar
diff --git a/parent/pom.xml b/parent/pom.xml
diff --git a/editor/pom.xml → pom.xml b/editor/pom.xml → pom.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>com.jvms</groupId>
-		<artifactId>i18n-editor-parent</artifactId>
-		<version>0.4.0</version>
-		<relativePath>../parent</relativePath>
-	</parent>
+	<groupId>com.jvms</groupId>
 	<artifactId>i18n-editor</artifactId>
+	<version>0.5.0</version>
 	<packaging>jar</packaging>
 	<dependencies>
 		<dependency>
@@ -21,13 +17,27 @@
 			<version>2.3.1</version>
 		</dependency>
 		<dependency>
-            <groupId>net.iharder</groupId>
-            <artifactId>dnd</artifactId>
-            <version>1.1</version>
-        </dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>18.0</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.3</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>

diff --git a/...ms/i18neditor/AddTranslationMenuItem.java → ...ms/i18neditor/AddTranslationMenuItem.java b/...ms/i18neditor/AddTranslationMenuItem.java → ...ms/i18neditor/AddTranslationMenuItem.java
diff --git a/...neditor/CollapseTranslationsMenuItem.java → ...neditor/CollapseTranslationsMenuItem.java b/...neditor/CollapseTranslationsMenuItem.java → ...neditor/CollapseTranslationsMenuItem.java
diff --git a/...neditor/DuplicateTranslationMenuItem.java → ...neditor/DuplicateTranslationMenuItem.java b/...neditor/DuplicateTranslationMenuItem.java → ...neditor/DuplicateTranslationMenuItem.java
diff --git a/...main/java/com/jvms/i18neditor/Editor.java → ...main/java/com/jvms/i18neditor/Editor.java b/...main/java/com/jvms/i18neditor/Editor.java → ...main/java/com/jvms/i18neditor/Editor.java
@@ -35,14 +35,13 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jvms.i18neditor.Resource.ResourceType;
+import com.jvms.i18neditor.swing.JFileDrop;
 import com.jvms.i18neditor.swing.JScrollablePanel;
 import com.jvms.i18neditor.util.ExtendedProperties;
 import com.jvms.i18neditor.util.MessageBundle;
 import com.jvms.i18neditor.util.Resources;
 import com.jvms.i18neditor.util.TranslationKeys;
 
-import net.iharder.dnd.FileDrop;
-
 /**
  * This class represents the main class of the editor.
  * 
@@ -53,13 +52,15 @@ 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.4.0";
+	public final static String VERSION = "0.5.0";
+	public final static String COPYRIGHT_YEAR = "2016";
 	public final static int DEFAULT_WIDTH = 1024;
 	public final static int DEFAULT_HEIGHT = 768;
 
 	private List<Resource> resources = Lists.newLinkedList();
 	private Path resourcesDir;
 	private boolean dirty;
+	private boolean minifyOutput;
 
 	private EditorMenu editorMenu;
 	private JSplitPane contentPane;
@@ -124,7 +125,7 @@ public void saveResources() {
 		boolean error = false;
 		for (Resource resource : resources) {
 			try {
-				Resources.write(resource);
+				Resources.write(resource, !minifyOutput);
 			} catch (Exception e) {
 				error = true;
 				e.printStackTrace();
@@ -199,6 +200,14 @@ public void setDirty(boolean dirty) {
 		editorMenu.setSaveable(dirty);
 	}
 
+	public boolean isMinifyOutput() {
+		return minifyOutput;
+	}
+
+	public void setMinifyOutput(boolean minifyOutput) {
+		this.minifyOutput = minifyOutput;
+	}
+
 	public void showError(String message) {
 		showMessageDialog(MessageBundle.get("dialogs.error.title"), message, JOptionPane.ERROR_MESSAGE);
 	}
@@ -332,15 +341,13 @@ public void showFindTranslationDialog() {
 
 	public void showAboutDialog() {
 		showMessage(MessageBundle.get("dialogs.about.title", TITLE), 
-				"<html>" +
-						"<body style=\"text-align:center;width:200px;\"><br>" +
-							"<span style=\"font-weight:bold;font-size:1.2em;\">" + TITLE + "</span><br>" +
-							"v" + VERSION + "<br><br>" +
-							"(c) Copyright 2015<br>" +
-							"Jacob van Mourik<br>" +
-							"MIT Licensed<br><br>" +
-						"</body>" +
-				"</html>");
+				"<html><body style=\"text-align:center;width:200px;\"><br>" +
+					"<span style=\"font-weight:bold;font-size:1.2em;\">" + TITLE + "</span><br>" +
+					"v" + VERSION + "<br><br>" +
+					"(c) Copyright " + COPYRIGHT_YEAR + "<br>" +
+					"Jacob van Mourik<br>" +
+					"MIT Licensed<br><br>" +
+				"</body></html>");
 	}
 
 	public boolean closeCurrentSession() {
@@ -359,6 +366,9 @@ public boolean closeCurrentSession() {
 
 	public void launch() {
 		settings.load(SETTINGS_PATH);
+
+		// Restore editor settings
+		minifyOutput = settings.getBooleanProperty("minify_output");
 
 		// Restore window bounds
 		setPreferredSize(new Dimension(settings.getIntegerProperty("window_width", 1024), settings.getIntegerProperty("window_height", 768)));
@@ -368,9 +378,7 @@ public void launch() {
     	pack();
     	setVisible(true);
 
-    	boolean showImportDialog = !loadResourcesFromHistory();
-
-    	if (showImportDialog) {
+    	if (!loadResourcesFromHistory()) {
     		showImportDialog();
     	} else {
     		// Restore last expanded nodes
@@ -488,7 +496,7 @@ private void setupUI() {
 	}
 
 	private void setupFileDrop() {
-		new FileDrop(this, new FileDrop.Listener() {
+		new JFileDrop(this, new JFileDrop.Listener() {
 			@Override
 			public void filesDropped(java.io.File[] files) {
 				try {
@@ -507,6 +515,9 @@ private Image getResourceImage(String path) {
 	}
 
 	private void storeEditorState() {
+		// Store editor settings
+		settings.setProperty("minify_output", minifyOutput);
+
 		// Store window bounds
 		settings.setProperty("window_width", getWidth());
 		settings.setProperty("window_height", getHeight());

diff --git a/.../java/com/jvms/i18neditor/EditorMenu.java → .../java/com/jvms/i18neditor/EditorMenu.java b/.../java/com/jvms/i18neditor/EditorMenu.java → .../java/com/jvms/i18neditor/EditorMenu.java
@@ -8,6 +8,7 @@
 import java.nio.file.Paths;
 import java.util.List;
 
+import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
@@ -164,17 +165,22 @@ private void setupUI() {
         viewMenu.add(new ExpandTranslationsMenuItem(tree));
         viewMenu.add(new CollapseTranslationsMenuItem(tree));
 
+        JMenu settingsMenu = new JMenu(MessageBundle.get("menu.settings.title"));
+        settingsMenu.setMnemonic(MessageBundle.getMnemonic("menu.settings.vk"));
+        JCheckBoxMenuItem minifyMenuItem = new JCheckBoxMenuItem(MessageBundle.get("menu.settings.minify.title"), editor.isMinifyOutput());
+        minifyMenuItem.addActionListener(e -> editor.setMinifyOutput(minifyMenuItem.isSelected()));
+        settingsMenu.add(minifyMenuItem);
+
      	JMenu helpMenu = new JMenu(MessageBundle.get("menu.help.title"));
      	helpMenu.setMnemonic(MessageBundle.getMnemonic("menu.help.vk"));
-
      	JMenuItem aboutMenuItem = new JMenuItem(MessageBundle.get("menu.help.about.title", Editor.TITLE), MessageBundle.getMnemonic("menu.help.about.vk"));
      	aboutMenuItem.addActionListener(e -> editor.showAboutDialog());
-
      	helpMenu.add(aboutMenuItem);
 
      	add(fileMenu);
      	add(editMenu);
      	add(viewMenu);
+     	add(settingsMenu);
      	add(helpMenu);
 
      	tree.addTreeSelectionListener(e -> {

diff --git a/...18neditor/ExpandTranslationsMenuItem.java → ...18neditor/ExpandTranslationsMenuItem.java b/...18neditor/ExpandTranslationsMenuItem.java → ...18neditor/ExpandTranslationsMenuItem.java
diff --git a/...s/i18neditor/FindTranslationMenuItem.java → ...s/i18neditor/FindTranslationMenuItem.java b/...s/i18neditor/FindTranslationMenuItem.java → ...s/i18neditor/FindTranslationMenuItem.java
diff --git a/...c/main/java/com/jvms/i18neditor/Main.java → src/main/java/com/jvms/i18neditor/Main.java b/...c/main/java/com/jvms/i18neditor/Main.java → src/main/java/com/jvms/i18neditor/Main.java
diff --git a/...i18neditor/RemoveTranslationMenuItem.java → ...i18neditor/RemoveTranslationMenuItem.java b/...i18neditor/RemoveTranslationMenuItem.java → ...i18neditor/RemoveTranslationMenuItem.java
diff --git a/...i18neditor/RenameTranslationMenuItem.java → ...i18neditor/RenameTranslationMenuItem.java b/...i18neditor/RenameTranslationMenuItem.java → ...i18neditor/RenameTranslationMenuItem.java
diff --git a/...in/java/com/jvms/i18neditor/Resource.java → ...in/java/com/jvms/i18neditor/Resource.java b/...in/java/com/jvms/i18neditor/Resource.java → ...in/java/com/jvms/i18neditor/Resource.java
diff --git a/...va/com/jvms/i18neditor/ResourceEvent.java → ...va/com/jvms/i18neditor/ResourceEvent.java b/...va/com/jvms/i18neditor/ResourceEvent.java → ...va/com/jvms/i18neditor/ResourceEvent.java
diff --git a/...va/com/jvms/i18neditor/ResourceField.java → ...va/com/jvms/i18neditor/ResourceField.java b/...va/com/jvms/i18neditor/ResourceField.java → ...va/com/jvms/i18neditor/ResourceField.java
diff --git a/...com/jvms/i18neditor/ResourceListener.java → ...com/jvms/i18neditor/ResourceListener.java b/...com/jvms/i18neditor/ResourceListener.java → ...com/jvms/i18neditor/ResourceListener.java
diff --git a/...com/jvms/i18neditor/TranslationField.java → ...com/jvms/i18neditor/TranslationField.java b/...com/jvms/i18neditor/TranslationField.java → ...com/jvms/i18neditor/TranslationField.java
diff --git a/.../com/jvms/i18neditor/TranslationTree.java → .../com/jvms/i18neditor/TranslationTree.java b/.../com/jvms/i18neditor/TranslationTree.java → .../com/jvms/i18neditor/TranslationTree.java
diff --git a/.../jvms/i18neditor/TranslationTreeMenu.java → .../jvms/i18neditor/TranslationTreeMenu.java b/.../jvms/i18neditor/TranslationTreeMenu.java → .../jvms/i18neditor/TranslationTreeMenu.java
diff --git a/...jvms/i18neditor/TranslationTreeModel.java → ...jvms/i18neditor/TranslationTreeModel.java b/...jvms/i18neditor/TranslationTreeModel.java → ...jvms/i18neditor/TranslationTreeModel.java
diff --git a/.../jvms/i18neditor/TranslationTreeNode.java → .../jvms/i18neditor/TranslationTreeNode.java b/.../jvms/i18neditor/TranslationTreeNode.java → .../jvms/i18neditor/TranslationTreeNode.java
diff --git a/...s/i18neditor/TranslationTreeNodeMenu.java → ...s/i18neditor/TranslationTreeNodeMenu.java b/...s/i18neditor/TranslationTreeNodeMenu.java → ...s/i18neditor/TranslationTreeNodeMenu.java