Changeset 85 for java/main/src/main/java/com/framsticks/gui/TreeNode.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/TreeNode.java (modified) (18 diffs)

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

@@ -1 +1 @@
 package com.framsticks.gui;
 
+import com.framsticks.communication.Connection;
 import com.framsticks.communication.Subscription;
 import com.framsticks.communication.util.LoggingStateCallback;
+import com.framsticks.core.Instance;
 import com.framsticks.core.ListChange;
 import com.framsticks.core.Path;
@@ -18 +20 @@
 import com.framsticks.util.StateFunctor;
 import org.apache.log4j.Logger;
+import com.framsticks.util.dispatching.RunAt;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -40 +43 @@
         final protected EndpointAtFrame endpoint;
 
-        final protected Map<EventParam, Subscription> userSubscriptions = new HashMap<EventParam, Subscription>();
+        final protected Map<EventParam, Subscription<?>> userSubscriptions = new HashMap<>();
         protected Map<ValueControl, Object> localChanges = null;
         protected String tooltip;
@@ -59 +62 @@
                 iconName = TreeCellRenderer.findIconName(name, path.getTextual());
                 tooltip = "?";
-                path.getInstance().invokeLater(new Runnable() {
+                path.getInstance().invokeLater(new RunAt<Instance>() {
                         @Override
                         public void run() {
@@ -82 +85 @@
                 assert p.getInstance().isActive();
                 if (Logging.log(log, "fetch", TreeNode.this, e)) {
-                        frame.invokeLater(new Runnable() {
+                        frame.invokeLater(new RunAt<Frame>() {
                                 @Override
                                 public void run() {
@@ -92 +95 @@
                 }
                 updateChildren(p);
-                frame.invokeLater(new Runnable() {
+                frame.invokeLater(new RunAt<Frame>() {
                         @Override
                         public void run() {
@@ -104 +107 @@
                 assert !frame.isActive();
                 /** TODO those two actions could be merged into single closure */
-                frame.invokeLater(new Runnable() {
+                frame.invokeLater(new RunAt<Frame>() {
                         @Override
                         public void run() {
@@ -149 +152 @@
                 /**If some child were found, update in frame context.*/
                 if (childrenPaths.size() > 0) {
-                        frame.invokeLater(new Runnable() {
+                        frame.invokeLater(new RunAt<Frame>() {
                                 @Override
                                 public void run() {
@@ -186 +189 @@
                 final Path p = path;
 
-                p.getInstance().invokeLater(new Runnable() {
+                p.getInstance().invokeLater(new RunAt<Instance>() {
                         @Override
                         public void run() {
@@ -246 +249 @@
                 final String name = (nameParam != null ? access.get(nameParam, String.class) : path.getTop().getParam().getId());
 
-                frame.invokeLater(new Runnable() {
+                frame.invokeLater(new RunAt<Frame>() {
                         @Override
                         public void run() {
@@ -303 +306 @@
                 assert p.isResolved();
                 panel.setCurrentTreeNode(this);
-                p.getInstance().invokeLater(new Runnable() {
+                p.getInstance().invokeLater(new RunAt<Instance>() {
                         @Override
                         public void run() {
@@ -309 +312 @@
                                 panel.pullValuesFromLocalToUser(access);
 
-                                frame.invokeLater(new Runnable() {
+                                frame.invokeLater(new RunAt<Frame>() {
                                         @Override
                                         public void run() {
@@ -341 +344 @@
                 final Path p = path;
                 log.debug("preparing panel: " + p);
-                p.getInstance().invokeLater(new Runnable() {
+                p.getInstance().invokeLater(new RunAt<Instance>() {
                         @Override
                         public void run() {
@@ -347 +350 @@
                                 final CompositeParam param = p.getTop().getParam();
                                 final FramsClass framsClass = p.getInstance().getInfoFromCache(param.getContainedTypeName());
-                                frame.invokeLater(new Runnable() {
+                                frame.invokeLater(new RunAt<Frame>() {
                                         @Override
                                         public void run() {
@@ -410 +413 @@
                         return;
                 }
-                userSubscriptions.get(eventParam).unsubscribe(new LoggingStateCallback(log, "unsubscribed " + eventParam));
+                userSubscriptions.get(eventParam).unsubscribe(new LoggingStateCallback<Connection>(log, "unsubscribed " + eventParam));
                 userSubscriptions.remove(eventParam);
         }
@@ -500 +503 @@
                 final Map<ValueControl, Object> changes = localChanges;
                 localChanges = null;
-                endpoint.getEndpoint().invokeLater(new Runnable() {
+                endpoint.getEndpoint().invokeLater(new RunAt<Instance>() {
                         @Override
                         public void run() {
@@ -514 +517 @@
                                                         }
                                                         log.debug("applied changes for: " + p);
-                                                        frame.invokeLater(new Runnable() {
+                                                        frame.invokeLater(new RunAt<Frame>() {
                                                                 @Override
                                                                 public void run() {
@@ -526 +529 @@
                 });
         }
-
 }