INTEGRATION: CWS native185_DEV300 (1.8.10); FILE MERGED

2008/08/12 16:08:31 is 1.8.10.1: #i92713# userland installation with prepared database

1 files changed, 12 insertions, 1 deletions

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java
index ab011a148eba..0c10c960aa0a 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: PackageDescription.java,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -79,6 +79,7 @@ public class PackageDescription implements TreeNode {
     private boolean isDefault   = true;
     private boolean isHidden    = false;
     private boolean showInUserInstall = true;
+    private boolean showInUserInstallOnly = false;
     private boolean isOptional  = true;
     private boolean dontUninstall = false;
     private boolean allChildrenHidden = false;
@@ -186,6 +187,10 @@ public class PackageDescription implements TreeNode {
         return showInUserInstall;
     }
 
+    public boolean showInUserInstallOnly() {
+        return showInUserInstallOnly;
+    }
+
     public boolean dontUninstall() {
         return dontUninstall;
     }
@@ -413,6 +418,12 @@ public class PackageDescription implements TreeNode {
                 // showInUserInstall = Boolean.parseBoolean(showInUserInstallValue);
             }
 
+            subSection = section.getElement("showinuserinstallonly");
+            if (subSection != null) {
+                String showInUserInstallValueOnly = subSection.getValue();
+                showInUserInstallOnly = Parser.parseBoolean(showInUserInstallValueOnly);
+            }
+
             subSection = section.getElement("dontuninstall");
             if (subSection != null) {
                 String dontUninstallValue = subSection.getValue();