diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java index 4818208967e7..378acefdd473 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java @@ -4,9 +4,9 @@ * * $RCSfile: ModuleCtrl.java,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: ihi $ $Date: 2008-02-05 13:38:03 $ + * last change: $Author: kz $ $Date: 2008-04-02 16:01:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -414,6 +414,18 @@ public class ModuleCtrl { } } + static public void setIgnoreNonRelocatablePackages(PackageDescription packageData) { + if ( ! packageData.isRelocatable() ) { + packageData.setSelectionState(PackageDescription.IGNORE); + System.err.println("Ignoring package " + packageData.getName() + " " + packageData.getPackageName()); + } + + for (Enumeration e = packageData.children(); e.hasMoreElements(); ) { + PackageDescription child = (PackageDescription) e.nextElement(); + setIgnoreNonRelocatablePackages(child); + } + } + static public void setHiddenLanguageModuleDefaultSettings(PackageDescription packageData) { // This function is needed during installation for the language modules,