Changeset 88 for java/main/src/test/java/com/framsticks/gui/BrowserTest.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/test/java/com/framsticks/gui/BrowserTest.java (modified) (8 diffs)

java/main/src/test/java/com/framsticks/gui/BrowserTest.java

@@ -3 +3 @@
 import javax.swing.JFrame;
 
-import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.log4j.Logger;
 import org.fest.swing.edt.FailOnThreadViolationRepaintManager;
@@ -16 +15 @@
 import com.framsticks.remote.RemoteInstance;
 import com.framsticks.test.TestConfiguration;
+import com.framsticks.util.dispatching.Dispatching;
+import com.framsticks.util.dispatching.JoinableMonitor;
+// import com.framsticks.util.dispatching.Dispatching;
 
 import static org.fest.assertions.Assertions.*;
@@ -25 +27 @@
         private static final Logger log = Logger.getLogger(BrowserTest.class);
 
+        JoinableMonitor monitor;
         Browser browser;
         Robot robot;
@@ -37 +40 @@
 
                 browser = new Browser();
-                browser.configure(new PropertiesConfiguration());
+                monitor = new JoinableMonitor(browser);
 
                 RemoteInstance localhost = new RemoteInstance();
@@ -43 +46 @@
                 localhost.setAddress("localhost:9009");
 
-                browser.addEndpointForInstance(localhost);
+                browser.addInstance(localhost);
 
-                browser.start();
+                monitor.use();
                 // robot.waitForIdle();
                 frame = new FrameFixture(robot,
@@ -51 +54 @@
                                         @Override
                                         protected JFrame executeInEDT() throws Throwable {
-                                                return browser.getMainFrame();
+                                                return browser.getMainFrame().getSwing();
                                         }
                                 }));
@@ -86 +89 @@
                 clickAndExpandPath(tree, "localhost/simulator/genepools/groups");
                 clickAndExpandPath(tree, "localhost/simulator/genepools/groups/Genotypes");
+
+
+
+
+
+
                 // tree.clickPath("localhost/simulator/genepools/groups/Genotypes/genotypes");
                 // robot.waitForIdle();
@@ -97 +106 @@
         }
 
-        public void sleep(int seconds) {
-                try {
-                        Thread.sleep(seconds * 1000, 0);
-                } catch (InterruptedException e) {
-                        e.printStackTrace();
-                }
-        }
 
         @AfterClass
         public void tearDown() {
-                // frame.close();
-                frame.cleanUp();
+                log.info("before close");
+
+                monitor.drop();
+
+                Dispatching.joinAbsolutely(browser);
+                // frame.cleanUp();
+                // log.info("before close");
+                // browser.interrupt();
+
+                // try {
+                //      // frame.close();
+                // } catch (Throwable t) {
+                //      log.error("caught ", t);
+                // }
+                // log.info("after close");
+                // // frame.close();
+                // // frame.cleanUp();
+
+
+
+                // Dispatching.join(browser);
         }