Author: mes
Date: 2010-09-09 09:47:06 -0700 (Thu, 09 Sep 2010)
New Revision: 21754
Modified:
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/AbstractDataTableTask.java
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/AbstractDataTableTaskFactory.java
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/DataTableTaskFactory.java
core3/core-task-api/trunk/src/test/java/org/cytoscape/task/AbstractDataTableTaskFactoryTest.java
core3/core-task-api/trunk/src/test/java/org/cytoscape/task/AbstractDataTableTaskTest.java
Log:
Changed CyDataTable name to CyTable
Modified:
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/AbstractDataTableTask.java
===================================================================
---
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/AbstractDataTableTask.java
2010-09-09 16:46:59 UTC (rev 21753)
+++
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/AbstractDataTableTask.java
2010-09-09 16:47:06 UTC (rev 21754)
@@ -29,16 +29,16 @@
package org.cytoscape.task;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
import org.cytoscape.work.AbstractTask;
public abstract class AbstractDataTableTask extends AbstractTask {
- final protected CyDataTable table;
+ final protected CyTable table;
- public AbstractDataTableTask(final CyDataTable table) {
+ public AbstractDataTableTask(final CyTable table) {
if (table == null)
- throw new NullPointerException("CyDataTable is null");
+ throw new NullPointerException("CyTable is null");
this.table = table;
}
Modified:
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/AbstractDataTableTaskFactory.java
===================================================================
---
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/AbstractDataTableTaskFactory.java
2010-09-09 16:46:59 UTC (rev 21753)
+++
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/AbstractDataTableTaskFactory.java
2010-09-09 16:47:06 UTC (rev 21754)
@@ -35,15 +35,15 @@
package org.cytoscape.task;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
public abstract class AbstractDataTableTaskFactory implements
DataTableTaskFactory {
- protected CyDataTable table;
+ protected CyTable table;
- public void setDataTable(final CyDataTable table) {
+ public void setDataTable(final CyTable table) {
if ( table == null )
- throw new NullPointerException("CyDataTable is null");
+ throw new NullPointerException("CyTable is null");
this.table = table;
}
Modified:
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/DataTableTaskFactory.java
===================================================================
---
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/DataTableTaskFactory.java
2010-09-09 16:46:59 UTC (rev 21753)
+++
core3/core-task-api/trunk/src/main/java/org/cytoscape/task/DataTableTaskFactory.java
2010-09-09 16:47:06 UTC (rev 21754)
@@ -35,7 +35,7 @@
package org.cytoscape.task;
import org.cytoscape.work.TaskFactory;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
/**
@@ -45,5 +45,5 @@
*/
public interface DataTableTaskFactory extends TaskFactory {
- void setDataTable(CyDataTable table);
+ void setDataTable(CyTable table);
}
Modified:
core3/core-task-api/trunk/src/test/java/org/cytoscape/task/AbstractDataTableTaskFactoryTest.java
===================================================================
---
core3/core-task-api/trunk/src/test/java/org/cytoscape/task/AbstractDataTableTaskFactoryTest.java
2010-09-09 16:46:59 UTC (rev 21753)
+++
core3/core-task-api/trunk/src/test/java/org/cytoscape/task/AbstractDataTableTaskFactoryTest.java
2010-09-09 16:47:06 UTC (rev 21754)
@@ -41,8 +41,8 @@
import org.junit.Test;
import org.junit.Before;
-import org.cytoscape.model.CyDataTableFactory;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTableFactory;
+import org.cytoscape.model.CyTable;
import org.cytoscape.work.TaskIterator;
@@ -68,16 +68,16 @@
@Test
public void testGoodSetDataTable() throws Exception {
- factory.setDataTable(mock(CyDataTable.class));
+ factory.setDataTable(mock(CyTable.class));
assertNotNull( factory.table );
}
@Test
public void testNotFinal() throws Exception {
- factory.setDataTable(mock(CyDataTable.class));
- CyDataTable t1 = factory.table;
- factory.setDataTable(mock(CyDataTable.class));
- CyDataTable t2 = factory.table;
+ factory.setDataTable(mock(CyTable.class));
+ CyTable t1 = factory.table;
+ factory.setDataTable(mock(CyTable.class));
+ CyTable t2 = factory.table;
assertFalse( (t1 == t2) );
}
}
Modified:
core3/core-task-api/trunk/src/test/java/org/cytoscape/task/AbstractDataTableTaskTest.java
===================================================================
---
core3/core-task-api/trunk/src/test/java/org/cytoscape/task/AbstractDataTableTaskTest.java
2010-09-09 16:46:59 UTC (rev 21753)
+++
core3/core-task-api/trunk/src/test/java/org/cytoscape/task/AbstractDataTableTaskTest.java
2010-09-09 16:47:06 UTC (rev 21754)
@@ -40,13 +40,13 @@
import static org.junit.Assert.*;
import org.junit.Test;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
import org.cytoscape.work.TaskMonitor;
public class AbstractDataTableTaskTest {
private class DataTableTask extends AbstractDataTableTask {
- DataTableTask(CyDataTable tab) { super(tab); }
+ DataTableTask(CyTable tab) { super(tab); }
public void run(TaskMonitor tm) {
assertNotNull(table);
}
@@ -63,7 +63,7 @@
@Test
public void testGoodDataTable() throws Exception {
- DataTableTask rt = new DataTableTask( mock(CyDataTable.class) );
+ DataTableTask rt = new DataTableTask( mock(CyTable.class) );
rt.run(mock(TaskMonitor.class));
}
}
--
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.
