[Cdk-commits] SF.net SVN: cdk: [8563] trunk/cdk-taverna/src/main/java/org/openscience/cdk /applications/taverna

[<tho...@us...>]

Revision: 8563
          http://svn.sourceforge.net/cdk/?rev=8563&view=rev
Author:   thomaskuhn
Date:     2007-07-18 07:19:08 -0700 (Wed, 18 Jul 2007)

Log Message:
-----------
Due to the major change some changes within these files

Modified Paths:
--------------
    trunk/cdk-taverna/src/main/java/org/openscience/cdk/applications/taverna/io/ReadMDLMolFile.java
    trunk/cdk-taverna/src/main/java/org/openscience/cdk/applications/taverna/jchempaint/JChemPaintEditor.java
    trunk/cdk-taverna/src/main/java/org/openscience/cdk/applications/taverna/jchempaint/action/JChemPaintEditorAction.java

Modified: trunk/cdk-taverna/src/main/java/org/openscience/cdk/applications/taverna/io/ReadMDLMolFile.java
===================================================================
--- trunk/cdk-taverna/src/main/java/org/openscience/cdk/applications/taverna/io/ReadMDLMolFile.java	2007-07-18 14:18:08 UTC (rev 8562)
+++ trunk/cdk-taverna/src/main/java/org/openscience/cdk/applications/taverna/io/ReadMDLMolFile.java	2007-07-18 14:19:08 UTC (rev 8563)
@@ -38,14 +38,14 @@
 import org.embl.ebi.escience.scufl.OutputPort;
 import org.embl.ebi.escience.scufl.PortCreationException;
 import org.embl.ebi.escience.scufl.XScufl;
-import org.embl.ebi.escience.scuflworkers.java.LocalServiceProcessor;
-import org.embl.ebi.escience.scuflworkers.java.LocalWorkerWithPorts;
-import org.embl.ebi.escience.scuflworkers.java.XMLExtensible;
 import org.jdom.Attribute;
 import org.jdom.Element;
 import org.openscience.cdk.applications.taverna.CMLChemFile;
 import org.openscience.cdk.applications.taverna.LocalWorkerCDK;
 import org.openscience.cdk.applications.taverna.basicutilities.CMLChemFileWrapper;
+import org.openscience.cdk.applications.taverna.scuflworkers.cdk.CDKLocalWorkerWithPorts;
+import org.openscience.cdk.applications.taverna.scuflworkers.cdk.CDKProcessor;
+import org.openscience.cdk.applications.taverna.scuflworkers.cdk.XMLExtensible;
 import org.openscience.cdk.io.IChemObjectReader;
 import org.openscience.cdk.io.MDLReader;
 
@@ -57,7 +57,7 @@
  * the mol file from within a filechooser
  * @author Thomas Kuhn
  */
-public class ReadMDLMolFile implements LocalWorkerCDK, LocalWorkerWithPorts, XMLExtensible {
+public class ReadMDLMolFile implements LocalWorkerCDK, CDKLocalWorkerWithPorts, XMLExtensible {
 	
 	//	 Region: class variables 
 	
@@ -104,7 +104,7 @@
 		return new String[] {LocalWorkerCDK.CMLChemFileList, LocalWorkerCDK.STRING_ARRAY};
 	}
 	
-	public List<InputPort> inputPorts(LocalServiceProcessor processor) throws DuplicatePortNameException, PortCreationException {
+	public List<InputPort> inputPorts(CDKProcessor processor) throws DuplicatePortNameException, PortCreationException {
 		List<InputPort> input = new ArrayList<InputPort>();
 		InputPort inPort;
 		for (int i = 0; i < inputNames.length; i++) {
@@ -114,7 +114,7 @@
 		}
 		return input;
 	}
-	public List<OutputPort> outputPorts(LocalServiceProcessor processor) throws DuplicatePortNameException, PortCreationException {
+	public List<OutputPort> outputPorts(CDKProcessor processor) throws DuplicatePortNameException, PortCreationException {
 		List<OutputPort> output = new ArrayList<OutputPort>();
 		OutputPort outPort;
 		for (int i = 0; i < outputNames.length; i++) {

Modified: trunk/cdk-taverna/src/main/java/org/openscience/cdk/applications/taverna/jchempaint/JChemPaintEditor.java
===================================================================
--- trunk/cdk-taverna/src/main/java/org/openscience/cdk/applications/taverna/jchempaint/JChemPaintEditor.java	2007-07-18 14:18:08 UTC (rev 8562)
+++ trunk/cdk-taverna/src/main/java/org/openscience/cdk/applications/taverna/jchempaint/JChemPaintEditor.java	2007-07-18 14:19:08 UTC (rev 8563)
@@ -36,14 +36,14 @@
 import org.embl.ebi.escience.scufl.OutputPort;
 import org.embl.ebi.escience.scufl.PortCreationException;
 import org.embl.ebi.escience.scufl.XScufl;
-import org.embl.ebi.escience.scuflworkers.java.LocalServiceProcessor;
-import org.embl.ebi.escience.scuflworkers.java.LocalWorkerWithPorts;
-import org.embl.ebi.escience.scuflworkers.java.XMLExtensible;
 import org.jdom.Attribute;
 import org.jdom.Element;
 import org.openscience.cdk.applications.taverna.CMLChemFile;
 import org.openscience.cdk.applications.taverna.LocalWorkerCDK;
 import org.openscience.cdk.applications.taverna.basicutilities.CMLChemFileWrapper;
+import org.openscience.cdk.applications.taverna.scuflworkers.cdk.CDKLocalWorkerWithPorts;
+import org.openscience.cdk.applications.taverna.scuflworkers.cdk.CDKProcessor;
+import org.openscience.cdk.applications.taverna.scuflworkers.cdk.XMLExtensible;
 
 import uk.ac.soton.itinnovation.taverna.enactor.entities.TaskExecutionException;
 
@@ -54,7 +54,7 @@
  * @author Thomas Kuhn
  *
  */
-public class JChemPaintEditor implements LocalWorkerCDK, LocalWorkerWithPorts, XMLExtensible {
+public class JChemPaintEditor implements LocalWorkerCDK, CDKLocalWorkerWithPorts, XMLExtensible {
 	
 	//	 Region: class variables 
 	
@@ -131,7 +131,7 @@
 		return new String[] {LocalWorkerCDK.CMLChemFileList, LocalWorkerCDK.STRING_ARRAY};
 	}
 	
-	public List<InputPort> inputPorts(LocalServiceProcessor processor) throws DuplicatePortNameException, PortCreationException {
+	public List<InputPort> inputPorts(CDKProcessor processor) throws DuplicatePortNameException, PortCreationException {
 		List<InputPort> input = new ArrayList<InputPort>();
 		InputPort inPort;
 		for (int i = 0; i < inputNames.length; i++) {
@@ -141,7 +141,7 @@
 		}
 		return input;
 	}
-	public List<OutputPort> outputPorts(LocalServiceProcessor processor) throws DuplicatePortNameException, PortCreationException {
+	public List<OutputPort> outputPorts(CDKProcessor processor) throws DuplicatePortNameException, PortCreationException {
 		List<OutputPort> output = new ArrayList<OutputPort>();
 		OutputPort outPort;
 		for (int i = 0; i < outputNames.length; i++) {

Modified: trunk/cdk-taverna/src/main/java/org/openscience/cdk/applications/taverna/jchempaint/action/JChemPaintEditorAction.java
===================================================================
--- trunk/cdk-taverna/src/main/java/org/openscience/cdk/applications/taverna/jchempaint/action/JChemPaintEditorAction.java	2007-07-18 14:18:08 UTC (rev 8562)
+++ trunk/cdk-taverna/src/main/java/org/openscience/cdk/applications/taverna/jchempaint/action/JChemPaintEditorAction.java	2007-07-18 14:19:08 UTC (rev 8563)
@@ -43,12 +43,12 @@
 import javax.vecmath.Point2d;
 
 import org.embl.ebi.escience.scufl.Processor;
-import org.embl.ebi.escience.scuflworkers.java.LocalServiceProcessor;
 import org.openscience.cdk.applications.jchempaint.JCPPropertyHandler;
 import org.openscience.cdk.applications.jchempaint.JChemPaintEditorPanel;
 import org.openscience.cdk.applications.jchempaint.JChemPaintModel;
 import org.openscience.cdk.applications.taverna.actions.AbstractCDKProcessorAction;
 import org.openscience.cdk.applications.taverna.jchempaint.JChemPaintEditor;
+import org.openscience.cdk.applications.taverna.scuflworkers.cdk.CDKProcessor;
 import org.openscience.cdk.geometry.GeometryTools;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.io.CMLWriter;
@@ -137,7 +137,7 @@
 			setLayout(new BorderLayout());
 			this.jcpvop = new JChemPaintEditorPanel();
 			this.jcpvop.registerModel(this.jcpModel);
-			this.jcpvop.setJChemPaintModel(this.jcpModel);
+			this.jcpvop.setJChemPaintModel(this.jcpModel, new Dimension(800, 500));
 			this.jcpModel.getControllerModel().setAutoUpdateImplicitHydrogens(true);
 			this.jcpModel.getRendererModel().setShowEndCarbons(true);
 			this.add(this.jcpvop, BorderLayout.CENTER);
@@ -230,10 +230,10 @@
 	}
 
 	public boolean canHandle(Processor processor) {
-		if (!(processor instanceof LocalServiceProcessor)) {
+		if (!(processor instanceof CDKProcessor)) {
 			return false;
 		}
-		LocalServiceProcessor proc = (LocalServiceProcessor) processor;
+		CDKProcessor proc = (CDKProcessor) processor;
 		if (proc.getWorker() instanceof JChemPaintEditor) {
 			return true;
 		}
@@ -262,10 +262,10 @@
 
 	@Override
 	public JFrame getFrame(Processor processor) {
-		if (!(processor instanceof LocalServiceProcessor)) {
+		if (!(processor instanceof CDKProcessor)) {
 			return null;
 		}
-		LocalServiceProcessor proc = (LocalServiceProcessor) processor;
+		CDKProcessor proc = (CDKProcessor) processor;
 		final JChemPaintEditor jChemPaintProcessor = (JChemPaintEditor) proc.getWorker();
 		this.panel = new JCPPanel(jChemPaintProcessor);
 		this.frame = new JFrame("JChemPaint, a open-source 2D Structure Editor");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.