/hg/release/icedtea-web-1.6: Fixed bug when generated desktop ic...

[jvanek at icedtea.classpath.org]

changeset 4e3281c63564 in /hg/release/icedtea-web-1.6
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=4e3281c63564
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jun 09 14:36:37 2015 +0200

	Fixed bug when generated desktop icon was not matched and user was asked for recreation
	* netx/net/sourceforge/jnlp/util/XDesktopEntry.java: (getShortcutTmpFile) (getLinuxDesktopIconFile) (getLinuxMenuIconFile) now generate file name by same way. By new method getDesktopIconFileName which is using sanitizing  getDesktopIconName.


diffstat:

 ChangeLog                                         |   8 ++++++++
 netx/net/sourceforge/jnlp/util/XDesktopEntry.java |  10 +++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 9d92f5640f83 -r 4e3281c63564 ChangeLog
--- a/ChangeLog	Wed May 27 16:56:55 2015 +0200
+++ b/ChangeLog	Tue Jun 09 14:36:37 2015 +0200
@@ -1,3 +1,11 @@
+2015-06-09  Jiri Vanek  <jvanek at redhat.com>
+
+	Fixed bug when generated desktop icon was not matched and user was asked for recreation
+	* netx/net/sourceforge/jnlp/util/XDesktopEntry.java: (getShortcutTmpFile)
+	(getLinuxDesktopIconFile) (getLinuxMenuIconFile) now generate file name by
+	same way. By new method getDesktopIconFileName which is using sanitizing 
+	getDesktopIconName.
+
 2015-05-27  Jiri Vanek  <jvanek at redhat.com>
 
 	Improved caching of files obtained via query
diff -r 9d92f5640f83 -r 4e3281c63564 netx/net/sourceforge/jnlp/util/XDesktopEntry.java
--- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java	Wed May 27 16:56:55 2015 +0200
+++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java	Tue Jun 09 14:36:37 2015 +0200
@@ -266,7 +266,7 @@
 
     public File getShortcutTmpFile() {
         String userTmp = PathsAndFiles.TMP_DIR.getFullPath();
-        File shortcutFile = new File(userTmp + File.separator + FileUtils.sanitizeFileName(file.getTitle()) + ".desktop");
+        File shortcutFile = new File(userTmp + File.separator + getDesktopIconFileName());
         return shortcutFile;
     }
 
@@ -497,11 +497,15 @@
     }
 
     public File getLinuxDesktopIconFile() {
-        return new File(findFreedesktopOrgDesktopPathCatch() + "/" + getDesktopIconName() + ".desktop");
+        return new File(findFreedesktopOrgDesktopPathCatch() + "/" + getDesktopIconFileName());
     }
 
     public File getLinuxMenuIconFile() {
-        return new File(findAndVerifyJavawsMenuDir() + "/" + getDesktopIconName() + ".desktop");
+        return new File(findAndVerifyJavawsMenuDir() + "/" + getDesktopIconFileName());
+    }
+    
+    private String getDesktopIconFileName() {
+        return getDesktopIconName() + ".desktop";
     }
 
     private static String findAndVerifyGeneratedJnlpDir() {