/hg/icedtea-web: Returned accidentally removed creation of short...

[jvanek at icedtea.classpath.org]

changeset 918fb141b815 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=918fb141b815
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Jan 23 15:35:46 2015 +0100

	Returned accidentally removed creation of shortcuts for jnlp applications. Opera added to list of shortcut browsers.
	* netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java: filling of AccessWarningPaneComplexReturn no longer depnds on existence of htmlPanels.
	* netx/net/sourceforge/jnlp/util/XDesktopEntry.java: (BROWSERS) opera added to list of recognized browsers


diffstat:

 ChangeLog                                                         |   8 ++++
 netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java |  20 ++++++++--
 netx/net/sourceforge/jnlp/util/XDesktopEntry.java                 |   2 +-
 3 files changed, 25 insertions(+), 5 deletions(-)

diffs (58 lines):

diff -r 5bd739d5e4e1 -r 918fb141b815 ChangeLog
--- a/ChangeLog	Thu Jan 22 13:52:23 2015 -0500
+++ b/ChangeLog	Fri Jan 23 15:35:46 2015 +0100
@@ -1,3 +1,11 @@
+2014-01-23  Jiri Vanek  <jvanek at redhat.com>
+
+	Returned accidentally removed creation of shortcuts for jnlp applications.
+	* netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java: filling
+	of AccessWarningPaneComplexReturn no longer depnds on existence of htmlPanels.
+	* netx/net/sourceforge/jnlp/util/XDesktopEntry.java: (BROWSERS) opera added
+	to list of recognized browsers
+
 2014-01-22  Jie Kang  <jkang at redhat.com>
 
 	Add quotes to Docs paths in Makefile.am
diff -r 5bd739d5e4e1 -r 918fb141b815 netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java
--- a/netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java	Thu Jan 22 13:52:23 2015 -0500
+++ b/netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java	Fri Jan 23 15:35:46 2015 +0100
@@ -328,11 +328,23 @@
 
     private AccessWarningPaneComplexReturn getModifier(int button) {
         AccessWarningPaneComplexReturn ar = new AccessWarningPaneComplexReturn(button);
-        if (htmlPanelDesktop != null && desktopCheck != null) {
-            ar.setDekstop(htmlPanelDesktop.getShortcutResult(desktopCheck.isSelected()));
+        if (desktopCheck != null) {
+            if (htmlPanelDesktop != null) {
+                //html
+                ar.setDekstop(htmlPanelDesktop.getShortcutResult(desktopCheck.isSelected()));
+            } else {
+                //jnlp
+                ar.setDekstop(new AccessWarningPaneComplexReturn.ShortcutResult(desktopCheck.isSelected()));
+            }
         }
-        if (htmlPanelMenu != null && menuCheck != null) {
-            ar.setMenu(htmlPanelMenu.getShortcutResult(menuCheck.isSelected()));
+        if (menuCheck != null) {
+            if (htmlPanelMenu != null) {
+                //html
+                ar.setMenu(htmlPanelMenu.getShortcutResult(menuCheck.isSelected()));
+            } else {
+                //jnlp
+                ar.setMenu(new AccessWarningPaneComplexReturn.ShortcutResult(menuCheck.isSelected()));
+            }
         }
         if (rememberPanel != null) {
             ar.setRember(rememberPanel.getShortcutResult());
diff -r 5bd739d5e4e1 -r 918fb141b815 netx/net/sourceforge/jnlp/util/XDesktopEntry.java
--- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java	Thu Jan 22 13:52:23 2015 -0500
+++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java	Fri Jan 23 15:35:46 2015 +0100
@@ -87,7 +87,7 @@
     //in pixels
     private static final int[] VALID_ICON_SIZES = new int[] { 16, 22, 32, 48, 64, 128 };
     //browsers we try to find  on path for html shortcut
-    public static final String[] BROWSERS = new String[]{"firefox", "midori", "epiphany", "chromium", "chrome", "konqueror"};
+    public static final String[] BROWSERS = new String[]{"firefox", "midori", "epiphany", "opera", "chromium", "chrome", "konqueror"};
     public static final String FAVICON = "favicon.ico";
 
     /**