Move to last CVS version of BrowserLauncher2 and added support for Iceweasel

2 files changed, 25 insertions, 46 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/utils/CrossPlatformBrowserLauncher.java b/src/net/java/sip/communicator/impl/gui/utils/CrossPlatformBrowserLauncher.java
index c960125..38bb69d 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/CrossPlatformBrowserLauncher.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/CrossPlatformBrowserLauncher.java
@@ -7,54 +7,42 @@
 
 package net.java.sip.communicator.impl.gui.utils;
 
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.*;
 
-import net.java.sip.communicator.impl.gui.main.message.ChatWindow;
-import net.java.sip.communicator.util.Logger;
-import edu.stanford.ejalbert.BrowserLauncher;
-import edu.stanford.ejalbert.BrowserLauncherRunner;
-import edu.stanford.ejalbert.exception.BrowserLaunchingInitializingException;
-import edu.stanford.ejalbert.exception.UnsupportedOperatingSystemException;
-import edu.stanford.ejalbert.exceptionhandler.BrowserLauncherErrorHandler;
+import edu.stanford.ejalbert.*;
+import edu.stanford.ejalbert.exception.*;
+import edu.stanford.ejalbert.exceptionhandler.*;
+import net.java.sip.communicator.util.*;
 
 /**
  * Launches a browser, depending on the operation system and the browsers
  * available.
- *  
+ *
  * @author Yana Stamcheva
  */
 public class CrossPlatformBrowserLauncher {
 
-    private static Logger logger = Logger.getLogger(ChatWindow.class.getName());
-    
+    private static Logger logger = Logger.getLogger(CrossPlatformBrowserLauncher.class.getName());
+
 	private static BrowserLauncher launcher;
-	
+
     /**
      * Launches a browser for the given url, depending on the operation system
      * and the browsers available.
-     * 
+     *
      * @param urlString The url to open in the browser.
      */
     public static void openURL(String urlString) {
-        
+
 		try {
             launcher = new BrowserLauncher(null);
-                
+
     		if (urlString == null || urlString.trim().length() == 0) {
                 throw new MalformedURLException("You must specify a url.");
             }
             logger.debug("Creating browser launcher...");
-            
-            BrowserLauncherRunner runner = new BrowserLauncherRunner(
-                    launcher,
-                    urlString,
-                    null);
-            
-            logger.debug("Browser launcher created...");            
-            Thread launcherThread = new Thread(runner);
-            logger.debug("Run browser in a different thread...");
-            launcherThread.start();
+
+            launcher.openURLinBrowser(urlString);
         }
         catch (BrowserLaunchingInitializingException e) {
             logger.error("Failed to initialize browser launcher : " + e);
@@ -67,13 +55,13 @@ public class CrossPlatformBrowserLauncher {
             logger.error("The URL string could not be parsed : " + e);
         }
     }
-    
+
     /**
      * The error handler to be passed to the browser launcher runner.
      */
     private static class BrowserErrorHandler
         implements BrowserLauncherErrorHandler {
-        
+
         public void handleException(Exception ex) {
             logger.error(ex);
         }
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/CrossPlatformBrowserLauncher.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/CrossPlatformBrowserLauncher.java
index 0b74a49..411748e 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/CrossPlatformBrowserLauncher.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/CrossPlatformBrowserLauncher.java
@@ -17,41 +17,32 @@ import edu.stanford.ejalbert.exceptionhandler.*;
 /**
  * Launches a browser, depending on the operation system and the browsers
  * available.
- *  
+ *
  * @author Yana Stamcheva
  */
 public class CrossPlatformBrowserLauncher {
 
     private static Logger logger = Logger.getLogger(
             CrossPlatformBrowserLauncher.class.getName());
-    
+
 	private static BrowserLauncher launcher;
-	
+
     /**
      * Launches a browser for the given url, depending on the operation system
      * and the browsers available.
-     * 
+     *
      * @param urlString The url to open in the browser.
      */
     public static void openURL(String urlString) {
-        
+
 		try {
             launcher = new BrowserLauncher(null);
-                
+
     		if (urlString == null || urlString.trim().length() == 0) {
                 throw new MalformedURLException("You must specify a url.");
             }
             new URL(urlString); // may throw MalformedURLException
-            BrowserLauncherErrorHandler errorHandler = new BrowserErrorHandler();
-            String targetBrowser = launcher.getBrowserList().get(0).toString();
-            
-            BrowserLauncherRunner runner = new BrowserLauncherRunner(
-                    launcher,
-                    targetBrowser,
-                    urlString,
-                    errorHandler);
-            Thread launcherThread = new Thread(runner);
-            launcherThread.start();
+            launcher.openURLinBrowser(urlString);
         }
         catch (BrowserLaunchingInitializingException e) {
             logger.error("Failed to initialize browser launcher : " + e);
@@ -64,13 +55,13 @@ public class CrossPlatformBrowserLauncher {
             logger.error("The URL string could not be parsed : " + e);
         }
     }
-    
+
     /**
      * The error handler to be passed to the browser launcher runner.
      */
     private static class BrowserErrorHandler
         implements BrowserLauncherErrorHandler {
-        
+
         public void handleException(Exception ex) {
             logger.error(ex);
         }