Changeset 88 for java/main/src/main/java/com/framsticks/core/Entity.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/core/Entity.java (modified) (2 diffs)

java/main/src/main/java/com/framsticks/core/Entity.java

@@ -1 +1 @@
 package com.framsticks.core;
 
-import javax.annotation.OverridingMethodsMustInvokeSuper;
 
 import com.framsticks.params.annotations.FramsClassAnnotation;
-import com.framsticks.params.annotations.ParamAnnotation;
-import com.framsticks.util.dispatching.Thread;
-import com.framsticks.util.dispatching.Dispatcher;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.log4j.Logger;
-import com.framsticks.util.dispatching.RunAt;
+import com.framsticks.util.dispatching.Joinable;
 
 /**
@@ -16 +9 @@
  */
 @FramsClassAnnotation
-public abstract class Entity implements Dispatcher<Entity> {
+public interface Entity extends Joinable {
 
-        private final static Logger log = Logger.getLogger(Entity.class);
+        public String getName();
 
-        @ParamAnnotation
-        protected String name = "entity";
-        protected EntityOwner owner;
-        protected Dispatcher<Entity> dispatcher;
-
-        public Entity() {
-        }
-
-        public final String getName() {
-                return name;
-        }
-
-        /**
-         * @param name the name to set
-         */
-        public final void setName(String name) {
-                this.name = name;
-                if (dispatcher instanceof Thread) {
-                        ((Thread<Entity>) dispatcher).setName(name);
-                }
-        }
-
-        /**
-         * @return the owner
-         */
-        public EntityOwner getOwner() {
-                return owner;
-        }
-
-        /**
-         * @param owner the owner to set
-         */
-        public void setOwner(EntityOwner owner) {
-                this.owner = owner;
-        }
-
-        @Override
-        public final boolean isActive() {
-                return dispatcher == null || dispatcher.isActive();
-        }
-
-        @Override
-        public final void invokeLater(RunAt<? extends Entity> runnable) {
-                assert dispatcher != null;
-                dispatcher.invokeLater(runnable);
-        }
-
-        public Dispatcher<Entity> createDefaultDispatcher() {
-                return new Thread<Entity>(name).start();
-        }
-
-        @OverridingMethodsMustInvokeSuper
-        protected void run() {
-                assert isActive();
-                log.info("running: " + this);
-        }
+        // /**
+        //  * @param name the name to set
+        //  */
+        // @ParamAnnotation
+        // public final void setName(String name) {
+        //      this.name = name;
+        //      if (dispatcher instanceof Thread) {
+        //              ((Thread<Entity>) dispatcher).setName(name);
+        //      }
+        // }
 
 
-        public void configure(Configuration config) {
-        }
+        // public Dispatcher<Entity> createDefaultDispatcher() {
+        //      return new Thread<Entity>().setName(name).start();
+        // }
 
-        public Dispatcher<Entity> getDispatcher() {
-                return dispatcher;
-        }
-
-        /**
-         * @param dispatcher the dispatcher to set
-         */
-        public void setDispatcher(Dispatcher<Entity> dispatcher) {
-                this.dispatcher = dispatcher;
-        }
-
-        public final void start() {
-                if (dispatcher == null) {
-                        log.debug("no dispatcher set for " + this + ", creating default one");
-                        setDispatcher(createDefaultDispatcher());
-                }
-                invokeLater(new RunAt<Entity>() {
-                        @Override
-                        public void run() {
-                                Entity.this.run();
-                        }
-                });
-        }
-
-        public final void done() {
-                log.info("stopping entity");
-                if (owner != null) {
-                        owner.onDone();
-                }
-        }
-
+        // public void start() {
+        //      if (dispatcher == null) {
+        //              log.debug("no dispatcher set for " + this + ", creating default one");
+        //              dispatcher = createDefaultDispatcher();
+        //      }
+        //      invokeLater(new RunAt<Entity>() {
+        //              @Override
+        //              public void run() {
+        //                      Entity.this.run();
+        //              }
+        //      });
+        // }
 }