Changeset 88 for java/main/src/main/java/com/framsticks/communication/ClientConnection.java

Timestamp:

06/30/13 12:48:20 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• loading f0 schema with XmlLoader?
• use XmlLoader? to load configuration
• introduce unified fork-join model of various entities

(Instances, Connections, GUI Frames, etc.),
all those entities clean up gracefully on
shutdown, which may be initialized by user
or by some entity

• basing on above, simplify several organizing classes

(Observer, main class)

• add ExternalProcess? runner and it's extension: FramsServer?

(to host native frams server process from Java level)

CHANGELOG:
Remove redundant Observer class.

Clean up in AbstractJoinable?.

Update ExternalProcess? class to changes in joining model.

Another sweep through code with FindBugs?.

Find bug with not joining RemoteInstance?.

Joining almost works.

Much improved joining model.

More improvement to joining model.

Add logging messages around joinable operations.

Rename methods in AbstractJoinable?.

Improve Joinable.

Rewrite of entity structure.

More simplifications with entities.

Further improve joinables.

Let Frame compose from JFrame instead of inheriting.

Add join classes.

Improvements of closing.

Add Builder interface.

Add FramsServerTest?.xml

FramsServer? may be configured through xml.

Make Framsticks main class an Observer of Entities.

Make Observer a generic type.

Remove variables regarding to removed endpoint.

Simplify observer (remove endpoints).

More changes to Observer and Endpoint.

Minor improvements.

Add OutputListener? to ExternalProcess?.

Improve testing of ExternalProcess?.

Add ExternalProcess? runner.

Rename the Program class to Framsticks.

Migrate Program to use XmlLoader? configuration.

First steps with configuration using XmlLoader?.

Fix several bugs.

Move all f0 classes to apriopriate package.

XmlLoader? is able to load Schema.

XmlLoader? is loading classes and props.

Add GroupBuilder?.

File:

• java/main/src/main/java/com/framsticks/communication/ClientConnection.java (modified) (10 diffs)

java/main/src/main/java/com/framsticks/communication/ClientConnection.java

@@ -32 +32 @@
         protected final Map<String, Subscription<?>> subscriptions = new HashMap<>();
 
-        public String getAddress() {
-                return address;
-        }
-
-        public void connect(StateFunctor connectedFunctor) {
+        /**
+         * @param connectedFunctor the connectedFunctor to set
+         */
+        public void setConnectedFunctor(StateFunctor connectedFunctor) {
+                this.connectedFunctor = connectedFunctor;
+        }
+
+
+        protected StateFunctor connectedFunctor;
+
+        @Override
+        protected void joinableStart() {
                 try {
                         log.info("connecting to " + address);
@@ -46 +53 @@
                         log.info("connected to " + hostName + ":" + port);
                         connected = true;
-
                         runThreads();
 
@@ -56 +62 @@
                         log.error("buffer creation failure");
                         connectedFunctor.call(e);
-                        close();
-                }
-        }
+                        // close();
+                }
+        }
+
 
         private static abstract class InboundMessage {
@@ -149 +156 @@
 
 
-        protected final String address;
         protected final String hostName;
         protected final int port;
@@ -156 +162 @@
 
         public ClientConnection(String address) {
-                assert address != null;
-                this.address = address;
+                super(address);
                 Matcher matcher = addressPattern.matcher(address);
                 if (!matcher.matches()) {
@@ -235 +240 @@
         @Override
         public String toString() {
-                return address;
+                return "client connection " + address;
         }
 
@@ -328 +333 @@
         private int nextQueryId = 0;
 
-        protected void processMessage(InboundMessage inboundMessage) throws Exception {
+        protected void processMessage(InboundMessage inboundMessage) {
                 if (inboundMessage == null) {
                         log.error("failed to use any inbound message");
@@ -342 +347 @@
         }
 
-        protected void processEvent(String rest) throws Exception {
+        protected void processEvent(String rest) {
                 Matcher matcher = eventPattern.matcher(rest);
                 if (!matcher.matches()) {
@@ -359 +364 @@
 
 
-        protected void processMessageStartingWith(String line) throws Exception {
+        protected void processMessageStartingWith(String line) {
                 Pair<String, String> command = Strings.splitIntoPair(line, ' ', "\n");
                 if (command.first.equals("event")) {
@@ -384 +389 @@
 
         @Override
-        protected void receiverThreadRoutine() throws Exception {
+        protected void receiverThreadRoutine() {
                 while (connected) {
-                        processMessageStartingWith(getLine());
-                }
-        }
+                        try {
+                                processMessageStartingWith(getLine());
+                        } catch (Exception e) {
+                                break;
+                        }
+                }
+        }
+
 
 }