[Cdk-commits] CVS: cdk/src/org/openscience/cdk/applications/jchempaint JChemPaintPanel.java,1.60,1.61 JChemPaintEditorPanel.java,1.42,1.43

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/jchempaint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29250/src/org/openscience/cdk/applications/jchempaint

Modified Files:
	JChemPaintPanel.java JChemPaintEditorPanel.java 
Log Message:
Fixed problem: use interfaces instead of implementations.

Index: JChemPaintPanel.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/jchempaint/JChemPaintPanel.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- JChemPaintPanel.java	30 Aug 2005 19:55:45 -0000	1.60
+++ JChemPaintPanel.java	31 Aug 2005 14:07:05 -0000	1.61
@@ -75,6 +75,7 @@
 import org.openscience.cdk.applications.jchempaint.action.JCPAction;
 import org.openscience.cdk.applications.jchempaint.action.SaveAction;
 import org.openscience.cdk.applications.jchempaint.dialogs.CreateCoordinatesForFileDialog;
+import org.openscience.cdk.applications.plugin.CDKEditBus;
 import org.openscience.cdk.applications.undoredo.UndoAdapter;
 import org.openscience.cdk.geometry.GeometryTools;
 import org.openscience.cdk.io.ChemObjectReader;
@@ -94,7 +95,7 @@
  */
 public abstract class JChemPaintPanel
 		 extends JPanel
-		 implements ChangeListener {
+		 implements ChangeListener, CDKEditBus {
 
 	//Static variables hold information if the application is embedded and keep track of instances of JCPPanel
 	boolean isEmbedded = false;
@@ -744,7 +745,7 @@
 	 *
 	 *@param  chemFile  Description of the Parameter
 	 */
-	public void showChemFile(ChemFile chemFile) {
+	public void showChemFile(org.openscience.cdk.interfaces.ChemFile chemFile) {
 		logger.info("Information read from file:");
 
 		int chemSequenceCount = chemFile.getChemSequenceCount();
@@ -769,7 +770,7 @@
 	 *
 	 *@param  chemModel  Description of the Parameter
 	 */
-	public void showChemModel(ChemModel chemModel) {
+	public void showChemModel(org.openscience.cdk.interfaces.ChemModel chemModel) {
 		// check for bonds
 		if (ChemModelManipulator.getAllInOneContainer(chemModel).getBondCount() == 0) {
 			String error = "Model does not have bonds. Cannot depict contents.";
@@ -784,14 +785,14 @@
 			String error = "Model does not have coordinates. Will ask for coord generation.";
 			logger.warn(error);
 
-			CreateCoordinatesForFileDialog frame = new CreateCoordinatesForFileDialog(chemModel);
+			CreateCoordinatesForFileDialog frame = new CreateCoordinatesForFileDialog((ChemModel)chemModel);
 			frame.pack();
 			frame.show();
 			frame.moveToFront();
 			return;
 		}
 
-		setJChemPaintModel(new JChemPaintModel(chemModel));
+		setJChemPaintModel(new JChemPaintModel((ChemModel)chemModel));
 	}
 
 
@@ -801,7 +802,7 @@
 	 *
 	 *@return    The chemModel value
 	 */
-	public ChemModel getChemModel() {
+	public org.openscience.cdk.interfaces.ChemModel getChemModel() {
 		return jchemPaintModel.getChemModel();
 	}
 
@@ -812,7 +813,7 @@
 	 *
 	 *@return    The chemFile value
 	 */
-	public ChemFile getChemFile() {
+	public org.openscience.cdk.interfaces.ChemFile getChemFile() {
 		ChemFile file = new ChemFile();
 		ChemSequence sequence = new ChemSequence();
 		sequence.addChemModel(getChemModel());
@@ -961,7 +962,7 @@
     		        }
     		        else if (panel instanceof JChemPaintEditorPanel) {
     		          panel = (JChemPaintEditorPanel) panel;
-    		          ChemModel model = panel.getChemModel();
+    		          ChemModel model = (ChemModel)panel.getChemModel();
     		          frame =JChemPaintEditorPanel.getNewFrame(new JChemPaintModel(model));
     		          JChemPaintEditorPanel newPanel = (JChemPaintEditorPanel) frame.getContentPane().getComponent(0);
     		          newPanel.scaleAndCenterMolecule(model);

Index: JChemPaintEditorPanel.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/jchempaint/JChemPaintEditorPanel.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- JChemPaintEditorPanel.java	30 Aug 2005 19:55:45 -0000	1.42
+++ JChemPaintEditorPanel.java	31 Aug 2005 14:07:05 -0000	1.43
@@ -86,7 +86,7 @@
  *@see           JChemPaintViewerOnlyPanel
  */
 public class JChemPaintEditorPanel extends JChemPaintPanel
-		 implements ChangeListener, CDKChangeListener, CDKEditBus
+		 implements ChangeListener, CDKChangeListener
 {
 
 	static String JCP_MODEL_CHANGED = "1";