Author: kono
Date: 2011-07-18 16:10:54 -0700 (Mon, 18 Jul 2011)
New Revision: 26205
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/AbstractSelectTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllNodesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectUtils.java
Log:
fixes #324 UpdateView() timing issue had been fixed. Payload events should be
flushed before ALL redraw method calls. This type of bugs still exist in Cy3
code.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/AbstractSelectTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/AbstractSelectTask.java
2011-07-18 21:48:48 UTC (rev 26204)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/AbstractSelectTask.java
2011-07-18 23:10:54 UTC (rev 26205)
@@ -38,17 +38,23 @@
public abstract class AbstractSelectTask extends AbstractNetworkTask {
+
private final CyNetworkViewManager networkViewManager;
protected final SelectUtils selectUtils;
+ protected final CyEventHelper eventHelper;
public AbstractSelectTask(final CyNetwork net, final
CyNetworkViewManager networkViewManager, final CyEventHelper eventHelper) {
super(net);
this.networkViewManager = networkViewManager;
- this.selectUtils = new SelectUtils(eventHelper, this);
+ this.selectUtils = new SelectUtils();
+ this.eventHelper = eventHelper;
}
protected final void updateView() {
+ // This is necessary, otherwise, this does not update
presentation!
+ eventHelper.flushPayloadEvents();
+
final CyNetworkView view =
networkViewManager.getNetworkView(network.getSUID());
if (view != null)
view.updateView();
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllNodesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllNodesTask.java
2011-07-18 21:48:48 UTC (rev 26204)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllNodesTask.java
2011-07-18 23:10:54 UTC (rev 26205)
@@ -40,7 +40,9 @@
super(net, networkViewManager, eventHelper);
}
- public void run(TaskMonitor tm) {
+
+ @Override
+ public void run(TaskMonitor tm) throws Exception {
selectUtils.setSelectedNodes(network.getNodeList(), true);
updateView();
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
2011-07-18 21:48:48 UTC (rev 26204)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
2011-07-18 23:10:54 UTC (rev 26205)
@@ -52,7 +52,7 @@
final CyEventHelper eventHelper) {
this.nodeView = nodeView;
this.netView = netView;
- this.selectUtils = new SelectUtils(eventHelper, this);
+ this.selectUtils = new SelectUtils();
}
public void run(TaskMonitor tm) throws Exception {
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectUtils.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectUtils.java
2011-07-18 21:48:48 UTC (rev 26204)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectUtils.java
2011-07-18 23:10:54 UTC (rev 26205)
@@ -39,23 +39,13 @@
import java.util.Collection;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableEntry;
final class SelectUtils {
- private final CyEventHelper eventHelper;
- private final Object eventSource;
-
- SelectUtils(final CyEventHelper eventHelper, final Object eventSource) {
- this.eventHelper = eventHelper;
- this.eventSource = eventSource;
- }
-
void setSelectedNodes(final Collection<CyNode> nodes, final boolean
select) {
setSelected(nodes, select);
}
@@ -65,7 +55,6 @@
}
private void setSelected(final Collection<? extends CyTableEntry>
objects, final boolean select) {
- final CyTable table =
objects.iterator().next().getCyRow().getTable();
for (final CyTableEntry nodeOrEdge : objects)
nodeOrEdge.getCyRow().set(CyNetwork.SELECTED, select);
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
