ClientGUI: Allow waitForServer() to set ProgressMonitor's duration

diff --git a/src/uk/ac/ntu/n0521366/wsyd/client/ClientGUI.java b/src/uk/ac/ntu/n0521366/wsyd/client/ClientGUI.java
index 40039ed..39b8d52 100644 (file)
--- a/src/uk/ac/ntu/n0521366/wsyd/client/ClientGUI.java
+++ b/src/uk/ac/ntu/n0521366/wsyd/client/ClientGUI.java
@@ -582,8 +582,8 @@ public class ClientGUI extends javax.swing.JFrame implements NetworkMessageEvent
      *
      * @return this object
      */
-    private ClientGUI waitForServer() {
-        _progressMonitor = new ProgressMonitor(this, "Waiting 30 seconds for Social Server...", "", 0, 30000);
+    private ClientGUI waitForServer(int seconds) {
+        _progressMonitor = new ProgressMonitor(this, "Waiting " + seconds + " seconds for Social Server...", "", 0, 1000 * seconds);
         _progressMonitor.setMillisToPopup(100);
         _progressMonitor.setProgress(0);
 
@@ -602,14 +602,16 @@ public class ClientGUI extends javax.swing.JFrame implements NetworkMessageEvent
     public void propertyChange(PropertyChangeEvent evt) {
         switch (evt.getPropertyName()) {
             case "progress":
-                int progress = 1000 * (Integer) evt.getNewValue();
+                int progress = (Integer) evt.getNewValue();
                 if (_progressMonitor.isCanceled()) {
                     _shutdownInProgress = true;
                     _waitForServerSocial.cancel(true);
                     _progressMonitor.close();
                     exitCleanly();
+                } else {
+                    _progressMonitor.setProgress(1000 * progress);
+                    _progressMonitor.setNote(progress + " seconds elapsed");
                 }
-                _progressMonitor.setProgress(progress);
                 break;
             case "state":
                 SwingWorker.StateValue state = (SwingWorker.StateValue) evt.getNewValue();
@@ -878,7 +880,7 @@ public class ClientGUI extends javax.swing.JFrame implements NetworkMessageEvent
             @Override
             public void run() {
                 try {
-                    ClientGUI app = new ClientGUI(multicastAnnouncements, serverSocial).initNeighbourListener().waitForServer();
+                    ClientGUI app = new ClientGUI(multicastAnnouncements, serverSocial).initNeighbourListener().waitForServer(60);
                 }
                 catch(UnknownHostException ex) {
                     Logger.getLogger(ClientGUI.class.getName()).log(Level.SEVERE, null, MessageFormat.format("Error: initNeighbourListener(): {0}", ex.toString()));