Changeset 649

Timestamp:

12/23/13 21:31:52 (10 years ago)

Author:

davidb

Message:

Code added so command-line version of FrameShare starts the thread for the server(s)

Location:

trunk/src/org/expeditee

Files:

• gui/MessageBay.java (modified) (2 diffs)
• network/DefaultServer.java (modified) (1 diff)
• network/FrameShare.java (modified) (4 diffs)

trunk/src/org/expeditee/gui/MessageBay.java

@@ -312 +312 @@
 
                                         Graphics g = FrameGraphics.createGraphics();
-                                        if (g != null)
+                                        if (g != null) {
                                                 refresh(false, g, Item.DEFAULT_BACKGROUND);
+                                        }
                                         return _messages[i];
                                 }
@@ -341 +342 @@
                 _messageLink.setLink(_creator.getCurrent());
 
-                refresh(false, FrameGraphics.createGraphics(), Item.DEFAULT_BACKGROUND);
+                Graphics g = FrameGraphics.createGraphics();
+                if (g != null) {
+                    refresh(false, g, Item.DEFAULT_BACKGROUND);
+                }
 
                 return last;

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

@@ -54 +54 @@
                 //MessageBay.displayMessage(this.getName() + " started on port "
                 //              + socket.getLocalPort());
-        
+
                 while (!_stop) {
                         try {

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

@@ -42 +42 @@
         private void startServers() throws IOException
         {
+            System.err.println("Starting Expeditee Server on port " + _port);
             _servers.add(new FrameServer(_port));
             _servers.add(new FrameSaver(_port));
@@ -67 +68 @@
                 }
 
+                try {
+                    for (DefaultServer server : _servers) {
+                        server.start();
+                    }
+                } catch (Exception e) {
+                    System.err.println("Error in server startup");
+                }
         }
 
@@ -112 +120 @@
 
                 try {
-                        for (DefaultServer server : _servers)
+                    for (DefaultServer server : _servers) {
                                 server.start();
+                    }
                 } catch (Exception e) {
                         MessageBay.errorMessage("Error in PeerToPeer setup");
@@ -120 +129 @@
 
         public void finalise() {
+            System.err.println("Closing servers");
+
                 for (DefaultServer server : _servers)
                         server.close();