Author: mes
Date: 2011-10-20 17:37:22 -0700 (Thu, 20 Oct 2011)
New Revision: 27260
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTaskFactory.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTaskTest.java
Log:
removed unused parameter
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2011-10-21 00:31:04 UTC (rev 27259)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2011-10-21 00:37:22 UTC (rev 27260)
@@ -171,7 +171,7 @@
InvertSelectedEdgesTaskFactory invertSelectedEdgesTaskFactory =
new
InvertSelectedEdgesTaskFactory(undoSupportServiceRef,cyNetworkViewManagerServiceRef,cyEventHelperRef);
InvertSelectedNodesTaskFactory invertSelectedNodesTaskFactory =
new
InvertSelectedNodesTaskFactory(undoSupportServiceRef,cyNetworkViewManagerServiceRef,cyEventHelperRef);
SelectFromFileListTaskFactory selectFromFileListTaskFactory =
new
SelectFromFileListTaskFactory(undoSupportServiceRef,cyNetworkViewManagerServiceRef,cyEventHelperRef);
- SelectFirstNeighborsNodeViewTaskFactory
selectFirstNeighborsNodeViewTaskFactory = new
SelectFirstNeighborsNodeViewTaskFactory(cyEventHelperRef);
+ SelectFirstNeighborsNodeViewTaskFactory
selectFirstNeighborsNodeViewTaskFactory = new
SelectFirstNeighborsNodeViewTaskFactory();
HideSelectedTaskFactory hideSelectedTaskFactory = new
HideSelectedTaskFactory(undoSupportServiceRef,cyEventHelperRef);
HideSelectedNodesTaskFactory hideSelectedNodesTaskFactory = new
HideSelectedNodesTaskFactory(undoSupportServiceRef,cyEventHelperRef);
HideSelectedEdgesTaskFactory hideSelectedEdgesTaskFactory = new
HideSelectedEdgesTaskFactory(undoSupportServiceRef,cyEventHelperRef);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
2011-10-21 00:31:04 UTC (rev 27259)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
2011-10-21 00:37:22 UTC (rev 27260)
@@ -43,31 +43,29 @@
public class SelectFirstNeighborsNodeViewTask extends AbstractTask {
- private View<CyNode> nodeView;
- private CyNetworkView netView;
+ private View<CyNode> nodeView;
+ private CyNetworkView netView;
- private final SelectUtils selectUtils;
+ private final SelectUtils selectUtils;
- public SelectFirstNeighborsNodeViewTask(View<CyNode> nodeView,
CyNetworkView netView,
- final CyEventHelper eventHelper) {
- this.nodeView = nodeView;
- this.netView = netView;
- this.selectUtils = new SelectUtils();
- }
+ public SelectFirstNeighborsNodeViewTask(View<CyNode> nodeView,
CyNetworkView netView) {
+ this.nodeView = nodeView;
+ this.netView = netView;
+ this.selectUtils = new SelectUtils();
+ }
- public void run(TaskMonitor tm) throws Exception {
- if (nodeView == null)
- throw new NullPointerException("node view is null");
- if (netView == null)
- throw new NullPointerException("network view is null");
+ public void run(TaskMonitor tm) throws Exception {
+ if (nodeView == null)
+ throw new NullPointerException("node view is null");
+ if (netView == null)
+ throw new NullPointerException("network view is null");
- final Set<CyNode> selNodes = new HashSet<CyNode>();
- final CyNode node = nodeView.getModel();
- final CyNetwork net = netView.getModel();
- selNodes.add(node);
- selNodes.addAll(net.getNeighborList(node, CyEdge.Type.ANY));
- selectUtils.setSelectedNodes(selNodes, true);
-
- netView.updateView();
- }
+ final Set<CyNode> selNodes = new HashSet<CyNode>();
+ final CyNode node = nodeView.getModel();
+ final CyNetwork net = netView.getModel();
+ selNodes.add(node);
+ selNodes.addAll(net.getNeighborList(node, CyEdge.Type.ANY));
+ selectUtils.setSelectedNodes(selNodes, true);
+ netView.updateView();
+ }
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTaskFactory.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTaskFactory.java
2011-10-21 00:31:04 UTC (rev 27259)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTaskFactory.java
2011-10-21 00:37:22 UTC (rev 27260)
@@ -29,19 +29,12 @@
*/
package org.cytoscape.task.internal.select;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.task.AbstractNodeViewTaskFactory;
import org.cytoscape.work.TaskIterator;
public class SelectFirstNeighborsNodeViewTaskFactory extends
AbstractNodeViewTaskFactory {
- private final CyEventHelper eventHelper;
-
- public SelectFirstNeighborsNodeViewTaskFactory(final CyEventHelper
eventHelper) {
- this.eventHelper = eventHelper;
- }
-
public TaskIterator getTaskIterator() {
- return new TaskIterator(new SelectFirstNeighborsNodeViewTask(nodeView,
netView, eventHelper));
+ return new TaskIterator(new
SelectFirstNeighborsNodeViewTask(nodeView, netView));
}
}
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTaskTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTaskTest.java
2011-10-21 00:31:04 UTC (rev 27259)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTaskTest.java
2011-10-21 00:37:22 UTC (rev 27260)
@@ -53,46 +53,46 @@
public class SelectFirstNeighborsNodeViewTaskTest extends
AbstractSelectTaskTester {
- @Before
- public void setUp() throws Exception {
- super.setUp();
- }
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
- @Test
- public void testRun() throws Exception {
- // more setup
- List<CyNode> nl = new ArrayList<CyNode>();
- nl.add(e4);
- when(net.getNeighborList(e3, CyEdge.Type.ANY)).thenReturn(nl);
+ @Test
+ public void testRun() throws Exception {
+ // more setup
+ List<CyNode> nl = new ArrayList<CyNode>();
+ nl.add(e4);
+ when(net.getNeighborList(e3, CyEdge.Type.ANY)).thenReturn(nl);
- View<CyNode> nv = (View<CyNode>) mock(View.class);
- when(nv.getModel()).thenReturn(e3);
- CyNetworkView netView = mock(CyNetworkView.class);
- when(netView.getModel()).thenReturn(net);
+ View<CyNode> nv = (View<CyNode>) mock(View.class);
+ when(nv.getModel()).thenReturn(e3);
+ CyNetworkView netView = mock(CyNetworkView.class);
+ when(netView.getModel()).thenReturn(net);
- // run the task
- Task t = new SelectFirstNeighborsNodeViewTask(nv, netView, eventHelper);
- t.run(tm);
+ // run the task
+ Task t = new SelectFirstNeighborsNodeViewTask(nv, netView);
+ t.run(tm);
- // check that the expected rows were set
- verify(r4, times(1)).set("selected", true);
- }
+ // check that the expected rows were set
+ verify(r4, times(1)).set("selected", true);
+ }
- @Test(expected = NullPointerException.class)
- public void testNullNetworkView() throws Exception {
- View<CyNode> nv = (View<CyNode>) mock(View.class);
+ @Test(expected = NullPointerException.class)
+ public void testNullNetworkView() throws Exception {
+ View<CyNode> nv = (View<CyNode>) mock(View.class);
- // run the task
- Task t = new SelectFirstNeighborsNodeViewTask(nv, null, eventHelper);
- t.run(tm);
- }
+ // run the task
+ Task t = new SelectFirstNeighborsNodeViewTask(nv, null);
+ t.run(tm);
+ }
- @Test(expected = NullPointerException.class)
- public void testNullNodeView() throws Exception {
- CyNetworkView netView = mock(CyNetworkView.class);
+ @Test(expected = NullPointerException.class)
+ public void testNullNodeView() throws Exception {
+ CyNetworkView netView = mock(CyNetworkView.class);
- // run the task
- Task t = new SelectFirstNeighborsNodeViewTask(null, netView,
eventHelper);
- t.run(tm);
- }
+ // run the task
+ Task t = new SelectFirstNeighborsNodeViewTask(null, netView);
+ t.run(tm);
+ }
}
--
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.
