From a5b22b1f602afa5665ac63c5ad2ba9c4b686391d Mon Sep 17 00:00:00 2001 From: Rubykuby Date: Tue, 11 Nov 2014 10:12:34 +0100 Subject: [PATCH 1/8] Typos fixd --- CONTRIBUTING.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 42d6585..469bde2 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -41,9 +41,9 @@ Some oft-used git terms: Merging can be done in a multitude of fashions. - Upstream: The reference repository. Best explained by comparing to Linux. Linus Torvalds (the creator of Linux) is the upstream maintainer of the Linux - kernel. Canonical (creatory of Ubuntu) has their own version of Linux. + kernel. Canonical (creator of Ubuntu) has their own version of Linux. Canonical's version of Linux is *downstream*, because everybody recognises - Linus Torvalds' repository as "the one true Linux", not Canonical. + Linus Torvalds' repository as "the one true Linux", not Canonical's. - Origin: Your own remote repository. - Maintainer: The "admin" of a repository who has read/write access. - Pull: Fetching changes hosted on a remote repository and merging them into From 7a06f056031edfb4218fb648aa47c0a586943c93 Mon Sep 17 00:00:00 2001 From: Rubykuby Date: Tue, 11 Nov 2014 11:10:47 +0100 Subject: [PATCH 2/8] Added Controller --- .../org/nhl/containing/controller/Controller.java | 12 ++++++++++++ .../org/nhl/containing/{ => simulator}/Main.java | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/nhl/containing/controller/Controller.java rename src/main/java/org/nhl/containing/{ => simulator}/Main.java (96%) diff --git a/src/main/java/org/nhl/containing/controller/Controller.java b/src/main/java/org/nhl/containing/controller/Controller.java new file mode 100644 index 0000000..d77c45e --- /dev/null +++ b/src/main/java/org/nhl/containing/controller/Controller.java @@ -0,0 +1,12 @@ +package org.nhl.containing.controller; + +/** + * Central logic controller. + * + * @author Ruben Bakker + */ +public class Controller { + public Controller() { + + } +} diff --git a/src/main/java/org/nhl/containing/Main.java b/src/main/java/org/nhl/containing/simulator/Main.java similarity index 96% rename from src/main/java/org/nhl/containing/Main.java rename to src/main/java/org/nhl/containing/simulator/Main.java index 3e01c09..13b3964 100644 --- a/src/main/java/org/nhl/containing/Main.java +++ b/src/main/java/org/nhl/containing/simulator/Main.java @@ -1,4 +1,4 @@ -package org.nhl.containing; +package org.nhl.containing.simulator; import com.jme3.app.SimpleApplication; import com.jme3.material.Material; From 47d1c9bdd197bc6b79b57603f592bd8885894373 Mon Sep 17 00:00:00 2001 From: Rubykuby Date: Tue, 11 Nov 2014 11:10:47 +0100 Subject: [PATCH 3/8] Changed property to match Main class --- nbproject/project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index a53d179..bfa1249 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -57,7 +57,7 @@ jnlp.descriptor=application jnlp.enabled=false jnlp.offline-allowed=false jnlp.signed=false -main.class=org.nhl.containing.Main +main.class=org.nhl.containing.simulator.Main meta.inf.dir=${src.dir}/META-INF manifest.file=MANIFEST.MF platform.active=default_platform From 2cc69fac86ef0a1a3205e0422f9a793ba1552280 Mon Sep 17 00:00:00 2001 From: MorenoB Date: Wed, 12 Nov 2014 11:31:45 +0100 Subject: [PATCH 4/8] Deleted simulator package --- nbproject/project.properties | 2 +- .../org/nhl/containing/controller/Container.java | 15 +++++++++------ .../{simulator => controller}/Main.java | 8 ++++---- 3 files changed, 14 insertions(+), 11 deletions(-) rename src/main/java/org/nhl/containing/{simulator => controller}/Main.java (90%) diff --git a/nbproject/project.properties b/nbproject/project.properties index bfa1249..648c16e 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -57,7 +57,7 @@ jnlp.descriptor=application jnlp.enabled=false jnlp.offline-allowed=false jnlp.signed=false -main.class=org.nhl.containing.simulator.Main +main.class=org.nhl.containing.controller.Main meta.inf.dir=${src.dir}/META-INF manifest.file=MANIFEST.MF platform.active=default_platform diff --git a/src/main/java/org/nhl/containing/controller/Container.java b/src/main/java/org/nhl/containing/controller/Container.java index ecd27cf..4edfdd7 100644 --- a/src/main/java/org/nhl/containing/controller/Container.java +++ b/src/main/java/org/nhl/containing/controller/Container.java @@ -1,23 +1,26 @@ package org.nhl.containing.controller; +import java.util.Date; + /** * Data model for a container. - * + * * @author Ruben Bakker */ public class Container { - private int arrivalDate; // Probably change to DateTime format. + + private Date arrivalDate; private String arrivalTransportType; // Method of transport through which the container was delivered. private String arrivalCompany; private String owner; - private int departureDate; // Probably change to DateTime format. + private Date departureDate; private String departureTransportType; // Method of transport through which the container must be dispatched. private String departureCompany; private float weight; // Weight in kilogrammes. private String contents; // What's in the container? - - public Container(int arrivalDate, String arrivalTransportType, String arrivalCompany, String owner, - int departureDate, String departureTransportType, String departureCompany, float weight, String contents) { + + public Container(Date arrivalDate, String arrivalTransportType, String arrivalCompany, String owner, + Date departureDate, String departureTransportType, String departureCompany, float weight, String contents) { this.arrivalDate = arrivalDate; this.arrivalTransportType = arrivalTransportType; this.arrivalCompany = arrivalCompany; diff --git a/src/main/java/org/nhl/containing/simulator/Main.java b/src/main/java/org/nhl/containing/controller/Main.java similarity index 90% rename from src/main/java/org/nhl/containing/simulator/Main.java rename to src/main/java/org/nhl/containing/controller/Main.java index 13b3964..537e749 100644 --- a/src/main/java/org/nhl/containing/simulator/Main.java +++ b/src/main/java/org/nhl/containing/controller/Main.java @@ -1,16 +1,16 @@ -package org.nhl.containing.simulator; +package org.nhl.containing.controller; import com.jme3.app.SimpleApplication; import com.jme3.material.Material; import com.jme3.math.ColorRGBA; -import com.jme3.math.Vector3f; import com.jme3.renderer.RenderManager; import com.jme3.scene.Geometry; import com.jme3.scene.shape.Box; /** - * test - * @author normenhansen + * + * + * @author TRJMM */ public class Main extends SimpleApplication { From f67ff1ead1c68e791f970cc673a7f702578c9b3f Mon Sep 17 00:00:00 2001 From: MorenoB Date: Mon, 17 Nov 2014 13:46:11 +0100 Subject: [PATCH 5/8] Added communication to controller from simulation --- nbproject/project.properties | 2 +- .../containing/controller/Communication.java | 151 ++++++++++++++++++ .../nhl/containing/controller/Controller.java | 10 +- .../org/nhl/containing/controller/Main.java | 5 +- .../containing/simulator/Communication.java | 102 ++++++++++++ .../nhl/containing/simulator/Container.java | 34 ++++ .../nhl/containing/simulator/Controller.java | 14 ++ .../org/nhl/containing/simulator/Main.java | 44 +++++ 8 files changed, 356 insertions(+), 6 deletions(-) create mode 100644 src/main/java/org/nhl/containing/controller/Communication.java create mode 100644 src/main/java/org/nhl/containing/simulator/Communication.java create mode 100644 src/main/java/org/nhl/containing/simulator/Container.java create mode 100644 src/main/java/org/nhl/containing/simulator/Controller.java create mode 100644 src/main/java/org/nhl/containing/simulator/Main.java diff --git a/nbproject/project.properties b/nbproject/project.properties index 648c16e..bfa1249 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -57,7 +57,7 @@ jnlp.descriptor=application jnlp.enabled=false jnlp.offline-allowed=false jnlp.signed=false -main.class=org.nhl.containing.controller.Main +main.class=org.nhl.containing.simulator.Main meta.inf.dir=${src.dir}/META-INF manifest.file=MANIFEST.MF platform.active=default_platform diff --git a/src/main/java/org/nhl/containing/controller/Communication.java b/src/main/java/org/nhl/containing/controller/Communication.java new file mode 100644 index 0000000..ad7f746 --- /dev/null +++ b/src/main/java/org/nhl/containing/controller/Communication.java @@ -0,0 +1,151 @@ +package org.nhl.containing.controller; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.Socket; + +/** + * @author TRJMM Used to communicate with the Backend system + */ +public class Communication { + + private enum statusEnum { + + LISTEN, SENDING, INITIALIZE, DISPOSE + }; + private statusEnum status; + private Socket client; + private InputStream inFromServer; + private DataOutputStream out; + private final int PORT = 6666; + private final String serverName = "localhost"; + private Thread operation; + + public Communication() { + status = status.INITIALIZE; + update(); + } + + /** + * Starts the client + */ + public void startClient() { + try { + + System.out.println("Connecting to " + serverName + + " on port " + PORT); + client = new Socket(serverName, PORT); + System.out.println(" Just connected to " + + client.getRemoteSocketAddress()); + } catch (IOException e) { + e.printStackTrace(); + } + sleep(1000); + } + + /** + * Listens for input from the backend system + */ + public void listen() { + try { + client = new Socket(serverName, PORT); + System.out.println("Listening to " + + client.getRemoteSocketAddress() + "..."); + inFromServer = client.getInputStream(); + DataInputStream in = + new DataInputStream(inFromServer); + if (in.readUTF() == "") { + in.reset(); + } else { + System.out.println("Recieved string " + in.readUTF() + " from backend system!"); + } + in.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * Sends a message to the backend system + * + * @param message The message + */ + public void sendMessage(String message) { + status = status.SENDING; + + try { + if (client == null) { + client = new Socket(serverName, PORT); + sleep(100); + } + System.out.println("Trying to send message " + message + " to the Backend system!"); + out = new DataOutputStream(client.getOutputStream()); + out.writeUTF(message); + System.out.println("Sent message " + message + " to the Backend system!"); + + } catch (Exception e) { + e.printStackTrace(); + } + status = status.LISTEN; + } + + /** + * Stops the client and stops this thread + */ + public void stopClient() { + try { + client.close(); + status = status.DISPOSE; + } catch (Exception e) { + e.printStackTrace(); + } + } + + private void update() { + operation = new Thread(new Runnable() { + @Override + public void run() { + while (true) { + try { + switch (status) { + case INITIALIZE: + startClient(); + status = status.LISTEN; + break; + case LISTEN: + listen(); + status = status.LISTEN; + break; + case SENDING: + sleep(100); + status = status.SENDING; + break; + case DISPOSE: + operation.stop(); + break; + } + + } catch (Throwable e) { + } + } + } + }); + operation.setName("Simulation Communicator"); + operation.start(); + } + + /** + * Sleep this thread we are working with for x milliseconds + * + * @param milliseconds How long are we waiting in milliseconds? + */ + public void sleep(int milliseconds) { + try { + operation.currentThread().sleep(milliseconds); //1000 milliseconds is one second. + } catch (InterruptedException ex) { + operation.currentThread().interrupt(); + } + } +} diff --git a/src/main/java/org/nhl/containing/controller/Controller.java b/src/main/java/org/nhl/containing/controller/Controller.java index d77c45e..9a0df4f 100644 --- a/src/main/java/org/nhl/containing/controller/Controller.java +++ b/src/main/java/org/nhl/containing/controller/Controller.java @@ -2,11 +2,15 @@ /** * Central logic controller. - * - * @author Ruben Bakker + * + * @author TRJMM */ public class Controller { + + private Communication client; + public Controller() { - + client = new Communication(); + client.sendMessage("TEST"); } } diff --git a/src/main/java/org/nhl/containing/controller/Main.java b/src/main/java/org/nhl/containing/controller/Main.java index 537e749..43e8066 100644 --- a/src/main/java/org/nhl/containing/controller/Main.java +++ b/src/main/java/org/nhl/containing/controller/Main.java @@ -15,8 +15,9 @@ public class Main extends SimpleApplication { public static void main(String[] args) { - Main app = new Main(); - app.start(); + //Main app = new Main(); + //app.start(); + Controller controller = new Controller(); } @Override diff --git a/src/main/java/org/nhl/containing/simulator/Communication.java b/src/main/java/org/nhl/containing/simulator/Communication.java new file mode 100644 index 0000000..b9924a2 --- /dev/null +++ b/src/main/java/org/nhl/containing/simulator/Communication.java @@ -0,0 +1,102 @@ +package org.nhl.containing.simulator; + +import java.io.BufferedReader; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.Socket; + +/** + * + * Used to communicate with the Backend system + */ +public class Communication extends Thread { + + private enum commandsEnum { + + WAIT, MOVE, INITIALIZE, LOCATION, LOCATIONNAME, DISPOSE + }; + private commandsEnum commands; + private Socket client; + private OutputStream outToServer; + private InputStream inFromServer; + private final int PORT = 6666; + + public Communication() { + commands = commands.INITIALIZE; + } + + public void startClient() { + String serverName = "localhost"; + String commando; + BufferedReader inFromUser = new BufferedReader(new InputStreamReader(System.in)); + try { + + System.out.println("Connecting to " + serverName + + " on port " + PORT); + client = new Socket(serverName, PORT); + System.out.println("Just connected to " + + client.getRemoteSocketAddress()); + outToServer = client.getOutputStream(); + DataOutputStream out = + new DataOutputStream(outToServer); + commando = inFromUser.readLine(); + out.writeUTF(commando); + inFromServer = client.getInputStream(); + DataInputStream in = + new DataInputStream(inFromServer); + System.out.println("Server says " + in.readUTF()); + + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void listen() { + String serverName = "localhost"; + String commando; + BufferedReader inFromUser = new BufferedReader(new InputStreamReader(System.in)); + try { + client = new Socket(serverName, PORT); + System.out.println("Listening to " + + client.getRemoteSocketAddress() + "..."); + outToServer = client.getOutputStream(); + DataOutputStream out = + new DataOutputStream(outToServer); + System.out.println("Please provide a commando for server " + client.getRemoteSocketAddress()); + commando = inFromUser.readLine(); + out.writeUTF(commando); + inFromServer = client.getInputStream(); + DataInputStream in = + new DataInputStream(inFromServer); + System.out.println("Server says " + in.readUTF()); + + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void run() { + while (true) { + try { + switch (commands) { + case INITIALIZE: + startClient(); + commands = commands.WAIT; + break; + case WAIT: + listen(); + commands = commands.WAIT; + } + + } catch (Throwable e) { + } + + + } + } +} diff --git a/src/main/java/org/nhl/containing/simulator/Container.java b/src/main/java/org/nhl/containing/simulator/Container.java new file mode 100644 index 0000000..cf31a0d --- /dev/null +++ b/src/main/java/org/nhl/containing/simulator/Container.java @@ -0,0 +1,34 @@ +package org.nhl.containing.simulator; + +import java.util.Date; + +/** + * Data model for a container. + * + * @author Ruben Bakker + */ +public class Container { + + private Date arrivalDate; + private String arrivalTransportType; // Method of transport through which the container was delivered. + private String arrivalCompany; + private String owner; + private Date departureDate; + private String departureTransportType; // Method of transport through which the container must be dispatched. + private String departureCompany; + private float weight; // Weight in kilogrammes. + private String contents; // What's in the container? + + public Container(Date arrivalDate, String arrivalTransportType, String arrivalCompany, String owner, + Date departureDate, String departureTransportType, String departureCompany, float weight, String contents) { + this.arrivalDate = arrivalDate; + this.arrivalTransportType = arrivalTransportType; + this.arrivalCompany = arrivalCompany; + this.owner = owner; + this.departureDate = departureDate; + this.departureTransportType = departureTransportType; + this.departureCompany = departureCompany; + this.weight = weight; + this.contents = contents; + } +} diff --git a/src/main/java/org/nhl/containing/simulator/Controller.java b/src/main/java/org/nhl/containing/simulator/Controller.java new file mode 100644 index 0000000..29b3d4c --- /dev/null +++ b/src/main/java/org/nhl/containing/simulator/Controller.java @@ -0,0 +1,14 @@ +package org.nhl.containing.simulator; + +/** + * Central logic controller. + * + * @author Ruben Bakker + */ +public class Controller { + private Thread client; + public Controller() { + client = new Communication(); + client.start(); + } +} diff --git a/src/main/java/org/nhl/containing/simulator/Main.java b/src/main/java/org/nhl/containing/simulator/Main.java new file mode 100644 index 0000000..1f3d59e --- /dev/null +++ b/src/main/java/org/nhl/containing/simulator/Main.java @@ -0,0 +1,44 @@ +package org.nhl.containing.simulator; + +import com.jme3.app.SimpleApplication; +import com.jme3.material.Material; +import com.jme3.math.ColorRGBA; +import com.jme3.renderer.RenderManager; +import com.jme3.scene.Geometry; +import com.jme3.scene.shape.Box; + +/** + * + * + * @author TRJMM + */ +public class Main extends SimpleApplication { + + public static void main(String[] args) { + //Main app = new Main(); + //app.start(); + Controller controller = new Controller(); + } + + @Override + public void simpleInitApp() { + Box b = new Box(1, 1, 1); + Geometry geom = new Geometry("Box", b); + + Material mat = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md"); + mat.setColor("Color", ColorRGBA.Blue); + geom.setMaterial(mat); + + rootNode.attachChild(geom); + } + + @Override + public void simpleUpdate(float tpf) { + //TODO: add update code + } + + @Override + public void simpleRender(RenderManager rm) { + //TODO: add render code + } +} From 7cc8e86511312ff642807f10193b89f79b319553 Mon Sep 17 00:00:00 2001 From: MorenoB Date: Mon, 17 Nov 2014 14:09:42 +0100 Subject: [PATCH 6/8] Added full communication between the two applications --- .../containing/controller/Communication.java | 18 ++++++++++++------ .../nhl/containing/controller/Controller.java | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/nhl/containing/controller/Communication.java b/src/main/java/org/nhl/containing/controller/Communication.java index ad7f746..5a935c8 100644 --- a/src/main/java/org/nhl/containing/controller/Communication.java +++ b/src/main/java/org/nhl/containing/controller/Communication.java @@ -50,18 +50,21 @@ public void startClient() { */ public void listen() { try { - client = new Socket(serverName, PORT); + if (client == null) { + client = new Socket(serverName, PORT); + sleep(100); + } System.out.println("Listening to " + client.getRemoteSocketAddress() + "..."); inFromServer = client.getInputStream(); - DataInputStream in = + DataInputStream input = new DataInputStream(inFromServer); - if (in.readUTF() == "") { - in.reset(); + String outputString = input.readUTF(); + if (outputString == "") { + input.reset(); } else { - System.out.println("Recieved string " + in.readUTF() + " from backend system!"); + System.out.println("Recieved string " + outputString + " from backend system!"); } - in.close(); } catch (IOException e) { e.printStackTrace(); } @@ -103,6 +106,9 @@ public void stopClient() { } } + /** + * This method will be called once and loops until the thread stops. + */ private void update() { operation = new Thread(new Runnable() { @Override diff --git a/src/main/java/org/nhl/containing/controller/Controller.java b/src/main/java/org/nhl/containing/controller/Controller.java index 9a0df4f..f8e4e1a 100644 --- a/src/main/java/org/nhl/containing/controller/Controller.java +++ b/src/main/java/org/nhl/containing/controller/Controller.java @@ -11,6 +11,6 @@ public class Controller { public Controller() { client = new Communication(); - client.sendMessage("TEST"); + //client.sendMessage("TEST"); } } From 7bf420f79b697b7c1f5f06e4cefd6ad5ca8e8d80 Mon Sep 17 00:00:00 2001 From: MorenoB Date: Mon, 17 Nov 2014 14:12:31 +0100 Subject: [PATCH 7/8] Deleted duplicates --- .../containing/simulator/Communication.java | 102 ------------------ .../nhl/containing/simulator/Container.java | 34 ------ .../nhl/containing/simulator/Controller.java | 14 --- .../org/nhl/containing/simulator/Main.java | 44 -------- 4 files changed, 194 deletions(-) delete mode 100644 src/main/java/org/nhl/containing/simulator/Communication.java delete mode 100644 src/main/java/org/nhl/containing/simulator/Container.java delete mode 100644 src/main/java/org/nhl/containing/simulator/Controller.java delete mode 100644 src/main/java/org/nhl/containing/simulator/Main.java diff --git a/src/main/java/org/nhl/containing/simulator/Communication.java b/src/main/java/org/nhl/containing/simulator/Communication.java deleted file mode 100644 index b9924a2..0000000 --- a/src/main/java/org/nhl/containing/simulator/Communication.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.nhl.containing.simulator; - -import java.io.BufferedReader; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.Socket; - -/** - * - * Used to communicate with the Backend system - */ -public class Communication extends Thread { - - private enum commandsEnum { - - WAIT, MOVE, INITIALIZE, LOCATION, LOCATIONNAME, DISPOSE - }; - private commandsEnum commands; - private Socket client; - private OutputStream outToServer; - private InputStream inFromServer; - private final int PORT = 6666; - - public Communication() { - commands = commands.INITIALIZE; - } - - public void startClient() { - String serverName = "localhost"; - String commando; - BufferedReader inFromUser = new BufferedReader(new InputStreamReader(System.in)); - try { - - System.out.println("Connecting to " + serverName - + " on port " + PORT); - client = new Socket(serverName, PORT); - System.out.println("Just connected to " - + client.getRemoteSocketAddress()); - outToServer = client.getOutputStream(); - DataOutputStream out = - new DataOutputStream(outToServer); - commando = inFromUser.readLine(); - out.writeUTF(commando); - inFromServer = client.getInputStream(); - DataInputStream in = - new DataInputStream(inFromServer); - System.out.println("Server says " + in.readUTF()); - - } catch (IOException e) { - e.printStackTrace(); - } - } - - public void listen() { - String serverName = "localhost"; - String commando; - BufferedReader inFromUser = new BufferedReader(new InputStreamReader(System.in)); - try { - client = new Socket(serverName, PORT); - System.out.println("Listening to " - + client.getRemoteSocketAddress() + "..."); - outToServer = client.getOutputStream(); - DataOutputStream out = - new DataOutputStream(outToServer); - System.out.println("Please provide a commando for server " + client.getRemoteSocketAddress()); - commando = inFromUser.readLine(); - out.writeUTF(commando); - inFromServer = client.getInputStream(); - DataInputStream in = - new DataInputStream(inFromServer); - System.out.println("Server says " + in.readUTF()); - - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void run() { - while (true) { - try { - switch (commands) { - case INITIALIZE: - startClient(); - commands = commands.WAIT; - break; - case WAIT: - listen(); - commands = commands.WAIT; - } - - } catch (Throwable e) { - } - - - } - } -} diff --git a/src/main/java/org/nhl/containing/simulator/Container.java b/src/main/java/org/nhl/containing/simulator/Container.java deleted file mode 100644 index cf31a0d..0000000 --- a/src/main/java/org/nhl/containing/simulator/Container.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.nhl.containing.simulator; - -import java.util.Date; - -/** - * Data model for a container. - * - * @author Ruben Bakker - */ -public class Container { - - private Date arrivalDate; - private String arrivalTransportType; // Method of transport through which the container was delivered. - private String arrivalCompany; - private String owner; - private Date departureDate; - private String departureTransportType; // Method of transport through which the container must be dispatched. - private String departureCompany; - private float weight; // Weight in kilogrammes. - private String contents; // What's in the container? - - public Container(Date arrivalDate, String arrivalTransportType, String arrivalCompany, String owner, - Date departureDate, String departureTransportType, String departureCompany, float weight, String contents) { - this.arrivalDate = arrivalDate; - this.arrivalTransportType = arrivalTransportType; - this.arrivalCompany = arrivalCompany; - this.owner = owner; - this.departureDate = departureDate; - this.departureTransportType = departureTransportType; - this.departureCompany = departureCompany; - this.weight = weight; - this.contents = contents; - } -} diff --git a/src/main/java/org/nhl/containing/simulator/Controller.java b/src/main/java/org/nhl/containing/simulator/Controller.java deleted file mode 100644 index 29b3d4c..0000000 --- a/src/main/java/org/nhl/containing/simulator/Controller.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.nhl.containing.simulator; - -/** - * Central logic controller. - * - * @author Ruben Bakker - */ -public class Controller { - private Thread client; - public Controller() { - client = new Communication(); - client.start(); - } -} diff --git a/src/main/java/org/nhl/containing/simulator/Main.java b/src/main/java/org/nhl/containing/simulator/Main.java deleted file mode 100644 index 1f3d59e..0000000 --- a/src/main/java/org/nhl/containing/simulator/Main.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.nhl.containing.simulator; - -import com.jme3.app.SimpleApplication; -import com.jme3.material.Material; -import com.jme3.math.ColorRGBA; -import com.jme3.renderer.RenderManager; -import com.jme3.scene.Geometry; -import com.jme3.scene.shape.Box; - -/** - * - * - * @author TRJMM - */ -public class Main extends SimpleApplication { - - public static void main(String[] args) { - //Main app = new Main(); - //app.start(); - Controller controller = new Controller(); - } - - @Override - public void simpleInitApp() { - Box b = new Box(1, 1, 1); - Geometry geom = new Geometry("Box", b); - - Material mat = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md"); - mat.setColor("Color", ColorRGBA.Blue); - geom.setMaterial(mat); - - rootNode.attachChild(geom); - } - - @Override - public void simpleUpdate(float tpf) { - //TODO: add update code - } - - @Override - public void simpleRender(RenderManager rm) { - //TODO: add render code - } -} From 658c9ebcdc7ac41c22364899b49485ee31d4d2bd Mon Sep 17 00:00:00 2001 From: MorenoB Date: Thu, 20 Nov 2014 11:29:54 +0100 Subject: [PATCH 8/8] Corrected commit --- nbproject/project.properties | 7 +++ .../containing/controller/Communication.java | 43 +++++++++++-------- .../nhl/containing/controller/Controller.java | 5 ++- .../org/nhl/containing/controller/Main.java | 1 + 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index bfa1249..b20d2f0 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,3 +1,7 @@ +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.processors.list= +annotation.processing.run.all.processors=true application.title=MyGame application.vendor=MyCompany assets.jar.name=assets.jar @@ -35,6 +39,8 @@ javac.classpath=\ # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} javac.source=1.5 javac.target=1.5 javac.test.classpath=\ @@ -60,6 +66,7 @@ jnlp.signed=false main.class=org.nhl.containing.simulator.Main meta.inf.dir=${src.dir}/META-INF manifest.file=MANIFEST.MF +mkdist.disabled=false platform.active=default_platform run.classpath=\ ${javac.classpath}:\ diff --git a/src/main/java/org/nhl/containing/controller/Communication.java b/src/main/java/org/nhl/containing/controller/Communication.java index 5a935c8..9ebce54 100644 --- a/src/main/java/org/nhl/containing/controller/Communication.java +++ b/src/main/java/org/nhl/containing/controller/Communication.java @@ -5,27 +5,37 @@ import java.io.IOException; import java.io.InputStream; import java.net.Socket; +/* + * Commands; + * + * OK + [OBJECT] + [OBJECTID] + /OK + * + */ /** * @author TRJMM Used to communicate with the Backend system */ public class Communication { - private enum statusEnum { + private enum Status { LISTEN, SENDING, INITIALIZE, DISPOSE }; - private statusEnum status; + private Status status; private Socket client; private InputStream inFromServer; private DataOutputStream out; private final int PORT = 6666; private final String serverName = "localhost"; private Thread operation; + private String commando = ""; public Communication() { - status = status.INITIALIZE; - update(); + status = Status.INITIALIZE; + } + + public String getCommando() { + return commando; } /** @@ -40,7 +50,6 @@ public void startClient() { System.out.println(" Just connected to " + client.getRemoteSocketAddress()); } catch (IOException e) { - e.printStackTrace(); } sleep(1000); } @@ -59,14 +68,14 @@ public void listen() { inFromServer = client.getInputStream(); DataInputStream input = new DataInputStream(inFromServer); - String outputString = input.readUTF(); - if (outputString == "") { + commando = input.readUTF(); + if (commando.equals("")) { input.reset(); + commando = ""; } else { - System.out.println("Recieved string " + outputString + " from backend system!"); + System.out.println("Recieved string " + commando + " from backend system!"); } } catch (IOException e) { - e.printStackTrace(); } } @@ -76,7 +85,7 @@ public void listen() { * @param message The message */ public void sendMessage(String message) { - status = status.SENDING; + status = Status.SENDING; try { if (client == null) { @@ -89,9 +98,8 @@ public void sendMessage(String message) { System.out.println("Sent message " + message + " to the Backend system!"); } catch (Exception e) { - e.printStackTrace(); } - status = status.LISTEN; + status = Status.LISTEN; } /** @@ -100,16 +108,15 @@ public void sendMessage(String message) { public void stopClient() { try { client.close(); - status = status.DISPOSE; + status = Status.DISPOSE; } catch (Exception e) { - e.printStackTrace(); } } /** * This method will be called once and loops until the thread stops. */ - private void update() { + public void Start() { operation = new Thread(new Runnable() { @Override public void run() { @@ -118,15 +125,15 @@ public void run() { switch (status) { case INITIALIZE: startClient(); - status = status.LISTEN; + status = Status.LISTEN; break; case LISTEN: listen(); - status = status.LISTEN; + status = Status.LISTEN; break; case SENDING: sleep(100); - status = status.SENDING; + status = Status.SENDING; break; case DISPOSE: operation.stop(); diff --git a/src/main/java/org/nhl/containing/controller/Controller.java b/src/main/java/org/nhl/containing/controller/Controller.java index f8e4e1a..19598d8 100644 --- a/src/main/java/org/nhl/containing/controller/Controller.java +++ b/src/main/java/org/nhl/containing/controller/Controller.java @@ -11,6 +11,9 @@ public class Controller { public Controller() { client = new Communication(); - //client.sendMessage("TEST"); + } + + public void Start() { + client.Start(); } } diff --git a/src/main/java/org/nhl/containing/controller/Main.java b/src/main/java/org/nhl/containing/controller/Main.java index 43e8066..b41012b 100644 --- a/src/main/java/org/nhl/containing/controller/Main.java +++ b/src/main/java/org/nhl/containing/controller/Main.java @@ -18,6 +18,7 @@ public static void main(String[] args) { //Main app = new Main(); //app.start(); Controller controller = new Controller(); + controller.Start(); } @Override