Changeset 17516

Timestamp:

2008-10-10T13:49:43+13:00 (16 years ago)

Author:

oranfry

Message:

made pages reinitialise just before they are shown and added an option to selectinput to change the locale, the end result of this being that you can change the language of the installer as it runs

Location:

release-kits/shared/ant-installer

Files:

• lib/ant-installer.jar (modified) ( previous)
• src/org/tp23/antinstaller/input/SelectInput.java (modified) (2 diffs)
• src/org/tp23/antinstaller/renderer/swing/SimpleInputPageRenderer.java (modified) (1 diff)
• src/org/tp23/antinstaller/renderer/swing/SwingPageRenderer.java (modified) (3 diffs)
• src/org/tp23/antinstaller/runtime/SwingRunner.java (modified) (2 diffs)

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

@@ -70 +70 @@
         }
         public String getText() {
-            if( org.tp23.antinstaller.Installer.langPack != null ){
-                return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + "." + idx +".displayText");
+            if( org.tp23.antinstaller.Installer.langPack != null ) {
+                String r = org.tp23.antinstaller.Installer.langPack.getString( getProperty() + "." + idx + ".displayText" );
+                if ( r != null ) return r;
             }
             return text;
@@ -81 +82 @@
         if ( useAsLocale ) {
             //expect something like 'en' or or something like 'en_US'
+            Locale newLocale = null;
             if ( value.length() == 2 ) {
-                Locale.setDefault( new Locale(value) );
+                newLocale = new Locale(value);
+                Locale.setDefault( newLocale );
             } else if ( value.length() == 5 ) {
-                Locale.setDefault( new Locale(value.substring(0,2), value.substring(3,5)) );
+                newLocale = new Locale(value.substring(0,2), value.substring(3,5));
+                Locale.setDefault( newLocale );
             } //else { you're out of luck }
-            org.tp23.antinstaller.Installer.langPack = ResourceBundle.getBundle("resources.LanguagePack");
+            org.tp23.antinstaller.Installer.langPack = ResourceBundle.getBundle("resources.LanguagePack", newLocale );
         }
     }

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

@@ -99 +99 @@
 
     public void instanceInit() throws Exception {
-
         ToolTipManager.sharedInstance().setInitialDelay(0);
         ToolTipManager.sharedInstance().setDismissDelay(Integer.MAX_VALUE);
-
-
         overflow = ((SimpleInputPage)page).isOverflow();
         if(overflow){

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

@@ -17 +17 @@
 
 import java.awt.BorderLayout;
+import java.awt.FlowLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -53 +54 @@
     
     // holds the next back buttons etc
-    private JPanel controlPanel = new JPanel();
+    private JPanel controlPanel = new JPanel(new FlowLayout(FlowLayout.CENTER,20,3));
 
     private JButton backButton = new JButton();
@@ -107 +108 @@
     }
         
-    
+    public void reInit() {
+        backButton.setText(org.tp23.antinstaller.Installer.langPack.getString("backButton"));// "<< Back");
+        cancelButton.setText(org.tp23.antinstaller.Installer.langPack.getString("cancelButton"));// "Cancel");
+        nextButton.setText(org.tp23.antinstaller.Installer.langPack.getString("nextButton"));// "Next >>");
+        finishButton.setText(ctx.getInstaller().getFinishButtonText());
+        titleLabel.setText(page.getDisplayText());
+    }
+
     private void jbInit() throws Exception {
         

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

@@ -272 +272 @@
         for (int i = 0; i < pages.length; i++) {
             SwingPageRenderer renderer = RendererFactory.getSwingPageRenderer(pages[i]);
-            if (i == 0) {
-                renderer.getBackButton().setEnabled(false);
-            }
+            if (i == 0) renderer.getBackButton().setEnabled(false);
             renderer.setContext(swingCtx);
             renderer.setPageCompletionListener(this);
@@ -287 +285 @@
 
     protected void renderNext(SwingPageRenderer renderer) throws ClassNotFoundException, InstallException {
+        try {
+            renderer.instanceInit();
+            renderer.reInit();
+        } catch ( Exception e ) {
+            System.err.println( "Couldn't initialise a page" );
+            System.exit(1);
+        }
+
+
         renderer.updateDefaultValues();
         frame.getContentPane().removeAll();