JSON maintenance fix

Author: DGrothe-PhD

src/app/Localization.java

@@ -17,10 +17,10 @@ private String lookUpField(String key) {
     	return "Empty key";
     }
 
-	public Localization(){
+	public Localization() {
 		super("/json/localized.json");
 		charRep = new CharRep();
-		switchTo("EN");		
+		switchTo("EN");
 	}
 
 	public String Header(String key) {

src/app/ReadJson.java

@@ -14,34 +14,27 @@
 class ReadJson {
 	String resource;
 	String[] keysArray;
-	String jsonString;
+	String jsonString, defaultJsonString;
 	JSONObject obj;
 	List<String> keysList;
 
     public ReadJson(String resource) {
 
     	jsonString = "";
+    	defaultJsonString = "{\"EN\": {\"Close window\": \"Close window\"}}";
 
         try {
         	this.resource = resource;
         	InputStream inputAsStream = this.getClass().getResourceAsStream(resource);
         	jsonString = new String(inputAsStream.readAllBytes());
 
         	obj = new JSONObject(jsonString);
-        	
-        	// standard
-        	Iterator<String> keysIt = obj.keys();
-        	keysList = new ArrayList<String>();
-        	while(keysIt.hasNext()) {
-        	    String key = (String) keysIt.next();
-        	    keysList.add(key);
-        	}
-        	
-        	keysList.sort(null);
-        	keysArray = keysList.toArray(new String[keysList.size()]);
+        	prepareKeys();
         } 
         catch (org.json.JSONException js) {
-        	System.out.println("json error");
+        	System.out.println("JSON file raised an exception. Formatting error");
+        	obj = new JSONObject(defaultJsonString);
+        	prepareKeys();
         }
         catch (Exception e) {
         	System.out.println("JSON loader failed for "+resource);
@@ -51,6 +44,19 @@ public ReadJson(String resource) {
     public String[] getAll() {
     	return keysArray;
     }
+    
+    private void prepareKeys() {
+    	Iterator<String> keysIt = obj.keys();
+    	keysList = new ArrayList<String>();
+    	while(keysIt.hasNext()) {
+    	    String key = (String) keysIt.next();
+    	    keysList.add(key);
+    	}
+    	
+    	keysList.sort(null);
+    	keysArray = keysList.toArray(new String[keysList.size()]);
+    }
+    
 }
 
 class SearchWords extends ReadJson {

src/app/UserDialog.java

@@ -89,6 +89,7 @@ public void switchMode(int mode) {
 	public UserDialog() {
 		try {
 			lang = new Localization();
+			
 			jsonSearchWords = new SearchWords();
 			headline = new JLabel(lang.getLocalizedText("description"));
 
@@ -134,7 +135,8 @@ public UserDialog() {
 			mainFrame.setVisible(true);
 			mainFrame.requestFocus();
 
-		} catch (Exception awe) {
+		}
+		catch (Exception awe) {
 			// intended as fallback if UI cannot be shown on system
 			System.out.println("Application window could not be opened. Reason:");
 			System.out.println(awe.toString());

src/json/localized.json

@@ -104,7 +104,7 @@
 	"times": "fois",
 	"userST": "Termes de recherche trouvés:",
 	"wordscounted": " mots comptés.",
-	"List of Abbreviations": "Tableau d'abréviations",
+	"List of Abbreviations": "Tableau d'abréviations",
 	"(S): Words beginning with same letter sequence": "(S): Les mots qui commencent avec la même suite de caractères",
 	"(A): Anagrams or words with extra hyphens": "(A): Les anagrammes ou des mots avec plus de traits d'union"
 },

src/json/searchwords.json

@@ -1,16 +1,18 @@
 {
 "jobOfferDE": [
-	"reise", "Reise", "Assist", "befrist", "Teilzeit", "Kunde", 
-	"Vertrieb", "Büro", "Homeoffice", "remote", "Projekt", "Gehaltsvorstellung", "Anschreiben", "Lebenslauf",
-	"Zeugnisse", "Bewerbungsfrist", "Startup", "einschlägig", "Studium", "Ausbildung"
+	"Anschreiben", "Assist", "Ausbildung", "Berufserfahrung", "Bewerbungsfrist", "Büro", "Gehaltsvorstellung",
+	"Gleitzeit", "Homeoffice", "Kunde", "Lebenslauf", "Projekt", "Reise", "Startup", "Studium", "TV-L",
+	"Teilzeit", "Vergütung", "Vertrieb", "Zertifikate", "Zeugnisse", "befrist", "einschlägig", "reise", "remote"
 ],
 "weatherEN": [
 	"yesterday", "tomorrow", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday",
-	"rain", "sun", "cloudy", "clouds", "snow", "ice", "precipitation", "wet"
+	"rain", "sun", "cloudy", "clouds", "snow", "ice", "precipitation",
+	"wet", "frozen", "storm", "icy", "heat", "thunderstorm", "thunder"
 ],
 "weatherDE": [
-	"gestern", "morgen", "übermorgen", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag",
-	"Regen", "Sonne", "sonnig", "wolkig", "Wolke", "Schnee", "Niederschl"
+	"Abkühlung", "Blitze", "Dienstag", "Donnerstag", "Freitag", "Gewitter", "Glatteis", "Hitze", "Kaltfront",
+	"Kälte", "Mittwoch", "Montag", "Niederschl", "Regen", "Samstag", "Schnee", "Sonne", "Sonntag",
+	"Sturmböen", "Warmfront", "Wolke", "gestern", "heiß", "morgen", "sonnig", "wolkig", "überfrieren", "übermorgen"
 ],
 "months": [
 	"Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September",