changeset 4005:5b698983ad81

RT-27984: MSI and EXE installers provide inconsistent installs [mhowe] Contributed-by: Danno Ferrin <danno.ferrin@shemnon.com> Modified the patch slightly to call getVendor() from new method getGroup() in the fallback
author mhowe
date Sun, 09 Jun 2013 20:26:19 -0700
parents 018368ab7327
children dce4c708d955
files deploy/packager/src/com/sun/javafx/tools/packager/bundlers/WinMsiBundler.java
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/deploy/packager/src/com/sun/javafx/tools/packager/bundlers/WinMsiBundler.java	Wed May 29 13:43:08 2013 -0700
+++ b/deploy/packager/src/com/sun/javafx/tools/packager/bundlers/WinMsiBundler.java	Sun Jun 09 20:26:19 2013 -0700
@@ -306,6 +306,14 @@
         }
     }
 
+    private String getGroup() {
+        if (params.applicationCategory != null) {
+            return params.applicationCategory;
+        } else {
+            return getVendor();
+        }
+    }
+
     UUID getUpgradeGUID() {
         UUID uid = null;
         if (params.identifier != null) {
@@ -523,7 +531,7 @@
         }
         if (menuShortcut) {
             out.println("  <Directory Id=\"ProgramMenuFolder\">");
-            out.println("    <Directory Id=\"ProgramMenuDir\" Name=\"" + getVendor() + "\">");
+            out.println("    <Directory Id=\"ProgramMenuDir\" Name=\"" + getGroup() + "\">");
             out.println("      <Component Id=\"comp" + (compId++) + "\""
                     + " Guid=\"" + UUID.randomUUID().toString() + "\">");
             out.println("        <RemoveFolder Id=\"ProgramMenuDir\" On=\"uninstall\" />");