Author: ruschein
Date: 2011-07-28 08:36:18 -0700 (Thu, 28 Jul 2011)
New Revision: 26300
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTaskFactory.java
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/AllFactoryTest.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTaskTest.java
Log:
Added undo/redo support for selection of adjacent edges.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTask.java
2011-07-27 23:56:28 UTC (rev 26299)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTask.java
2011-07-28 15:36:18 UTC (rev 26300)
@@ -1,7 +1,7 @@
/*
File: SelectAdjacentEdgesTask.java
- Copyright (c) 2006, 2010, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2006, 2010-2011, The Cytoscape Consortium (www.cytoscape.org)
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -26,9 +26,10 @@
You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
+*/
package org.cytoscape.task.internal.select;
+
import java.util.HashSet;
import java.util.Set;
@@ -37,25 +38,38 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTableUtil;
+import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.undo.UndoSupport;
+
public class SelectAdjacentEdgesTask extends AbstractSelectTask {
- public SelectAdjacentEdgesTask(final CyNetwork net, final
CyNetworkViewManager networkViewManager,
- final CyEventHelper eventHelper) {
- super(net, networkViewManager, eventHelper);
- }
+ private final UndoSupport undoSupport;
- public void run(TaskMonitor tm) {
- final Set<CyEdge> edgeSet = new HashSet<CyEdge>();
+ public SelectAdjacentEdgesTask(final UndoSupport undoSupport, final
CyNetwork net,
+ final CyNetworkViewManager
networkViewManager,
+ final CyEventHelper eventHelper)
+ {
+ super(net, networkViewManager, eventHelper);
+ this.undoSupport = undoSupport;
+ }
- // Get the list of selected nodes
- for (CyNode node : CyTableUtil.getNodesInState(network, "selected",
true)) {
- // Get the list of edges connected to this node
- edgeSet.addAll(network.getAdjacentEdgeList(node, CyEdge.Type.ANY));
+ public void run(final TaskMonitor tm) {
+ final CyNetworkView view =
networkViewManager.getNetworkView(network.getSUID());
+ undoSupport.getUndoableEditSupport().postEdit(
+ new SelectionEdit(eventHelper, "Select Adjacent Edges",
network, view,
+
SelectionEdit.SelectionFilter.EDGES_ONLY));
+
+ final Set<CyEdge> edgeSet = new HashSet<CyEdge>();
+
+ // Get the list of selected nodes
+ for (CyNode node : CyTableUtil.getNodesInState(network,
"selected", true)) {
+ // Get the list of edges connected to this node
+ edgeSet.addAll(network.getAdjacentEdgeList(node,
CyEdge.Type.ANY));
+ }
+
+ selectUtils.setSelectedEdges(edgeSet, true);
+ updateView();
}
-
- selectUtils.setSelectedEdges(edgeSet, true);
- updateView();
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTaskFactory.java
2011-07-27 23:56:28 UTC (rev 26299)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTaskFactory.java
2011-07-28 15:36:18 UTC (rev 26300)
@@ -1,7 +1,7 @@
/*
File: SelectAdjacentEdgesTaskFactory.java
- Copyright (c) 2006, 2010, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2006, 2010-2011, The Cytoscape Consortium (www.cytoscape.org)
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -26,7 +26,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
+*/
package org.cytoscape.task.internal.select;
@@ -34,18 +34,25 @@
import org.cytoscape.task.AbstractNetworkTaskFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.undo.UndoSupport;
public class SelectAdjacentEdgesTaskFactory extends AbstractNetworkTaskFactory
{
+ private final UndoSupport undoSupport;
private CyNetworkViewManager networkViewManager;
private final CyEventHelper eventHelper;
- public SelectAdjacentEdgesTaskFactory(final CyNetworkViewManager
networkViewManager, final CyEventHelper eventHelper) {
+ public SelectAdjacentEdgesTaskFactory(final UndoSupport undoSupport,
+ final CyNetworkViewManager
networkViewManager,
+ final CyEventHelper eventHelper)
+ {
+ this.undoSupport = undoSupport;
this.networkViewManager = networkViewManager;
- this.eventHelper = eventHelper;
+ this.eventHelper = eventHelper;
}
public TaskIterator getTaskIterator() {
- return new TaskIterator(new SelectAdjacentEdgesTask(network,
networkViewManager, eventHelper));
+ return new TaskIterator(new
SelectAdjacentEdgesTask(undoSupport, network,
+
networkViewManager, eventHelper));
}
}
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-07-27 23:56:28 UTC (rev 26299)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-07-28 15:36:18 UTC (rev 26300)
@@ -106,6 +106,7 @@
<bean id="selectAdjacentEdgesTaskFactory"
class="org.cytoscape.task.internal.select.SelectAdjacentEdgesTaskFactory">
+ <constructor-arg ref="undoSupportServiceRef" />
<constructor-arg ref="cyNetworkViewManagerServiceRef" />
<constructor-arg ref="cyEventHelperRef" />
</bean>
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/AllFactoryTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/AllFactoryTest.java
2011-07-27 23:56:28 UTC (rev 26299)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/AllFactoryTest.java
2011-07-28 15:36:18 UTC (rev 26300)
@@ -93,7 +93,7 @@
@Test
public void testSelectAdjacentEdgesTaskFactory() {
- executeTest(new
SelectAdjacentEdgesTaskFactory(networkViewManager, eventHelper));
+ executeTest(new SelectAdjacentEdgesTaskFactory(undoSupport,
networkViewManager, eventHelper));
}
@Test
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTaskTest.java
2011-07-27 23:56:28 UTC (rev 26299)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectAdjacentEdgesTaskTest.java
2011-07-28 15:36:18 UTC (rev 26300)
@@ -1,13 +1,6 @@
/*
- Copyright (c) 2010, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2010-2011, The Cytoscape Consortium (www.cytoscape.org)
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2.1 of the License, or
@@ -31,10 +24,13 @@
You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
+*/
package org.cytoscape.task.internal.select;
+
+import javax.swing.undo.UndoableEditSupport;
+
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -43,30 +39,40 @@
import java.util.List;
import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyTable;
import org.cytoscape.work.Task;
+import org.cytoscape.work.undo.UndoSupport;
+
import org.junit.Before;
import org.junit.Test;
+
public class SelectAdjacentEdgesTaskTest extends AbstractSelectTaskTester {
- @Before
- public void setUp() throws Exception {
- super.setUp();
- }
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
- @Test
- public void testRun() throws Exception {
- when(r3.get("selected", Boolean.class)).thenReturn(true);
- when(r4.get("selected", Boolean.class)).thenReturn(false);
+ @Test
+ public void testRun() throws Exception {
+ final CyTable edgeTable = mock(CyTable.class);
+ when(net.getDefaultEdgeTable()).thenReturn(edgeTable);
+ UndoableEditSupport undoableEditSupport =
mock(UndoableEditSupport.class);
+ UndoSupport undoSupport = mock(UndoSupport.class);
+
when(undoSupport.getUndoableEditSupport()).thenReturn(undoableEditSupport);
- List<CyEdge> el = new ArrayList<CyEdge>();
- el.add(e1);
- when(net.getAdjacentEdgeList(e3, CyEdge.Type.ANY)).thenReturn(el);
+ when(r3.get("selected", Boolean.class)).thenReturn(true);
+ when(r4.get("selected", Boolean.class)).thenReturn(false);
- // run the task
- Task t = new SelectAdjacentEdgesTask(net, networkViewManager,
eventHelper);
- t.run(tm);
+ List<CyEdge> el = new ArrayList<CyEdge>();
+ el.add(e1);
+ when(net.getAdjacentEdgeList(e3,
CyEdge.Type.ANY)).thenReturn(el);
- // check that the expected rows were set
- verify(r1, times(1)).set("selected", true);
- }
+ // run the task
+ Task t = new SelectAdjacentEdgesTask(undoSupport, net,
networkViewManager, eventHelper);
+ t.run(tm);
+
+ // check that the expected rows were set
+ verify(r1, times(1)).set("selected", true);
+ }
}
--
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.
