Merge pull request #42 from vickyvxr/master

Plain JSON keys instead of tree keys

Author: jcbvm

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

@@ -209,7 +209,7 @@ public boolean saveProject() {
 		if (project != null) {
 			for (Resource resource : project.getResources()) {
 				try {
-					Resources.write(resource, !project.isMinifyResources());
+					Resources.write(resource, !project.isMinifyResources(), project.isPlainJSON());
 				} catch (IOException e) {
 					error = true;
 					log.error("Error saving resource file " + resource.getPath(), e);
@@ -831,6 +831,7 @@ private void updateTreeNodeStatus(String key) {
 	private void storeProjectState() {
 		ExtendedProperties props = new ExtendedProperties();
 		props.setProperty("minify_resources", project.isMinifyResources());
+		props.setProperty("plain_json", project.isPlainJSON());
 		props.setProperty("resource_name", project.getResourceName());
 		props.setProperty("resource_type", project.getResourceType().toString());
 		props.store(Paths.get(project.getPath().toString(), PROJECT_FILE));
@@ -842,6 +843,7 @@ private void restoreProjectState(EditorProject project) {
 		if (Files.exists(path)) {
 			props.load(Paths.get(project.getPath().toString(), PROJECT_FILE));
 			project.setMinifyResources(props.getBooleanProperty("minify_resources", settings.isMinifyResources()));
+			project.setPlainJSON(props.getBooleanProperty("plain_json", settings.isPlainJSON()));
 			project.setResourceName(props.getProperty("resource_name", settings.getResourceName()));
 			project.setResourceType(props.getEnumProperty("resource_type", ResourceType.class));
 		} else {
@@ -858,6 +860,7 @@ private void storeEditorState() {
 		props.setProperty("window_pos_y", getY());
 		props.setProperty("window_div_pos", contentPane.getDividerLocation());
 		props.setProperty("minify_resources", settings.isMinifyResources());
+		props.setProperty("plain_json", settings.isPlainJSON());
 		props.setProperty("resource_name", settings.getResourceName());
 		props.setProperty("check_version", settings.isCheckVersionOnStartup());
 		props.setProperty("default_input_height", settings.getDefaultInputHeight());
@@ -891,6 +894,7 @@ private void restoreEditorState() {
 		settings.setLastExpandedNodes(props.getListProperty("last_expanded"));
 		settings.setLastSelectedNode(props.getProperty("last_selected"));
 		settings.setMinifyResources(props.getBooleanProperty("minify_resources", false));
+		settings.setPlainJSON(props.getBooleanProperty("plain_json", false));
 		settings.setResourceName(props.getProperty("resource_name", DEFAULT_RESOURCE_NAME));
 		settings.setCheckVersionOnStartup(props.getBooleanProperty("check_version", true));
 		settings.setDefaultInputHeight(props.getIntegerProperty("default_input_height", 5));

src/main/java/com/jvms/i18neditor/editor/EditorProject.java

@@ -19,6 +19,7 @@ public class EditorProject {
 	private ResourceType resourceType;
 	private List<Resource> resources = Lists.newLinkedList();
 	private boolean minifyResources;
+	private boolean plainJSON;
 
 	public EditorProject(Path path) {
 		this.path = path;
@@ -71,4 +72,12 @@ public boolean isMinifyResources() {
 	public void setMinifyResources(boolean minifyResources) {
 		this.minifyResources = minifyResources;
 	}
+
+	public boolean isPlainJSON() {
+		return plainJSON;
+	}
+
+	public void setPlainJSON(boolean plainJSON) {
+		this.plainJSON = plainJSON;
+	}
 }

src/main/java/com/jvms/i18neditor/editor/EditorProjectSettingsPane.java

@@ -41,7 +41,12 @@ private void setupUI() {
 			minifyBox.addChangeListener(e -> project.setMinifyResources(minifyBox.isSelected()));
 			fieldset1.add(minifyBox, createVerticalGridBagConstraints());
 		}
-		
+		if (project.getResourceType().equals(ResourceType.JSON)) {
+			JCheckBox plainJSONBox = new JCheckBox(MessageBundle.get("settings.plainJSON.title"));
+			plainJSONBox.setSelected(project.isPlainJSON());
+			plainJSONBox.addChangeListener(e -> project.setPlainJSON(plainJSONBox.isSelected()));
+			fieldset1.add(plainJSONBox, createVerticalGridBagConstraints());
+		}
 		JPanel resourcePanel = new JPanel(new GridLayout(0, 1));
 		JLabel resourceNameLabel = new JLabel(MessageBundle.get("settings.resourcename.title"));
 		JTextField resourceNameField = new JTextField(project.getResourceName());

src/main/java/com/jvms/i18neditor/editor/EditorSettings.java

@@ -15,6 +15,7 @@ public class EditorSettings {
 	private int windowHeight;
 	private String resourceName;
 	private boolean minifyResources;
+	private boolean plainJSON;
 	private List<String> history;
 	private List<String> lastExpandedNodes;
 	private String lastSelectedNode;
@@ -134,4 +135,12 @@ public boolean isDoubleClickTreeToggling() {
 	public void setDoubleClickTreeToggling(boolean doubleClickTreeToggling) {
 		this.doubleClickTreeToggling = doubleClickTreeToggling;
 	}
+
+	public boolean isPlainJSON() {
+		return plainJSON;
+	}
+
+	public void setPlainJSON(boolean plainJSON) {
+		this.plainJSON = plainJSON;
+	}
 }

src/main/java/com/jvms/i18neditor/util/Resources.java

@@ -114,15 +114,16 @@ public static void load(Resource resource) throws IOException {
 	 * 
 	 * @param 	resource the resource to write.
 	 * @param   prettyPrinting whether to pretty print the contents
+	 * @param plainKeys 
 	 * @throws 	IOException if an I/O error occurs writing the file.
 	 */
-	public static void write(Resource resource, boolean prettyPrinting) throws IOException {
+	public static void write(Resource resource, boolean prettyPrinting, boolean plainKeys) throws IOException {
 		ResourceType type = resource.getType();
 		if (type == ResourceType.Properties) {
 			ExtendedProperties content = toProperties(resource.getTranslations());
 			content.store(resource.getPath());
 		} else {
-			String content = toJson(resource.getTranslations(), prettyPrinting);
+			String content = toJson(resource.getTranslations(), prettyPrinting, plainKeys);
 			if (type == ResourceType.ES6) {
 				content = jsonToEs6(content);
 			}
@@ -153,7 +154,7 @@ public static Resource create(Path root, ResourceType type, Optional<Locale> loc
 			path = Paths.get(root.toString(), locale.get().toString(), baseName + extension);			
 		}
 		Resource resource = new Resource(type, path, locale.orElse(null));
-		write(resource, false);
+		write(resource, false, false);
 		return resource;
 	}
 
@@ -212,16 +213,28 @@ private static void fromJson(String key, JsonElement elem, Map<String,String> co
 		}
 	}
 
-	private static String toJson(Map<String,String> translations, boolean prettify) {
+	private static String toJson(Map<String,String> translations, boolean prettify, boolean plainKeys) {
 		List<String> keys = Lists.newArrayList(translations.keySet());
-		JsonElement elem = toJson(translations, null, keys);
+		JsonElement elem = !plainKeys ? toJson(translations, null, keys) : toPlainJson(translations, keys);
 		GsonBuilder builder = new GsonBuilder().disableHtmlEscaping();
 		if (prettify) {
 			builder.setPrettyPrinting();
 		}
 		return builder.create().toJson(elem);
 	}
 
+	private static JsonElement toPlainJson(Map<String, String> translations, List<String> keys) {
+		JsonObject object = new JsonObject();
+		if (keys.size() > 0) {
+			translations.forEach((k, v) -> {
+				if (translations.get(k)!=null){
+					object.add(k, new JsonPrimitive(translations.get(k)));
+				}
+			});			
+		}
+		return object;
+	}
+
 	private static JsonElement toJson(Map<String,String> translations, String key, List<String> keys) {
 		if (keys.size() > 0) {
 			JsonObject object = new JsonObject();

src/main/resources/bundles/messages.properties

@@ -91,7 +91,7 @@ settings.minify.title = Minify translations on save
 settings.resourcename.title = Translations filename
 settings.treetogglemode.title = Expand and collapse translations using double click
 settings.checkversion.title = Check for new version on startup
-
+settings.plainJSON.title= Plain JSON keys
 swing.action.copy = Copy
 swing.action.cut = Cut
 swing.action.delete = Delete

src/main/resources/bundles/messages_nl.properties

@@ -91,6 +91,7 @@ settings.minify.title = Comprimeer vertalingen bij opslaan
 settings.resourcename.title = Bestandsnaam vertalingen
 settings.treetogglemode.title = Vertalingen in- en uitvouwen met dubbelklik
 settings.checkversion.title = Controleer op nieuwe versie bij opstarten
+settings.plainJSON.title= Plain JSON keys
 
 swing.action.copy = Kopi\u00ebren
 swing.action.cut = Knippen

src/main/resources/bundles/messages_pt_BR.properties

@@ -91,6 +91,7 @@ settings.minify.title = Minificar tradu\u00e7\u00f5es ao salvar
 settings.resourcename.title = Nome do arquivo de tradu\u00e7\u00e3es
 settings.treetogglemode.title = Expandir e contrair tradu\u00e7\u00f5es usando duplo clique
 settings.checkversion.title = Verificar a nova vers\u00e3o na inicializa\u00e7\u00e3o
+settings.plainJSON.title= Plain JSON keys
 
 swing.action.copy = Copiar
 swing.action.cut = Cortar