summaryrefslogtreecommitdiff
path: root/javainstaller2/src
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-24 09:15:59 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-24 09:15:59 +0000
commitc4d805b6ae817c1561f937cf1d9992b8ef22c6f7 (patch)
tree41153ad66734dd02a1e150bc9b38eac1836f81af /javainstaller2/src
parenta7a884995392edcc85a09ebcdc8654445e8053b4 (diff)
INTEGRATION: CWS native163 (1.6.8); FILE MERGED
2008/06/18 15:50:44 is 1.6.8.1: #i87887# java installer without --nodeps
Diffstat (limited to 'javainstaller2/src')
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java13
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 6124efa1d343..3ded9327063e 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.6 $
+ * $Revision: 1.7 $
*
* This file is part of OpenOffice.org.
*
@@ -101,6 +101,7 @@ public class PackageDescription implements TreeNode {
private boolean showMultiLingualOnly = false;
private boolean isApplicationPackage = false;
private boolean isJavaPackage = false;
+ private boolean installCanFail = false;
private boolean isNewInstalled = false;
private boolean wasAlreadyInstalled = false;
@@ -204,6 +205,10 @@ public class PackageDescription implements TreeNode {
return isJavaPackage;
}
+ public boolean installCanFail() {
+ return installCanFail;
+ }
+
public void setIsNewInstalled(boolean installed) {
isNewInstalled = installed;
}
@@ -441,6 +446,12 @@ public class PackageDescription implements TreeNode {
// isJavaPackage = Boolean.parseBoolean(isJavaPackageValue);
}
+ subSection = section.getElement("installcanfail");
+ if (subSection != null) {
+ String installCanFailValue = subSection.getValue();
+ installCanFail = Parser.parseBoolean(installCanFailValue);
+ }
+
}
/* query information about the physical (rpm/pkg/msi...) package itself */