Author: ruschein
Date: 2011-07-28 08:55:22 -0700 (Thu, 28 Jul 2011)
New Revision: 26301
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllEdgesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllEdgesTaskFactory.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/SelectAllNodesTaskFactory.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/SelectAllEdgesTaskTest.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectAllNodesTaskTest.java
Log:
Added undo/redo support for selection of all nodes or edges.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllEdgesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllEdgesTask.java
2011-07-28 15:36:18 UTC (rev 26300)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllEdgesTask.java
2011-07-28 15:55:22 UTC (rev 26301)
@@ -1,7 +1,7 @@
/*
File: SelectAllEdgesTask.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,21 +26,35 @@
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 org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
+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 SelectAllEdgesTask extends AbstractSelectTask {
- public SelectAllEdgesTask(final CyNetwork net, final
CyNetworkViewManager networkViewManager,
- final CyEventHelper eventHelper) {
+ private final UndoSupport undoSupport;
+
+ public SelectAllEdgesTask(final UndoSupport undoSupport, final
CyNetwork net,
+ final CyNetworkViewManager networkViewManager,
+ final CyEventHelper eventHelper)
+ {
super(net, networkViewManager, eventHelper);
+ this.undoSupport = undoSupport;
}
public void run(TaskMonitor tm) {
+ final CyNetworkView view =
networkViewManager.getNetworkView(network.getSUID());
+ undoSupport.getUndoableEditSupport().postEdit(
+ new SelectionEdit(eventHelper, "Select All Edges",
network, view,
+
SelectionEdit.SelectionFilter.EDGES_ONLY));
+
selectUtils.setSelectedEdges(network.getEdgeList(), true);
updateView();
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllEdgesTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllEdgesTaskFactory.java
2011-07-28 15:36:18 UTC (rev 26300)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllEdgesTaskFactory.java
2011-07-28 15:55:22 UTC (rev 26301)
@@ -1,7 +1,7 @@
/*
File: SelectAllEdgesTaskFactory.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,24 +26,33 @@
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 org.cytoscape.event.CyEventHelper;
import org.cytoscape.task.AbstractNetworkTaskFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.undo.UndoSupport;
+
public class SelectAllEdgesTaskFactory extends AbstractNetworkTaskFactory {
- private CyNetworkViewManager networkViewManager;
+ private final UndoSupport undoSupport;
+ private final CyNetworkViewManager networkViewManager;
private final CyEventHelper eventHelper;
- public SelectAllEdgesTaskFactory(final CyNetworkViewManager
networkViewManager, final CyEventHelper eventHelper) {
+ public SelectAllEdgesTaskFactory(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 SelectAllEdgesTask(network,
networkViewManager, this.eventHelper));
+ return new TaskIterator(new SelectAllEdgesTask(undoSupport,
network,
+
networkViewManager, eventHelper));
}
}
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-28 15:36:18 UTC (rev 26300)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllNodesTask.java
2011-07-28 15:55:22 UTC (rev 26301)
@@ -1,7 +1,7 @@
/*
File: SelectAllNodesTask.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,23 +26,37 @@
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 org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
+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 SelectAllNodesTask extends AbstractSelectTask {
- public SelectAllNodesTask(final CyNetwork net, final
CyNetworkViewManager networkViewManager,
- final CyEventHelper eventHelper) {
+ private final UndoSupport undoSupport;
+
+ public SelectAllNodesTask(final UndoSupport undoSupport, final
CyNetwork net,
+ final CyNetworkViewManager networkViewManager,
+ final CyEventHelper eventHelper)
+ {
super(net, networkViewManager, eventHelper);
+ this.undoSupport = undoSupport;
}
@Override
public void run(TaskMonitor tm) throws Exception {
+ final CyNetworkView view =
networkViewManager.getNetworkView(network.getSUID());
+ undoSupport.getUndoableEditSupport().postEdit(
+ new SelectionEdit(eventHelper, "Select All Nodes",
network, view,
+
SelectionEdit.SelectionFilter.NODES_ONLY));
+
selectUtils.setSelectedNodes(network.getNodeList(), true);
updateView();
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllNodesTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllNodesTaskFactory.java
2011-07-28 15:36:18 UTC (rev 26300)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectAllNodesTaskFactory.java
2011-07-28 15:55:22 UTC (rev 26301)
@@ -1,7 +1,7 @@
/*
File: SelectAllNodesTaskFactory.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,24 +26,33 @@
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 org.cytoscape.event.CyEventHelper;
import org.cytoscape.task.AbstractNetworkTaskFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.undo.UndoSupport;
+
public class SelectAllNodesTaskFactory extends AbstractNetworkTaskFactory {
+ private final UndoSupport undoSupport;
private CyNetworkViewManager networkViewManager;
private final CyEventHelper eventHelper;
- public SelectAllNodesTaskFactory(final CyNetworkViewManager
networkViewManager, final CyEventHelper eventHelper) {
+ public SelectAllNodesTaskFactory(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 SelectAllNodesTask(network,
networkViewManager, eventHelper));
+ return new TaskIterator(new SelectAllNodesTask(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-28 15:36:18 UTC (rev 26300)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-07-28 15:55:22 UTC (rev 26301)
@@ -94,12 +94,14 @@
<bean id="selectAllEdgesTaskFactory"
class="org.cytoscape.task.internal.select.SelectAllEdgesTaskFactory">
+ <constructor-arg ref="undoSupportServiceRef" />
<constructor-arg ref="cyNetworkViewManagerServiceRef" />
<constructor-arg ref="cyEventHelperRef" />
</bean>
<bean id="selectAllNodesTaskFactory"
class="org.cytoscape.task.internal.select.SelectAllNodesTaskFactory">
+ <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-28 15:36:18 UTC (rev 26300)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/AllFactoryTest.java
2011-07-28 15:55:22 UTC (rev 26301)
@@ -98,12 +98,12 @@
@Test
public void testSelectAllEdgesTaskFactory() {
- executeTest(new SelectAllEdgesTaskFactory(networkViewManager,
eventHelper));
+ executeTest(new SelectAllEdgesTaskFactory(undoSupport,
networkViewManager, eventHelper));
}
@Test
public void testSelectAllNodesTaskFactory() {
- executeTest(new SelectAllNodesTaskFactory(networkViewManager,
eventHelper));
+ executeTest(new SelectAllNodesTaskFactory(undoSupport,
networkViewManager, eventHelper));
}
@Test
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectAllEdgesTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectAllEdgesTaskTest.java
2011-07-28 15:36:18 UTC (rev 26300)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectAllEdgesTaskTest.java
2011-07-28 15:55:22 UTC (rev 26301)
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2010, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 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
@@ -24,32 +24,45 @@
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;
+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 SelectAllEdgesTaskTest extends AbstractSelectTaskTester {
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
- @Before
- public void setUp() throws Exception {
- super.setUp();
- }
+ @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);
- @Test
- public void testRun() throws Exception {
- // run the task
- Task t = new SelectAllEdgesTask(net, networkViewManager, eventHelper);
- t.run(tm);
+ // run the task
+ Task t = new SelectAllEdgesTask(undoSupport, net,
networkViewManager, eventHelper);
+ t.run(tm);
- // check that the expected rows were set
- verify(r1, times(1)).set("selected", true);
- verify(r2, times(1)).set("selected", true);
- }
+ // check that the expected rows were set
+ verify(r1, times(1)).set("selected", true);
+ verify(r2, times(1)).set("selected", true);
+ }
}
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectAllNodesTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectAllNodesTaskTest.java
2011-07-28 15:36:18 UTC (rev 26300)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectAllNodesTaskTest.java
2011-07-28 15:55:22 UTC (rev 26301)
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2010, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 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
@@ -24,31 +24,45 @@
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;
+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 SelectAllNodesTaskTest extends AbstractSelectTaskTester {
- @Before
- public void setUp() throws Exception {
- super.setUp();
- }
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
- @Test
- public void testRun() throws Exception {
- // run the task
- Task t = new SelectAllNodesTask(net, networkViewManager, eventHelper);
- t.run(tm);
+ @Test
+ public void testRun() throws Exception {
+ final CyTable nodeTable = mock(CyTable.class);
+ when(net.getDefaultNodeTable()).thenReturn(nodeTable);
+ UndoableEditSupport undoableEditSupport =
mock(UndoableEditSupport.class);
+ UndoSupport undoSupport = mock(UndoSupport.class);
+
when(undoSupport.getUndoableEditSupport()).thenReturn(undoableEditSupport);
- // check that the expected rows were set
- verify(r3, times(1)).set("selected", true);
- verify(r4, times(1)).set("selected", true);
- }
+ // run the task
+ Task t = new SelectAllNodesTask(undoSupport, net,
networkViewManager, eventHelper);
+ t.run(tm);
+
+ // check that the expected rows were set
+ verify(r3, times(1)).set("selected", true);
+ verify(r4, 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.
