/hg/icedtea6: Desktop element fix.
mwong at icedtea.classpath.org
mwong at icedtea.classpath.org
Thu Dec 3 11:03:30 PST 2009
changeset 1ac152b3ec07 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1ac152b3ec07
author: Man Lung Wong <mwong at redhat.com>
date: Thu Dec 03 13:55:11 2009 -0500
Desktop element fix.
diffstat:
5 files changed, 44 insertions(+), 22 deletions(-)
ChangeLog | 17 +++++++
rt/net/sourceforge/jnlp/JNLPFile.java | 8 +++
rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 31 ++++----------
rt/net/sourceforge/jnlp/runtime/Boot.java | 5 ++
rt/net/sourceforge/jnlp/util/XDesktopEntry.java | 5 +-
diffs (132 lines):
diff -r bc6d4b57cacf -r 1ac152b3ec07 ChangeLog
--- a/ChangeLog Thu Dec 03 15:58:48 2009 +0000
+++ b/ChangeLog Thu Dec 03 13:55:11 2009 -0500
@@ -1,3 +1,20 @@ 2009-12-03 Gary Benson <gbenson at redhat
+2009-12-03 Man Lung Wong <mwong at redhat.com>
+
+ * rt/net/sourceforge/jnlp/JNLPFile.java
+ (JNLPFile): Download the jnlp file from the webspace it originated, if
+ it exists.
+ * rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java
+ (initialize): Enable desktop element and revise the list of fixme.
+ (addMenuAndDesktopEntries): No longer errors out when shortcut tag not
+ specified.
+ * rt/net/sourceforge/jnlp/runtime/Boot.java
+ (getFile): Launches the original jnlp file (i.e. if the file was
+ downloaded from http://icedtea.classpath.org, then it will launch the
+ one from http://icedtea.classpath.org).
+ * rt/net/sourceforge/jnlp/util/XDesktopEntry.java
+ (getContentsAsReader): Shortcut uses jnlp file in cache and launches
+ with system preferred javaws.
+
2009-12-03 Gary Benson <gbenson at redhat.com>
* patches/icedtea-core-build.patch: Remove a very old workaround.
diff -r bc6d4b57cacf -r 1ac152b3ec07 rt/net/sourceforge/jnlp/JNLPFile.java
--- a/rt/net/sourceforge/jnlp/JNLPFile.java Thu Dec 03 15:58:48 2009 +0000
+++ b/rt/net/sourceforge/jnlp/JNLPFile.java Thu Dec 03 13:55:11 2009 -0500
@@ -173,6 +173,14 @@ public class JNLPFile {
public JNLPFile(URL location, Version version, boolean strict, UpdatePolicy policy) throws IOException, ParseException {
Node root = Parser.getRootNode(openURL(location, version, policy));
parse(root, strict, location);
+
+ //Downloads the original jnlp file into the cache if possible
+ //(i.e. If the jnlp file being launched exist locally, but it
+ //originated from a website, then download the one from the website
+ //into the cache).
+ if (sourceLocation != null && location.getProtocol() == "file") {
+ openURL(sourceLocation, version, policy);
+ }
this.fileLocation = location;
diff -r bc6d4b57cacf -r 1ac152b3ec07 rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java
--- a/rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java Thu Dec 03 15:58:48 2009 +0000
+++ b/rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java Thu Dec 03 13:55:11 2009 -0500
@@ -109,24 +109,12 @@ public class ApplicationInstance {
*/
public void initialize() {
installEnvironment();
-
- /*
- * FIXME: Disable creating desktop entries for now
- *
- * there are some major issues we need to work out before we can enable them
- * 1. Playing nice with the altnatives system
- * - use the system preferred jdk (/usr/bin/javaws)
- * - dont assume what jdk javaws corresponds to
- * - make sure our shortcuts work with the sun jdk and vice versa
- * (may not be possible since sun's javaws creates a launcher that
- * links to /usr/java/${ver}/bin/javaws)
- * - we should use the same options and arguments as sun's javaws
- * 2. Make shortcuts work offline
- * - make the cache updates and replacements work properly
- * - shortcuts should use the cache
- *
- * addMenuAndDesktopEntries();
- */
+
+ //Fixme: -Should check whether a desktop entry already exists for
+ // for this jnlp file, and do nothing if it exists.
+ // -If no href is specified in the jnlp tag, it should
+ // default to using the one passed in as an argument.
+ addMenuAndDesktopEntries();
}
/**
@@ -135,14 +123,15 @@ public class ApplicationInstance {
private void addMenuAndDesktopEntries() {
XDesktopEntry entry = new XDesktopEntry(file);
-
- if (file.getInformation().getShortcut().onDesktop()) {
+ ShortcutDesc sd = file.getInformation().getShortcut();
+
+ if (sd != null && sd.onDesktop()) {
if (ServiceUtil.checkAccess(this, AccessType.CREATE_DESTKOP_SHORTCUT)) {
entry.createDesktopShortcut();
}
}
- if (file.getInformation().getShortcut().getMenu() != null) {
+ if (sd != null && sd.getMenu() != null) {
/*
* Sun's WebStart implementation doesnt seem to do anything under GNOME
*/
diff -r bc6d4b57cacf -r 1ac152b3ec07 rt/net/sourceforge/jnlp/runtime/Boot.java
--- a/rt/net/sourceforge/jnlp/runtime/Boot.java Thu Dec 03 15:58:48 2009 +0000
+++ b/rt/net/sourceforge/jnlp/runtime/Boot.java Thu Dec 03 13:55:11 2009 -0500
@@ -278,6 +278,11 @@ public final class Boot implements Privi
JNLPFile file = new JNLPFile(url, strict);
+ // Launches the jnlp file where this file originated.
+ if (file.getSourceLocation() != null) {
+ file = new JNLPFile(file.getSourceLocation(), strict);
+ }
+
// add in extra params from command line
addProperties(file);
diff -r bc6d4b57cacf -r 1ac152b3ec07 rt/net/sourceforge/jnlp/util/XDesktopEntry.java
--- a/rt/net/sourceforge/jnlp/util/XDesktopEntry.java Thu Dec 03 15:58:48 2009 +0000
+++ b/rt/net/sourceforge/jnlp/util/XDesktopEntry.java Thu Dec 03 13:55:11 2009 -0500
@@ -73,6 +73,7 @@ public class XDesktopEntry {
String pathToJavaws = System.getProperty("java.home") + File.separator + "bin"
+ File.separator + "javaws";
+ File cacheFile = CacheUtil.urlToPath(file.getSourceLocation(), "cache");
String fileContents = "[Desktop Entry]\n";
fileContents += "Version=1.0\n";
@@ -89,7 +90,9 @@ public class XDesktopEntry {
if (file.getInformation().getVendor() != null) {
fileContents += "Vendor=" + file.getInformation().getVendor() + "\n";
}
- fileContents += "Exec=" + pathToJavaws + " \"" + file.getSourceLocation() + "\"\n";
+
+ //Shortcut executes the jnlp from cache and system preferred java..
+ fileContents += "Exec=" + "javaws" + " \"" + cacheFile.getAbsolutePath() + "\"\n";
return new StringReader(fileContents);
More information about the distro-pkg-dev
mailing list