[Taverna-cvs] taverna1.0/src/org/embl/ebi/escience/scuflworkers/workflow WorkflowTask.java, 1.11, 1.12 WorkflowProcessor.java, 1.18, 1.19 WorkflowProcessorFactory.java, 1.10, 1.11

[Stuart O. <so...@us...>]

Update of /cvsroot/taverna/taverna1.0/src/org/embl/ebi/escience/scuflworkers/workflow
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32382/src/org/embl/ebi/escience/scuflworkers/workflow

Modified Files:
	WorkflowTask.java WorkflowProcessor.java 
	WorkflowProcessorFactory.java 
Log Message:
Refactoring to break the cyclic dependancies between scufl, scuflui and WorkflowProcessor and friends.

Index: WorkflowProcessorFactory.java
===================================================================
RCS file: /cvsroot/taverna/taverna1.0/src/org/embl/ebi/escience/scuflworkers/workflow/WorkflowProcessorFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** WorkflowProcessorFactory.java	8 Jun 2006 09:24:00 -0000	1.10
--- WorkflowProcessorFactory.java	30 Jun 2006 14:34:38 -0000	1.11
***************
*** 5,8 ****
--- 5,9 ----
   */
  package org.embl.ebi.escience.scuflworkers.workflow;
+ import org.embl.ebi.escience.scufl.ScuflWorkflowProcessorFactory;
  import org.embl.ebi.escience.scufl.XScufl;
  import org.embl.ebi.escience.scuflworkers.ProcessorFactory;
***************
*** 16,20 ****
   * @author Tom Oinn
   */
! public class WorkflowProcessorFactory extends ProcessorFactory {
      
      private String definitionURL = null;
--- 17,21 ----
   * @author Tom Oinn
   */
! public class WorkflowProcessorFactory extends ProcessorFactory implements ScuflWorkflowProcessorFactory {
      
      private String definitionURL = null;

Index: WorkflowTask.java
===================================================================
RCS file: /cvsroot/taverna/taverna1.0/src/org/embl/ebi/escience/scuflworkers/workflow/WorkflowTask.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** WorkflowTask.java	22 Mar 2006 15:19:34 -0000	1.11
--- WorkflowTask.java	30 Jun 2006 14:34:38 -0000	1.12
***************
*** 50,57 ****
  import uk.ac.soton.itinnovation.freefluo.event.WorkflowStateListener;
  import uk.ac.soton.itinnovation.freefluo.main.WorkflowState;
  import uk.ac.soton.itinnovation.taverna.enactor.entities.ProcessorTask;
  import uk.ac.soton.itinnovation.taverna.enactor.entities.TaskExecutionException;
  
! public class WorkflowTask implements ProcessorTaskWorker {
  	private static EnactorProxy defaultEnactor = new FreefluoEnactorProxy();
  
--- 50,58 ----
  import uk.ac.soton.itinnovation.freefluo.event.WorkflowStateListener;
  import uk.ac.soton.itinnovation.freefluo.main.WorkflowState;
+ import uk.ac.soton.itinnovation.taverna.enactor.entities.EnactorWorkflowTask;
  import uk.ac.soton.itinnovation.taverna.enactor.entities.ProcessorTask;
  import uk.ac.soton.itinnovation.taverna.enactor.entities.TaskExecutionException;
  
! public class WorkflowTask implements ProcessorTaskWorker, EnactorWorkflowTask {
  	private static EnactorProxy defaultEnactor = new FreefluoEnactorProxy();
  

Index: WorkflowProcessor.java
===================================================================
RCS file: /cvsroot/taverna/taverna1.0/src/org/embl/ebi/escience/scuflworkers/workflow/WorkflowProcessor.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** WorkflowProcessor.java	15 May 2006 13:52:34 -0000	1.18
--- WorkflowProcessor.java	30 Jun 2006 14:34:38 -0000	1.19
***************
*** 23,26 ****
--- 23,27 ----
  import org.embl.ebi.escience.scufl.SetOnlineException;
  import org.embl.ebi.escience.scufl.UnknownPortException;
+ import org.embl.ebi.escience.scufl.ScuflWorkflowProcessor;
  import org.embl.ebi.escience.scufl.parser.XScuflParser;
  import org.jdom.Document;
***************
*** 34,38 ****
   * @author Tom Oinn
   */
! public class WorkflowProcessor extends Processor implements java.io.Serializable {
  
  	private ScuflModel theModel = null;
--- 35,39 ----
   * @author Tom Oinn
   */
! public class WorkflowProcessor extends Processor implements ScuflWorkflowProcessor,java.io.Serializable {
  
  	private ScuflModel theModel = null;