[izpack-changes] r1676 - in izpack-src/trunk/src/lib/com/izforge/izpack: installer panels

[noreply at berlios.de]

Author: dreil
Date: 2007-01-05 09:06:24 +0100 (Fri, 05 Jan 2007)
New Revision: 1676

Modified:
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/Unpacker.java
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/InstallPanelAutomationHelper.java
Log:
completed packaging options


Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2007-01-05 08:00:33 UTC (rev 1675)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2007-01-05 08:06:24 UTC (rev 1676)
@@ -1200,7 +1200,8 @@
     public void install(AbstractUIProgressHandler listener)
     {       
         IUnpacker unpacker = UnpackerFactory.getUnpacker(this.installdata.info.getUnpackerClassName(), installdata, listener);
-        unpacker.run();
+        Thread unpackerthread = new Thread(unpacker, "IzPack - Unpacker thread");
+        unpackerthread.start();
         /*
         Unpacker unpacker = new Unpacker(installdata, listener);
         unpacker.start();

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/Unpacker.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/Unpacker.java	2007-01-05 08:00:33 UTC (rev 1675)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/Unpacker.java	2007-01-05 08:06:24 UTC (rev 1676)
@@ -22,28 +22,53 @@
 
 package com.izforge.izpack.installer;
 
-import com.izforge.izpack.*;
-import com.izforge.izpack.event.InstallerListener;
-import com.izforge.izpack.util.*;
-import org.apache.regexp.RE;
-import org.apache.regexp.RECompiler;
-import org.apache.regexp.RESyntaxException;
-
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
 import java.lang.reflect.Constructor;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Stack;
+import java.util.TreeSet;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
+import org.apache.regexp.RE;
+import org.apache.regexp.RECompiler;
+import org.apache.regexp.RESyntaxException;
+
+import com.izforge.izpack.ExecutableFile;
+import com.izforge.izpack.LocaleDatabase;
+import com.izforge.izpack.Pack;
+import com.izforge.izpack.PackFile;
+import com.izforge.izpack.ParsableFile;
+import com.izforge.izpack.UpdateCheck;
+import com.izforge.izpack.event.InstallerListener;
+import com.izforge.izpack.util.AbstractUIHandler;
+import com.izforge.izpack.util.AbstractUIProgressHandler;
+import com.izforge.izpack.util.FileExecutor;
+import com.izforge.izpack.util.IoHelper;
+import com.izforge.izpack.util.OsConstraint;
+import com.izforge.izpack.util.VariableSubstitutor;
+
 /**
  * Unpacker class.
  * 
  * @author Julien Ponge
  * @author Johannes Lehtinen
  */
-public class Unpacker extends Thread implements IUnpacker
+public class Unpacker implements IUnpacker
 {
 
     /** The installdata. */
@@ -93,7 +118,7 @@
      */
     public Unpacker(AutomatedInstallData idata, AbstractUIProgressHandler handler)
     {
-        super("IzPack - Unpacker thread");
+        //super("IzPack - Unpacker thread");
         try
         {
             String resource = LANG_FILE_NAME + "_" + idata.localeISO3;

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/InstallPanelAutomationHelper.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/InstallPanelAutomationHelper.java	2007-01-05 08:00:33 UTC (rev 1675)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/InstallPanelAutomationHelper.java	2007-01-05 08:06:24 UTC (rev 1676)
@@ -24,9 +24,10 @@
 import net.n3.nanoxml.XMLElement;
 
 import com.izforge.izpack.installer.AutomatedInstallData;
+import com.izforge.izpack.installer.IUnpacker;
 import com.izforge.izpack.installer.PanelAutomation;
 import com.izforge.izpack.installer.PanelAutomationHelper;
-import com.izforge.izpack.installer.Unpacker;
+import com.izforge.izpack.installer.UnpackerFactory;
 import com.izforge.izpack.util.AbstractUIProgressHandler;
 
 /**
@@ -60,10 +61,15 @@
      */
     public boolean runAutomated(AutomatedInstallData idata, XMLElement panelRoot)
     {
+        /*
         Unpacker unpacker = new Unpacker(idata, this);
         unpacker.start();
+        */
+        IUnpacker unpacker = UnpackerFactory.getUnpacker(idata.info.getUnpackerClassName(), idata, this);        
+        Thread unpackerthread = new Thread(unpacker, "IzPack - Unpacker thread");
+        unpackerthread.start();
         boolean done = false;
-        while (!done && unpacker.isAlive())
+        while (!done && unpackerthread.isAlive())
         {
             try
             {