Added basic RMI support

git-svn-id: http://svn.dmdirc.com/trunk@2777 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/commandline/CommandLineParser.java

@@ -27,6 +27,7 @@ import com.dmdirc.util.IrcAddress;
 import com.dmdirc.Main;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.util.resourcemanager.ResourceManager;
+import java.rmi.RemoteException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,6 +47,7 @@ public class CommandLineParser {
     private static final Object[][] ARGUMENTS = new Object[][]{
         {'c', "connect", "Connect to the specified server", Boolean.TRUE},
         {'d', "directory", "Use the specified configuration directory", Boolean.TRUE},
+        {'e', "existing", "Try to use an existing instance of DMDirc (use with -c)", Boolean.FALSE},
         {'h', "help", "Show command line options and exit", Boolean.FALSE},
         {'p', "portable", "Enable portable mode", Boolean.FALSE},
         {'r', "disable-reporting", "Disable automatic error reporting", Boolean.FALSE},
@@ -58,6 +60,9 @@ public class CommandLineParser {
     /** Whether to disable error reporting or not. */
     private boolean disablereporting = false;
     
+    /** Whether or not to try and use an existing client. */
+    private boolean useExisting = false;
+    
     /**
      * Creates a new instance of CommandLineParser.
      *
@@ -87,6 +92,21 @@ public class CommandLineParser {
         if (inArg) {
             doUnknownArg("Missing parameter for argument: " + previousArg);
         }
+        
+        if (useExisting) {
+            final RemoteInterface server = RemoteServer.getServer();
+            
+            if (server != null) {
+                try {
+                    server.connect(addresses);
+                    System.exit(0);
+                } catch (RemoteException ex) {
+                    // Do nothing
+                }
+            }
+        }
+        
+        RemoteServer.bind();
     }
     
     /**
@@ -168,6 +188,9 @@ public class CommandLineParser {
         case 'd':
             doDirectory(param);
             break;
+        case 'e':
+            useExisting = true;
+            break;
         case 'h':
             doHelp();
             break;

src/com/dmdirc/commandline/RemoteInterface.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.commandline;
+
+import com.dmdirc.util.IrcAddress;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.util.List;
+
+/**
+ *
+ * @author chris
+ */
+public interface RemoteInterface extends Remote {
+    
+    void connect(List<IrcAddress> addresses) throws RemoteException;
+
+}

src/com/dmdirc/commandline/RemoteServer.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.commandline;
+
+import com.dmdirc.util.IrcAddress;
+
+import java.rmi.NotBoundException;
+import java.rmi.RemoteException;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
+import java.rmi.server.UnicastRemoteObject;
+import java.util.List;
+
+/**
+ *
+ * @author chris
+ */
+public class RemoteServer implements RemoteInterface {
+    
+    public RemoteServer() {
+        super();
+    }
+    
+    @Override
+    public void connect(List<IrcAddress> addresses) throws RemoteException {
+        for (IrcAddress address : addresses) {
+            address.connect();
+        }
+    }    
+    
+    /**
+     * Binds to the RMI registry so that other clients may find this remote
+     * server.
+     */
+    public static void bind() {
+        try {
+            final RemoteServer server = new RemoteServer();
+            RemoteInterface stub =
+                (RemoteInterface) UnicastRemoteObject.exportObject(server, 0);
+            Registry registry = LocateRegistry.createRegistry(1099);
+            registry.rebind("DMDirc", stub);
+        } catch (RemoteException ex) {
+            // Do nothing
+        }
+    }
+    
+    /**
+     * Retrieves a reference to an existing RemoteServer, if there is one.
+     * Note that this must be called before bind(), unless you want a reference
+     * to our own client for some reason.
+     * 
+     * @return The RemoteServer instance, or null if none was available
+     */
+    public static RemoteInterface getServer() {
+        try {
+            Registry registry = LocateRegistry.getRegistry();
+            return (RemoteInterface) registry.lookup("DMDirc");
+        } catch (RemoteException ex) {
+            return null;
+        } catch (NotBoundException ex) {
+            return null;
+        }
+    }
+
+}

src/com/dmdirc/util/IrcAddress.java

@@ -27,6 +27,7 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,7 +37,9 @@ import java.util.List;
  * 
  * @author Chris
  */
-public class IrcAddress {
+public class IrcAddress implements Serializable {
+    
+    private final static long serialVersionUID = 1;
 
     /** Whether or not this address uses SSL. */
     private boolean usesSSL;