[izpack-changes] r1538 - izpack-src/trunk/src/lib/com/izforge/izpack/installer

[noreply at berlios.de]

Author: eppelman
Date: 2006-08-27 13:27:14 +0200 (Sun, 27 Aug 2006)
New Revision: 1538

Modified:
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/AutomatedInstaller.java
Log:
Added some logging lines.

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/AutomatedInstaller.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/AutomatedInstaller.java	2006-08-25 15:22:36 UTC (rev 1537)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/AutomatedInstaller.java	2006-08-27 11:27:14 UTC (rev 1538)
@@ -43,6 +43,7 @@
 import com.izforge.izpack.ExecutableFile;
 import com.izforge.izpack.LocaleDatabase;
 import com.izforge.izpack.Panel;
+import com.izforge.izpack.util.Debug;
 import com.izforge.izpack.util.Housekeeper;
 import com.izforge.izpack.util.OsConstraint;
 
@@ -179,6 +180,7 @@
     {
         // TODO: i18n
         System.out.println("[ Starting automated installation ]");
+        Debug.log("[ Starting automated installation ]");
 
         try
         {
@@ -190,6 +192,7 @@
             while (panelsIterator.hasNext())
             {
                 Panel p = (Panel) panelsIterator.next();
+                
                 String praefix = "com.izforge.izpack.panels.";
                 if (p.className.compareTo(".") > -1)
                 // Full qualified class name
@@ -199,14 +202,19 @@
                 String panelClassName = p.className;
                 String automationHelperClassName = praefix + panelClassName + "AutomationHelper";
                 Class automationHelperClass = null;
+                
+                Debug.log( "AutomationHelper:" + automationHelperClassName );
                 // determine if the panel supports automated install
                 try
                 {
+                    
                     automationHelperClass = Class.forName(automationHelperClassName);
+                    
                 }
                 catch (ClassNotFoundException e)
                 {
                     // this is OK - not all panels have/need automation support.
+                    Debug.log( "ClassNotFoundException-skip :" + automationHelperClassName );
                     continue;
                 }
     
@@ -216,12 +224,13 @@
                 {
                     try
                     {
+                        Debug.log( "Instantiate :" + automationHelperClassName );
                         automationHelperInstance = (PanelAutomation) automationHelperClass
                                 .newInstance();
                     }
                     catch (Exception e)
                     {
-                        System.err.println("ERROR: no default constructor for "
+                        Debug.log("ERROR: no default constructor for "
                                 + automationHelperClassName + ", skipping...");
                         continue;
                     }
@@ -247,17 +256,22 @@
                 {
                     try
                     {
+                        Debug.log( "automationHelperInstance.runAutomated :" + automationHelperClassName + " entered." );
                         if (! automationHelperInstance.runAutomated(this.idata, panelRoot))
                         {
                             // make installation fail instantly
                             this.result = false;
                             return;
                         }
+                        else
+                        {
+                          Debug.log( "automationHelperInstance.runAutomated :" + automationHelperClassName + " successfully done." );  
+                        }
                     }
                     catch (Exception e)
                     {
-                        System.err.println("ERROR: automated installation failed for panel "
-                                + panelClassName);
+                        Debug.log( "ERROR: automated installation failed for panel "
+                                + panelClassName );
                         e.printStackTrace();
                         this.result = false;
                         continue;