Author: ruschein
Date: 2011-07-29 08:56:33 -0700 (Fri, 29 Jul 2011)
New Revision: 26331
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTaskFactory.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/hide/UnHideAllTaskFactoryTest.java
Log:
Added undo/redo support for unhiding of all nodes and edges.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
2011-07-29 15:45:54 UTC (rev 26330)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
2011-07-29 15:56:33 UTC (rev 26331)
@@ -1,15 +1,8 @@
/*
File: UnHideAllTask.java
- Copyright (c) 2006, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2006, 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
@@ -37,22 +30,33 @@
package org.cytoscape.task.internal.hide;
+import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.task.AbstractNetworkViewTask;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.undo.UndoSupport;
public class UnHideAllTask extends AbstractNetworkViewTask {
- public UnHideAllTask(CyNetworkView v) {
+ private final UndoSupport undoSupport;
+ private final CyEventHelper eventHelper;
+
+ public UnHideAllTask(final UndoSupport undoSupport, final CyEventHelper
eventHelper,
+ final CyNetworkView v)
+ {
super(v);
+ this.undoSupport = undoSupport;
+ this.eventHelper = eventHelper;
}
public void run(TaskMonitor e) {
- final CyNetwork curr = view.getModel();
+ final CyNetwork network = view.getModel();
+ undoSupport.getUndoableEditSupport().postEdit(
+ new HideEdit(eventHelper, "Show All Nodes And Edges",
network, view));
- HideUtils.setVisibleNodes( curr.getNodeList(), true, view );
- HideUtils.setVisibleEdges( curr.getEdgeList(), true, view );
+ HideUtils.setVisibleNodes(network.getNodeList(), true, view);
+ HideUtils.setVisibleEdges(network.getEdgeList(), true, view);
view.updateView();
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTaskFactory.java
2011-07-29 15:45:54 UTC (rev 26330)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTaskFactory.java
2011-07-29 15:56:33 UTC (rev 26331)
@@ -1,7 +1,7 @@
/*
File: UnHideAllTaskFactory.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
@@ -30,13 +30,24 @@
package org.cytoscape.task.internal.hide;
+import org.cytoscape.event.CyEventHelper;
import org.cytoscape.task.AbstractNetworkViewTaskFactory;
import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.undo.UndoSupport;
public class UnHideAllTaskFactory extends AbstractNetworkViewTaskFactory {
+ private final UndoSupport undoSupport;
+ private final CyEventHelper eventHelper;
+ public UnHideAllTaskFactory(final UndoSupport undoSupport,
+ final CyEventHelper eventHelper)
+ {
+ this.undoSupport = undoSupport;
+ this.eventHelper = eventHelper;
+ }
+
public TaskIterator getTaskIterator() {
- return new TaskIterator(new UnHideAllTask(view));
+ return new TaskIterator(new UnHideAllTask(undoSupport,
eventHelper, view));
}
}
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-29 15:45:54 UTC (rev 26330)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-07-29 15:56:33 UTC (rev 26331)
@@ -196,6 +196,8 @@
</bean>
<bean id="unHideAllTaskFactory"
class="org.cytoscape.task.internal.hide.UnHideAllTaskFactory">
+ <constructor-arg ref="undoSupportServiceRef" />
+ <constructor-arg ref="cyEventHelperRef" />
</bean>
<bean id="unHideAllNodesTaskFactory"
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/UnHideAllTaskFactoryTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/UnHideAllTaskFactoryTest.java
2011-07-29 15:45:54 UTC (rev 26330)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/UnHideAllTaskFactoryTest.java
2011-07-29 15:56:33 UTC (rev 26331)
@@ -1,21 +1,27 @@
package org.cytoscape.task.internal.hide;
+
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
+import org.cytoscape.event.CyEventHelper;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.undo.UndoSupport;
+
import org.junit.Test;
+
public class UnHideAllTaskFactoryTest {
@Test
public void testRun() throws Exception {
+ UndoSupport undoSupport = mock(UndoSupport.class);
+ CyEventHelper eventHelper = mock(CyEventHelper.class);
+ UnHideAllTaskFactory factory = new
UnHideAllTaskFactory(undoSupport, eventHelper);
CyNetworkView view = mock(CyNetworkView.class);
-
- UnHideAllTaskFactory factory = new UnHideAllTaskFactory();
factory.setNetworkView(view);
TaskIterator ti = factory.getTaskIterator();
--
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.
