Changeset 85 for java/main/src/main/java/com/framsticks/gui/Frame.java

Timestamp:

06/24/13 13:38:40 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• upgrade to Java 7
  • use try-multi-catch clauses
  • use try-with-resources were appropriate
• configure FindBugs? (use mvn site and then navigate in browser to the report)
  • remove most bugs found
• parametrize Dispatching environment (Dispatcher, RunAt?) to enforce more control on the place of closures actual call

CHANGELOG:
Rework FavouritesXMLFactory.

FindBugs?. Thread start.

FindBugs?. Minor change.

FindBugs?. Iterate over entrySet.

FindBugs?. Various.

FindBug?.

FindBug?. Encoding.

FindBug?. Final fields.

FindBug?.

Remove synchronization bug in ClientConnection?.

Experiments with findbugs.

Finish parametrization.

Make RunAt? an abstract class.

More changes in parametrization.

More changes in parametrizing dispatching.

Several changes to parametrize tasks.

Rename Runnable to RunAt?.

Add specific framsticks Runnable.

Add JSR305 (annotations).

Add findbugs reporting.

More improvements to ParamBuilder? wording.

Make FramsClass? accept also ParamBuilder?.

Change wording of ParamBuilder?.

Change wording of Request creation.

Use Java 7 exception catch syntax.

Add ScopeEnd? class.

Upgrade to Java 7.

File:

• java/main/src/main/java/com/framsticks/gui/Frame.java (modified) (7 diffs)

java/main/src/main/java/com/framsticks/gui/Frame.java

@@ -6 +6 @@
 import com.framsticks.gui.view.TreeCellRenderer;
 import com.framsticks.util.dispatching.Dispatcher;
+import com.framsticks.util.lang.ScopeEnd;
 import com.framsticks.util.swing.KeyboardModifier;
 import org.apache.log4j.Logger;
@@ -21 +22 @@
 import java.util.HashMap;
 import java.util.Map;
+import com.framsticks.util.dispatching.RunAt;
 
 /**
@@ -26 +28 @@
  */
 @SuppressWarnings("serial")
-public class Frame extends JFrame implements Dispatcher {
+public class Frame extends JFrame implements Dispatcher<Frame> {
 
         private static final Logger log = Logger.getLogger(Frame.class.getName());
@@ -267 +269 @@
 
         @Override
-        public void invokeLater(Runnable runnable) {
-                SwingDispatcher.instance.invokeLater(runnable);
+        public void invokeLater(RunAt<? extends Frame> runnable) {
+                SwingDispatcher.getInstance().invokeLater(runnable);
         }
 
@@ -325 +327 @@
         }
 
-        public Runnable startChange(final DefaultMutableTreeNode node) {
+        public ScopeEnd startChange(final DefaultMutableTreeNode node) {
                 assert isActive();
                 final TreePath selection = tree.getSelectionPath();
-                return new Runnable() {
-                        @Override
-                        public void run() {
+                return new ScopeEnd() {
+                        @Override
+                        public void close() {
                                 assert isActive();
                                 treeModel.nodeChanged(node);
@@ -373 +375 @@
                 final TreePath treePath = endpointsByInstance.get(path.getInstance()).getTreePath(path, false);
                 log.info("go to path: " + path + "(" + treePath + ")");
-                invokeLater(new Runnable() {
+
+                new RunAt<Frame>(this) {
                         @Override
                         public void run() {
+                                log.info("executed");
                                 tree.setSelectionPath(treePath);
                                 tree.makeVisible(treePath);
                                 assert tree.isVisible(treePath);
                         }
-
-                });
+                };
+
         }
 
@@ -387 +391 @@
         public void addNode(TreeNode child, DefaultMutableTreeNode parent) {
                 assert isActive();
-                Runnable r = startChange(parent);
-                treeModel.insertNodeInto(child, parent, parent.getChildCount());
-                r.run();
+
+                try (ScopeEnd e = startChange(parent)) {
+                        treeModel.insertNodeInto(child, parent, parent.getChildCount());
+                }
         }