Marina

.gitignore

@@ -0,0 +1 @@
+/dist/

build/built-jar.properties

@@ -1,4 +1,4 @@
-#Wed, 18 Dec 2013 22:55:13 +0000
-
-
-/Users/samc/Desktop/CM3033=
+#Thu, 19 Dec 2013 19:48:40 +0000
+
+
+H\:\\CM_3033\\Java\\CM3033-marina=

nbproject/private/private.properties

@@ -1 +1 @@
-user.properties.file=/Users/samc/Library/Application Support/NetBeans/7.4/build.properties
+user.properties.file=C:\\TEMP\\netbeans-settings\\build.properties

nbproject/private/private.xml

@@ -3,10 +3,11 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/Users/samc/Desktop/CM3033/src/CM3033Tests/StartServer.java</file>
-            <file>file:/Users/samc/Desktop/CM3033/src/CM3033Tests/TestClientStart.java</file>
-            <file>file:/Users/samc/Desktop/CM3033/src/CM3033Tests/Server.java</file>
-            <file>file:/Users/samc/Desktop/CM3033/src/CM3033Tests/Test1.java</file>
+            <file>file:/C:/Users/Mazzy/Documents/GitHub/CM3033/src/CM3033Tests/Client.java</file>
+            <file>file:/C:/Users/Mazzy/Documents/GitHub/CM3033/src/CM3033Tests/ClientApp.java</file>
+            <file>file:/C:/Users/Mazzy/Documents/GitHub/CM3033/src/CM3033Tests/Server.java</file>
+            <file>file:/C:/Users/Mazzy/Documents/GitHub/CM3033/src/CM3033Tests/StartServer.java</file>
+            <file>file:/C:/Users/Mazzy/Documents/GitHub/CM3033/src/CM3033Tests/TestClientStart.java</file>
         </group>
     </open-files>
 </project-private>

nbproject/project.properties

@@ -51,7 +51,7 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
-main.class=cm3033.lab2.ex3.MainAppEx3
+main.class=CM3033Tests.StartServer
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false

src/CM3033Tests/Client.java

@@ -99,6 +99,7 @@ public void run() {
                             if (!sendStr.equals(oldSendStr)) {
                                 // Send the message
                                 sendMessage(sendStr);
+                                sendMessage("BPM:200"); //for the testing purposes
                                 // Set the sent message record
                                 oldSendStr = sendStr;
                                 // Take 1 from message count as one has been sent

src/CM3033Tests/MyRejectedExecutionHandlerImpl.java

@@ -0,0 +1,22 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package CM3033Tests;
+
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ *
+ * @author 1014481
+ */
+public class MyRejectedExecutionHandlerImpl implements RejectedExecutionHandler {
+    @Override
+    public void rejectedExecution(Runnable runnable,
+            ThreadPoolExecutor executor)
+    {
+        System.out.println(runnable.toString() + " : I've been rejected ! ");
+    }
+}
+

src/CM3033Tests/Server.java

@@ -19,20 +19,26 @@ public class Server implements Runnable {
     // store the incoming connection
     private Socket incoming;
     private int number;
+    private ServerApp serverApp;
 
     // Create the server using the passed incoming code
-    public Server(Socket incoming, int no) {
+    public Server(Socket incoming, int no, ServerApp serverApp) {
         // Set this's incoming to the passed on
         this.incoming = incoming;
         this.number = no;
+        this.serverApp = serverApp; //@ MS
+
     }
-
+    
     @Override
     public void run() {
+
         try {
+             //serverApp.setVisible(true); //@ MS
             // Configure the listener/sender
             BufferedReader in = new BufferedReader(new InputStreamReader(incoming.getInputStream()));
             PrintWriter out = new PrintWriter(incoming.getOutputStream(), true /* auto flush */);
+
             // Once connected, let the user know so by printing the details
             out.println(number + " You are connected to "
                     + incoming.getLocalAddress().getHostName()
@@ -42,18 +48,24 @@ public void run() {
             System.out.println(incoming.getLocalAddress().getHostName() + " Connected " + number);
             // A boolean to store a while variable
             boolean finished = false;
+            int bpm = 0;
             while (!finished) {
+                bpm++;
+                serverApp.updateBPM(number, bpm);
+                serverApp.updateConnected(number);
+
                 // if the listener is ready
                 if (in.ready()) {
                     // create a String to store the sent data
                     String str = in.readLine().trim();
                     // If the string is not null
                     if (str != null) {
                         // Send the receive value back to the client
-                        out.println("Recieved: " + str);
+                        out.println("Received: " + str);
                         // Print the recieve value
-                        System.out.println("Recieved: " + str);
+                        System.out.println("Receieved: " + str);
                         // If the string is bye
+                        //processInput(str);
                         if (str.trim().equals("BYE")) {
                             // Print that machine is disconnecting
                             System.out.println(incoming.getLocalAddress().getHostName() + " Disconnected");
@@ -64,6 +76,7 @@ public void run() {
                 }
             }
             // Disconnect the client
+            serverApp.disconnect(number);
             incoming.close();
         } catch (IOException e) {
             System.out.println(e);