Changeset 17514 for release-kits


Ignore:
Timestamp:
2008-10-10T09:05:07+13:00 (16 years ago)
Author:
oranfry
Message:

changes to the way ant-installer loads and reloads the language packs, and a new attribute to the select input which triggers it to change the language to the input value

Location:
release-kits/shared/ant-installer
Files:
46 edited

Legend:

Unmodified
Added
Removed

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/Installer.java

    r14982 r17514  
    2929import org.tp23.antinstaller.runtime.exe.ExecuteRunnerFilter.AbortException;
    3030
    31 
    32 
    3331/**
    3432 * <p>Object representation of the Installer element in the config. </p>
    … …  
    4341
    4442    // i18n support
    45     private static ResourceBundle langPack = null;
    46     static{
     43    public static ResourceBundle langPack = null;
     44    static {
    4745        try {
    4846            langPack = ResourceBundle.getBundle("resources.LanguagePack");
    4947        } catch (MissingResourceException e) {
    50             // ignore, signifies no lang packs installed 
     48            // ignore, signifies no lang packs installed
    5149        }
    5250    }

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/antmod/FeedbackListener.java

    r15210 r17514  
    2121import org.apache.tools.ant.BuildListener;
    2222import org.tp23.antinstaller.renderer.swing.SwingInstallerContext;
     23import org.tp23.antinstaller.Installer;
     24
    2325/**
    2426 *
    … …  
    3537
    3638    private final SwingInstallerContext swingCtx;
    37     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    3839
    3940    public FeedbackListener(SwingInstallerContext swingCtx) {
    … …  
    5758     */
    5859    public void buildFinished(BuildEvent buildEvent) {
    59         swingCtx.provideAntFeedBack(res.getString("installFinished"));
     60        swingCtx.provideAntFeedBack(org.tp23.antinstaller.Installer.langPack.getString("installFinished"));
    6061        swingCtx.buildFinished(buildEvent);
    6162    }
    … …  
    6768     */
    6869    public void targetStarted(BuildEvent buildEvent) {
    69         swingCtx.provideAntFeedBack(res.getString("running")+buildEvent.getTarget());
     70        swingCtx.provideAntFeedBack(org.tp23.antinstaller.Installer.langPack.getString("running")+buildEvent.getTarget());
    7071        swingCtx.targetStarted(buildEvent);
    7172    }

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/AppRootInput.java

    r15210 r17514  
    3636    extends DirectoryInput {
    3737
    38     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    39 
    40 
    4138    private String checkFile1;
    4239    private String checkFile2;
    … …  
    6360//      }
    6461        if(!file.isDirectory()){
    65             mr.printMessage(res.getString("dirNotExist")+":"+file.getAbsolutePath());
     62            mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("dirNotExist")+":"+file.getAbsolutePath());
    6663            return false;
    6764        }
    … …  
    9289    private void reportMissing(MessageRenderer mr,File missing){
    9390        StringBuffer message = new StringBuffer();
    94         message.append(res.getString("appRootInvalid"));
     91        message.append(org.tp23.antinstaller.Installer.langPack.getString("appRootInvalid"));
    9592        message.append(System.getProperty("line.separator"));
    9693        if(missing.isDirectory()){
    97             message.append(res.getString("dirNotExist"));
     94            message.append(org.tp23.antinstaller.Installer.langPack.getString("dirNotExist"));
    9895        }
    9996        else{
    100             message.append(res.getString("fileNotExist"));
     97            message.append(org.tp23.antinstaller.Installer.langPack.getString("fileNotExist"));
    10198        }
    10299        message.append(":");

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/DirectoryInput.java

    r15210 r17514  
    3434    extends OSSpecific {
    3535
    36     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    37 
    38 
    3936    private boolean abort = false;
    4037    private String create;
    … …  
    5451        if( "".equals(selectedName) ){
    5552            if( InputField.isTrue(create) || InputField.isTrue(checkExists) ){
    56                 mr.printMessage(res.getString("dirNotExist"));
     53                mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("dirNotExist"));
    5754                return false;
    5855            }
    … …  
    6562            if(!file.exists()){
    6663                try {
    67                     if(mr.prompt(res.getString("dirNotExistCreate") + "\n" + file.getAbsolutePath())){
     64                    if(mr.prompt(org.tp23.antinstaller.Installer.langPack.getString("dirNotExistCreate") + "\n" + file.getAbsolutePath())){
    6865                        boolean ok = file.mkdirs();
    6966                        if(!ok){
    70                             mr.printMessage(res.getString("dirNotCreated"));
     67                            mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("dirNotCreated"));
    7168                        }
    7269                    }
    7370                }
    7471                catch (Exception ex) {
    75                     mr.printMessage(res.getString("canNotCreateFile") + "\n" + file.getAbsolutePath());
     72                    mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("canNotCreateFile") + "\n" + file.getAbsolutePath());
    7673                    //FIXME should not throw here, should do something better so users on linux can chmod where necessary
    7774                    // then try again
    78                     throw new ValidationException(res.getString("canNotCreateFile"),ex);
     75                    throw new ValidationException(org.tp23.antinstaller.Installer.langPack.getString("canNotCreateFile"),ex);
    7976                   
    8077                }
    … …  
    8683//          }
    8784            if(!file.exists() || !file.isDirectory()){
    88                 mr.printMessage(res.getString("dirNotExist") + "\n" + file.getAbsolutePath());
     85                mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("dirNotExist") + "\n" + file.getAbsolutePath());
    8986                return false;
    9087            }

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/InputField.java

    r14982 r17514  
    1818import java.util.MissingResourceException;
    1919import java.util.ResourceBundle;
     20import org.tp23.antinstaller.Installer;
    2021
    2122/**
    … …  
    2930    extends OutputField {
    3031
    31     // i18n support
    32     private static ResourceBundle langPack = null;
    33     static{
    34         try {
    35             langPack = ResourceBundle.getBundle("resources.LanguagePack");
    36         } catch (MissingResourceException e) {
    37             // ignore, signifies no lang packs installed 
    38         }
    39     }
    40 
    4132    private String property;
    4233    protected String defaultValue;
    … …  
    4637     */
    4738    private boolean editted = false;
     39    private Installer i = new Installer();
    4840
    4941    public InputField() {
    … …  
    5143
    5244    public String getDisplayText() {
    53         if(langPack != null){
    54             return langPack.getString(getProperty() + ".displayText");
     45        if( org.tp23.antinstaller.Installer.langPack != null){
     46            return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + ".displayText");
    5547        }
    5648        return displayText;
    5749    }
    5850    public String getExplanatoryText() {
    59         if(langPack != null){
     51        if( org.tp23.antinstaller.Installer.langPack != null ) {
    6052            try {
    61                 return langPack.getString(getProperty() + ".explanatoryText");
     53                return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + ".explanatoryText");
    6254            } catch (MissingResourceException e) {
    6355                // ignore and return null explanatoryText is optional

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/LargeSelectInput.java

    r14982 r17514  
    3737    extends InputField{
    3838
    39     // i18n support
    40     private static ResourceBundle langPack = null;
    4139    private int optionIdx = 0;
    42     static{
    43         try {
    44             langPack = ResourceBundle.getBundle("resources.LanguagePack");
    45         } catch (MissingResourceException e) {
    46             // ignore, signifies no lang packs installed 
    47         }
    48     }
    4940
    5041    private LargeSelectInput.Option[] options;
    … …  
    7465        }
    7566        public String getText() {
    76             if(langPack != null){
    77                 return langPack.getString(getProperty() + "." + idx +".displayText");
     67            if( org.tp23.antinstaller.Installer.langPack != null ) {
     68                return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + "." + idx +".displayText");
    7869            }
    7970            return text;

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/OutputField.java

    r14982 r17514  
    2929public abstract class OutputField {
    3030
    31     // i18n support
    32     private static ResourceBundle langPack = null;
    3331    private static int commentIdx = 0;
    34     static{
    35         try {
    36             langPack = ResourceBundle.getBundle("resources.LanguagePack");
    37         } catch (MissingResourceException e) {
    38             // ignore, signifies no lang packs installed
    39         }
    40     }
    4132   
    4233    /* This is redundant unless language packs are used
    … …  
    6556
    6657    public String getDisplayText() {
    67         if(langPack != null){
    68             return langPack.getString(getName() + ".displayText");
     58        if( org.tp23.antinstaller.Installer.langPack != null ) {
     59            return org.tp23.antinstaller.Installer.langPack.getString(getName() + ".displayText");
    6960        }
    7061        return displayText;
    … …  
    7667
    7768    public String getExplanatoryText() {
    78         if(langPack != null){
     69        if( org.tp23.antinstaller.Installer.langPack != null ) {
    7970            try {
    80                 return langPack.getString(getName() + ".explanatoryText");
     71                return org.tp23.antinstaller.Installer.langPack.getString(getName() + ".explanatoryText");
    8172            } catch (MissingResourceException e) {
    8273                // ignore and return null explanatoryText is optional

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/SelectInput.java

    r14982 r17514  
    1919import java.util.MissingResourceException;
    2020import java.util.ResourceBundle;
    21 
     21import java.util.Locale;
    2222import org.tp23.antinstaller.InstallerContext;
    2323import org.tp23.antinstaller.ValidationException;
    24 
     24import org.tp23.antinstaller.Installer;
    2525
    2626
    … …  
    3535 */
    3636public class SelectInput
    37     extends InputField{
     37    extends InputField {
    3838
    39     // i18n support
    40     private static ResourceBundle langPack = null;
    4139    private int optionIdx = 0;
    42     static{
    43         try {
    44             langPack = ResourceBundle.getBundle("resources.LanguagePack");
    45         } catch (MissingResourceException e) {
    46             // ignore, signifies no lang packs installed 
    47         }
     40    private SelectInput.Option[] options;
     41    private boolean useAsLocale = false;
     42
     43    public SelectInput() {
    4844    }
    4945
    50     private SelectInput.Option[] options;
    51 
    52     public SelectInput() {
     46    public void setUseAsLocale(boolean ual) {
     47        this.useAsLocale = ual;
    5348    }
    5449
    … …  
    7570        }
    7671        public String getText() {
    77             if(langPack != null){
    78                 return langPack.getString(getProperty() + "." + idx +".displayText");
     72            if( org.tp23.antinstaller.Installer.langPack != null ){
     73                return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + "." + idx +".displayText");
    7974            }
    8075            return text;
    … …  
    8479    public void setValue(String value){
    8580        setInputResult(value);
     81        if ( useAsLocale ) {
     82            //expect something like 'en' or or something like 'en_US'
     83            if ( value.length() == 2 ) {
     84                Locale.setDefault( new Locale(value) );
     85            } else if ( value.length() == 5 ) {
     86                Locale.setDefault( new Locale(value.substring(0,2), value.substring(3,5)) );
     87            } //else { you're out of luck }
     88            org.tp23.antinstaller.Installer.langPack = ResourceBundle.getBundle("resources.LanguagePack");
     89        }
    8690    }
    8791   

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/page/Page.java

    r15211 r17514  
    4444public abstract class Page {
    4545
    46 //   i18n support
    47     private static ResourceBundle langPack = null;
    48     //private static ResourceBundle otherLangPack = null;
    49     static{
    50         try {
    51             langPack = ResourceBundle.getBundle("resources.LanguagePack");
    52         } catch (MissingResourceException e) {
    53             // ignore, signifies no lang packs installed 
    54         }
    55     }
    56    
    5746    //private static final int MAX_TARGETS = 10;
    5847    private String name;
    … …  
    7968
    8069    public String getDisplayText() {
    81         if( langPack != null){
    82             return langPack.getString("page." + getName() + ".displayText");
     70        if( org.tp23.antinstaller.Installer.langPack != null ) {
     71            return org.tp23.antinstaller.Installer.langPack.getString("page." + getName() + ".displayText");
    8372        }
    8473        return displayText;

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/ConfirmPasswordTextInputRenderer.java

    r15210 r17514  
    2020public class ConfirmPasswordTextInputRenderer extends PasswordTextInputRenderer{
    2121   
    22     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    23    
    2422    protected String getErrorMessage(){
    25         return res.getString("passwordsDoNotMatch");
     23        return org.tp23.antinstaller.Installer.langPack.getString("passwordsDoNotMatch");
    2624    }
    2725}

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/DateInputRenderer.java

    r15210 r17514  
    3333    extends SwingOutputFieldRenderer {
    3434
    35     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    36    
    3735    protected DateInput inputField;
    3836
    … …  
    9694    public void renderError() {
    9795        MessageRenderer mr = ctx.getMessageRenderer();
    98         mr.printMessage(res.getString("notCorrectFormat") + "\n\n " + inputField.getDateFormat());
     96        mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("notCorrectFormat") + "\n\n " + inputField.getDateFormat());
    9997        //fixed BUG1295944 mr.printMessage("The field is not of the correct format\n\n "+inputField.getDateFormat());
    10098        this.jTextField.requestFocus();

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/DirectoryInputRenderer.java

    r15211 r17514  
    3737public class DirectoryInputRenderer
    3838    extends SwingOutputFieldRenderer {
    39 
    40     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    4139
    4240    private static final String EMPTY_STRING = "";
    … …  
    119117            }
    120118        });
    121         browseButton.setText(res.getString("selectFolder"));
     119        browseButton.setText(org.tp23.antinstaller.Installer.langPack.getString("selectFolder"));
    122120        browseButton.setPreferredSize(new Dimension(150, SizeConstants.FIELD_HEIGHT));
    123121

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/FileInputRenderer.java

    r15210 r17514  
    3636public class FileInputRenderer
    3737    extends SwingOutputFieldRenderer {
    38 
    39     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    4038
    4139    protected FileInput inputField;
    … …  
    103101            }
    104102        });
    105         browseButton.setText(res.getString("selectFile"));
     103        browseButton.setText(org.tp23.antinstaller.Installer.langPack.getString("selectFile"));
    106104        browseButton.setPreferredSize(new Dimension(150, SizeConstants.FIELD_HEIGHT));
    107105
    … …  
    133131    public void renderError() {
    134132        MessageRenderer mr = ctx.getMessageRenderer();
    135         mr.printMessage(res.getString("fileNotExist"));
     133        mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("fileNotExist"));
    136134        this.jTextField.requestFocus();
    137135        this.jTextField.setForeground(Color.red);

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/LargeSelectInputRenderer.java

    r15210 r17514  
    3030public class LargeSelectInputRenderer
    3131    extends SwingOutputFieldRenderer {
    32 
    33     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    3432
    3533    protected LargeSelectInput inputField;
    … …  
    111109     */
    112110    public void renderError() {
    113         ctx.getMessageRenderer().printMessage(res.getString("notValidSelection"));
     111        ctx.getMessageRenderer().printMessage(org.tp23.antinstaller.Installer.langPack.getString("notValidSelection"));
    114112        optionCombo.requestFocus();
    115113    }

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/LicensePageRenderer.java

    r15210 r17514  
    4242public class LicensePageRenderer
    4343    extends SwingPageRenderer {
    44 
    45     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    4644
    4745    private JTextArea licenseTextArea = new JTextArea();
    … …  
    9088        this.add(scrollPane, BorderLayout.CENTER);
    9189
    92         getNextButton().setText( res.getString( "license.next.text" ) );
     90        getNextButton().setText( org.tp23.antinstaller.Installer.langPack.getString( "license.next.text" ) );
    9391        getNextButton().setIcon(getImage("/resources/icons/ok.png"));
    94         getCancelButton().setText( res.getString( "license.cancel.text" ) );
     92        getCancelButton().setText( org.tp23.antinstaller.Installer.langPack.getString( "license.cancel.text" ) );
    9593
    9694    }

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/PasswordTextInputRenderer.java

    r15210 r17514  
    2727
    2828public class PasswordTextInputRenderer extends ValidatedTextInputRenderer{
    29    
    30     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    3129   
    3230    public PasswordTextInputRenderer() {
    … …  
    5957    }
    6058    protected String getErrorMessage(){
    61         return res.getString("notCorrectPasswordFormat") +
     59        return org.tp23.antinstaller.Installer.langPack.getString("notCorrectPasswordFormat") +
    6260                "\n\n e.g. " +
    6361                inputField.getDefaultValue();

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/ProgressPageRenderer.java

    r15210 r17514  
    4747    implements AntOutputRenderer {
    4848
    49     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    5049    private static final int MESSAGE_PANEL_HEIGHT = 30;
    5150
    … …  
    103102
    104103        //FIXME not i18n properly since the sentence is not correct ordering in German
    105         feedBackLabel.setText(res.getString("click")+" "+ctx.getInstaller().getFinishButtonText()+" "+res.getString("toContinue"));
     104        feedBackLabel.setText(org.tp23.antinstaller.Installer.langPack.getString("click")+" "+ctx.getInstaller().getFinishButtonText()+" "+org.tp23.antinstaller.Installer.langPack.getString("toContinue"));
    106105        feedBackLabel.setBounds(new Rectangle(115, 7, 272, 22));
    107         jToggleButton.setText(res.getString("showDetails"));
     106        jToggleButton.setText(org.tp23.antinstaller.Installer.langPack.getString("showDetails"));
    108107        jToggleButton.setBounds(new Rectangle(5, 7, 104, 22));
    109108        jToggleButton.setMargin(new Insets(0,0,0,0));
    … …  
    138137            contentPanel.add(progressScrollPane, BorderLayout.CENTER);
    139138        }
    140         jTabbedPane.add(res.getString("output"), outPanel);
    141         jTabbedPane.add(res.getString("errors"), errPanel);
     139        jTabbedPane.add(org.tp23.antinstaller.Installer.langPack.getString("output"), outPanel);
     140        jTabbedPane.add(org.tp23.antinstaller.Installer.langPack.getString("errors"), errPanel);
    142141//      if(OutputField.isTrue( ctx.getInstaller().getAntialiased())){
    143142//          outPanel.setAntialiased(true);

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/SelectInputRenderer.java

    r15210 r17514  
    3333    extends SwingOutputFieldRenderer {
    3434   
    35     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    36 
    3735    protected SelectInput inputField;
    3836
    … …  
    132130     */
    133131    public void renderError() {
    134         ctx.getMessageRenderer().printMessage(res.getString("notValidSelection"));
     132        ctx.getMessageRenderer().printMessage(org.tp23.antinstaller.Installer.langPack.getString("notValidSelection"));
    135133        // fixed BUG:1295944  ctx.getMessageRenderer().printMessage("Not a valid selection");
    136134        //optionGroup.requestFocus();

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/SwingPageRenderer.java

    r15210 r17514  
    4949    extends JPanel {
    5050   
    51     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    52 
    5351    // gui components
    5452    private BorderLayout borderLayout1 = new BorderLayout();
    … …  
    151149        controlPanel.add(nextButton, null);
    152150        controlPanel.add(finishButton, null);
    153         backButton.setText(res.getString("backButton"));// "<< Back");
    154         cancelButton.setText(res.getString("cancelButton"));// "Cancel");
    155         nextButton.setText(res.getString("nextButton"));// "Next >>");
     151        backButton.setText(org.tp23.antinstaller.Installer.langPack.getString("backButton"));// "<< Back");
     152        cancelButton.setText(org.tp23.antinstaller.Installer.langPack.getString("cancelButton"));// "Cancel");
     153        nextButton.setText(org.tp23.antinstaller.Installer.langPack.getString("nextButton"));// "Next >>");
    156154        finishButton.setText(ctx.getInstaller().getFinishButtonText());
    157155        finishButton.setEnabled(false);
    … …  
    223221        finishButton.addActionListener(new ActionListener(){
    224222            public void actionPerformed(ActionEvent e){
    225                 if(finishButton.getText().equals(res.getString("exit"))) {
     223                if(finishButton.getText().equals(org.tp23.antinstaller.Installer.langPack.getString("exit"))) {
    226224                    //TODO FindBugs this will prevent cleanup in FinalizerFilter
    227225                    System.exit(0);

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/ValidatedTextInputRenderer.java

    r15210 r17514  
    3232
    3333public class ValidatedTextInputRenderer extends SwingOutputFieldRenderer {
    34 
    35     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    3634
    3735    protected ValidatedTextInput inputField;
    … …  
    103101    public void renderError() {
    104102        MessageRenderer mr = ctx.getMessageRenderer();
    105         mr.printMessage(res.getString("notCorrectFormat") + "\n\n e.g. "
     103        mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("notCorrectFormat") + "\n\n e.g. "
    106104                + inputField.getDefaultValue());
    107105        this.jTextField.requestFocus();

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/AbstractTextPageRenderer.java

    r15353 r17514  
    8484    }
    8585
    86     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    87     private static final char[] affimativeChars = parseChars(res.getString("affirmativeChars"));
     86    private static final char[] affimativeChars = parseChars(org.tp23.antinstaller.Installer.langPack.getString("affirmativeChars"));
    8887   
    8988    private static char[] parseChars(String commaSeparated){

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/CheckboxInputRenderer.java

    r15353 r17514  
    3030    implements TextOutputFieldRenderer {
    3131
    32     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    33 
    3432    protected InstallerContext ctx;
    3533
    … …  
    4543        out.print(iField.getDisplayText());
    4644        out.print("   [");
    47         out.print(res.getString("_default_"));
     45        out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_"));
    4846        out.print(":");
    4947        out.print(iField.getDefaultValue());
    5048        out.print("]");
    5149        if (InputField.isTrue(iField.getForce())) {
    52             out.println(res.getString("_required_"));
     50            out.println(org.tp23.antinstaller.Installer.langPack.getString("_required_"));
    5351            iField.setValue(iField.getDefaultValue());
    5452            return;

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/ConditionalFieldRenderer.java

    r15353 r17514  
    3636public class ConditionalFieldRenderer implements TextOutputFieldRenderer
    3737{
    38     private static final ResourceBundleHelper res = new ResourceBundleHelper("resources.LanguagePack");
    3938
     39    private ResourceBundleHelper resHelper = new ResourceBundleHelper( "resources.LanguagePack" );
    4040    private InstallerContext context;
    4141
    … …  
    6464        catch( ConfigurationException configExc )
    6565        {
    66             throw new InstallException( res.getMessage( "invalid.conditional.expression", conditional.getIfProperty()),
     66            throw new InstallException( resHelper.getMessage( "invalid.conditional.expression", conditional.getIfProperty()),
    6767                                                        configExc );
    6868        }
    6969        catch( ClassNotFoundException clsNotFoundExc )
    7070        {
    71             throw new InstallException( res.getMessage( "text.render.not.found" ),
     71            throw new InstallException( resHelper.getMessage( "text.render.not.found" ),
    7272                                                        clsNotFoundExc );
    7373        }

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/ConfirmPasswordTextInputRenderer.java

    r15210 r17514  
    55public class ConfirmPasswordTextInputRenderer extends PasswordTextInputRenderer {
    66   
    7     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    8    
    97    protected String getErrorMessage(){
    10         return res.getString("passwordsDoNotMatch");
     8        return org.tp23.antinstaller.Installer.langPack.getString("passwordsDoNotMatch");
    119    }   
    1210

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/DateInputRenderer.java

    r15353 r17514  
    2929    implements TextOutputFieldRenderer {
    3030
    31     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    32 
    3331    protected InstallerContext ctx;
    3432    public DateInputRenderer() {
    … …  
    4442
    4543        out.print("   [");
    46         out.print(res.getString("_default_"));
     44        out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_"));
    4745        out.print(":");
    4846        out.print(iField.getDefaultValue());

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/DirectoryInputRenderer.java

    r15353 r17514  
    2828public class DirectoryInputRenderer implements TextOutputFieldRenderer {
    2929
    30     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    31 
    3230    protected InstallerContext ctx;
    3331
    … …  
    4442
    4543        out.print("   [");
    46         out.print(res.getString("_default_"));
     44        out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_"));
    4745        out.print(":");
    4846        out.print(iField.getDefaultValue(true));

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/FileInputRenderer.java

    r15353 r17514  
    3131    implements TextOutputFieldRenderer {
    3232
    33     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    34 
    3533    protected InstallerContext ctx;
    3634    public FileInputRenderer() {
    … …  
    4644
    4745        out.print("   [");
    48         out.print(res.getString("_default_"));
     46        out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_"));
    4947        out.print(":");
    5048        out.print(iField.getDefaultValue(true));
    … …  
    6159    public void renderError(OutputField field, BufferedReader reader, PrintStream out) throws IOException{
    6260        MessageRenderer mr = ctx.getMessageRenderer();
    63         mr.printMessage(res.getString("fileDoesNotExist"));
     61        mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("fileDoesNotExist"));
    6462        renderOutput(field, reader, out);
    6563    }

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/LargeSelectInputRenderer.java

    r15353 r17514  
    2929    implements TextOutputFieldRenderer {
    3030
    31     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    32     private static final String nextChar = res.getString("nextChar");
     31    private static final String nextChar = org.tp23.antinstaller.Installer.langPack.getString("nextChar");
    3332
    3433    protected InstallerContext ctx;
    … …  
    6766        LargeSelectInput.Option[] options = iField.getOptions();
    6867        out.print("  ");
    69         out.println(res.getString("availableOptions"));
     68        out.println(org.tp23.antinstaller.Installer.langPack.getString("availableOptions"));
    7069        StringBuffer optionsData = new StringBuffer();
    7170        for (int i = 0; i < options.length; i++) {
    … …  
    7675            if(iField.getDefaultValue().equals(options[i].value)){
    7776                optionsData.append(" [");
    78                 optionsData.append(res.getString("_default_"));
     77                optionsData.append(org.tp23.antinstaller.Installer.langPack.getString("_default_"));
    7978                optionsData.append("]");
    8079            }
    … …  
    8281        }
    8382        optionsData.append("  ");
    84         optionsData.append(res.getString("enterNumber")).append("\n");
     83        optionsData.append(org.tp23.antinstaller.Installer.langPack.getString("enterNumber")).append("\n");
    8584        Pager pager = new Pager(optionsData.toString());
    8685        String command = null;
    … …  
    111110    }
    112111    private String getNextInstructions() {
    113         return res.getString("large_select_next");
     112        return org.tp23.antinstaller.Installer.langPack.getString("large_select_next");
    114113    }
    115114}

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/LicensePageRenderer.java

    r15353 r17514  
    3131    extends AbstractTextPageRenderer {
    3232
    33     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    34     private static final String nextChar = res.getString("nextChar");
     33    private static final String nextChar = org.tp23.antinstaller.Installer.langPack.getString("nextChar");
    3534   
    3635    private boolean usePaging = false;
    … …  
    5554            BufferedReader commandReader = reader;
    5655            out.println();
    57             out.println(res.getString("clickViewLicense"));
     56            out.println(org.tp23.antinstaller.Installer.langPack.getString("clickViewLicense"));
    5857            commandReader.readLine();
    5958
    … …  
    9796            }
    9897            out.println();
    99             out.println(res.getString("licenseAccept"));
     98            out.println(org.tp23.antinstaller.Installer.langPack.getString("licenseAccept"));
    10099            command = commandReader.readLine();
    101100            command = command.trim();
    … …  
    114113
    115114    private String getNextInstructions() {
    116         return res.getString("license_next");
     115        return org.tp23.antinstaller.Installer.langPack.getString("license_next");
    117116    }
    118117}

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/PasswordTextInputRenderer.java

    r15353 r17514  
    3030    implements TextOutputFieldRenderer {
    3131
    32     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    33    
    3432    public PasswordTextInputRenderer() {
    3533    }
    … …  
    4442        displayText.append(field.getDisplayText());
    4543        displayText.append("   [");
    46         displayText.append(res.getString("_default_"));
     44        displayText.append(org.tp23.antinstaller.Installer.langPack.getString("_default_"));
    4745        displayText.append(":");
    4846        displayText.append(iField.getDefaultValue());
    … …  
    7573
    7674    protected String getErrorMessage(){
    77         return res.getString("notCorrectPasswordFormat");
     75        return org.tp23.antinstaller.Installer.langPack.getString("notCorrectPasswordFormat");
    7876    }
    7977   

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/SelectInputRenderer.java

    r15353 r17514  
    2828public class SelectInputRenderer
    2929    implements TextOutputFieldRenderer {
    30 
    31     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    3230
    3331    protected InstallerContext ctx;
    … …  
    6563        SelectInput.Option[] options = iField.getOptions();
    6664        out.print("  ");
    67         out.println(res.getString("enterNumber"));
     65        out.println(org.tp23.antinstaller.Installer.langPack.getString("enterNumber"));
    6866        for (int i = 0; i < options.length; i++) {
    6967            out.print("  ");
    … …  
    7371            if(iField.getDefaultValue().equals(options[i].value)){
    7472                out.print(" [");
    75                 out.print(res.getString("_default_"));
     73                out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_"));
    7674                out.print("]");
    7775            }

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/TargetInputRenderer.java

    r15353 r17514  
    3030    implements TextOutputFieldRenderer {
    3131
    32     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    33 
    3432    protected InstallerContext ctx;
    3533    public TargetInputRenderer() {
    … …  
    4644
    4745        out.print("   [");
    48         out.print(res.getString("_default_"));
     46        out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_"));
    4947        out.print(":");
    5048        out.print(iField.getDefaultValue());
    … …  
    5351        if (InputField.isTrue(iField.getForce())) {
    5452            out.print("   [");
    55             out.print(res.getString("_required_"));
     53            out.print(org.tp23.antinstaller.Installer.langPack.getString("_required_"));
    5654            out.println("]");
    5755            ctx.getCurrentPage().addTarget(iField.getIdx(), iField.getTarget());

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/TargetSelectInputRenderer.java

    r15353 r17514  
    3232    extends SelectInputRenderer {
    3333
    34     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    35 
    3634    public TargetSelectInputRenderer() {
    3735    }
    … …  
    6260        TargetSelectInput.Option[] options = iField.getOptions();
    6361        out.print("  ");
    64         out.println(res.getString("enterNumber"));
     62        out.println(org.tp23.antinstaller.Installer.langPack.getString("enterNumber"));
    6563        for (int i = 0; i < options.length; i++) {
    6664            out.print("  ");
    … …  
    7068            if(iField.getDefaultValue().equals(options[i].value)){
    7169                out.print(" [");
    72                 out.print(res.getString("_default_"));
     70                out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_"));
    7371                out.print("]");
    7472            }

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/TextPageRenderer.java

    r15353 r17514  
    3030    extends AbstractTextPageRenderer {
    3131
    32     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    33     private static final String nextChar = res.getString("nextChar");
     32    private static final String nextChar = org.tp23.antinstaller.Installer.langPack.getString("nextChar");
    3433
    3534    public TextPageRenderer() {
    … …  
    8584           
    8685            out.println();
    87             out.println(res.getString("clickViewText"));
     86            out.println(org.tp23.antinstaller.Installer.langPack.getString("clickViewText"));
    8887            commandReader.readLine();
    8988           
    … …  
    9695
    9796    private String getNextInstructions() {
    98         return res.getString("license_next");
     97        return org.tp23.antinstaller.Installer.langPack.getString("license_next");
    9998    }
    10099}

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/UnvalidatedTextInputRenderer.java

    r15353 r17514  
    2929    implements TextOutputFieldRenderer {
    3030
    31     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    32 
    3331    protected InstallerContext ctx;
    3432    public UnvalidatedTextInputRenderer() {
    … …  
    4442
    4543        out.print("   [");
    46         out.print(res.getString("_default_"));
     44        out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_"));
    4745        out.print(":");
    4846        out.print(iField.getDefaultValue());

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/ValidatedTextInputRenderer.java

    r15353 r17514  
    2929    implements TextOutputFieldRenderer {
    3030
    31     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    32 
    3331    protected InstallerContext ctx;
    3432    public ValidatedTextInputRenderer() {
    … …  
    4442
    4543        out.print("   [");
    46         out.print(res.getString("_default_"));
     44        out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_"));
    4745        out.print(":");
    4846        out.print(iField.getDefaultValue());

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/ExecInstall.java

    r17314 r17514  
    4949public class ExecInstall {
    5050
    51     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    5251    public static final String CONFIG_RESOURCE = "/org/tp23/antinstaller/runtime/exe/script.fconfig";
    5352   
    … …  
    118117                MessageRenderer vLogger = ctx.getMessageRenderer();
    119118                if(vLogger != null){
    120                     vLogger.printMessage(res.getString("installationFailed") + "\n" + ex.getMessage());
     119                    vLogger.printMessage(org.tp23.antinstaller.Installer.langPack.getString("installationFailed") + "\n" + ex.getMessage());
    121120                    //Fixed BUG:1295944 vLogger.printMessage("Install failed\n" + ex.getMessage());
    122121                } else {
    123                     System.err.println(res.getString("installationFailed") + ex.getClass().getName());
     122                    System.err.println(org.tp23.antinstaller.Installer.langPack.getString("installationFailed") + ex.getClass().getName());
    124123                    System.err.println(ex.getMessage());
    125124                }

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/SwingRunner.java

    r15615 r17514  
    5656public class SwingRunner extends AntRunner implements Runner, PageCompletionListener {
    5757
    58     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    59 
    60 
    6158    protected SwingInstallerContext swingCtx = null;
    6259    private JFrame frame = new JFrame();
    … …  
    339336        renderer.getNextButton().setEnabled(false);
    340337        renderer.getCancelButton().setEnabled(false);
    341         renderer.getFinishButton().setText(res.getString("exit"));
     338        renderer.getFinishButton().setText(org.tp23.antinstaller.Installer.langPack.getString("exit"));
    342339        renderer.getFinishButton().setEnabled(true);
    343340        renderer.getFinishButton().requestFocus();
    344         renderer.getTitleLabel().setText(res.getString("complete"));
     341        renderer.getTitleLabel().setText(org.tp23.antinstaller.Installer.langPack.getString("complete"));
    345342        ctx.getAntOutputRenderer().getErr().flush();
    346343        ctx.getAntOutputRenderer().getOut().flush();
    347         ctx.getMessageRenderer().printMessage(res.getString("finished"));
     344        ctx.getMessageRenderer().printMessage(org.tp23.antinstaller.Installer.langPack.getString("finished"));
    348345    }
    349346
    … …  
    355352            renderer.getNextButton().setEnabled(false);
    356353            renderer.getCancelButton().setEnabled(false);
    357             renderer.getFinishButton().setText(res.getString("exit"));
     354            renderer.getFinishButton().setText(org.tp23.antinstaller.Installer.langPack.getString("exit"));
    358355            renderer.getFinishButton().setEnabled(true);
    359356            renderer.getFinishButton().requestFocus();
    360             renderer.getTitleLabel().setText(res.getString("failed"));
     357            renderer.getTitleLabel().setText(org.tp23.antinstaller.Installer.langPack.getString("failed"));
    361358        }
    362359        // else - we're done here, or should we call abort()?

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/TextRunner.java

    r15210 r17514  
    4747    implements Runner {
    4848   
    49     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    50 
    5149    protected final InstallerContext ctx;
    5250    protected final Installer installer;
    … …  
    8684            logger.log(installer, ex);
    8785           
    88             ctx.getMessageRenderer().printMessage(res.getString("installationFailed") + ":" + ex.getMessage());
     86            ctx.getMessageRenderer().printMessage(org.tp23.antinstaller.Installer.langPack.getString("installationFailed") + ":" + ex.getMessage());
    8987            //Fixed BUG: ctx.getMessageRenderer().printMessage("Installation failed:"+ex.getMessage());
    9088            throw new InstallException("Installation failed", ex);
    … …  
    127125     */
    128126    public void antFinished() {
    129         System.out.println(res.getString("finished"));
     127        System.out.println(org.tp23.antinstaller.Installer.langPack.getString("finished"));
    130128        //System.exit(0);
    131129    }
    … …  
    134132     */
    135133    public void fatalError(){
    136         System.out.println(res.getString("failed"));
     134        System.out.println(org.tp23.antinstaller.Installer.langPack.getString("failed"));
    137135        //System.exit(1);
    138136    }

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/exe/AntLauncherFilter.java

    r15210 r17514  
    2323import org.tp23.antinstaller.ResourceBundleHelper;
    2424import org.tp23.antinstaller.antmod.Launcher;
     25import org.tp23.antinstaller.Installer;
    2526
    2627/**
    … …  
    3839public class AntLauncherFilter implements ExecuteFilter {
    3940
    40     private static final ResourceBundleHelper resHelper = new ResourceBundleHelper("resources.LanguagePack");
    41 
     41    private ResourceBundleHelper resHelper = new ResourceBundleHelper( "resources.LanguagePack" );
    4242
    4343    public AntLauncherFilter() {

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/exe/ExecuteRunnerFilter.java

    r17314 r17514  
    1919import org.tp23.antinstaller.InstallException;
    2020import org.tp23.antinstaller.InstallerContext;
    21 
     21import org.tp23.antinstaller.Installer;
    2222
    2323/**
    … …  
    2727 */
    2828public class ExecuteRunnerFilter implements ExecuteFilter {
    29 
    30     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    3129
    3230    /**
    … …  
    3937        boolean ok = ctx.getRunner().runInstaller();
    4038        if(!ok){
    41             throw new AbortException(res.getString("install-cancelled"));
     39            throw new AbortException(Installer.langPack.getString("install-cancelled"));
    4240        }
    4341        ctx.log("Install screens rendered");

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/exe/LoadConfigFilter.java

    r15210 r17514  
    343343            options.toArray(optionArr);
    344344            sInput.setOptions(optionArr);
     345
     346            String s = field.getAttribute("useAsLocale");
     347            if ( s != null || !s.equals("") ) {
     348                sInput.setUseAsLocale(true);
     349            }
    345350
    346351            return sInput;

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/exe/PropertyLoaderFilter.java

    r15210 r17514  
    4040import org.tp23.antinstaller.runtime.VersionHelper;
    4141import org.tp23.antinstaller.runtime.exe.ExecuteRunnerFilter.AbortException;
    42 
    4342
    4443/**
    … …  
    6059public class PropertyLoaderFilter implements ExecuteFilter {
    6160   
    62     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    63    
    6461    public static final String LOAD = "true";
    6562    public static final String PROMPT = "prompt";
    … …  
    128125
    129126        if( foundProps && PROMPT.equals(loadDefaults) ) {
    130             load = ctx.getMessageRenderer().prompt(res.getString("promptLoadDefaults"));
     127            load = ctx.getMessageRenderer().prompt(org.tp23.antinstaller.Installer.langPack.getString("promptLoadDefaults"));
    131128        }
    132129        else if( foundProps && PROMPT_AUTO.equals(loadDefaults)) {
    133             load = ctx.getMessageRenderer().prompt(res.getString("promptLoadDefaults"));
     130            load = ctx.getMessageRenderer().prompt(org.tp23.antinstaller.Installer.langPack.getString("promptLoadDefaults"));
    134131        }
    135132        else if( foundProps && LOAD.equals(loadDefaults) ) {
    … …  
    159156                    // let major versions pass but prompt for differences
    160157                    if( (! ctx.isAutoBuild()) && helper.majorVersionCompatible(configVersion , propertiesVersion) ){
    161                         if( ! ctx.getMessageRenderer().prompt(res.getString("propertiesVersionMismatch")) ){
     158                        if( ! ctx.getMessageRenderer().prompt(org.tp23.antinstaller.Installer.langPack.getString("propertiesVersionMismatch")) ){
    162159                            throw new AbortException("Install Aborted: existing configuration is not compatible, config version: " + configVersion);
    163160                        }
    … …  
    224221                    if(field instanceof PasswordTextInput) {
    225222                        if(value == null ){
    226                             ctx.getMessageRenderer().printMessage(res.getString("promptMissingDefaultPassword"));
     223                            ctx.getMessageRenderer().printMessage(org.tp23.antinstaller.Installer.langPack.getString("promptMissingDefaultPassword"));
    227224
    228225                        }

  • release-kits/shared/ant-installer/src/org/tp23/antinstaller/selfextract/ProgressIndicator.java

    r15210 r17514  
    5252
    5353    public static final String IMAGE_RESOURCE = "/resources/extract-image.png";
    54     private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
    5554
    5655    private JPanel jPanel1 = new JPanel();
    … …  
    6160    private static int PAGE_WIDTH = 160;
    6261    private static int PAGE_HEIGHT = 110; // 35 is text + bar
    63     private String title = res.getString("extracting");
     62    private String title = org.tp23.antinstaller.Installer.langPack.getString("extracting");
    6463    private JLabel imagePanel = new JLabel();
    6564    GridBagLayout gridBagLayout1 = new GridBagLayout();
Note: See TracChangeset for help on using the changeset viewer.