[Libreoffice-commits] .: javainstaller2/build.xml javainstaller2/makefile.mk javainstaller2/nbproject javainstaller2/prj javainstaller2/src
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Feb 22 04:16:40 PST 2011
dev/null |binary
javainstaller2/build.xml | 105 -
javainstaller2/makefile.mk | 35
javainstaller2/nbproject/private/private.xml | 4
javainstaller2/nbproject/project.xml | 56
javainstaller2/prj/build.lst | 5
javainstaller2/prj/d.lst | 2
javainstaller2/src/Helpfiles/create_helpfiles.pl | 268 --
javainstaller2/src/Helpfiles/helpfilenames.txt | 43
javainstaller2/src/Helpfiles/makefile.mk | 57
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java | 77
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java | 204 --
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java | 256 --
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java | 174 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java | 131 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationTypeCtrl.java | 133 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationCompletedCtrl.java | 111 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java | 155 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java | 195 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java | 200 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java | 103 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationImminentCtrl.java | 112 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java | 146 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java | 186 -
javainstaller2/src/JavaSetup/org/openoffice/setup/DeckOfPanels.java | 54
javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DatabaseDialog.java | 64
javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.java | 139 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/HelpDialog.java | 166 -
javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java | 746 -------
javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/Installer.java | 79
javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/InstallerFactory.java | 67
javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java | 720 -------
javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.java | 574 -----
javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java | 540 -----
javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java | 404 ----
javainstaller2/src/JavaSetup/org/openoffice/setup/Main.java | 98
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/AcceptLicense.java | 104 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseComponents.java | 189 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseDirectory.java | 185 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseInstallationType.java | 180 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseUninstallationComponents.java | 182 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseUninstallationType.java | 176 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/InstallationImminent.java | 115 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/InstallationOngoing.java | 121 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/Prologue.java | 76
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationCompleted.java | 108 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationImminent.java | 110 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationOngoing.java | 109 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationPrologue.java | 62
javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/installationCompleted.java | 107 -
javainstaller2/src/JavaSetup/org/openoffice/setup/PanelController.java | 97
javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelLabel.java | 82
javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelTitle.java | 116 -
javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/TreeNodeRenderer.java | 89
javainstaller2/src/JavaSetup/org/openoffice/setup/ResourceManager.java | 171 -
javainstaller2/src/JavaSetup/org/openoffice/setup/SetupActionListener.java | 116 -
javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/DisplayPackageDescription.java | 200 -
javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java | 659 ------
javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java | 277 --
javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/SetupDataProvider.java | 109 -
javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/XMLPackageDescription.java | 307 ---
javainstaller2/src/JavaSetup/org/openoffice/setup/SetupFrame.java | 300 --
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/AbortInstaller.java | 52
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Calculator.java | 88
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.java | 291 --
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Converter.java | 95
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/DialogFocusTraversalPolicy.java | 115 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Dumper.java | 202 --
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ExecuteProcess.java | 114 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/FileExtensionFilter.java | 53
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java | 163 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java | 319 ---
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Informer.java | 45
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InstallChangeCtrl.java | 137 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/LogManager.java | 105 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java | 1004 ----------
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/PackageCollector.java | 179 -
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Parser.java | 49
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/SystemManager.java | 484 ----
javainstaller2/src/Localization/makefile.mk | 54
javainstaller2/src/Localization/setupstrings.ulf | 455 ----
javainstaller2/src/Properties/create_property.pl | 303 ---
javainstaller2/src/Properties/makefile.mk | 50
javainstaller2/src/Properties/setupfiles_template.properties | 26
javainstaller2/src/Properties/setupstrings_template.properties | 123 -
85 files changed, 15262 deletions(-)
New commits:
commit af875df329d7b59f21d737f27c4c925bd257e5c0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 22 12:08:04 2011 +0000
remove javainstaller2
diff --git a/javainstaller2/build.xml b/javainstaller2/build.xml
deleted file mode 100755
index 235b18b..0000000
--- a/javainstaller2/build.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
--->
-
-<project name="javainstaller2" default="build" basedir=".">
-
- <!-- build output directory -->
- <property name="name" value="JavaSetup"/>
- <property name="out" value="build"/>
- <property name="classes.dir" value="classes"/>
- <property name="source.dir" location="${basedir}/src/${name}"/>
- <property name="build.dir" location="${out}/misc"/>
- <property name="dist.dir" location="${out}/bin"/>
- <property name="compile.debug" value="true"/>
- <property name="compile.optimize" value="false"/>
- <property name="lib.dir" location="{$basedir}/lib"/>
- <property name="verbose" value="false"/>
- <property name="javainstaller.jar.file" location="{$basedir}/lib"/>
-
- <!-- MAIN TARGET -->
- <target name="build" depends="prepare, info_uptodate, info_notuptodate, compile-javainstaller, jar-javainstaller, clean">
- <echo message="Done"/>
- </target>
-
- <!-- INITIALIZATION TASKS -->
- <target name="init">
- <!-- up to date checks -->
- <uptodate property="jarFile.uptodate" targetfile="${dist.dir}/${name}.jar">
- <srcfiles dir="${source.dir}" includes="**/*.gif,**/*.png,**/*.java"/>
- <srcfiles dir="${build.dir}" includes="**/*.properties"/>
- </uptodate>
- </target>
-
- <target name="prepare" depends="init" unless="jarFile.uptodate">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/${classes.dir}"/>
- <mkdir dir="${build.dir}/${classes.dir}/${name}"/>
- <mkdir dir="${dist.dir}"/>
- </target>
-
- <!-- show information about current sub target in recursive builds -->
- <target name="info_uptodate" depends="init" if="jarFile.uptodate">
- <tstamp prefix="start"/>
- <echo message="--------------------------------------------------------------------------------" />
- <echo message="Nothing to do. ${dist.dir}/${name}.jar is up to date."/>
- <echo message="--------------------------------------------------------------------------------" />
- </target>
-
- <!-- show information about current sub target in recursive builds -->
- <target name="info_notuptodate" depends="init" unless="jarFile.uptodate">
- <tstamp prefix="start"/>
- <echo message="--------------------------------------------------------------------------------" />
- <echo message="Source dir: ${source.dir}"/>
- <echo message="Build dir: ${build.dir}"/>
- <echo message="Dist dir: ${dist.dir}"/>
- <echo message="Debug is ${debug}"/>
- <echo message="--------------------------------------------------------------------------------" />
- </target>
-
- <target name="compile-javainstaller" depends="prepare" unless="jarFile.uptodate">
- <javac srcdir="${source.dir}" source="1.4" target="1.4"
- destdir="${build.dir}/${classes.dir}/${name}"
- debug="${compile.debug}"
- optimize="${compile.optimize}">
- </javac>
- <copy todir="${build.dir}/${classes.dir}/${name}/org/openoffice/setup">
- <fileset dir="${build.dir}" includes="*.properties"/>
- </copy>
- <copy todir="${build.dir}/${classes.dir}/${name}/org/openoffice/setup/Icons">
- <fileset dir="${source.dir}/org/openoffice/setup/Icons" includes="*.gif,*.png"/>
- </copy>
- </target>
-
- <target name="jar-javainstaller" depends="compile-javainstaller" unless="jarFile.uptodate">
- <jar file="${dist.dir}/${name}.jar">
- <fileset dir="${build.dir}/${classes.dir}/${name}" includes="**/*"/>
- <manifest>
- <attribute name="Main-Class" value="org.openoffice.setup.Main"/>
- </manifest>
- </jar>
- </target>
-
- <!-- CLEAN UP OUTPUT TREES -->
- <target name="clean" unless="jarFile.uptodate">
- <!-- <delete dir="${build.dir}"/> -->
- </target>
-
- <!-- execution section -->
- <target name="run" depends="jar-javainstaller">
- <echo message="Starting: java -jar ${dist.dir}/${name}.jar" />
- <java jar="${dist.dir}/${name}.jar" fork="true"/>
- <!-- </java> -->
- </target>
-
- <target name="debug" depends="jar-javainstaller">
- <echo message="Starting for debugging: java -jar ${dist.dir}/${name}.jar" />
- <java jar="${dist.dir}/${name}.jar" fork="true"/>
- <!-- </java> -->
-</target>
-
-
-</project>
diff --git a/javainstaller2/makefile.mk b/javainstaller2/makefile.mk
deleted file mode 100755
index 99d5bf0..0000000
--- a/javainstaller2/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-TARGET=javainstaller2
-PRJ=.
-
-.INCLUDE : ant.mk
-
-.IF "$(SOLAR_JAVA)"!=""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/javainstaller2/nbproject/private/private.xml b/javainstaller2/nbproject/private/private.xml
deleted file mode 100755
index c1f155a..0000000
--- a/javainstaller2/nbproject/private/private.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
diff --git a/javainstaller2/nbproject/project.xml b/javainstaller2/nbproject/project.xml
deleted file mode 100755
index 1797bcf..0000000
--- a/javainstaller2/nbproject/project.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>javainstaller2</name>
- <properties/>
- <folders>
- <source-folder>
- <label>src\JavaSetup</label>
- <type>java</type>
- <location>src/JavaSetup</location>
- </source-folder>
- </folders>
- <ide-actions>
- <action name="build">
- <target>build</target>
- </action>
- <action name="clean">
- <target>clean</target>
- </action>
- <action name="run">
- <target>run</target>
- </action>
- <action name="rebuild">
- <target>clean</target>
- <target>build</target>
- </action>
- </ide-actions>
- <view>
- <items>
- <source-folder style="packages">
- <label>src\JavaSetup</label>
- <location>src/JavaSetup</location>
- </source-folder>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu>
- <ide-action name="build"/>
- <ide-action name="clean"/>
- <ide-action name="run"/>
- <ide-action name="rebuild"/>
- </context-menu>
- </view>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
- <compilation-unit>
- <package-root>src/JavaSetup</package-root>
- <source-level>1.5</source-level>
- </compilation-unit>
- </java-data>
- </configuration>
-</project>
diff --git a/javainstaller2/prj/build.lst b/javainstaller2/prj/build.lst
deleted file mode 100755
index f6a0ef5..0000000
--- a/javainstaller2/prj/build.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-jl2 javainstaller2 : l10n setup_native NULL
-jl2 javainstaller2\src\Localization nmake - u jl2_local NULL
-jl2 javainstaller2\src\Properties nmake - u jl2_properties jl2_local.u NULL
-jl2 javainstaller2\src\Helpfiles nmake - u jl2_helpfiles jl2_local.u NULL
-jl2 javainstaller2 nmake - u jl2_mkout jl2_properties.u jl2_helpfiles.u NULL
diff --git a/javainstaller2/prj/d.lst b/javainstaller2/prj/d.lst
deleted file mode 100755
index 3b1754f..0000000
--- a/javainstaller2/prj/d.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-..\%__SRC%\bin\*.jar %_DEST%\bin%_EXT%
-..\%__SRC%\bin\*.html %_DEST%\pck%_EXT%
diff --git a/javainstaller2/src/Helpfiles/create_helpfiles.pl b/javainstaller2/src/Helpfiles/create_helpfiles.pl
deleted file mode 100755
index 6a842a9..0000000
--- a/javainstaller2/src/Helpfiles/create_helpfiles.pl
+++ /dev/null
@@ -1,268 +0,0 @@
-: # -*- perl -*-
-eval 'exec perl -wS $0 ${1+"$@"}'
- if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# create java installer help files in html format for all languages defined in ulf file
-
-use Cwd;
-use File::Copy;
-
-if( $#ARGV < 2 )
- {
- print <<ENDHELP;
-USAGE: $0 <separator> <ulf_file_path> <outputpath>
- <separator>: separator, used on the platform (slash or backslash)
- <ulf_file_path>: path, in which the ulf file(s) can be found
- <outputpath>: path, in which the help files will be created
-ENDHELP
- exit;
- }
-
-$separator = $ARGV[0];
-$inputpath = $ARGV[1];
-$outputpath = $ARGV[2];
-
-$inputpath =~ s/\Q$separator\E\s*$//;
-$outputpath =~ s/\Q$separator\E\s*$//;
-
-if ( ! -d $outputpath ) { mkdir $outputpath; }
-
-print "Separator: $separator \n";
-print "Input path: $inputpath \n";
-print "Output path: $outputpath \n";
-
-my $localdir = cwd();
-
-my $ulffilename = "setupstrings.ulf";
-my $helpfilename = "helpfilenames.txt";
-my $defaultlanguage = "en-US";
-
-$ulffilename = $inputpath . $separator . $ulffilename;
-my $ulffile = read_file($ulffilename);
-
-my $helpfilenames = read_file($helpfilename);
-my $allhelpfilenames = collect_helpfile_names($helpfilenames);
-
-my $alllanguages = get_all_languages($ulffile);
-my @allnewpropertyfiles = ();
-
-for ( my $i = 0; $i <= $#{$allhelpfilenames}; $i++ )
-{
- my $helpfilename = ${$allhelpfilenames}[$i];
-
- for ( my $j = 0; $j <= $#{$alllanguages}; $j++ )
- {
- my $language = ${$alllanguages}[$j];
-
- # Creating content of help file
- my $helpfilecontent = collect_helpfile_content($helpfilename, $ulffile, $language);
-
- # Saving helpfile
- my $savefilename = $helpfilename . "_" . $language . ".html";
- $savefilename = $outputpath . $separator . $savefilename;
- save_file($savefilename, $helpfilecontent);
-
- if ( $language eq $defaultlanguage )
- {
- $savefilename = $helpfilename . ".html";
- $savefilename = $outputpath . $separator . $savefilename;
- save_file($savefilename, $helpfilecontent);
- }
- }
-}
-
-exit;
-
-sub main::read_directory
-{
- my ($dir, $ext) = @_;
-
- my @content = ();
- my $direntry;
- opendir(DIR, $dir);
-
- foreach $direntry (readdir (DIR))
- {
- next if $direntry eq ".";
- next if $direntry eq "..";
- next if ( ! ( $direntry =~ /\.\Q$ext\E\s*$/ ));
-
- # my $completeentry = $dir . $separator . $direntry;
- # push(@content, $completeentry);
- push(@content, $direntry);
- }
-
- closedir(DIR);
- return \@content;
-}
-
-sub main::read_file
-{
- my ($filename) = @_;
-
- open( IN, "<$filename" ) || die "cannot open $filename";
- my @content = <IN>;
- close( IN );
-
- return \@content;
-}
-
-sub main::collect_helpfile_content
-{
- my ($helpfilename, $ulffile, $language) = @_;
-
- my @helpfilecontent = ();
- my $stringhash = create_string_hash($ulffile, $language);
-
- # Collecting all strings for one html file.
- # For "Prologue_de.html" all files need to begin with "STRING_PROLOGUE_X"
- # The "X" is the ordering number.
-
- my $basestring = "STRING_" . uc($helpfilename) . "_";
-
- for ( my $i = 0; $i <= 10; $i++ ) # 10 strings possible for each html file
- {
- my $key = $basestring . $i;
- if ( exists $stringhash->{$key} )
- {
- my $content = $stringhash->{$key} . "\n<p>\n";
- push(@helpfilecontent, $content);
- }
- }
-
- return \@helpfilecontent;
-}
-
-sub main::collect_helpfile_names
-{
- my ($helpfilecontent) = @_;
-
- my @allhelpfiles = ();
-
- for ( my $i = 0; $i <= $#{$helpfilecontent}; $i++ )
- {
- if ( ${$helpfilecontent}[$i] =~ /^\s*#/ ) { next; } # comment line
- if ( ${$helpfilecontent}[$i] =~ /^\s*$/ ) { next; } # empty line
- my $filename = ${$helpfilecontent}[$i];
- $filename =~ s/\s//g;
- push(@allhelpfiles, $filename);
- }
-
- return \@allhelpfiles;
-}
-
-sub main::get_all_languages
-{
- my ($ulffile) = @_;
-
- my @languages = ();
- my $record = 0;
-
- for ( my $i = 0; $i <= $#{$ulffile}; $i++ )
- {
- if (( ${$ulffile}[$i] =~ /^\s*\[.*]\s*$/ ) && ( $record )) { last; }
- if (( ${$ulffile}[$i] =~ /^\s*\[.*]\s*$/ ) && ( $record == 0 )) { $record = 1; }
-
- if (( $record ) && ( ${$ulffile}[$i] =~ /^\s*(.+?)\s*\=/ ))
- {
- $language = $1;
- push(@languages, $language);
- }
- }
-
- my $languagestring = "";
- for ( my $i = 0; $i <= $#languages; $i++ ) { $languagestring = $languagestring . $languages[$i] . ","; }
- $languagestring =~ s/,\s*$//;
- print "Languages: $languagestring\n";
-
- return \@languages;
-}
-
-sub main::create_string_hash
-{
- my ($ulffile, $language) = @_;
-
- my %stringhash = ();
- my $key = "";
- my $value_defined = 0;
-
- for ( my $i = 0; $i <= $#{$ulffile}; $i++ )
- {
- if ( ${$ulffile}[$i] =~ /^\s*\[(.*)\]\s*$/ )
- {
- $key = $1;
- $value_defined = 0;
- }
-
- if (( ${$ulffile}[$i] =~ /^\s*\Q$defaultlanguage\E\s*=\s*\"(.*)\"\s*$/ ) && ( ! $value_defined ))
- {
- $value = $1; # defaulting to english
- $stringhash{$key} = $value;
- }
-
- if (( ${$ulffile}[$i] =~ /^\s*\Q$language\E\s*=\s*\"(.*)\"\s*$/ ) && ( ! $value_defined ))
- {
- $value = $1;
- $stringhash{$key} = $value;
- $value_defined = 1;
- }
- }
-
- # additional replacement for ${LANGUAGE}, not defined in ulf file
- my $languagekey = "LANGUAGE";
- $stringhash{$languagekey} = $language;
-
- # print_hash(\%stringhash);
-
- return \%stringhash;
-}
-
-sub main::print_hash
-{
- my ( $hashref ) = @_;
-
- print "Hash contains:\n";
-
- my $key;
- foreach $key (keys %{$hashref} ) { print "Key: $key, Value: $hashref->{$key}\n"; }
-}
-
-sub main::save_file
-{
- my ($filename, $filecontent) = @_;
-
- if ( open( OUT, ">$filename" ) )
- {
- print OUT @{$filecontent};
- close( OUT);
- }
-
- push(@allnewpropertyfiles, $filename);
- print "Created file: $filename\n";
-}
diff --git a/javainstaller2/src/Helpfiles/helpfilenames.txt b/javainstaller2/src/Helpfiles/helpfilenames.txt
deleted file mode 100755
index 85fade3..0000000
--- a/javainstaller2/src/Helpfiles/helpfilenames.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# List of all required html files:
-# -> ChooseDirectory.html, ChooseDirectory_de.html, ...
-Prologue
-AcceptLicense
-ChooseDirectory
-ChooseInstallationType
-ChooseComponents
-InstallationImminent
-InstallationOngoing
-# InstallationCompleted
-UninstallationPrologue
-ChooseUninstallationType
-ChooseUninstallationComponents
-UninstallationImminent
-UninstallationOngoing
-# UninstallationCompleted
diff --git a/javainstaller2/src/Helpfiles/makefile.mk b/javainstaller2/src/Helpfiles/makefile.mk
deleted file mode 100755
index 0f77f31..0000000
--- a/javainstaller2/src/Helpfiles/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=javainstaller2
-TARGET=create_help_files
-
-INPUT=java_ulffiles
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(SOLAR_JAVA)"!=""
-.IF "$(WITH_LANG)"==""
-ULFDIR:=$(PRJ)/src/Localization
-.ELSE #"$(WITH_LANG)"==""
-ULFDIR:=$(COMMONMISC)/$(INPUT)
-.ENDIF #"$(WITH_LANG)"==""
-
-
-ALLTAR: $(BIN)$/Prologue.html
-
-$(BIN)$/Prologue.html : create_helpfiles.pl helpfilenames.txt $(ULFDIR)/setupstrings.ulf
- $(PERL) create_helpfiles.pl / $(ULFDIR) $(BIN)
-.ENDIF
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java
deleted file mode 100755
index 8a1f390..0000000
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.setup.Controller;
-
-import org.openoffice.setup.InstallData;
-import org.openoffice.setup.PanelController;
-import org.openoffice.setup.Panel.AcceptLicense;
-import org.openoffice.setup.ResourceManager;
-
-public class AcceptLicenseCtrl extends PanelController {
-
- private String helpFile;
-
- public AcceptLicenseCtrl() {
- super("AcceptLicense", new AcceptLicense());
- helpFile = "String_Helpfile_AcceptLicense";
- }
-
- public String getNext() {
- InstallData data = InstallData.getInstance();
-
- if ( data.isRootInstallation() ) {
- if ( data.olderVersionExists() ) {
- return new String("InstallationImminent");
- } else if ( data.sameVersionExists() ) {
- return new String("ChooseComponents");
- } else {
- return new String("ChooseInstallationType");
- }
- } else {
- return new String("ChooseDirectory");
- }
- }
-
- public String getPrevious() {
- return new String("Prologue");
- }
-
- public final String getHelpFileName () {
- return this.helpFile;
- }
-
- public void beforeShow() {
- String StringInstall = ResourceManager.getString("String_AcceptLicense");
- getSetupFrame().setButtonText(StringInstall, getSetupFrame().BUTTON_NEXT);
- String StringDecline = ResourceManager.getString("String_Decline");
- getSetupFrame().setButtonText(StringDecline, getSetupFrame().BUTTON_CANCEL);
-
- getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_CANCEL);
- }
-
-}
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java
deleted file mode 100755
index 1ab3edc..0000000
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.setup.Controller;
-
-import java.util.Vector;
-import org.openoffice.setup.InstallData;
-import org.openoffice.setup.PanelController;
-import org.openoffice.setup.Panel.ChooseComponents;
-import org.openoffice.setup.ResourceManager;
-import org.openoffice.setup.SetupData.PackageDescription;
-import org.openoffice.setup.SetupData.SetupDataProvider;
-import org.openoffice.setup.Util.Calculator;
-import org.openoffice.setup.Util.Dumper;
-import org.openoffice.setup.Util.Informer;
-import org.openoffice.setup.Util.ModuleCtrl;
-import org.openoffice.setup.Util.PackageCollector;
-
-public class ChooseComponentsCtrl extends PanelController {
-
- private String helpFile;
-
- public ChooseComponentsCtrl() {
- super("ChooseComponents", new ChooseComponents());
- helpFile = "String_Helpfile_ChooseComponents";
- }
-
- public String getNext() {
- return new String("InstallationImminent");
- }
-
- public String getPrevious() {
-
- InstallData data = InstallData.getInstance();
-
- if ( data.isRootInstallation() ) {
- if ( data.sameVersionExists() ) {
- if ( data.hideEula() ) {
- return new String("Prologue");
- } else {
- return new String("AcceptLicense");
- }
- } else {
- return new String("ChooseInstallationType");
- }
- } else {
- if ( data.sameVersionExists() ) {
- return new String("ChooseDirectory");
- } else {
- return new String("ChooseInstallationType");
- }
- }
- }
-
- public final String getHelpFileName () {
- return this.helpFile;
- }
-
- public void beforeShow() {
-
- InstallData data = InstallData.getInstance();
-
- // Setting the package size for node modules, that have hidden children
- // -> Java module has three hidden children and 0 byte size
-
- if ( ! data.moduleSizeSet() ) {
- PackageDescription packageData = SetupDataProvider.getPackageDescription();
- ModuleCtrl.setModuleSize(packageData);
- data.setModuleSizeSet(true);
- }
-
- if ( data.sameVersionExists() ) {
- ChooseComponents panel = (ChooseComponents)getPanel();
- String dialogTitle = ResourceManager.getString("String_ChooseComponents1_Maintain");
- panel.setTitleText(dialogTitle);
- }
-
- }
-
- public boolean afterShow(boolean nextButtonPressed) {
- boolean repeatDialog = false;
-
- InstallData data = InstallData.getInstance();
- PackageDescription packageData = SetupDataProvider.getPackageDescription();
-
- if ( nextButtonPressed ) {
-
- // Check, if at least one visible module was selected for installation
- data.setVisibleModulesChecked(false);
- ModuleCtrl.checkVisibleModulesInstall(packageData, data);
-
- if ( data.visibleModulesChecked() ) {
-
- // Check, if at least one application module was selected for installation
- // (not necessary, if an older product is updated or additional modules are
- // added in maintenance mode).
-
- boolean applicationSelected = false;
- if ( data.olderVersionExists() || data.sameVersionExists() ) {
- applicationSelected = true;
- } else {
- data.setApplicationModulesChecked(false);
- ModuleCtrl.checkApplicationSelection(packageData, data);
- applicationSelected = data.applicationModulesChecked();
- }
-
- if ( applicationSelected ) {
-
- // Check, if at least one language module was selected for installation
- // (not necessary, if an older product is updated or additional modules are
- // added in maintenance mode).
-
- boolean languageSelected = false;
- if ( data.olderVersionExists() || data.sameVersionExists() || ( ! data.isMultiLingual())) {
- languageSelected = true;
- } else {
- data.setLanguageModulesChecked(false);
- ModuleCtrl.checkLanguageSelection(packageData, data);
- languageSelected = data.languageModulesChecked();
- }
-
- if ( languageSelected ) {
-
- // Set module settings for hidden modules.
- // Then it is possible to calculate the size of the installed product,
- // to show a warning and to set the repeatDialog value to true
-
- if ( data.logModuleStates() ) {
- Dumper.logModuleStates(packageData, "ChooseComponentsCtrl: Before setHiddenModuleSettingsInstall");
- }
-
- ModuleCtrl.setHiddenModuleSettingsInstall(packageData);
- // Dumper.dumpInstallPackages(packageData);
-
- if ( data.logModuleStates() ) {
- Dumper.logModuleStates(packageData, "ChooseComponentsCtrl: After setHiddenModuleSettingsInstall");
- }
-
- // Collecting packages to install
- Vector installPackages = new Vector();
- PackageCollector.collectInstallPackages(packageData, installPackages);
- data.setInstallPackages(installPackages);
-
- // Check disc space
- if ( Calculator.notEnoughDiscSpace(data) ) {
- repeatDialog = true;
- System.err.println("Not enough disc space");
- }
- } else { // no language modules selected for installation
- String message = ResourceManager.getString("String_No_Language_Selected_1") + "\n" +
- ResourceManager.getString("String_No_Language_Selected_2");
- String title = ResourceManager.getString("String_Change_Selection");
- Informer.showInfoMessage(message, title);
- repeatDialog = true;
- }
- } else {
- String message = ResourceManager.getString("String_No_Application_Selected_1") + "\n" +
- ResourceManager.getString("String_No_Application_Selected_2");
- String title = ResourceManager.getString("String_Change_Selection");
- Informer.showInfoMessage(message, title);
- repeatDialog = true;
- }
- } else { // no modules selected for installation
- String message = ResourceManager.getString("String_No_Components_Selected_1") + "\n" +
- ResourceManager.getString("String_No_Components_Selected_2");
- String title = ResourceManager.getString("String_Nothing_To_Install");
- Informer.showInfoMessage(message, title);
- repeatDialog = true;
- }
- } else { // the back button was pressed
- // Saving typical selection state values (always if back button is pressed!).
- // System.err.println("Saving custom selection states");
- ModuleCtrl.saveCustomSelectionStates(packageData);
- data.setCustomSelectionStateSaved(true);
- }
-
- return repeatDialog;
- }
-
-}
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java
deleted file mode 100755
index deecd85..0000000
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.setup.Controller;
-
-import java.awt.Dimension;
-import org.openoffice.setup.InstallData;
-import org.openoffice.setup.Installer.Installer;
-import org.openoffice.setup.Installer.InstallerFactory;
-import org.openoffice.setup.PanelController;
-import org.openoffice.setup.Panel.ChooseDirectory;
-import org.openoffice.setup.ResourceManager;
-import org.openoffice.setup.SetupData.SetupDataProvider;
-import org.openoffice.setup.Util.InstallChangeCtrl;
-import org.openoffice.setup.Util.LogManager;
-import org.openoffice.setup.Util.SystemManager;
-import java.io.File;
-import java.util.Vector;
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-import org.openoffice.setup.Dialogs.DatabaseDialog;
-import org.openoffice.setup.SetupData.PackageDescription;
-import org.openoffice.setup.Util.Controller;
-import org.openoffice.setup.Util.Dumper;
-import org.openoffice.setup.Util.Informer;
-import org.openoffice.setup.Util.ModuleCtrl;
-import org.openoffice.setup.Util.PackageCollector;
-
-public class ChooseDirectoryCtrl extends PanelController {
-
- private String helpFile;
-
- public ChooseDirectoryCtrl() {
- super("ChooseDirectory", new ChooseDirectory());
- helpFile = "String_Helpfile_ChooseDirectory";
- }
-
- public String getNext() {
-
- InstallData data = InstallData.getInstance();
-
- if ( data.olderVersionExists() ) {
- return new String("InstallationImminent");
- } else if ( data.sameVersionExists() ) {
- return new String("ChooseComponents");
- } else {
- return new String("ChooseInstallationType");
- }
- }
-
- public String getPrevious() {
- InstallData data = InstallData.getInstance();
-
- if ( data.hideEula() ) {
- return new String("Prologue");
- } else {
- return new String("AcceptLicense");
- }
- }
-
- public final String getHelpFileName () {
- return this.helpFile;
- }
-
- private String removeEndingDelimiter(String s) {
- s.trim();
- if (( s.endsWith("/")) || ( s.endsWith("\\"))) {
- // removing the last character
- s = s.substring(0, s.length() - 1);
- }
- // mask spaces
- // s.replaceAll(" ", "\\ ");
-
- return s;
- }
-
- public void beforeShow() {
- ChooseDirectory panel = (ChooseDirectory)getPanel();
- InstallData data = InstallData.getInstance();
-
- if ( data.getInstallDir() == null ) {
- String installDir = data.getDefaultDir();
-
- if ( data.isUserInstallation() ) {
- // System.getenv only supported in Java 1.5, property set in shell script
- // if (( System.getenv("HOME") != null ) && ( ! System.getenv("HOME").equals(""))) {
- // rootDir = System.getenv("HOME");
- // }
- if (( System.getProperty("HOME") != null ) && ( ! System.getProperty("HOME").equals("") )) {
- installDir = System.getProperty("user.home");
- }
- }
- data.setInstallDir(installDir);
- }
-
- panel.setDirectory(data.getInstallDir());
- }
-
- public boolean afterShow(boolean nextButtonPressed) {
- boolean repeatDialog = false;
- ChooseDirectory panel = (ChooseDirectory)getPanel();
- String dir = panel.getDirectory();
- dir = removeEndingDelimiter(dir);
- InstallData data = InstallData.getInstance();
- data.setInstallDir(dir);
-
- File installDefaultDir = new File(dir, data.getDefaultDir());
- data.setInstallDefaultDir(installDefaultDir.getPath());
-
- SetupDataProvider.setNewMacro("DIR", installDefaultDir.getPath()); // important for string replacement
- // SetupDataProvider.dumpMacros();
-
- // Check existence of directory. Try to create, if it does not exist.
- // If successufully created, calculate available disc space
-
- if ( nextButtonPressed ) {
-
- // If the directory exists, is has to be tested, whether the user has write access
-
- if ( SystemManager.exists_directory(dir) ) {
- if ( ! Controller.createdSubDirectory(dir) ) {
- repeatDialog= true;
- }
- }
-
- // If the directory does not exist, is has to be tested, whether the user can create it
-
- if ( ! SystemManager.exists_directory(dir)) {
- String title = ResourceManager.getString("String_ChooseDirectory4_Question_Title");
- String message = null;
- message = ResourceManager.getString("String_ChooseDirectory5_Question_Message");
-
- int returnValue = JOptionPane.showConfirmDialog(null, message, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
-
- if ( returnValue == JOptionPane.YES_OPTION ) {
- if ( ! Controller.createdDirectory(dir) ) {
- repeatDialog= true;
- }
- }
- else if (returnValue == JOptionPane.NO_OPTION) {
- repeatDialog = true;
- }
- }
-
- // Additional tasks, if the directory is okay
-
- if ( ! repeatDialog ) {
- // Calculate available disc space
- int discSpace = SystemManager.calculateDiscSpace(dir);
- data.setAvailableDiscSpace(discSpace);
-
- Installer installer = InstallerFactory.getInstance();
-
- // Is this a new directory, or one that was already set before.
- // In this case, the database does not need to be evaluated again.
- // -> Testing, whether the database path has changed. This can
- // only happen in user installations.
- if ( data.isUserInstallation() ) {
- String oldDatabasePath = data.getDatabasePath();
- // Setting the database path
- installer.defineDatabasePath();
-
- if (( oldDatabasePath == null ) || ( ! oldDatabasePath.equals(data.getDatabasePath()))) {
- data.setDatabaseAnalyzed(false);
- data.setDatabaseQueried(false);
- } else {
- data.setDatabaseAnalyzed(true);
- }
- }
-
- // In installations with user privileges, now it can be controlled,
- // if there are products installed in the selected directory.
- // Therefore the directory selection dialog has to be shown before.
- // In installations with root privileges, this can only be checked,
- // before the destination directory can be set, because it is fix.
- if ( data.isUserInstallation() ) {
- LogManager.setCommandsHeaderLine("Checking change installation");
- InstallChangeCtrl.checkInstallChange(data);
- // InstallChangeCtrl.checkInstallChange(data, panel);
- }
-
- // At this point it is clear, whether the update-Package is installed or not.
- // If it is installed, it is also clear, in which version it is installed.
- // Therefore the following dialog is also defined.
-
- if ( data.newerVersionExists() ) {
- // This can happen only in installation with user privileges.
- // Installations with root privileges have cancelled installation
- // already at first dialog.
- // Possibility to select a new directory, in which no
- // newer product exists
- String message = ResourceManager.getString("String_Newer_Version_Installed_Found") + "\n" + data.getInstallDir() + "\n" +
- ResourceManager.getString("String_Newer_Version_Database") + ": " + data.getDatabasePath() + "\n" +
- ResourceManager.getString("String_Newer_Version_Tip");
- String title = ResourceManager.getString("String_Error");
- Informer.showErrorMessage(message, title);
-
- repeatDialog = true;
- }
-
- // If an older version is found, and the update is forbidden, the user
- // can select another installation directory.
-
- if ( data.olderVersionExists() && data.dontUpdate() ) {
- // This can happen only in installation with user privileges.
- // Installations with root privileges have cancelled installation
- // already at first dialog (InstallChangeCtrl.java).
- // Possibility to select a new directory, in which no
- // older product exists
- String message = ResourceManager.getString("String_Older_Version_Installed_Found") + "\n" + data.getInstallDir() + "\n" +
- ResourceManager.getString("String_Newer_Version_Database") + ": " + data.getDatabasePath() + "\n" +
- ResourceManager.getString("String_Newer_Version_Tip");
- String title = ResourceManager.getString("String_Error");
- Informer.showErrorMessage(message, title);
-
- repeatDialog = true;
- }
-
- if ( ! repeatDialog ) {
-
- if ( ! data.databaseAnalyzed()) {
- ModuleCtrl.defaultDatabaseAnalysis(data);
- data.setDatabaseAnalyzed(true);
- }
- }
- }
- }
-
- return repeatDialog;
- }
-
-}
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java
deleted file mode 100755
index ee7bea2..0000000
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.setup.Controller;
-
-import org.openoffice.setup.InstallData;
-import org.openoffice.setup.PanelController;
-import org.openoffice.setup.Panel.ChooseInstallationType;
-import org.openoffice.setup.SetupData.PackageDescription;
-import org.openoffice.setup.SetupData.SetupDataProvider;
-import org.openoffice.setup.Util.Calculator;
-import org.openoffice.setup.Util.Dumper;
-import org.openoffice.setup.Util.ModuleCtrl;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Vector;
-import org.openoffice.setup.Util.PackageCollector;
-
-public class ChooseInstallationTypeCtrl extends PanelController implements ActionListener {
-
- private String helpFile;
-
- public ChooseInstallationTypeCtrl() {
- super("ChooseInstallationType", new ChooseInstallationType());
- helpFile = "String_Helpfile_ChooseInstallationType";
- }
-
- public String getNext() {
-
- InstallData data = InstallData.getInstance();
-
- if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) {
- return new String("ChooseComponents");
- } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
- return new String("InstallationImminent");
- } else {
- System.err.println("Error: Unknown installation type!" );
- return new String("Error");
- }
- }
-
- public String getPrevious() {
-
- InstallData data = InstallData.getInstance();
-
- if ( data.isRootInstallation() ) {
- if ( data.hideEula() ) {
- return new String("Prologue");
- } else {
- return new String("AcceptLicense");
- }
- } else {
- return new String("ChooseDirectory");
- }
- }
-
- public final String getHelpFileName () {
- return this.helpFile;
- }
-
- public void beforeShow() {
-
- InstallData data = InstallData.getInstance();
-
- ChooseInstallationType panel = (ChooseInstallationType)getPanel();
- panel.setActionListener((ChooseInstallationTypeCtrl)this);
- panel.setTypicalActionCommand(data.getTypicalActionCommand());
- panel.setCustomActionCommand(data.getCustomActionCommand());
- }
-
- public boolean afterShow(boolean nextButtonPressed) {
- boolean repeatDialog = false;
- ChooseInstallationType panel = (ChooseInstallationType)getPanel();
- panel.removeActionListener((ChooseInstallationTypeCtrl)this);
-
- if ( nextButtonPressed ) {
-
- InstallData data = InstallData.getInstance();
- PackageDescription packageData = SetupDataProvider.getPackageDescription();
-
- if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
-
- // If typical selection state values have been saved before,
- // it is now time to restore them
-
- if ( data.typicalSelectionStateSaved()) {
- // System.err.println("Restoring typical selection states");
- ModuleCtrl.restoreTypicalSelectionStates(packageData);
- }
-
- if ( data.logModuleStates() ) {
- Dumper.logModuleStates(packageData, "ChooseInstallationType: Before setHiddenModuleSettingsInstall");
- }
-
- // For standard installation type, the hidden modules have to be defined here.
- // Then it is possible to calculate the size of the installed product, to show a warning
- // and to set the repeatDialog value to true
- ModuleCtrl.setHiddenModuleSettingsInstall(packageData);
- // Dumper.dumpInstallPackages(packageData);
-
- if ( data.logModuleStates() ) {
- Dumper.logModuleStates(packageData, "ChooseInstallationType: After setHiddenModuleSettingsInstall");
- }
-
- // Collecting packages to install
- Vector installPackages = new Vector();
- PackageCollector.collectInstallPackages(packageData, installPackages);
- data.setInstallPackages(installPackages);
-
- // Check disc space
- if ( Calculator.notEnoughDiscSpace(data) ) {
- repeatDialog = true;
- }
- }
-
- // Custom installation type
- if (( data.getInstallationType().equals(data.getCustomActionCommand() ))) {
- // Saving typical selection state values, if they are not already saved.
- if ( ! data.typicalSelectionStateSaved()) {
- // System.err.println("Saving typical selection states");
- ModuleCtrl.saveTypicalSelectionStates(packageData);
- data.setTypicalSelectionStateSaved(true);
- }
-
- // Setting custom selection state values, if they have been saved before.
- if ( data.customSelectionStateSaved() ) {
- // System.err.println("Restoring custom selection states");
- ModuleCtrl.restoreCustomSelectionStates(packageData);
- }
- }
- }
-
- return repeatDialog;
- }
-
- public void actionPerformed(ActionEvent evt) {
-
- InstallData data = InstallData.getInstance();
-
- if (evt.getActionCommand().equals(data.getTypicalActionCommand())) {
- data.setInstallationType(data.getTypicalActionCommand());
- // System.err.println("Setting installation type: " + data.getTypicalActionCommand());
- } else if (evt.getActionCommand().equals(data.getCustomActionCommand())) {
- data.setInstallationType(data.getCustomActionCommand());
- // System.err.println("Setting installation type: " + data.getCustomActionCommand());
- }
-
- }
-
-}
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java
deleted file mode 100755
index 69f0143..0000000
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.setup.Controller;
-
-import org.openoffice.setup.InstallData;
-import org.openoffice.setup.PanelController;
-import org.openoffice.setup.Panel.ChooseUninstallationComponents;
-import org.openoffice.setup.ResourceManager;
-import org.openoffice.setup.SetupData.PackageDescription;
-import org.openoffice.setup.SetupData.SetupDataProvider;
-import org.openoffice.setup.Util.Dumper;
-import org.openoffice.setup.Util.Informer;
-import org.openoffice.setup.Util.ModuleCtrl;
-
-public class ChooseUninstallationComponentsCtrl extends PanelController {
-
- private String helpFile;
-
- public ChooseUninstallationComponentsCtrl() {
- super("ChooseUninstallationComponents", new ChooseUninstallationComponents());
- helpFile = "String_Helpfile_ChooseUninstallationComponents";
- }
-
- public String getNext() {
- return new String("UninstallationImminent");
- }
-
- public String getPrevious() {
- return new String("ChooseUninstallationType");
- }
-
- public final String getHelpFileName () {
- return this.helpFile;
- }
-
- public boolean afterShow(boolean nextButtonPressed) {
- boolean repeatDialog = false;
-
- InstallData data = InstallData.getInstance();
- PackageDescription packageData = SetupDataProvider.getPackageDescription();
-
- if ( nextButtonPressed ) {
-
- if ( data.logModuleStates() ) {
- Dumper.logModuleStates(packageData, "Choose UninstallationComponents: Before checkVisibleModulesUninstall");
- }
-
- // Check, if at least one visible module is selected for uninstallation
- data.setVisibleModulesChecked(false);
- ModuleCtrl.checkVisibleModulesUninstall(packageData, data);
-
- if ( ! data.visibleModulesChecked() ) {
- String message = ResourceManager.getString("String_No_Uninstallcomponents_Selected_1") + "\n" +
- ResourceManager.getString("String_No_Uninstallcomponents_Selected_2");
- String title = ResourceManager.getString("String_Nothing_To_Uninstall");
- Informer.showInfoMessage(message, title);
- repeatDialog = true;
- } else {
- // Check, if all visible modules are selected for uninstallation.
- // Then this shall be handled as complete uninstallation
- // -> The responsible value is InstallData.isMaskedCompleteUninstallation
- data.setMaskedCompleteUninstallation(true);
- ModuleCtrl.checkMaskedCompleteUninstallation(packageData, data);
-
- // If this is not a complete uninstallation, at least one language
- // module or one application module has to be installed.
-
- if ( ! data.isMaskedCompleteUninstallation() ) {
-
- data.setApplicationModulesChecked(false);
- ModuleCtrl.checkApplicationModulesUninstall(packageData, data);
-
- if ( ! data.applicationModulesChecked() ) {
-
- String message = ResourceManager.getString("String_All_Applicationcomponents_Selected_1") + "\n" +
- ResourceManager.getString("String_All_Applicationcomponents_Selected_2");
- String title = ResourceManager.getString("String_Change_Selection");
- Informer.showInfoMessage(message, title);
- repeatDialog = true;
- } else {
- if ( data.isMultiLingual()) {
- data.setLanguageModulesChecked(false);
- ModuleCtrl.checkLanguageModulesUninstall(packageData, data);
-
- if ( ! data.languageModulesChecked() ) {
-
- String message = ResourceManager.getString("String_All_Languagecomponents_Selected_1") + "\n" +
- ResourceManager.getString("String_All_Languagecomponents_Selected_2");
- String title = ResourceManager.getString("String_Change_Selection");
- Informer.showInfoMessage(message, title);
- repeatDialog = true;
- }
- }
- }
- }
- }
- } else { // the back button was pressed
- // Saving typical selection state values (always if back button is pressed!).
- ModuleCtrl.saveCustomSelectionStates(packageData);
- data.setCustomSelectionStateSaved(true);
- }
-
- return repeatDialog;
- }
-
-}
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationTypeCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationTypeCtrl.java
deleted file mode 100755
index e24f385..0000000
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationTypeCtrl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.setup.Controller;
-
-import org.openoffice.setup.InstallData;
-import org.openoffice.setup.PanelController;
-import org.openoffice.setup.Panel.ChooseUninstallationType;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import org.openoffice.setup.SetupData.PackageDescription;
-import org.openoffice.setup.SetupData.SetupDataProvider;
-import org.openoffice.setup.Util.ModuleCtrl;
-
-public class ChooseUninstallationTypeCtrl extends PanelController implements ActionListener {
-
- private String helpFile;
-
- public ChooseUninstallationTypeCtrl() {
- super("ChooseUninstallationType", new ChooseUninstallationType());
- helpFile = "String_Helpfile_ChooseUninstallationType";
- }
-
- public String getNext() {
-
- InstallData data = InstallData.getInstance();
-
- if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) {
- return new String("ChooseUninstallationComponents");
- } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
- return new String("UninstallationImminent");
- } else {
- System.err.println("Error: Unknown uninstallation type!" );
- return new String("Error");
- }
- }
-
- public String getPrevious() {
- return new String("UninstallationPrologue");
- }
-
- public void beforeShow() {
-
- InstallData data = InstallData.getInstance();
-
- ChooseUninstallationType panel = (ChooseUninstallationType)getPanel();
- panel.setActionListener((ChooseUninstallationTypeCtrl)this);
- panel.setCompleteActionCommand(data.getTypicalActionCommand());
- panel.setCustomActionCommand(data.getCustomActionCommand());
- }
-
- public boolean afterShow(boolean nextButtonPressed) {
- boolean repeatDialog = false;
-
- ChooseUninstallationType panel = (ChooseUninstallationType)getPanel();
- panel.removeActionListener((ChooseUninstallationTypeCtrl)this);
-
- if ( nextButtonPressed ) {
-
- InstallData data = InstallData.getInstance();
- PackageDescription packageData = SetupDataProvider.getPackageDescription();
-
- // Typical uninstallation type
- if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
- // If typical selection state values have been saved before,
- // it is now time to restore them
-
- if ( data.typicalSelectionStateSaved()) {
- ModuleCtrl.restoreTypicalSelectionStates(packageData);
- }
- }
-
- // Custom uninstallation type
- if ( data.getInstallationType().equals(data.getCustomActionCommand())) {
- // Saving typical selection state values, if they are not already saved.
- if ( ! data.typicalSelectionStateSaved()) {
- ModuleCtrl.saveTypicalSelectionStates(packageData);
- data.setTypicalSelectionStateSaved(true);
- }
-
- // Setting custom selection state values, if they have been saved before.
- if ( data.customSelectionStateSaved() ) {
- ModuleCtrl.restoreCustomSelectionStates(packageData);
- }
- }
- }
-
- return repeatDialog;
- }
-
- public void actionPerformed(ActionEvent evt) {
-
- InstallData data = InstallData.getInstance();
-
- if (evt.getActionCommand().equals(data.getTypicalActionCommand())) {
- data.setInstallationType(data.getTypicalActionCommand());
- // System.err.println("Setting uninstallation type: " + data.getTypicalActionCommand());
- } else if (evt.getActionCommand().equals(data.getCustomActionCommand())) {
- data.setInstallationType(data.getCustomActionCommand());
- // System.err.println("Setting uninstallation type: " + data.getCustomActionCommand());
- }
-
- }
-
- public final String getHelpFileName () {
- return this.helpFile;
- }
-
-}
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationCompletedCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationCompletedCtrl.java
deleted file mode 100755
index 3934296..0000000
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationCompletedCtrl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.setup.Controller;
-
-import org.openoffice.setup.InstallData;
-import org.openoffice.setup.Installer.Installer;
-import org.openoffice.setup.Installer.InstallerFactory;
-import org.openoffice.setup.PanelController;
-import org.openoffice.setup.Panel.installationCompleted;
-import org.openoffice.setup.ResourceManager;
-import org.openoffice.setup.SetupData.PackageDescription;
-import org.openoffice.setup.SetupData.ProductDescription;
-import org.openoffice.setup.SetupData.SetupDataProvider;
-import org.openoffice.setup.Util.InfoCtrl;
-
-public class InstallationCompletedCtrl extends PanelController {
-
- private String helpFile;
- private String mDialogText;
- private String htmlInfoText;
-
- public InstallationCompletedCtrl() {
- super("InstallationCompleted", new installationCompleted());
- helpFile = "String_Helpfile_InstallationCompleted";
- }
-
- public void beforeShow() {
- InstallData installData = InstallData.getInstance();
- ProductDescription productData = SetupDataProvider.getProductDescription();
-
- getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_PREVIOUS);
- getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_CANCEL);
- getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_HELP);
- getSetupFrame().removeButtonIcon(getSetupFrame().BUTTON_NEXT);
- getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_NEXT);
-
- installationCompleted panel = (installationCompleted)getPanel();
- panel.setDetailsButtonActionCommand(getSetupFrame().ACTION_DETAILS);
- panel.addDetailsButtonActionListener(getSetupFrame().getSetupActionListener());
-
- if ( installData.isAbortedInstallation() ) {
- String titleText = ResourceManager.getString("String_InstallationCompleted1_Abort");
- panel.setTitleText(titleText);
- String dialogText = ResourceManager.getString("String_InstallationCompleted2_Abort");
- panel.setDialogText(dialogText);
- } else if ( installData.isErrorInstallation() ) {
- String titleText = ResourceManager.getString("String_InstallationCompleted1_Error");
- panel.setTitleText(titleText);
- String dialogText = ResourceManager.getString("String_InstallationCompleted2_Error");
- panel.setDialogText(dialogText);
- }
-
- htmlInfoText = InfoCtrl.setHtmlFrame("header", htmlInfoText);
- htmlInfoText = InfoCtrl.setInstallLogInfoText(productData, htmlInfoText);
- htmlInfoText = InfoCtrl.setHtmlFrame("end", htmlInfoText);
- }
-
- public void duringShow() {
- Thread t = new Thread() {
- public void run() {
- PackageDescription packageData = SetupDataProvider.getPackageDescription();
- Installer installer = InstallerFactory.getInstance();
- installer.postInstall(packageData);
- }
- };
-
- t.start();
- }
-
- public String getNext() {
- return null;
- }
-
- public String getPrevious() {
- return null;
- }
-
- public final String getHelpFileName () {
- return this.helpFile;
- }
-
- public String getDialogText() {
- return htmlInfoText;
- }
-
-}
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java
deleted file mode 100755
index b2629f6..0000000
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.setup.Controller;
-
-import org.openoffice.setup.InstallData;
-import org.openoffice.setup.PanelController;
-import org.openoffice.setup.Panel.InstallationImminent;
-import org.openoffice.setup.ResourceManager;
-import org.openoffice.setup.SetupData.PackageDescription;
-import org.openoffice.setup.SetupData.ProductDescription;
-import org.openoffice.setup.SetupData.SetupDataProvider;
-import org.openoffice.setup.Util.Dumper;
-import org.openoffice.setup.Util.InfoCtrl;
-import org.openoffice.setup.Util.Informer;
-import org.openoffice.setup.Util.LogManager;
-import org.openoffice.setup.Util.ModuleCtrl;
-import java.util.Vector;
-
-public class InstallationImminentCtrl extends PanelController {
-
- private String helpFile;
- private String htmlInfoText = "";
-
- public InstallationImminentCtrl() {
- super("InstallationImminent", new InstallationImminent());
- helpFile = "String_Helpfile_InstallationImminent";
- }
-
- public String getNext() {
- return new String("InstallationOngoing");
- }
-
- public String getPrevious() {
-
- InstallData data = InstallData.getInstance();
-
- if ( data.isRootInstallation() ) {
- if ( data.olderVersionExists() ) {
- if ( data.hideEula() ) {
- return new String("Prologue");
- } else {
- return new String("AcceptLicense");
- }
- } else if ( data.sameVersionExists() ) {
- return new String("ChooseComponents");
- } else {
- if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) {
- return new String("ChooseComponents");
- } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
- return new String("ChooseInstallationType");
- } else {
- System.err.println("Error: Unknown installation type!" );
- return new String("Error");
- }
- }
- } else {
- if ( data.olderVersionExists() ) {
- return new String("ChooseDirectory");
- } else if ( data.sameVersionExists() ) {
- return new String("ChooseComponents");
- } else {
- if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) {
- return new String("ChooseComponents");
- } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
- return new String("ChooseInstallationType");
- } else {
- System.err.println("Error: Unknown installation type!" );
- return new String("Error");
- }
- }
- }
- }
-
- public final String getHelpFileName () {
- return this.helpFile;
- }
-
- public void beforeShow() {
- String StringInstall = ResourceManager.getString("String_Install");
- getSetupFrame().setButtonText(StringInstall, getSetupFrame().BUTTON_NEXT);
-
- ProductDescription productData = SetupDataProvider.getProductDescription();
- PackageDescription packageData = SetupDataProvider.getPackageDescription();
- // Dumper.dumpPackageSettings(packageData);
- htmlInfoText = InfoCtrl.setHtmlFrame("header", htmlInfoText);
- htmlInfoText = InfoCtrl.setReadyToInstallInfoText(productData, htmlInfoText);
- htmlInfoText = InfoCtrl.setReadyToInstallInfoText(packageData, htmlInfoText);
- htmlInfoText = InfoCtrl.setHtmlFrame("end", htmlInfoText);
-
- InstallationImminent panel = (InstallationImminent)getPanel();
- panel.setInfoText(htmlInfoText);
- panel.setCaretPosition();
-
- // Update mode
- InstallData data = InstallData.getInstance();
- if ( data.olderVersionExists() ) {
- String dialogTitle = ResourceManager.getString("String_InstallationImminent1_Update");
- panel.setTitleText(dialogTitle);
- }
- }
-
- public void duringShow() {
- InstallationImminent panel = (InstallationImminent)getPanel();
- panel.setTabOrder();
- }
-
- public boolean afterShow(boolean nextButtonPressed) {
- boolean repeatDialog = false;
-
- if ( nextButtonPressed ) {
-
- InstallData data = InstallData.getInstance();
-
- // determining the packagePath
- if ( data.getPackagePath() != null ) {
- String log = "<b>Packages path:</b> " + data.getPackagePath() + "<br>";
- LogManager.addLogfileComment(log);
- } else {
- String message = ResourceManager.getString("String_InstallationOngoing_PackagePath_Not_Found");
- String title = ResourceManager.getString("String_Error");
- Informer.showErrorMessage(message, title);
- String log = "<b>Error: No path for packages exists!</b><br>";
- LogManager.addLogfileComment(log);
- repeatDialog = true;
- }
- }
-
- return repeatDialog;
- }
-}
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java
deleted file mode 100755
index 2cdaa16..0000000
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.setup.Controller;
-
-import org.openoffice.setup.InstallData;
-import org.openoffice.setup.Installer.Installer;
-import org.openoffice.setup.Installer.InstallerFactory;
-import org.openoffice.setup.PanelController;
-import org.openoffice.setup.Panel.InstallationOngoing;
-import org.openoffice.setup.ResourceManager;
-import org.openoffice.setup.SetupData.PackageDescription;
-import org.openoffice.setup.Util.LogManager;
-import org.openoffice.setup.Util.InfoDir;
-import org.openoffice.setup.Util.PackageCollector;
-import org.openoffice.setup.Util.SystemManager;
-import java.io.File;
-import java.util.Vector;
-
-public class InstallationOngoingCtrl extends PanelController {
-
- private String helpFile;
- private String nextDialog = new String("InstallationCompleted");
- private String previousDialog = new String("InstallationImminent");
-
- public InstallationOngoingCtrl() {
- super("InstallationOngoing", new InstallationOngoing());
- helpFile = "String_Helpfile_InstallationOngoing";
- }
-
- public String getNext() {
- return new String("InstallationCompleted");
- }
-
- public String getPrevious() {
- return new String("InstallationImminent");
- }
-
- public final String getHelpFileName () {
- return this.helpFile;
- }
-
- public void beforeShow() {
- getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_PREVIOUS);
- getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_NEXT);
- getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_CANCEL);
- getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_HELP);
-
- InstallationOngoing panel = (InstallationOngoing)getPanel();
- panel.setStopButtonActionCommand(getSetupFrame().ACTION_STOP);
- panel.addStopButtonActionListener(getSetupFrame().getSetupActionListener());
-
- // creating sorted list of packages to install
- InstallData installData = InstallData.getInstance();
- Vector installPackages = installData.getInstallPackages();
-
- Vector sortedPackages = new Vector();
- PackageCollector.sortPackages(installPackages, sortedPackages, "install");
- installData.setInstallPackages(sortedPackages);
-
- if ( installData.isMajorUpgrade() ) {
- // PackageCollector.findOldPackages(installData);
- // Sorting for correct order of uninstallation
- Vector sortedUninstallPackages = new Vector();
- PackageCollector.sortPackages(installData.getOldPackages(), sortedUninstallPackages, "uninstall");
- installData.setOldPackages(sortedUninstallPackages);
- }
-
- Installer installer = InstallerFactory.getInstance();
- installer.preInstallationOngoing();
- }
-
- public void duringShow() {
-
- Thread t = new Thread() {
-
- InstallData installData = InstallData.getInstance();
- InstallationOngoing panel = (InstallationOngoing)getPanel();
- Vector installPackages = installData.getInstallPackages();
- Vector removePackages = installData.getOldPackages();
- private Vector installedPackages = new Vector();
-
- public void run() {
- LogManager.setCommandsHeaderLine("Installation");
- Installer installer = InstallerFactory.getInstance();
- String titleText = ResourceManager.getString("String_InstallationOngoing1");
- panel.setTitle(titleText);
-
- for (int i = 0; i < installPackages.size(); i++) {
- PackageDescription packageData = (PackageDescription) installPackages.get(i);
- int progress = java.lang.Math.round((100*(i+1))/installPackages.size());
- panel.setProgressValue(progress);
- panel.setProgressText(packageData.getPackageName());
-
- // Creating an upgrade process for Solaris packages
- if ( installData.getOSType().equalsIgnoreCase("SunOS") ) {
- if ( installer.isPackageInstalled(packageData, installData) ) {
- if ( installer.isInstalledPackageOlder(packageData, installData) ) {
- packageData.setIgnoreDependsForUninstall(true);
- installer.uninstallPackage(packageData);
- } else {
- continue; // no downgrading
- }
- }
- }
-
- installer.installPackage(packageData);
- installedPackages.add(packageData);
-
- if ( installData.isAbortedInstallation() ) {
- break;
- }
- }
-
- if ( installData.isMajorUpgrade() ) {
- for (int i = 0; i < removePackages.size(); i++) {
- PackageDescription packageData = (PackageDescription) removePackages.get(i);
- installer.uninstallPackage(packageData);
- }
- }
-
- if ( installData.isAbortedInstallation() ) {
- // undoing the installation
- LogManager.setCommandsHeaderLine("Installation aborted!");
- titleText = ResourceManager.getString("String_UninstallationOngoing1");
- panel.setTitle(titleText);
- panel.setStopButtonEnabled(false);
-
- LogManager.setCommandsHeaderLine("Uninstallation");
-
- for (int i = 0; i < installedPackages.size(); i++) {
- PackageDescription packageData = (PackageDescription) installedPackages.get(i);
- int progress = java.lang.Math.round(100/installedPackages.size()) * (i+1);
- panel.setProgressValue(progress);
- panel.setProgressText(packageData.getPackageName());
- installer.uninstallPackage(packageData);
- }
-
- // removing already created helper files (admin files)
- Vector removeFiles = installData.getRemoveFiles();
- for (int i = 0; i < removeFiles.size(); i++) {
- File removeFile = new File((String)removeFiles.get(i));
- SystemManager.deleteFile(removeFile);
- }
- }
-
- installer.postInstallationOngoing();
-
- String next = getNext();
- getSetupFrame().setCurrentPanel(next, false, true);
- }
- };
-
- t.start();
- }
-
- public boolean afterShow(boolean nextButtonPressed) {
- boolean repeatDialog = false;
- getSetupFrame().setButtonEnabled(true, getSetupFrame().BUTTON_PREVIOUS);
- getSetupFrame().setButtonEnabled(true, getSetupFrame().BUTTON_NEXT);
- getSetupFrame().setButtonEnabled(true, getSetupFrame().BUTTON_CANCEL);
-
- InstallData installData = InstallData.getInstance();
- if ( ! installData.isAbortedInstallation() ) {
- InfoDir.prepareUninstallation();
- }
-
- return repeatDialog;
- }
-
-}
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java
deleted file mode 100755
index 0d3fc1f..0000000
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.setup.Controller;
-
-import org.openoffice.setup.InstallData;
-import org.openoffice.setup.Installer.Installer;
-import org.openoffice.setup.Installer.InstallerFactory;
-import org.openoffice.setup.PanelController;
-import org.openoffice.setup.Panel.Prologue;
-import org.openoffice.setup.SetupData.PackageDescription;
-import org.openoffice.setup.SetupData.SetupDataProvider;
-import org.openoffice.setup.Util.Controller;
-import org.openoffice.setup.Util.Dumper;
-import org.openoffice.setup.Util.ModuleCtrl;
-import org.openoffice.setup.Util.SystemManager;
-
-public class PrologueCtrl extends PanelController {
-
- private String helpFile;
-
- public PrologueCtrl() {
- super("Prologue", new Prologue());
- helpFile = "String_Helpfile_Prologue";
- }
-
- // public void beforeShow() {
- public void duringShow() {
- getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_PREVIOUS);
-
- Thread t = new Thread() {
- public void run() {
- InstallData installData = InstallData.getInstance();
- if ( ! installData.preInstallDone() ) {
- getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_NEXT);
-
- Controller.checkPackagePathExistence(installData);
- Controller.checkPackageFormat(installData);
-
- if (( installData.getOSType().equalsIgnoreCase("SunOS") ) && ( installData.isMultiLingual() )) {
- Controller.collectSystemLanguages(installData);
- }
-
- PackageDescription packageData = SetupDataProvider.getPackageDescription();
- Installer installer = InstallerFactory.getInstance();
- installer.preInstall(packageData);
-
- installData.setPreInstallDone(true);
-
- if ( SystemManager.logModuleStates() ) {
- installData.setLogModuleStates(true);
- }
-
- if ( installData.logModuleStates() ) {
- Dumper.logModuleStates(packageData, "Prologue Dialog");
- }
-
- if (( installData.getOSType().equalsIgnoreCase("SunOS") ) && ( installData.isMultiLingual() )) {
- ModuleCtrl.checkLanguagesPackages(packageData, installData);
-
- // int count = installData.getPreselectedLanguages();
- // System.err.println("Number of preselected language packages: " + count);
-
- if ( installData.getPreselectedLanguages() == 0 ) {
- // Something misterious happened. Setting all languages again.
- ModuleCtrl.setLanguagesPackages(packageData);
- }
-
- if ( installData.logModuleStates() ) {
- Dumper.logModuleStates(packageData, "Prologue Dialog Language Selection");
- }
- }
-
- if ( ! installData.isMultiLingual() ) {
- ModuleCtrl.setHiddenLanguageModuleDefaultSettings(packageData);
-
- if ( installData.logModuleStates() ) {
- Dumper.logModuleStates(packageData, "after setHiddenLanguageModuleDefaultSettings");
- }
- }
-
- if (( installData.isRootInstallation() ) && ( installData.getOSType().equalsIgnoreCase("SunOS") )) {
- // Check, if root has write access in /usr and /etc .
- // In sparse zones with imported directories this is not always the case.
- if ( Controller.reducedRootWritePrivileges() ) {
- ModuleCtrl.setIgnoreNonRelocatablePackages(packageData);
- }
-
- if ( installData.logModuleStates() ) {
- Dumper.logModuleStates(packageData, "after setIgnoreNonRelocatablePackages");
- }
- }
-
- if ( installData.isRootInstallation() ) {
-
- // Setting installation directory!
- String dir = "/";
- installData.setInstallDir(dir);
- installData.setInstallDefaultDir(installData.getDefaultDir());
-
- Controller.checkForNewerVersion(installData);
-
- // Check Write privileges in installation directory (installData.getInstallDefaultDir())
- // If the directory exists, is has to be tested, whether the user has write access
- dir = installData.getInstallDefaultDir();
-
- if ( SystemManager.exists_directory(dir) ) {
- if ( ! Controller.createdSubDirectory(dir) ) {
- System.err.println("ERROR: No write privileges inside directory: " + dir);
- System.exit(1);
- }
- }
-
- // If the directory does not exist, is has to be tested, whether the user can create it
- if ( ! SystemManager.exists_directory(dir)) {
- if ( ! Controller.createdDirectory(dir) ) {
- System.err.println("ERROR: No privileges to create directory: " + dir);
- System.exit(1);
- }
- }
-
- // Setting macro
- SetupDataProvider.setNewMacro("DIR", dir); // important for string replacement
-
- // Calculate available disc space
- int discSpace = SystemManager.calculateDiscSpace(dir);
- installData.setAvailableDiscSpace(discSpace);
-
- if ( ! installData.databaseAnalyzed()) {
- ModuleCtrl.defaultDatabaseAnalysis(installData);
- installData.setDatabaseAnalyzed(true);
- }
- }
-
- getSetupFrame().setButtonEnabled(true, getSetupFrame().BUTTON_NEXT);
- }
- }
- };
- t.start();
- }
-
- public boolean afterShow(boolean nextButtonPressed) {
- boolean repeatDialog = false;
- getSetupFrame().setButtonEnabled(true, getSetupFrame().BUTTON_PREVIOUS);
- return repeatDialog;
- }
-
- public String getNext() {
- InstallData data = InstallData.getInstance();
-
- if ( data.hideEula() ) {
- if ( data.isRootInstallation() ) {
- if ( data.olderVersionExists() ) {
- return new String("InstallationImminent");
- } else if ( data.sameVersionExists() ) {
- return new String("ChooseComponents");
- } else {
- return new String("ChooseInstallationType");
- }
- } else {
- return new String("ChooseDirectory");
- }
- } else {
- return new String("AcceptLicense");
- }
- }
-
- public String getPrevious() {
- return null;
- }
-
- public final String getHelpFileName() {
- return this.helpFile;
- }
-
-}
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java
deleted file mode 100755
index cb895dc..0000000
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.setup.Controller;
-
-import org.openoffice.setup.InstallData;
-import org.openoffice.setup.PanelController;
-import org.openoffice.setup.Panel.UninstallationCompleted;
-import org.openoffice.setup.ResourceManager;
-import org.openoffice.setup.SetupData.ProductDescription;
-import org.openoffice.setup.SetupData.SetupDataProvider;
-import org.openoffice.setup.Util.InfoCtrl;
-import org.openoffice.setup.Util.LogManager;
-import java.util.Vector;
-
-public class UninstallationCompletedCtrl extends PanelController {
-
- private String helpFile;
- private String mDialogText;
- private String htmlInfoText;
-
- public UninstallationCompletedCtrl() {
- super("UninstallationCompleted", new UninstallationCompleted());
- helpFile = "String_Helpfile_UninstallationCompleted";
- }
-
- public void beforeShow() {
- InstallData installData = InstallData.getInstance();
- ProductDescription productData = SetupDataProvider.getProductDescription();
-
- getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_PREVIOUS);
- getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_CANCEL);
- getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_HELP);
- getSetupFrame().removeButtonIcon(getSetupFrame().BUTTON_NEXT);
- getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_NEXT);
-
- UninstallationCompleted panel = (UninstallationCompleted)getPanel();
- panel.setDetailsButtonActionCommand(getSetupFrame().ACTION_DETAILS);
- panel.addDetailsButtonActionListener(getSetupFrame().getSetupActionListener());
-
- if (( installData.isCustomInstallation() ) && ( ! installData.isMaskedCompleteUninstallation() )) {
- String dialogText = ResourceManager.getString("String_UninstallationCompleted2_Partial");
- panel.setDialogText(dialogText);
- }
-
- if ( installData.isAbortedInstallation() ) {
- String titleText = ResourceManager.getString("String_UninstallationCompleted1_Abort");
- panel.setTitleText(titleText);
- String dialogText = ResourceManager.getString("String_UninstallationCompleted2_Abort");
- panel.setDialogText(dialogText);
- } else if ( installData.isErrorInstallation() ) {
- String titleText = ResourceManager.getString("String_UninstallationCompleted1_Error");
- panel.setTitleText(titleText);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list