Author: ruschein
Date: 2011-05-26 15:09:29 -0700 (Thu, 26 May 2011)
New Revision: 25553
Added:
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/AbstractTableCellTaskFactory.java
Removed:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/AbstractTableCellTaskFactory.java
Modified:
core3/core-task-impl/trunk/pom.xml
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/CopyValueToEntireColumnTaskFactory.java
Log:
Moved AbstractTableCellTaskFactory from core-task-impl to core-task-api.
Copied:
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/AbstractTableCellTaskFactory.java
(from rev 25544,
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/AbstractTableCellTaskFactory.java)
===================================================================
---
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/AbstractTableCellTaskFactory.java
(rev 0)
+++
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/AbstractTableCellTaskFactory.java
2011-05-26 22:09:29 UTC (rev 25553)
@@ -0,0 +1,56 @@
+/*
+ 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;
+
+
+import org.cytoscape.work.TaskFactory;
+import org.cytoscape.model.CyColumn;
+
+
+/**
+ * The assumption is that setColumnAndPrimaryKey() will be called before
getTask() and that the Task
+ * in question operates on the specified table entry identified by the column
and primary key value.'
+ */
+abstract public class AbstractTableCellTaskFactory implements
TableCellTaskFactory {
+ protected CyColumn column;
+ protected Object primaryKeyValue;
+
+ /** Used to provision this factory with a {@param CyColumn} and a
primary key that will be
+ * used to create tasks.
+ * @param column a non-null CyColumn
+ * @param primaryKeyValue a non-null primary key value
+ */
+ public void setColumnAndPrimaryKey(final CyColumn column, final Object
primaryKeyValue) {
+ if (column == null)
+ throw new NullPointerException("\"column\" parameter
must *never* be null!");
+ this.column = column;
+ if (primaryKeyValue == null)
+ throw new NullPointerException("\"primaryKeyValue\"
parameter must *never* be null!");
+ this.primaryKeyValue = primaryKeyValue;
+ }
+}
Modified: core3/core-task-impl/trunk/pom.xml
===================================================================
--- core3/core-task-impl/trunk/pom.xml 2011-05-26 21:50:10 UTC (rev 25552)
+++ core3/core-task-impl/trunk/pom.xml 2011-05-26 22:09:29 UTC (rev 25553)
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>core-task-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/AbstractTableCellTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/AbstractTableCellTaskFactory.java
2011-05-26 21:50:10 UTC (rev 25552)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/AbstractTableCellTaskFactory.java
2011-05-26 22:09:29 UTC (rev 25553)
@@ -1,57 +0,0 @@
-/*
- 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.TaskFactory;
-import org.cytoscape.model.CyColumn;
-import org.cytoscape.task.TableCellTaskFactory;
-
-
-/**
- * The assumption is that setColumnAndPrimaryKey() will be called before
getTask() and that the Task
- * in question operates on the specified table entry identified by the column
and primary key value.'
- */
-abstract public class AbstractTableCellTaskFactory implements
TableCellTaskFactory {
- protected CyColumn column;
- protected Object primaryKeyValue;
-
- /** Used to provision this factory with a {@param CyColumn} and a
primary key that will be
- * used to create tasks.
- * @param column a non-null CyColumn
- * @param primaryKeyValue a non-null primary key value
- */
- public void setColumnAndPrimaryKey(final CyColumn column, final Object
primaryKeyValue) {
- if (column == null)
- throw new NullPointerException("\"column\" parameter
must *never* be null!");
- this.column = column;
- if (primaryKeyValue == null)
- throw new NullPointerException("\"primaryKeyValue\"
parameter must *never* be null!");
- this.primaryKeyValue = primaryKeyValue;
- }
-}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/CopyValueToEntireColumnTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/CopyValueToEntireColumnTaskFactory.java
2011-05-26 21:50:10 UTC (rev 25552)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/CopyValueToEntireColumnTaskFactory.java
2011-05-26 22:09:29 UTC (rev 25553)
@@ -29,7 +29,7 @@
import org.cytoscape.model.CyColumn;
-import org.cytoscape.task.AbstractTableCellTask;
+import org.cytoscape.task.AbstractTableCellTaskFactory;
import org.cytoscape.work.TaskIterator;
--
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.
