Changeset 648

Timestamp:

12/20/13 12:38:19 (11 years ago)

Author:

davidb

Message:

Refactored so server can be started from the command line, in addition to part of a graphical Expeditee run

File:

• trunk/src/org/expeditee/network/FrameShare.java (modified) (3 diffs)

trunk/src/org/expeditee/network/FrameShare.java

@@ -39 +39 @@
         private int _port = Peer.DEFAULT_PORT;
 
-        public static void init(Frame settingsFrame) {
-                if (disableNetworking || settingsFrame == null)
-                        return;
-
-                if (_theSession == null)
-                        _theSession = new FrameShare(settingsFrame);
-        }
-
-        private FrameShare(Frame settingsFrame) {
+
+        private void startServers() throws IOException
+        {
+            _servers.add(new FrameServer(_port));
+            _servers.add(new FrameSaver(_port));
+            _servers.add(new MessageReciever(_port));
+            _servers.add(new InfServer(_port));
+            _servers.add(new InfUpdate(_port));
+
+        }
+
+        private FrameShare() {
                 _peers = new HashMap<String, Peer>();
+        }
+
+        private FrameShare(int port) {
+                this();
+                _port = port;
+
+                try {
+                    startServers();
+                    
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    System.err.println("Could not start servers [port: "
+                                       + port + "]");
+                }
+
+        }
+
+
+        private FrameShare(Frame settingsFrame) 
+        {
+                this();
 
                 // Set the settings
@@ -66 +90 @@
                                         MessageBay.displayMessage("Starting Expeditee Server on port: " + _port);
                                         
-                                        _servers.add(new FrameServer(_port));
-                                        _servers.add(new FrameSaver(_port));
-                                        _servers.add(new MessageReciever(_port));
-                                        _servers.add(new InfServer(_port));
-                                        _servers.add(new InfUpdate(_port));
+                                        startServers();
                                 } catch (Exception e) {
                                         e.printStackTrace();
@@ -326 +346 @@
                 return result;
         }
+
+        public static void init(Frame settingsFrame) {
+                if (disableNetworking || settingsFrame == null)
+                        return;
+
+                if (_theSession == null)
+                        _theSession = new FrameShare(settingsFrame);
+        }
+
+        public static void init(int port) {
+
+                if (_theSession == null) {
+                        _theSession = new FrameShare(port);
+                }
+        }
+
+
+        /**
+         * Start a server running on the port number supplied on the command line
+         * 
+         * @param args
+         */
+        public static void main(String[] args) {
+
+            if (args.length != 1) {
+
+                // Work out the 'program name' (i.e. this class), but done in a general 
+                //   way in case class name is changed at a later date
+                StackTraceElement[] stack = Thread.currentThread ().getStackTrace ();
+                StackTraceElement main = stack[stack.length - 1];
+                String mainClass = main.getClassName ();
+
+                System.err.println("Usage: java " + mainClass + " port-number");
+                System.exit(1);
+            }
+            
+            String port_str = args[0];
+
+            try {
+                int port = Integer.parseInt(port_str);
+
+                init(port);
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                System.exit(2);
+            }
+
+        }
+
 }