[rfc][icedtea-web] fixinf of desktop icon behaviour

[Adam Domurad]

On 12/21/2012 11:05 AM, Jiri Vanek wrote:
> Hi! This is fix for 
> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=725 - JNLP 
> applications will prompt for creating desktop shortcuts every time 
> they are run
>
> When I have seen Omairs original patch it was too much complicated, So 
> I want at least to try this one.

Do you know why Omair used explicit locking? I couldn't quite figure it out

> It is pretty simple. The disadvantage however is:
> +    public File getFinalLinuxDesktopIconFile() {
> +        return new 
> File(System.getProperty("user.home")+"/Desktop/"+getDesktopIconFinalName()+".desktop");
> +    }
>
> to be dependent on System.getProperty("user.home")+"/Desktop/" and 
> .desktop suffix.
>
> However .. can it be enough?
>
> The second patch is for testing purposes of this case which I would 
> like to push forward as soon as possible.
>
> J.

> doNotAskToDesktopIconCreationWithXtrustAll.patch
>
>
> diff -r a24c48429ff1 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 16:58:29 2012 +0100
> @@ -171,6 +177,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;

This is OK for head.

>
> fixedRecreationOfDesktopIcon.patch
>
>
> diff -r a24c48429ff1 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 16:58:29 2012 +0100
> @@ -146,7 +146,13 @@
>       private void addMenuAndDesktopEntries() {
>           XDesktopEntry entry = new XDesktopEntry(file);
>           ShortcutDesc sd = file.getInformation().getShortcut();
> -
> +        if (entry.getFinalLinuxDesktopIconFile().exists()) {

How would this behave if it was ever run on a non-Linux system ?

> +            if (JNLPRuntime.isDebug()) {
> +                System.out.println("ApplicationInstance.addMenuAndDesktopEntries(): file - "
> +                        + entry.getFinalLinuxDesktopIconFile().getAbsolutePath() + " already exists. Not proceeding with desktop additions");
> +            }
> +            return;
> +        }
>           if (shouldCreateShortcut(sd)) {
>               entry.createDesktopShortcut();
>           }
> diff -r a24c48429ff1 netx/net/sourceforge/jnlp/util/XDesktopEntry.java
> --- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java	Fri Dec 21 13:19:14 2012 +0100
> +++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java	Fri Dec 21 16:58:29 2012 +0100
> @@ -78,7 +78,7 @@
>   
>           String fileContents = "[Desktop Entry]\n";
>           fileContents += "Version=1.0\n";
> -        fileContents += "Name=" + sanitize(file.getTitle()) + "\n";
> +        fileContents += "Name=" + getDesktopIconFinalName() + "\n";
>           fileContents += "GenericName=Java Web Start Application\n";
>           fileContents += "Comment=" + sanitize(file.getInformation().getDescription()) + "\n";
>           fileContents += "Type=Application\n";
> @@ -122,6 +122,11 @@
>           return iconSize;
>       }
>   
> +    public File getShortcutTmpFile() {
> +        File shortcutFile = new File(JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_TMP_DIR) + File.separator + FileUtils.sanitizeFileName(file.getTitle()) + ".desktop");
> +        return shortcutFile;
> +    }
> +
>       /**
>        * Set the icon size to use for the desktop shortcut
>        *
> @@ -148,9 +153,7 @@
>        * Install this XDesktopEntry into the user's desktop as a launcher
>        */
>       private void installDesktopLauncher() {
> -        File shortcutFile = new File(JNLPRuntime.getConfiguration()
> -                .getProperty(DeploymentConfiguration.KEY_USER_TMP_DIR)
> -                + File.separator + FileUtils.sanitizeFileName(file.getTitle()) + ".desktop");
> +        File shortcutFile = getShortcutTmpFile();
>           try {
>   
>               if (!shortcutFile.getParentFile().isDirectory() && !shortcutFile.getParentFile().mkdirs()) {
> @@ -234,4 +237,12 @@
>           }
>       }
>   
> +    public String getDesktopIconFinalName() {
> +        return sanitize(file.getTitle());
> +    }
> +
> +    public File getFinalLinuxDesktopIconFile() {
> +        return new File(System.getProperty("user.home")+"/Desktop/"+getDesktopIconFinalName()+".desktop");

A deployment property could still be good. This seems a little hardcoded.

> +    }
> +
>   }

happy hackerdays,
-Adam
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121221/38fa390a/attachment.html