Author: ruschein
Date: 2011-03-02 16:27:24 -0800 (Wed, 02 Mar 2011)
New Revision: 24299
Added:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTaskFactory.java
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Added a new "delete column" task + task factory for the attribute browser
column header popup menu.
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTask.java
(from rev 24295,
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/DeleteColumnTask.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTask.java
2011-03-03 00:27:24 UTC (rev 24299)
@@ -0,0 +1,61 @@
+/*
+ Copyright (c) 2010, 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
+ by the Free Software Foundation; either version 2.1 of the License, or
+ any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
+ documentation provided hereunder is on an "as is" basis, and the
+ Institute for Systems Biology and the Whitehead Institute
+ have no obligations to provide maintenance, support,
+ updates, enhancements or modifications. In no event shall the
+ Institute for Systems Biology and the Whitehead Institute
+ be liable to any party for direct, indirect, special,
+ incidental or consequential damages, including lost profits, arising
+ out of the use of this software and its documentation, even if the
+ Institute for Systems Biology and the Whitehead Institute
+ have been advised of the possibility of such damage. See
+ the GNU Lesser General Public License for more details.
+
+ 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.table;
+
+
+import org.cytoscape.model.CyColumn;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.task.AbstractTableColumnTask;
+import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.Tunable;
+import org.cytoscape.work.TunableValidator;
+
+
+public final class DeleteColumnTask extends AbstractTableColumnTask implements
TunableValidator {
+ DeleteColumnTask(final CyColumn column) {
+ super(column);
+ }
+
+ @Override
+ public void run(final TaskMonitor taskMonitor) throws Exception {
+ column.getTable().deleteColumn(column.getName());
+ }
+
+ @Override
+ public boolean tunablesAreValid(final Appendable errMsg) {
+ if (column.isImmutable()) {
+ try {
+ errMsg.append("Cannot delete an immutable
column!");
+ } catch (Exception e) {
+ }
+ return false;
+ }
+
+ return true;
+ }
+}
\ No newline at end of file
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTaskFactory.java
(from rev 24295,
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/DeleteColumnTaskFactory.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTaskFactory.java
2011-03-03 00:27:24 UTC (rev 24299)
@@ -0,0 +1,41 @@
+/*
+ Copyright (c) 2010, 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
+ by the Free Software Foundation; either version 2.1 of the License, or
+ any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
+ documentation provided hereunder is on an "as is" basis, and the
+ Institute for Systems Biology and the Whitehead Institute
+ have no obligations to provide maintenance, support,
+ updates, enhancements or modifications. In no event shall the
+ Institute for Systems Biology and the Whitehead Institute
+ be liable to any party for direct, indirect, special,
+ incidental or consequential damages, including lost profits, arising
+ out of the use of this software and its documentation, even if the
+ Institute for Systems Biology and the Whitehead Institute
+ have been advised of the possibility of such damage. See
+ the GNU Lesser General Public License for more details.
+
+ 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.table;
+
+
+import org.cytoscape.work.TaskIterator;
+
+
+public final class DeleteColumnTaskFactory extends
AbstractTableColumnTaskFactory {
+ @Override
+ public TaskIterator getTaskIterator() {
+ if (column == null)
+ throw new IllegalStateException("you forgot to set the
CyColumn on this task factory!");
+ return new TaskIterator(new DeleteColumnTask(column));
+ }
+}
\ No newline at end of file
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-03-03 00:26:10 UTC (rev 24298)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-03-03 00:27:24 UTC (rev 24299)
@@ -581,6 +581,12 @@
</osgi:service-properties>
</osgi:service>
+ <osgi:service id="deleteColumnTaskFactoryService"
ref="deleteColumnTaskFactory"
+ interface="org.cytoscape.task.TableColumnTaskFactory">
+ <osgi:service-properties>
+ <entry key="title" value="Delete column" />
+ </osgi:service-properties>
+ </osgi:service>
<osgi:service id="renameColumnTaskFactoryService"
ref="renameColumnTaskFactory"
interface="org.cytoscape.task.TableColumnTaskFactory">
<osgi:service-properties>
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-03-03 00:26:10 UTC (rev 24298)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-03-03 00:27:24 UTC (rev 24299)
@@ -296,6 +296,10 @@
<constructor-arg ref="cyPropertyServiceRef" />
</bean>
+ <bean id="deleteColumnTaskFactory"
+ class="org.cytoscape.task.internal.table.DeleteColumnTaskFactory">
+ </bean>
+
<bean id="renameColumnTaskFactory"
class="org.cytoscape.task.internal.table.RenameColumnTaskFactory">
</bean>
--
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.
