diff --git a/lib/jsyntaxpane-0.9.5.jar b/lib/jsyntaxpane-0.9.5.jar
index eef12b11b..bc4a42add 100644
Binary files a/lib/jsyntaxpane-0.9.5.jar and b/lib/jsyntaxpane-0.9.5.jar differ
diff --git a/src/com/jpexs/decompiler/flash/gui/GraphTreeFrame.java b/src/com/jpexs/decompiler/flash/gui/GraphTreeFrame.java
index 993bd7d63..4d1d63f02 100644
--- a/src/com/jpexs/decompiler/flash/gui/GraphTreeFrame.java
+++ b/src/com/jpexs/decompiler/flash/gui/GraphTreeFrame.java
@@ -1,16 +1,16 @@
/*
* Copyright (C) 2010-2015 JPEXS
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see properties = new HashMap<>();
+ for (Class clazz : classes) {
+ String resourcePath = getResourcePath(clazz, null);
+ InputStream is = CheckResources.class.getResourceAsStream(resourcePath);
+ if (is == null) {
+ stream.println("Resource file not found: " + resourcePath);
+ return;
+ }
+ Properties prop = new Properties();
+ prop.load(is);
+ properties.put(clazz, prop);
}
- prop.load(is);
- Set keys = prop.keySet();
for (String lang : languages) {
if (lang.equals("en")) {
continue;
}
- Properties prop2 = new Properties();
- resourcePath = getResourcePath(clazz, lang);
- is = CheckResources.class.getResourceAsStream(resourcePath);
- if (is == null) {
- stream.println(lang + ": Resource file not found: " + resourcePath);
- continue;
- }
- prop2.load(is);
- for (Object key : keys) {
- String value = prop2.getProperty((String) key);
- if (value == null) {
- stream.println(lang + ": Property not found in resource file: " + clazz.getSimpleName() + ", property: " + key);
+ boolean firstMissing = true;
+ for (Class clazz : classes) {
+ Properties prop = properties.get(clazz);
+ Properties prop2 = new Properties();
+ String resourcePath = getResourcePath(clazz, lang);
+ InputStream is = CheckResources.class.getResourceAsStream(resourcePath);
+ if (is == null) {
+ stream.println(lang + ": Resource file not found: " + resourcePath);
+ continue;
}
+ try {
+ prop2.load(is);
+ } catch (Exception ex) {
+ Logger.getLogger(CheckResources.class.getName()).log(Level.SEVERE, "Cannot load resource:" + clazz.getSimpleName() + " " + lang, ex);
+ }
+
+ for (Object key : prop.keySet()) {
+ String keyStr = (String) key;
+ String value = prop2.getProperty(keyStr);
+ if (value == null) {
+ if (firstMissing) {
+ stream.println(lang);
+ stream.println("-----------------------------");
+ firstMissing = false;
+ }
+
+ stream.println(clazz.getSimpleName() + ", property: " + key + "=" + prop.getProperty(keyStr));
+ }
+ }
+ }
+
+ if (!firstMissing) {
+ stream.println();
}
}
} catch (FileNotFoundException ex) {
@@ -127,7 +155,7 @@ public class CheckResources {
name = name.substring("com.jpexs.decompiler.flash.gui.".length());
name = "/com/jpexs/decompiler/flash/gui/locales/" + name.replace(".", "/");
if (lang != null) {
- name += "_" + lang;
+ name += "_" + lang.replace("-", "_");
}
name += ".properties";
}
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/GraphTreeFrame_ca.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_de.properties
similarity index 99%
rename from src/com/jpexs/decompiler/flash/gui/locales/GraphTreeFrame_ca.properties
rename to src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_de.properties
index 62fda9f34..d077c06f0 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/GraphTreeFrame_ca.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_de.properties
@@ -12,4 +12,3 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see