[Jython-checkins] SF.net SVN: jython:[6147] trunk/installer

[<otm...@us...>]

Revision: 6147
          http://jython.svn.sourceforge.net/jython/?rev=6147&view=rev
Author:   otmarhumbel
Date:     2009-04-01 13:54:58 +0000 (Wed, 01 Apr 2009)

Log Message:
-----------
early initialize of the frame installer's java properties

Modified Paths:
--------------
    trunk/installer/src/java/org/python/util/install/FrameInstaller.java
    trunk/installer/test/java/org/python/util/install/FrameInstallerTest.java

Modified: trunk/installer/src/java/org/python/util/install/FrameInstaller.java
===================================================================
--- trunk/installer/src/java/org/python/util/install/FrameInstaller.java	2009-04-01 04:28:21 UTC (rev 6146)
+++ trunk/installer/src/java/org/python/util/install/FrameInstaller.java	2009-04-01 13:54:58 UTC (rev 6147)
@@ -42,6 +42,7 @@
         if (commandLine.hasJavaHomeOption()) {
             setJavaHomeHandler(commandLine.getJavaHomeHandler());
         }
+        initDefaultJava();
         Wizard wizard = new Wizard(jarInfo, autotest);
         wizard.addWindowListener(new WindowAdapter() {
             public void windowClosing(WindowEvent event) {
@@ -156,6 +157,12 @@
         return TRUE.equals(getProperty(TextKeys.ACCEPT_PROPERTY, FALSE));
     }
 
+    protected static void initDefaultJava() {
+        JavaVersionInfo javaVersionInfo = new JavaVersionInfo();
+        Installation.fillJavaVersionInfo(javaVersionInfo, System.getProperties());
+        FrameInstaller.setJavaVersionInfo(javaVersionInfo);
+    }
+
     private class SimpleWizardListener implements WizardListener {
         public void wizardStarted(WizardEvent event) {
         }

Modified: trunk/installer/test/java/org/python/util/install/FrameInstallerTest.java
===================================================================
--- trunk/installer/test/java/org/python/util/install/FrameInstallerTest.java	2009-04-01 04:28:21 UTC (rev 6146)
+++ trunk/installer/test/java/org/python/util/install/FrameInstallerTest.java	2009-04-01 13:54:58 UTC (rev 6147)
@@ -6,6 +6,21 @@
 
 public class FrameInstallerTest extends TestCase {
 
+    public void testInitDefaultJava() {
+        FrameInstaller.initDefaultJava();
+        JavaVersionInfo vInfo = FrameInstaller.getJavaVersionInfo();
+        assertNotNull(vInfo);
+        String version = vInfo.getVersion();
+        assertNotNull(version);
+        assertTrue(version.length() > 0);
+        String specificationVersion = vInfo.getSpecificationVersion();
+        assertNotNull(specificationVersion);
+        assertTrue(specificationVersion.length() > 0);
+        String vendor = vInfo.getVendor();
+        assertNotNull(vendor);
+        assertTrue(vendor.length() > 0);
+    }
+    
     public void testJavaVersionInfo() {
         String version = "1;2;3";
         String vendor = "jython [macrosystems]";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.