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

Timestamp:

2008-04-24T13:40:21+12:00 (16 years ago)

Author:

oranfry

Message:

Lots of changes to the installer. Now only look in LanguagePack resource bundle for strings.

File:

• release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/LicensePageRenderer.java (modified) (3 diffs)

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

@@ -43 +43 @@
     extends SwingPageRenderer {
 
-    private static final ResourceBundle res = ResourceBundle.getBundle("org.tp23.antinstaller.renderer.Res");
+    private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");
 
     private JTextArea licenseTextArea = new JTextArea();
@@ -59 +59 @@
         InputStream licensein = this.getClass().getResourceAsStream(resource);
         if (licensein == null) {
+            //delete me
+            System.out.println( "licensein is null" );
             throw new ConfigurationException("License resource '" + resource + "' is missing from installer");
         }
@@ -79 +81 @@
         scrollPane.getViewport().add(licenseTextArea);
         scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
-        scrollPane.setBorder(BorderFactory.createCompoundBorder(
-                        BorderFactory.createEmptyBorder(4, 4, 4, 4),
-                        BorderFactory.createEtchedBorder()));
+
+        scrollPane.setBorder(
+            BorderFactory.createCompoundBorder(
+                BorderFactory.createEmptyBorder(4, 4, 4, 4),
+                BorderFactory.createEtchedBorder()
+                )
+            );
         this.add(scrollPane, BorderLayout.CENTER);
 
-        getNextButton().setText( res.getString( "license.next.text" ) );
-        getNextButton().setIcon(getImage("/resources/icons/ok.png"));
-        getCancelButton().setText( res.getString( "license.cancel.text" ) );
+        getNextButton().setText( res.getString( "license.next.text" ) );
+        getNextButton().setIcon(getImage("/resources/icons/ok.png"));
+        getCancelButton().setText( res.getString( "license.cancel.text" ) );
 
     }