Author: ruschein
Date: 2011-07-21 10:43:13 -0700 (Thu, 21 Jul 2011)
New Revision: 26237
Added:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnEdit.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/table/
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/table/RenameColumnEditTest.java
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnTaskFactory.java
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Added undo/redo for column renaming.
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnEdit.java
(from rev 26225,
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/ZoomEdit.java)
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnEdit.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnEdit.java
2011-07-21 17:43:13 UTC (rev 26237)
@@ -0,0 +1,35 @@
+package org.cytoscape.task.internal.table;
+
+
+import org.cytoscape.model.CyColumn;
+import org.cytoscape.util.swing.CyAbstractEdit;
+
+
+/** An undoable edit that will undo and redo the zooming of a network view. */
+final class RenameColumnEdit extends CyAbstractEdit {
+ private final CyColumn column;
+ private String oldName;
+
+ RenameColumnEdit(final CyColumn column) {
+ super("Rename Column");
+
+ this.column = column;
+ this.oldName = column.getName();
+ }
+
+ public void redo() {
+ super.redo();
+
+ final String previousName = column.getName();
+ column.setName(oldName);
+ oldName = previousName;
+ }
+
+ public void undo() {
+ super.undo();
+
+ final String previousName = column.getName();
+ column.setName(oldName);
+ oldName = previousName;
+ }
+}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnTask.java
2011-07-21 15:32:57 UTC (rev 26236)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnTask.java
2011-07-21 17:43:13 UTC (rev 26237)
@@ -35,18 +35,24 @@
import org.cytoscape.work.Tunable;
import org.cytoscape.work.TunableValidator;
import org.cytoscape.work.TunableValidator.ValidationState;
+import org.cytoscape.work.undo.UndoSupport;
public final class RenameColumnTask extends AbstractTableColumnTask implements
TunableValidator {
+ private final UndoSupport undoSupport;
+
@Tunable(description="New column name:")
public String newColumnName;
- RenameColumnTask(final CyColumn column) {
+ RenameColumnTask(final UndoSupport undoSupport, final CyColumn column) {
super(column);
+ this.undoSupport = undoSupport;
}
@Override
public void run(final TaskMonitor taskMonitor) throws Exception {
+ undoSupport.getUndoableEditSupport().postEdit(new
RenameColumnEdit(column));
+
column.setName(newColumnName);
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnTaskFactory.java
2011-07-21 15:32:57 UTC (rev 26236)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnTaskFactory.java
2011-07-21 17:43:13 UTC (rev 26237)
@@ -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
@@ -29,13 +29,19 @@
import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.undo.UndoSupport;
public final class RenameColumnTaskFactory extends
AbstractTableColumnTaskFactory {
+ private final UndoSupport undoSupport;
+
+ public RenameColumnTaskFactory(final UndoSupport undoSupport) {
+ this.undoSupport = undoSupport;
+ }
@Override
public TaskIterator getTaskIterator() {
if (column == null)
throw new IllegalStateException("you forgot to set the
CyColumn on this task factory!");
- return new TaskIterator(new RenameColumnTask(column));
+ return new TaskIterator(new RenameColumnTask(undoSupport,
column));
}
}
\ No newline at end of file
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-21 15:32:57 UTC (rev 26236)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-07-21 17:43:13 UTC (rev 26237)
@@ -345,6 +345,7 @@
<bean id="renameColumnTaskFactory"
class="org.cytoscape.task.internal.table.RenameColumnTaskFactory">
+ <constructor-arg ref="undoSupportServiceRef" />
</bean>
<bean id="copyValueToEntireColumnTaskFactory"
Copied:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/table/RenameColumnEditTest.java
(from rev 26226,
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/zoom/FitContentEditTest.java)
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/table/RenameColumnEditTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/table/RenameColumnEditTest.java
2011-07-21 17:43:13 UTC (rev 26237)
@@ -0,0 +1,27 @@
+package org.cytoscape.task.internal.table;
+
+
+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.CyColumn;
+
+import org.junit.Test;
+
+
+public class RenameColumnEditTest {
+ @Test
+ public void runTest() {
+ final CyColumn column = mock(CyColumn.class);
+ when(column.getName()).thenReturn("orig name");
+
+ final RenameColumnEdit renameEdit = new
RenameColumnEdit(column);
+ when(column.getName()).thenReturn("new name");
+ renameEdit.undo();
+ verify(column, times(1)).setName("orig name");
+ renameEdit.redo();
+ verify(column, times(1)).setName("new name");
+ }
+}
--
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.
