strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS native87 (1.1.10); FILE MERGED

Browse source 
2007/06/01 10:56:32 is 1.1.10.2: #i65425# new Java gui installer
2007/04/24 10:09:20 is 1.1.10.1: #i65425# adding header
This commit is contained in:
Rüdiger Timm 2007-07-03 10:50:30 +00:00
parent 141366533b
commit 7f709cbb81
1 changed files with 54 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java
View file

@ -1,3 +1,38 @@
/*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChooseDirectoryCtrl.java,v $
*
* $Revision: 1.2 $
*
* last change: $Author: rt $ $Date: 2007-07-03 11:50:30 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
*
*
* GNU Lesser General Public License Version 2.1
* =============================================
* Copyright 2005 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License version 2.1, as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
************************************************************************/
package org.openoffice.setup.Controller;
import java.awt.Dimension;
@ -266,6 +301,15 @@ public class ChooseDirectoryCtrl extends PanelController {
Dumper.logModuleStates(packageData, "ChooseDirectory: After disableNonExistingPackages");
}
// disable packages, that are not valid in user installation
if ( data.isUserInstallation() ) {
ModuleCtrl.setShowInUserInstallFlags(packageData);
if ( data.logModuleStates() ) {
Dumper.logModuleStates(packageData, "ChooseDirectory: After setShowInUserInstallFlags");
}
}
// Collecting packages to install
// This has to be done here, because "ChooseInstallationType" and "ChooseComponents"
// are not called.
@ -297,6 +341,16 @@ public class ChooseDirectoryCtrl extends PanelController {
if ( data.logModuleStates() ) {
Dumper.logModuleStates(packageData, "ChooseDirectory: After disableNonExistingPackages");
}
// disable packages, that are not valid in user installation
if ( data.isUserInstallation() ) {
ModuleCtrl.setShowInUserInstallFlags(packageData);
if ( data.logModuleStates() ) {
Dumper.logModuleStates(packageData, "ChooseDirectory: After setShowInUserInstallFlags");
}
}
// Problem: If all submodules have flag IGNORE, the parent can also get IGNORE
// That is interesting for language packs with three submodules.
ModuleCtrl.setParentDefaultModuleSettings(packageData);