/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Dec 21 09:05:18 PST 2012
changeset 4f22cfdd5667 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=4f22cfdd5667
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Dec 21 18:02:50 2012 +0100
Minor fix for possible NPE (non fatal) during splashscreen creation
changeset 01b5bc425cd4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=01b5bc425cd4
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Dec 21 18:06:53 2012 +0100
netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java - (shouldCreateShortcut) added handling of xtrustall during asking for desktop icon creation
diffstat:
ChangeLog | 16 ++++
netx/net/sourceforge/jnlp/resources/Messages.properties | 3 +
netx/net/sourceforge/jnlp/resources/Messages_cs_CZ.properties | 3 +
netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 3 +
netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java | 36 ++++++++-
5 files changed, 56 insertions(+), 5 deletions(-)
diffs (119 lines):
diff -r a24c48429ff1 -r 01b5bc425cd4 ChangeLog
--- a/ChangeLog Fri Dec 21 13:19:14 2012 +0100
+++ b/ChangeLog Fri Dec 21 18:06:53 2012 +0100
@@ -1,3 +1,19 @@
+2012-12-21 Jiri Vanek <jvanek at redhat.com>
+
+ * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java
+ (shouldCreateShortcut) added handling of xtrustall during asking for
+ desktop icon creation
+
+2012-12-21 Jiri Vanek <jvanek at redhat.com>
+
+ Minor fix for possible NPE (non fatal) during splashscreen creation
+ * netx/net/sourceforge/jnlp/resources/Messages.properties:
+ * netx/net/sourceforge/jnlp/resources/Messages_cs_CZ.properties:
+ Added messages for user (SPLASHdefaultHomepage)
+ (SPLASHerrorInInformation)(SPLASHmissingInformation).
+ * netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java
+ (createFromJNLP) catch of NPE replaced by conditions with proper messages.
+
2012-12-21 Jiri Vanek <jvanek at redhat.com>
Forgotten condition for AviationWeather first run:
diff -r a24c48429ff1 -r 01b5bc425cd4 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Dec 21 13:19:14 2012 +0100
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Dec 21 18:06:53 2012 +0100
@@ -470,3 +470,6 @@
SPLASHcfl = Can't follow link to
SPLASHvendorsInfo = Information from vendor of your application
SPLASHanotherInfo = Another available info
+SPLASHdefaultHomepage = Unspecified homepage, verify source rather
+SPLASHerrorInInformation = Error during loading of information element, verify source rather
+SPLASHmissingInformation = Information element is missing, verify source rather
diff -r a24c48429ff1 -r 01b5bc425cd4 netx/net/sourceforge/jnlp/resources/Messages_cs_CZ.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages_cs_CZ.properties Fri Dec 21 13:19:14 2012 +0100
+++ b/netx/net/sourceforge/jnlp/resources/Messages_cs_CZ.properties Fri Dec 21 18:06:53 2012 +0100
@@ -466,3 +466,6 @@
SPLASHcfl= Nelze \u010d\u00edst odkaz
SPLASHvendorsInfo= Informace od dodavatele va\u0161\u00ed aplikace
SPLASHanotherInfo= Dal\u0161\u00ed dostupn\u00e9 informace
+SPLASHdefaultHomepage = Nespecifikovan\u00e1 domovsk\u00e1 st\u00e1nka, je doporu\u010deno zkontrolovat zdroj
+SPLASHerrorInInformation = Chyba na\u010d\u00edt\u00e1n\u00ed informa\u010dn\u00edho elementu, je doporu\u010deno zkontrolovat zdroj
+SPLASHmissingInformation = Informa\u010dn\u00ed element chyb\u00fd, je doporu\u010deno zkontrolovat zdroj
\ No newline at end of file
diff -r a24c48429ff1 -r 01b5bc425cd4 netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java
--- a/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java Fri Dec 21 13:19:14 2012 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java Fri Dec 21 18:06:53 2012 +0100
@@ -171,6 +171,9 @@
* @return true if a desktop shortcut should be created
*/
private boolean shouldCreateShortcut(ShortcutDesc sd) {
+ if (JNLPRuntime.isTrustAll()) {
+ return true;
+ }
String currentSetting = JNLPRuntime.getConfiguration()
.getProperty(DeploymentConfiguration.KEY_CREATE_DESKTOP_SHORTCUT);
boolean createShortcut = false;
diff -r a24c48429ff1 -r 01b5bc425cd4 netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java
--- a/netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java Fri Dec 21 13:19:14 2012 +0100
+++ b/netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java Fri Dec 21 18:06:53 2012 +0100
@@ -44,6 +44,7 @@
import java.util.List;
import net.sourceforge.jnlp.InformationDesc;
import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.runtime.Translator;
/**
* This class is wrapper arround <information> tag which should
@@ -193,12 +194,31 @@
}
public static InformationElement createFromJNLP(JNLPFile file) {
- if (file == null) {
- return null;
- }
try {
+ if (file == null) {
+ String message = Translator.R(InfoItem.SPLASH + "errorInInformation");
+ InformationElement ie = new InformationElement();
+ ie.setHomepage("");
+ ie.setTitle(message);
+ ie.setvendor("");
+ ie.addDescription(message);
+ return ie;
+ }
+ if (file.getInformation() == null) {
+ String message = Translator.R(InfoItem.SPLASH + "missingInformation");
+ InformationElement ie = new InformationElement();
+ ie.setHomepage("");
+ ie.setTitle(message);
+ ie.setvendor("");
+ ie.addDescription(message);
+ return ie;
+ }
InformationElement ie = new InformationElement();
- ie.setHomepage(file.getInformation().getHomepage().toString());
+ String homePage = Translator.R(InfoItem.SPLASH + "defaultHomepage");
+ if (file.getInformation().getHomepage() != null) {
+ homePage = file.getInformation().getHomepage().toString();
+ }
+ ie.setHomepage(homePage);
ie.setTitle(file.getInformation().getTitle());
ie.setvendor(file.getInformation().getVendor());
ie.addDescription(file.getInformation().getDescriptionStrict((String) (InformationDesc.DEFAULT)));
@@ -208,7 +228,13 @@
return ie;
} catch (Exception ex) {
ex.printStackTrace();
- return null;
+ String message = Translator.R(InfoItem.SPLASH + "errorInInformation");
+ InformationElement ie = new InformationElement();
+ ie.setHomepage("");
+ ie.setTitle(message);
+ ie.setvendor("");
+ ie.addDescription(ex.getMessage());
+ return ie;
}
}
}
More information about the distro-pkg-dev
mailing list