Changeset 84 for java/main/src/main/java/com/framsticks/core/Program.java

Timestamp:

06/22/13 21:51:33 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• simplification of entities management model
• cleanup around params (improve hierarchy)
• migrate from JUnit to TestNG
• introduce FEST to automatically test GUI
• improve slider control
• loosen synchronization between gui tree and backend representation
• and many other bug fixes

NOTICE:

• a great many of lines is changed only because of substituting spaces with tabs

CHANGELOG (oldest changes at the bottom):

Some cleaning after fix found.

Fix bug with tree.

More changes with TreeNodes?.

Finally fix issue with tree.

Improve gui tree management.

Decouple update of values from fetch request in gui.

Minor changes.

Minor changes.

Minor change.

Change Path construction wording.

More fixes to SliderControl?.

Fix SliderControl?.

Fix SliderControl?.

Minor improvement.

Several changes.

Make NumberParam? a generic class.

Add robot to the gui test.

Setup common testing logging configuration.

Remove Parameters class.

Remove entityOwner from Parameters.

Move name out from Parameters class.

Move configuration to after the construction.

Simplify observers and endpoints.

Remove superfluous configureEntity overrides.

Add dependency on fest-swing-testng.

Use FEST for final print test.

Use FEST for more concise and readable assertions.

Divide test of F0Parser into multiple methods.

Migrate to TestNG

Minor change.

Change convention from LOGGER to log.

Fix reporting of errors during controls filling.

Bound maximal height of SliderControl?.

Minor improvements.

Improve tooltips for controls.

Also use Delimeted in more places.

Move static control utilities to Gui.

Rename package gui.components to controls.

Some cleaning in controls.

Improve Param classes placing.

Move ValueParam?, PrimitiveParam? and CompositeParam? one package up.

Improve ParamBuilder?.

Move getDef to ValueParam? and PrimitiveParam?.

Move getMax and getDef to ValueParam?.

Move getMin to ValueParam?.

Upgrade to laters apache commons versions.

Use filterInstanceof extensively.

Add instanceof filters.

Make ValueParam? in many places of Param.

Place assertions about ValueParam?.

Add ValueParam?

Rename ValueParam? to PrimitiveParam?

Minor changes.

Several improvements to params types.

Add NumberParam?.

Add TextControl? component.

Add .swp files to .gitignore

Greatly improved slider component.

Some improvements.

Make Param.reassign return also a state.

Add IterableIterator?.

Several changes.

• Move util classes to better packages.
• Remove warnings from eclim.

Several improvements.

Fix bug with BooleanParam?.

Some experiments with visualization.

Another fix to panel management.

Improve panel management.

Some refactorization around panels.

Add root class for panel.

Location:

java/main

Files:

• . (modified) (1 prop)
• src/main/java/com/framsticks/core/Program.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package com.framsticks.core;
 
-import com.framsticks.util.Pair;
-import com.framsticks.util.Strings;
+import com.framsticks.util.lang.IterableIterator;
+import com.framsticks.util.lang.Pair;
+import com.framsticks.util.lang.Strings;
 import org.apache.commons.configuration.*;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
-//import sun.misc.Signal;
-//import sun.misc.SignalHandler;
 
 import java.lang.reflect.Constructor;
@@ -15 +14 @@
  * @author Piotr Sniegowski
  */
-public class Program extends com.framsticks.util.Thread {
+public class Program extends com.framsticks.util.dispatching.Thread {
 
-    private final static Logger LOGGER = Logger.getLogger(Program.class.getName());
+        private final static Logger log = Logger.getLogger(Program.class.getName());
 
-/*
-    protected SignalHandler signalHandler = new SignalHandler() {
-        @Override
-        public void handle(Signal signal) {
-            LOGGER.info("caught " + signal);
-            Runtime.getRuntime().exit(0);
-        }
-    };
-*/
+        protected Entity entity;
 
-    protected Entity entity;
+        Configuration config;
 
-    Configuration config;
+        public Program(String name) {
+                super(name, java.lang.Thread.currentThread());
+        }
 
+        public static Entity configureEntity(Configuration config) {
+                String typeName = config.getString("class");
+                log.info("configuring instance " + typeName);
+                try {
+                        Class<?> type = Class.forName(typeName);
+                        Constructor<?> constructor = type.getConstructor();
+                        Entity entity = (Entity) constructor.newInstance();
+                        return entity;
+                } catch (Exception e) {
+                        log.error("failed to instantiate: " + e);
+                }
+                return null;
+        }
 
-    public Program(String name) {
-        super(name, java.lang.Thread.currentThread());
-//        Signal.handle(new Signal("INT"), signalHandler);
-//        Signal.handle(new Signal("TERM"), signalHandler);
-    }
+        protected static void resolve(Configuration config, String prefix) {
+                for (String p : new IterableIterator<String>(prefix == null ? config.getKeys() : config.getKeys(prefix))) {
+                        if (p.endsWith(".mount")) {
+                                String source = config.getString(p);
+                                log.info("mounting " + source + " at " + p);
+                                config.clearProperty(p);
+                                Configuration mount = config.subset(source);
+                                for (String mk : new IterableIterator<String>(mount.getKeys())) {
+                                        config.addProperty(p.substring(0, p.length() - 6) + "." + mk, mount.getProperty(mk));
+                                }
+                        }
+                }
+        }
 
-    public static Entity configureEntity(Parameters parameters) {
-        String typeName = parameters.getConfig().getString("class");
-        LOGGER.info("configuring instance " + typeName);
-        try {
-            Class type = Class.forName(typeName);
-            Constructor constructor = type.getConstructor(Parameters.class);
-            return (Entity) constructor.newInstance(parameters);
-        } catch (Exception e) {
-            LOGGER.error("failed to instantiate: " + e);
-        }
-        return null;
-    }
-
-    protected static void resolve(Configuration config, String prefix) {
-
-        Iterator i = prefix == null ? config.getKeys() : config.getKeys(prefix);
-        while (i.hasNext()) {
-            String p = (String) i.next();
-            if (p.endsWith(".mount")) {
-                String source = config.getString(p);
-                LOGGER.info("mounting " + source + " at " + p);
-                config.clearProperty(p);
-                Configuration mount = config.subset(source);
-                Iterator mi = mount.getKeys();
-                while (mi.hasNext()) {
-                    String mk = (String) mi.next();
-                    config.addProperty(p.substring(0, p.length() - 6) + "." + mk, mount.getProperty(mk));
-                }
-            }
-        }
-    }
-
-    public void run(String[] args) {
+        public void run(String[] args) {
 
                 PropertyConfigurator.configure(getClass().getResource("/configs/log4j.properties"));
-                LOGGER.debug("started in " + System.getProperty("user.dir"));
-        try {
+                log.debug("started in " + System.getProperty("user.dir"));
+                try {
                         config = new PropertiesConfiguration(getClass().getResource("/configs/framsticks.properties"));
 
-            for (String a : args) {
-                Pair<String, String> p = Strings.splitIntoPair(a, '=', "true");
-                config.setProperty(p.first, p.second);
-            }
+                        for (String a : args) {
+                                Pair<String, String> p = Strings.splitIntoPair(a, '=', "true");
+                                config.setProperty(p.first, p.second);
+                        }
 
-            resolve(config, null);
+                        resolve(config, null);
 
-            Iterator i = config.getKeys();
-            while (i.hasNext()) {
-                String p = (String) i.next();
-                LOGGER.debug(p + " = " + config.getProperty(p));
-            }
+                        Iterator<?> i = config.getKeys();
+                        while (i.hasNext()) {
+                                String p = (String) i.next();
+                                log.debug(p + " = " + config.getProperty(p));
+                        }
 
-        } catch (ConfigurationException e) {
-            System.err.print("failed to parse configuration:" + e);
-            return;
-        }
+                } catch (ConfigurationException e) {
+                        System.err.print("failed to parse configuration:" + e);
+                        return;
+                }
+                Configuration entityConfig = config.subset("com.framsticks.entity");
 
-        entity = configureEntity(new Parameters(config.subset("com.framsticks.entity"), "main", null, new EntityOwner() {
+                entity = configureEntity(entityConfig);
+                entity.setOwner(new EntityOwner() {
                         @Override
                         public void onDone() {
-                                LOGGER.info("exiting");
+                                log.info("exiting");
                                 Runtime.getRuntime().exit(0);
                         }
-                }));
+                });
+                entity.setName("main");
                 try {
-                entity.configurePublic();
+                        entity.configure(entityConfig);
                 } catch (Exception e) {
-                        LOGGER.fatal("exception caught during configuration: " + e);
+                        log.fatal("exception caught during configuration: " + e);
                 }
-        LOGGER.info("all entities were configured");
-        entity.start();
-    }
+                log.info("all entities were configured");
+                entity.start();
+        }
 
-    public static void main(final String[] args) {
-        final Program program = new Program("program");
-        program.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                program.run(args);
-            }
-        });
-        program.routine();
-    }
+        public static void main(final String[] args) {
+
+                final Program program = new Program("program");
+                program.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                                program.run(args);
+                        }
+                });
+                program.routine();
+        }
 
 }