From: <eg...@us...> - 2008-05-12 06:29:55
|
Revision: 10979 http://cdk.svn.sourceforge.net/cdk/?rev=10979&view=rev Author: egonw Date: 2008-05-11 23:29:49 -0700 (Sun, 11 May 2008) Log Message: ----------- Installed new controller module using the Programmeerzomer code, and remove the obsolete progzjcp module Modified Paths: -------------- cdk/trunk/src/main/org/openscience/cdk/applications/swing/editor/Controller2DModelEditor.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AddAtomsAndBondsEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AddFuncGroupEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AddHydrogenEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AdjustBondOrdersEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/BondChangeEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeAtomSymbolEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeChargeEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeCoordsEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeIsotopeEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/CleanUpEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ClearAllEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ConvertToPseudoAtomEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ConvertToRadicalEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/FlipEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/IUndoRedoHandler.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/JCPUndoRedoHandler.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/MergeMoleculesEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/MoveAtomEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/RemoveAtomsAndBondsEdit.java cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/UndoAdapter.java cdk/trunk/src/main/org/openscience/cdk/controller/CDKPopupMenu.java cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DHub.java cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModel.java cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleAddAtom.java cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleChangeFormalC.java cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleHighlight.java cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleMove.java cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleRemove.java cdk/trunk/src/main/org/openscience/cdk/controller/ExampleController2DModule.java cdk/trunk/src/main/org/openscience/cdk/controller/IChemModelRelay.java cdk/trunk/src/main/org/openscience/cdk/controller/IController2DModule.java cdk/trunk/src/main/org/openscience/cdk/controller/IMouseEventRelay.java cdk/trunk/src/main/org/openscience/cdk/controller/IViewEventRelay.java cdk/trunk/src/main/org/openscience/cdk/controller/SwingEventRelay.java cdk/trunk/src/main/org/openscience/cdk/controller/SwingMouseEventRelay.java cdk/trunk/src/test/org/openscience/cdk/applications/undoredo/AddAtomsAndBondsEditTest.java cdk/trunk/src/test/org/openscience/cdk/applications/undoredo/AddHydrogenEditTest.java cdk/trunk/src/test/org/openscience/cdk/applications/undoredo/AdjustBondOrdersEditTest.java cdk/trunk/src/test/org/openscience/cdk/applications/undoredo/ChangeAtomSymbolEditTest.java cdk/trunk/src/test/org/openscience/cdk/applications/undoredo/ChangeChargeEditTest.java cdk/trunk/src/test/org/openscience/cdk/applications/undoredo/ChangeCoordsEditTest.java cdk/trunk/src/test/org/openscience/cdk/applications/undoredo/ChangeIsotopeEditTest.java cdk/trunk/src/test/org/openscience/cdk/applications/undoredo/CleanUpEditTest.java cdk/trunk/src/test/org/openscience/cdk/applications/undoredo/ConvertToPseudoAtomEditTest.java cdk/trunk/src/test/org/openscience/cdk/applications/undoredo/ConvertToRadicalEditTest.java cdk/trunk/src/test/org/openscience/cdk/applications/undoredo/FlipEditTest.java cdk/trunk/src/test/org/openscience/cdk/applications/undoredo/RemoveAtomsAndBondsEditTest.java cdk/trunk/src/test/org/openscience/cdk/modulesuites/MextraTests.java Added Paths: ----------- cdk/trunk/src/main/org/openscience/cdk/controller/IController2DModel.java cdk/trunk/src/main/org/openscience/cdk/renderer/IJava2DRenderer.java cdk/trunk/src/main/org/openscience/cdk/renderer/JCPAction2D.java cdk/trunk/src/main/org/openscience/cdk/renderer/JCPPropertyHandler.java cdk/trunk/src/main/org/openscience/cdk/renderer/Java2DRenderer.java Removed Paths: ------------- cdk/trunk/src/main/org/openscience/cdk/renderer/progz/IJava2DRenderer.java cdk/trunk/src/main/org/openscience/cdk/renderer/progz/JCPAction2D.java cdk/trunk/src/main/org/openscience/cdk/renderer/progz/JCPPropertyHandler.java cdk/trunk/src/main/org/openscience/cdk/renderer/progz/Java2DRenderer.java Modified: cdk/trunk/src/main/org/openscience/cdk/applications/swing/editor/Controller2DModelEditor.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/swing/editor/Controller2DModelEditor.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/swing/editor/Controller2DModelEditor.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -24,7 +24,7 @@ package org.openscience.cdk.applications.swing.editor; import org.openscience.cdk.applications.swing.FieldTablePanel; -import org.openscience.cdk.controller.Controller2DModel; +import org.openscience.cdk.controller.IController2DModel; /** * @cdk.module applications @@ -35,7 +35,7 @@ private static final long serialVersionUID = 7978080354056029617L; - private Controller2DModel model; + private IController2DModel model; public Controller2DModelEditor() { super(); @@ -45,14 +45,14 @@ private void constructPanel() { } - public void setModel(Controller2DModel model) { + public void setModel(IController2DModel model) { this.model = model; } public void applyChanges() { } - public Controller2DModel getModel() { + public IController2DModel getModel() { return model; } } Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AddAtomsAndBondsEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AddAtomsAndBondsEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AddAtomsAndBondsEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -30,7 +30,7 @@ import javax.swing.undo.CannotUndoException; import org.openscience.cdk.atomtype.CDKAtomTypeMatcher; -import org.openscience.cdk.controller.Controller2DModel; +import org.openscience.cdk.controller.IController2DModel; import org.openscience.cdk.graph.ConnectivityChecker; import org.openscience.cdk.interfaces.IAtom; import org.openscience.cdk.interfaces.IAtomContainer; @@ -45,7 +45,7 @@ /** * @author tohel - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class AddAtomsAndBondsEdit extends AbstractUndoableEdit { @@ -58,7 +58,7 @@ private String type; - private Controller2DModel c2dm=null; + private IController2DModel c2dm=null; /** * @param chemModel @@ -66,7 +66,7 @@ * @param c2dm The controller model; if none, set to null */ public AddAtomsAndBondsEdit(IChemModel chemModel, - IAtomContainer undoRedoContainer, String type, Controller2DModel c2dm) { + IAtomContainer undoRedoContainer, String type, IController2DModel c2dm) { this.chemModel = chemModel; this.undoRedoContainer = undoRedoContainer; this.type = type; Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AddFuncGroupEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AddFuncGroupEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AddFuncGroupEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -9,7 +9,7 @@ import org.openscience.cdk.tools.manipulator.ChemModelManipulator; /** - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision: 9162 $ */ public class AddFuncGroupEdit extends AbstractUndoableEdit{ Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AddHydrogenEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AddHydrogenEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AddHydrogenEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -45,7 +45,7 @@ * undoing and redoing the regarding changes * * @author tohel - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class AddHydrogenEdit extends AbstractUndoableEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AdjustBondOrdersEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AdjustBondOrdersEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/AdjustBondOrdersEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -39,7 +39,7 @@ * for undoing and redoing the regarding changes * * @author tohel - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class AdjustBondOrdersEdit extends AbstractUndoableEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/BondChangeEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/BondChangeEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/BondChangeEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -33,7 +33,7 @@ import org.openscience.cdk.tools.manipulator.ChemModelManipulator; /** - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class BondChangeEdit extends AbstractUndoableEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeAtomSymbolEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeAtomSymbolEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeAtomSymbolEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -37,7 +37,7 @@ * for undoing and redoing the regarding changes * * @author tohel - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class ChangeAtomSymbolEdit extends AbstractUndoableEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeChargeEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeChargeEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeChargeEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -34,7 +34,7 @@ * containing the methods for undoing and redoing the regarding changes * * @author tohel - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class ChangeChargeEdit extends AbstractUndoableEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeCoordsEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeCoordsEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeCoordsEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -39,7 +39,7 @@ * actions, containing the methods for undoing and redoing the regarding changes * * @author tohel - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class ChangeCoordsEdit extends AbstractUndoableEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeIsotopeEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeIsotopeEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ChangeIsotopeEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -34,7 +34,7 @@ * undoing and redoing the regarding changes * * @author tohel - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class ChangeIsotopeEdit extends AbstractUndoableEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/CleanUpEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/CleanUpEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/CleanUpEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -30,7 +30,7 @@ * superclass for providing undo/redo functionality * * @author tohel - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class CleanUpEdit extends ChangeCoordsEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ClearAllEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ClearAllEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ClearAllEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -9,7 +9,7 @@ import org.openscience.cdk.interfaces.IReactionSet; /** - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class ClearAllEdit extends AbstractUndoableEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ConvertToPseudoAtomEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ConvertToPseudoAtomEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ConvertToPseudoAtomEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -37,7 +37,7 @@ * methods for undoing and redoing the regarding changes * * @author tohel - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class ConvertToPseudoAtomEdit extends AbstractUndoableEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ConvertToRadicalEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ConvertToRadicalEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/ConvertToRadicalEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -35,7 +35,7 @@ * for undoing and redoing the regarding changes * * @author tohel - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class ConvertToRadicalEdit extends AbstractUndoableEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/FlipEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/FlipEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/FlipEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -30,7 +30,7 @@ * for providing undo/redo functionality * * @author tohel - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class FlipEdit extends ChangeCoordsEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/IUndoRedoHandler.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/IUndoRedoHandler.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/IUndoRedoHandler.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -38,7 +38,7 @@ *@author shk3 *@cdk.created 2. Mai 2005 *@cdk.keyword undo redo - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public interface IUndoRedoHandler { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/JCPUndoRedoHandler.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/JCPUndoRedoHandler.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/JCPUndoRedoHandler.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -31,17 +31,17 @@ import javax.swing.undo.UndoableEdit; -import org.openscience.cdk.controller.Controller2DModel; +import org.openscience.cdk.controller.IController2DModel; /** * This is an implementation of IUndoRedoHandler, which is used in JCP. It forwards the postEdit to the postEdit in UndoSupport from Controller2dModel * * @author shk3 - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class JCPUndoRedoHandler implements IUndoRedoHandler { - Controller2DModel c2dm=null; + IController2DModel c2dm=null; /** @@ -49,7 +49,7 @@ * * @param c2dm The Controller2dModel of the current application */ - public JCPUndoRedoHandler(Controller2DModel c2dm) { + public JCPUndoRedoHandler(IController2DModel c2dm) { this.setC2dm(c2dm); } @@ -65,7 +65,7 @@ * * @param c2dm The Controller2dModel of the current application */ - public void setC2dm(Controller2DModel c2dm) { + public void setC2dm(IController2DModel c2dm) { this.c2dm = c2dm; } Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/MergeMoleculesEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/MergeMoleculesEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/MergeMoleculesEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -14,7 +14,7 @@ import org.openscience.cdk.tools.manipulator.ChemModelManipulator; /** - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class MergeMoleculesEdit extends AbstractUndoableEdit{ Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/MoveAtomEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/MoveAtomEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/MoveAtomEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -34,7 +34,7 @@ import org.openscience.cdk.interfaces.IAtomContainer; /** - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class MoveAtomEdit extends AbstractUndoableEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/RemoveAtomsAndBondsEdit.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/RemoveAtomsAndBondsEdit.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/RemoveAtomsAndBondsEdit.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -39,7 +39,7 @@ import org.openscience.cdk.tools.manipulator.ChemModelManipulator; /** - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class RemoveAtomsAndBondsEdit extends AbstractUndoableEdit { Modified: cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/UndoAdapter.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/UndoAdapter.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/applications/undoredo/UndoAdapter.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -33,8 +33,8 @@ * the new state of the undo history list Is registered as a listener to the * undoSupport which is recieving the undo/redo events. * - * @author tohel - * @cdk.module control + * @author tohel + * @cdk.module control * @cdk.svnrev $Revision$ */ public class UndoAdapter implements UndoableEditListener { Modified: cdk/trunk/src/main/org/openscience/cdk/controller/CDKPopupMenu.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/CDKPopupMenu.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/CDKPopupMenu.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -43,7 +43,7 @@ * @author Egon Willighagen <eg...@sc...> * @cdk.created 2003-07-36 * @cdk.require swing - * @cdk.module control + * @cdk.module controlold * @cdk.svnrev $Revision$ */ public class CDKPopupMenu extends JPopupMenu { Modified: cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DHub.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DHub.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DHub.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -32,13 +32,11 @@ import javax.vecmath.Point2d; -import org.openscience.cdk.Molecule; import org.openscience.cdk.interfaces.IAtom; import org.openscience.cdk.interfaces.IAtomContainer; import org.openscience.cdk.interfaces.IBond; import org.openscience.cdk.interfaces.IChemModel; -import org.openscience.cdk.interfaces.IMolecule; -import org.openscience.cdk.renderer.progz.IJava2DRenderer; +import org.openscience.cdk.renderer.IJava2DRenderer; import org.openscience.cdk.tools.manipulator.ChemModelManipulator; /** @@ -48,7 +46,7 @@ * <p>FIXME: will replace the old Controller2D class. * * @cdk.svnrev $Revision: 9162 $ - * @cdk.module progzjcp + * @cdk.module control * @author Niels Out * @author egonw */ @@ -56,14 +54,14 @@ private IChemModel chemModel; - private Controller2DModel controllerModel; + private IController2DModel controllerModel; private IJava2DRenderer renderer; private IViewEventRelay eventRelay; private List<IController2DModule> generalModules; private Map<Controller2DModel.DrawMode,IController2DModule> drawModeModules; - public Controller2DHub(Controller2DModel controllerModel, + public Controller2DHub(IController2DModel controllerModel, IJava2DRenderer renderer, IChemModel chemModel, IViewEventRelay eventRelay) { @@ -77,19 +75,19 @@ //register all 'known' controllers registerDrawModeControllerModule( - Controller2DModel.DrawMode.MOVE, new Controller2DModuleMove()); + IController2DModel.DrawMode.MOVE, new Controller2DModuleMove()); registerDrawModeControllerModule( - Controller2DModel.DrawMode.ERASER, new Controller2DModuleRemove()); + IController2DModel.DrawMode.ERASER, new Controller2DModuleRemove()); registerDrawModeControllerModule( - Controller2DModel.DrawMode.INCCHARGE, new Controller2DModuleChangeFormalC(1)); + IController2DModel.DrawMode.INCCHARGE, new Controller2DModuleChangeFormalC(1)); registerDrawModeControllerModule( - Controller2DModel.DrawMode.DECCHARGE, new Controller2DModuleChangeFormalC(-1)); + IController2DModel.DrawMode.DECCHARGE, new Controller2DModuleChangeFormalC(-1)); registerDrawModeControllerModule( - Controller2DModel.DrawMode.ENTERELEMENT, new Controller2DModuleAddAtom()); + IController2DModel.DrawMode.ENTERELEMENT, new Controller2DModuleAddAtom()); registerGeneralControllerModule( new Controller2DModuleHighlight()); } - public Controller2DModel getController2DModel() { + public IController2DModel getController2DModel() { return controllerModel; } public IJava2DRenderer getIJava2DRenderer() { Modified: cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModel.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModel.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModel.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -34,49 +34,14 @@ import org.openscience.cdk.applications.undoredo.UndoAdapter; /** - * @cdk.module control + * @cdk.module control * @cdk.svnrev $Revision$ */ -public class Controller2DModel implements java.io.Serializable, Cloneable +public class Controller2DModel implements java.io.Serializable, Cloneable, IController2DModel { private static final long serialVersionUID = 9007159812273128989L; - public enum DrawMode { - DRAWBOND("Draw"), - MOVE("Move"), - SELECT("Select"), - ERASER("Delete"), - ELEMENT("Element"), - SYMBOL("Symbol"), - RING("Ring"), - CLEANUP("Clean"), - FLIP_H, - FLIP_V, - ROTATION, - UP_BOND("Wedge Up"), - DOWN_BOND("Wedge Down"), - NORMALIZE("Normalize"), - LASSO("Select"), - INCCHARGE("Increase Charge"), - DECCHARGE("Decrease Charge"), - BENZENERING, - MAPATOMATOM("Map Atom-Atom"), - ENTERELEMENT; - - private final String name; - DrawMode() { - this(""); - } - DrawMode(String name) { - this.name = name; - } - - public String getName() { - return this.name; - } - } - private DrawMode drawMode = DrawMode.DRAWBOND; private int ringSize = 6; @@ -105,68 +70,56 @@ undoSupport = new UndoableEditSupport(); undoSupport.addUndoableEditListener(new UndoAdapter(undoManager)); } - /** - * Returns the draw mode. - * - * @return The draw mode - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getDrawMode() + */ public DrawMode getDrawMode() { return this.drawMode; } - /** - * Returns the String representation of the draw mode. - * - * @return A String - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getDrawModeString() + */ public String getDrawModeString() { return this.drawMode.getName(); } - /** - * Sets the draw mode - * - * @param drawMode - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setDrawMode(org.openscience.cdk.controller.Controller2DModel.DrawMode) + */ public void setDrawMode(DrawMode drawMode) { this.drawMode = drawMode; } - /** - * Returns the snapToGridAngle mode - * - * @return the snapToGridAngle mode - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getSnapToGridAngle() + */ public boolean getSnapToGridAngle() { return this.snapToGridAngle; } - /** - * Returns true if the number of implicit hydrogens is updated - * when an Atom is edited. + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getAutoUpdateImplicitHydrogens() */ public boolean getAutoUpdateImplicitHydrogens() { return this.autoUpdateImplicitHydrogens; } - /** - * Sets whether the number of implicit hydrogens is update when an - * Atom is edited. + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setAutoUpdateImplicitHydrogens(boolean) */ public void setAutoUpdateImplicitHydrogens(boolean update) { this.autoUpdateImplicitHydrogens = update; } - /** - * Sets the snapToGridAngle mode - * - * @param snapToGridAngle - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setSnapToGridAngle(boolean) + */ public void setSnapToGridAngle(boolean snapToGridAngle) { this.snapToGridAngle = snapToGridAngle; @@ -174,22 +127,18 @@ - /** - * Returns the snapAngle mode - * - * @return the snapAngle mode - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getSnapAngle() + */ public int getSnapAngle() { return this.snapAngle; } - /** - * Sets the snapAngle mode - * - * @param snapAngle - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setSnapAngle(int) + */ public void setSnapAngle(int snapAngle) { this.snapAngle = snapAngle; @@ -197,22 +146,18 @@ - /** - * Returns the snapToGridCartesian mode - * - * @return the snapToGridCartesian mode - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getSnapToGridCartesian() + */ public boolean getSnapToGridCartesian() { return this.snapToGridCartesian; } - /** - * Sets the snapToGridCartesian mode - * - * @param snapToGridCartesian - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setSnapToGridCartesian(boolean) + */ public void setSnapToGridCartesian(boolean snapToGridCartesian) { this.snapToGridCartesian = snapToGridCartesian; @@ -220,149 +165,153 @@ - /** - * Returns the snapCartesian value - * - * @return the snapCartesian value - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getSnapCartesian() + */ public int getSnapCartesian() { return this.snapCartesian; } - /** - * Sets the snapCartesian value - * - * @param snapCartesian - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setSnapCartesian(int) + */ public void setSnapCartesian(int snapCartesian) { this.snapCartesian = snapCartesian; } - /** - * Returns the ring size - * - * @return the ring size - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getRingSize() + */ public int getRingSize() { return this.ringSize; } - /** - * Sets the ring size - * - * @param ringSize - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setRingSize(int) + */ public void setRingSize(int ringSize) { this.ringSize = ringSize; } + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getDefaultElementSymbol() + */ public String getDefaultElementSymbol() { return this.defaultElementSymbol; } - /** - * Sets the default element symbol - * - * @param defaultElementSymbol - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setDefaultElementSymbol(java.lang.String) + */ public void setDefaultElementSymbol(String defaultElementSymbol) { this.defaultElementSymbol = defaultElementSymbol; } - /** - * Returns the bond pointer length - * - * @return the length - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getBondPointerLength() + */ public double getBondPointerLength() { return this.bondPointerLength; } - /** - * Sets the pointer length - * - * @param bondPointerLength - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setBondPointerLength(double) + */ public void setBondPointerLength(double bondPointerLength) { this.bondPointerLength = bondPointerLength; } - /** - * Returns the ring pointer length - * - * @return the length - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getRingPointerLength() + */ public double getRingPointerLength() { return this.ringPointerLength; } - /** - * Sets the pointer length - * - * @param ringPointerLength - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setRingPointerLength(double) + */ public void setRingPointerLength(double ringPointerLength) { this.ringPointerLength = ringPointerLength; } + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setCommonElements(java.lang.String[]) + */ public void setCommonElements(String[] elements) { this.commonElements = elements; } + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getCommonElements() + */ public String[] getCommonElements() { return this.commonElements; } + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setDrawElement(java.lang.String) + */ public void setDrawElement(String element) { this.drawElement = element; } - /** - * Element symbol that <b>new</b> atoms get by default. + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getDrawElement() */ public String getDrawElement() { return this.drawElement; } + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getUndoSupport() + */ public UndoableEditSupport getUndoSupport() { return undoSupport; } + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setUndoSupport(javax.swing.undo.UndoableEditSupport) + */ public void setUndoSupport(UndoableEditSupport undoSupport) { this.undoSupport = undoSupport; } + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#getUndoManager() + */ public UndoManager getUndoManager() { return undoManager; } + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setUndoManager(javax.swing.undo.UndoManager) + */ public void setUndoManager(UndoManager undoManager) { this.undoManager = undoManager; } - /** - * To retrieve the value of the isMovingAllowed flag - * @return boolean isMovingAllowed - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#isMovingAllowed() + */ public boolean isMovingAllowed() { return isMovingAllowed; } - /** - * Lets you set the siMovingAllowed flag - * @param isMovingAllowed - */ + /* (non-Javadoc) + * @see org.openscience.cdk.controller.IController2DModel#setMovingAllowed(boolean) + */ public void setMovingAllowed(boolean isMovingAllowed) { this.isMovingAllowed = isMovingAllowed; } Modified: cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleAddAtom.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleAddAtom.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleAddAtom.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -24,24 +24,10 @@ */ package org.openscience.cdk.controller; -import java.awt.Graphics2D; -import java.awt.event.MouseEvent; -import java.awt.geom.Rectangle2D; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; - -import javax.imageio.ImageIO; import javax.vecmath.Point2d; import org.openscience.cdk.config.IsotopeFactory; import org.openscience.cdk.interfaces.IAtom; -import org.openscience.cdk.renderer.Renderer2DModel; -import org.openscience.cdk.renderer.progz.IJava2DRenderer; -import org.openscience.cdk.tools.manipulator.ChemModelManipulator; -import org.openscience.cdk.interfaces.IChemModel; -import org.openscience.cdk.interfaces.IAtomContainer; -import org.openscience.cdk.Atom; /** @@ -49,7 +35,7 @@ * * @author Niels Out * @cdk.svnrev $Revision: 9162 $ - * @cdk.module progzjcp + * @cdk.module control */ public class Controller2DModuleAddAtom implements IController2DModule { Modified: cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleChangeFormalC.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleChangeFormalC.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleChangeFormalC.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -35,7 +35,7 @@ * * @author Niels Out * @cdk.svnrev $Revision: 9162 $ - * @cdk.module progzjcp + * @cdk.module control */ public class Controller2DModuleChangeFormalC implements IController2DModule { Modified: cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleHighlight.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleHighlight.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleHighlight.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -34,7 +34,7 @@ * * @author Niels Out * @cdk.svnrev $Revision: 9162 $ - * @cdk.module progzjcp + * @cdk.module control */ public class Controller2DModuleHighlight implements IController2DModule { Modified: cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleMove.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleMove.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleMove.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -25,7 +25,6 @@ package org.openscience.cdk.controller; import java.awt.Graphics2D; -import java.awt.event.MouseEvent; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.io.File; @@ -35,10 +34,9 @@ import javax.vecmath.Point2d; import org.openscience.cdk.interfaces.IAtom; -import org.openscience.cdk.renderer.Renderer2DModel; -import org.openscience.cdk.renderer.progz.IJava2DRenderer; -import org.openscience.cdk.interfaces.IChemModel; import org.openscience.cdk.interfaces.IAtomContainer; +import org.openscience.cdk.interfaces.IChemModel; +import org.openscience.cdk.renderer.IJava2DRenderer; /** @@ -49,7 +47,7 @@ * * @author Niels Out * @cdk.svnrev $Revision: 9162 $ - * @cdk.module progzjcp + * @cdk.module control */ public class Controller2DModuleMove implements IController2DModule { Modified: cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleRemove.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleRemove.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/Controller2DModuleRemove.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -24,21 +24,9 @@ */ package org.openscience.cdk.controller; -import java.awt.Graphics2D; -import java.awt.event.MouseEvent; -import java.awt.geom.Rectangle2D; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; - -import javax.imageio.ImageIO; import javax.vecmath.Point2d; import org.openscience.cdk.interfaces.IAtom; -import org.openscience.cdk.renderer.Renderer2DModel; -import org.openscience.cdk.renderer.progz.IJava2DRenderer; -import org.openscience.cdk.interfaces.IChemModel; -import org.openscience.cdk.interfaces.IAtomContainer; /** @@ -46,7 +34,7 @@ * * @author Niels Out * @cdk.svnrev $Revision: 9162 $ - * @cdk.module progzjcp + * @cdk.module control */ public class Controller2DModuleRemove implements IController2DModule { Modified: cdk/trunk/src/main/org/openscience/cdk/controller/ExampleController2DModule.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/ExampleController2DModule.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/ExampleController2DModule.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -25,7 +25,6 @@ package org.openscience.cdk.controller; import java.awt.Graphics2D; -import java.awt.event.MouseEvent; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.io.File; @@ -35,10 +34,9 @@ import javax.vecmath.Point2d; import org.openscience.cdk.interfaces.IAtom; -import org.openscience.cdk.renderer.Renderer2DModel; -import org.openscience.cdk.renderer.progz.IJava2DRenderer; -import org.openscience.cdk.interfaces.IChemModel; import org.openscience.cdk.interfaces.IAtomContainer; +import org.openscience.cdk.interfaces.IChemModel; +import org.openscience.cdk.renderer.IJava2DRenderer; /** @@ -48,7 +46,7 @@ * * @author Niels Out * @cdk.svnrev $Revision: 9162 $ - * @cdk.module progzjcp + * @cdk.module control */ public class ExampleController2DModule implements IController2DModule { Modified: cdk/trunk/src/main/org/openscience/cdk/controller/IChemModelRelay.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/IChemModelRelay.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/IChemModelRelay.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -28,11 +28,11 @@ import org.openscience.cdk.interfaces.IAtom; import org.openscience.cdk.interfaces.IBond; -import org.openscience.cdk.renderer.progz.IJava2DRenderer; import org.openscience.cdk.interfaces.IChemModel; +import org.openscience.cdk.renderer.IJava2DRenderer; /** - * @cdk.module progzjcp + * @cdk.module render */ public interface IChemModelRelay { @@ -44,7 +44,7 @@ public abstract void updateView(); - public abstract Controller2DModel getController2DModel(); + public abstract IController2DModel getController2DModel(); public abstract IJava2DRenderer getIJava2DRenderer(); public abstract IChemModel getIChemModel(); Added: cdk/trunk/src/main/org/openscience/cdk/controller/IController2DModel.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/IController2DModel.java (rev 0) +++ cdk/trunk/src/main/org/openscience/cdk/controller/IController2DModel.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -0,0 +1,241 @@ +/* $Revision: 10179 $ $Author: egonw $ $Date: 2008-02-18 17:05:56 +0100 (Mon, 18 Feb 2008) $ + * + * Copyright (C) 2008 The Chemistry Development Kit (CDK) project + * + * Contact: cdk...@li... + * + * This program 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 (at your option) any later version. + * All I ask is that proper credit is given for my work, which includes + * - but is not limited to - adding the above copyright notice to the beginning + * of your source code files, and to any copyright notice that you may distribute + * with programs based on this work. + * + * This program 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. 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 program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ +package org.openscience.cdk.controller; + +import javax.swing.undo.UndoManager; +import javax.swing.undo.UndoableEditSupport; + +/** + * @cdk.module render + */ +public interface IController2DModel { + + public enum DrawMode { + DRAWBOND("Draw"), + MOVE("Move"), + SELECT("Select"), + ERASER("Delete"), + ELEMENT("Element"), + SYMBOL("Symbol"), + RING("Ring"), + CLEANUP("Clean"), + FLIP_H, + FLIP_V, + ROTATION, + UP_BOND("Wedge Up"), + DOWN_BOND("Wedge Down"), + NORMALIZE("Normalize"), + LASSO("Select"), + INCCHARGE("Increase Charge"), + DECCHARGE("Decrease Charge"), + BENZENERING, + MAPATOMATOM("Map Atom-Atom"), + ENTERELEMENT; + + private final String name; + DrawMode() { + this(""); + } + DrawMode(String name) { + this.name = name; + } + + public String getName() { + return this.name; + } + } + + /** + * Returns the draw mode. + * + * @return The draw mode + */ + public abstract DrawMode getDrawMode(); + + /** + * Returns the String representation of the draw mode. + * + * @return A String + */ + public abstract String getDrawModeString(); + + /** + * Sets the draw mode + * + * @param drawMode + */ + public abstract void setDrawMode(DrawMode drawMode); + + /** + * Returns the snapToGridAngle mode + * + * @return the snapToGridAngle mode + */ + public abstract boolean getSnapToGridAngle(); + + /** + * Returns true if the number of implicit hydrogens is updated + * when an Atom is edited. + */ + public abstract boolean getAutoUpdateImplicitHydrogens(); + + /** + * Sets whether the number of implicit hydrogens is update when an + * Atom is edited. + */ + public abstract void setAutoUpdateImplicitHydrogens(boolean update); + + /** + * Sets the snapToGridAngle mode + * + * @param snapToGridAngle + */ + public abstract void setSnapToGridAngle(boolean snapToGridAngle); + + /** + * Returns the snapAngle mode + * + * @return the snapAngle mode + */ + public abstract int getSnapAngle(); + + /** + * Sets the snapAngle mode + * + * @param snapAngle + */ + public abstract void setSnapAngle(int snapAngle); + + /** + * Returns the snapToGridCartesian mode + * + * @return the snapToGridCartesian mode + */ + public abstract boolean getSnapToGridCartesian(); + + /** + * Sets the snapToGridCartesian mode + * + * @param snapToGridCartesian + */ + public abstract void setSnapToGridCartesian(boolean snapToGridCartesian); + + /** + * Returns the snapCartesian value + * + * @return the snapCartesian value + */ + public abstract int getSnapCartesian(); + + /** + * Sets the snapCartesian value + * + * @param snapCartesian + */ + public abstract void setSnapCartesian(int snapCartesian); + + /** + * Returns the ring size + * + * @return the ring size + */ + public abstract int getRingSize(); + + /** + * Sets the ring size + * + * @param ringSize + */ + public abstract void setRingSize(int ringSize); + + public abstract String getDefaultElementSymbol(); + + /** + * Sets the default element symbol + * + * @param defaultElementSymbol + */ + public abstract void setDefaultElementSymbol(String defaultElementSymbol); + + /** + * Returns the bond pointer length + * + * @return the length + */ + public abstract double getBondPointerLength(); + + /** + * Sets the pointer length + * + * @param bondPointerLength + */ + public abstract void setBondPointerLength(double bondPointerLength); + + /** + * Returns the ring pointer length + * + * @return the length + */ + public abstract double getRingPointerLength(); + + /** + * Sets the pointer length + * + * @param ringPointerLength + */ + public abstract void setRingPointerLength(double ringPointerLength); + + public abstract void setCommonElements(String[] elements); + + public abstract String[] getCommonElements(); + + public abstract void setDrawElement(String element); + + /** + * Element symbol that <b>new</b> atoms get by default. + */ + public abstract String getDrawElement(); + + public abstract UndoableEditSupport getUndoSupport(); + + public abstract void setUndoSupport(UndoableEditSupport undoSupport); + + public abstract UndoManager getUndoManager(); + + public abstract void setUndoManager(UndoManager undoManager); + + /** + * To retrieve the value of the isMovingAllowed flag + * @return boolean isMovingAllowed + */ + public abstract boolean isMovingAllowed(); + + /** + * Lets you set the siMovingAllowed flag + * @param isMovingAllowed + */ + public abstract void setMovingAllowed(boolean isMovingAllowed); + +} \ No newline at end of file Modified: cdk/trunk/src/main/org/openscience/cdk/controller/IController2DModule.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/IController2DModule.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/IController2DModule.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -24,8 +24,6 @@ */ package org.openscience.cdk.controller; -import java.awt.event.MouseEvent; - import javax.vecmath.Point2d; /** @@ -35,7 +33,7 @@ * * @author egonw * @cdk.svnrev $Revision: 9162 $ - * @cdk.module progzjcp + * @cdk.module control * * @see Controller2DModel */ Modified: cdk/trunk/src/main/org/openscience/cdk/controller/IMouseEventRelay.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/IMouseEventRelay.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/IMouseEventRelay.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -24,8 +24,10 @@ */ package org.openscience.cdk.controller; -import java.awt.event.MouseEvent; - +/** + * + * @cdk.module control + */ public interface IMouseEventRelay { /** * Modified: cdk/trunk/src/main/org/openscience/cdk/controller/IViewEventRelay.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/IViewEventRelay.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/IViewEventRelay.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -24,6 +24,10 @@ */ package org.openscience.cdk.controller; +/** + * + * @cdk.module control + */ public interface IViewEventRelay { public abstract void updateView(); Modified: cdk/trunk/src/main/org/openscience/cdk/controller/SwingEventRelay.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/SwingEventRelay.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/SwingEventRelay.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -25,6 +25,9 @@ package org.openscience.cdk.controller; import javax.swing.JComponent; +/** + * @cdk.module control + */ public class SwingEventRelay implements IViewEventRelay { private JComponent component; Modified: cdk/trunk/src/main/org/openscience/cdk/controller/SwingMouseEventRelay.java =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/controller/SwingMouseEventRelay.java 2008-05-11 20:27:23 UTC (rev 10978) +++ cdk/trunk/src/main/org/openscience/cdk/controller/SwingMouseEventRelay.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -28,7 +28,9 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; - +/** + * @cdk.module control + */ public class SwingMouseEventRelay implements MouseMotionListener, MouseListener { Copied: cdk/trunk/src/main/org/openscience/cdk/renderer/IJava2DRenderer.java (from rev 10954, cdk/trunk/src/main/org/openscience/cdk/renderer/progz/IJava2DRenderer.java) =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/renderer/IJava2DRenderer.java (rev 0) +++ cdk/trunk/src/main/org/openscience/cdk/renderer/IJava2DRenderer.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -0,0 +1,42 @@ +/* $Revision: 7636$ $Author: nielsout $ $Date: 2007-09-02 11:46:10 +0100 (su, 02 sep 2007) $ + * + * Copyright (C) 2007 Niels Out <nie...@us...> + * + * Contact: cdk...@li... or no...@sc... + * + * This program 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 (at your option) any later version. + * All I ask is that proper credit is given for my work, which includes + * - but is not limited to - adding the above copyright notice to the beginning + * of your source code files, and to any copyright notice that you may distribute + * with programs based on this work. + * + * This program 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. 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 program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ +package org.openscience.cdk.renderer; + +import javax.vecmath.Point2d; + +import org.openscience.cdk.renderer.ISimpleRenderer2D; + +/** + * @cdk.module render + */ +public interface IJava2DRenderer extends ISimpleRenderer2D { + + /** + * Returns model coordinates from screen coordinates provided by the graphics translation. + * + * @return Point2D in real world coordinates + */ + public abstract Point2d getCoorFromScreen(int screenX, int screenY); +} Copied: cdk/trunk/src/main/org/openscience/cdk/renderer/JCPAction2D.java (from rev 10954, cdk/trunk/src/main/org/openscience/cdk/renderer/progz/JCPAction2D.java) =================================================================== --- cdk/trunk/src/main/org/openscience/cdk/renderer/JCPAction2D.java (rev 0) +++ cdk/trunk/src/main/org/openscience/cdk/renderer/JCPAction2D.java 2008-05-12 06:29:49 UTC (rev 10979) @@ -0,0 +1,357 @@ +/* + * $RCSfile$ + * $Author: egonw $ + * $Date: 2007-01-04 18:26:00 +0100 (do, 04 jan 2007) $ + * $Revision: 7634 $ + * + * Copyright (C) 1997-2007 The JChemPaint project + * + * Contact: jch...@li... + * + * This program 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 (at your option) any later version. + * All we ask is that proper credit is given for our work, which includes + * - but is not limited to - adding the above copyright notice to the beginning + * of your source code files, and to any copyright notice that you may distribute + * with programs based on this work. + * + * This program 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. 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 program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ +package org.openscience.cdk.renderer; + +import java.awt.Container; +import java.awt.event.ActionEvent; +import java.util.Hashtable; + +import javax.swing.AbstractAction; +import javax.swing.JMenuItem; +import javax.swing.JPopupMenu; +import javax.swing.JFrame; + +import org.openscience.cdk.interfaces.IChemObject; +//import org.openscience.cdk.applications.jchempaint.JChemPaintMenuBar; +//import org.openscience.cdk.applications.jchempaint.JChemPaintPanel; +import org.openscience.cdk.controller.CDKPopupMenu; +import org.openscience.cdk.tools.LoggingTool; + +/** + * Superclass of all JChemPaint GUI actions + * + * @cdk.module jchempaint + * @cdk.svnrev $Revision: 9162 $ + * @author steinbeck + */ +public class JCPAction2D extends AbstractAction +{ + + private static final long serialVersionUID = -4056416630614934238L; + + /** + * Description of the Field + */ + public final static String actionSuffix = "Action"; + /** + * Description of the Field + */ + public final static String imageSuffix = "Image"; + /** + * Description of the Field + */ + public final static String labelSuffix = "Label"; + + /** + * Description of the Field + */ + protected static LoggingTool logger = null; + + private Hashtable actions = null; + private Hashtable popupActions = null; + + /** + * Description of the Field + */ + protected String type; + + /** + * Description of the Field + */ + //protected JChemPaintPanel jcpPanel = null; + protected JFrame jcpPanel = null; + + /** + * Is this popup action assiociated with a PopupMenu or not. + */ + private boolean isPopupAction; + + + /** + * Constructor for the JCPAction object + * + *@param jcpPanel Description of the Parameter + *@param type Description of the Parameter + *@param isPopupAction Description of the Parameter + */ + public JCPAction2D(JFrame jcpPanel, String type, boolean isPopupAction) + { + super(); + //logger.debug("JCPAction->type: " + type); + if (JCPAction2D.logger == null) + { + JCPAction2D.logger = new LoggingTool(this); + } + if (this.actions == null) + { + this.actions = new Hashtable(); + } + if (this.popupActions == null) + { + this.popupActions = new Hashtable(); + } + this.type = ""; + this.isPopupAction = isPopupAction; + // this.jcpPanel = jcpPanel; + } + + + /** + * Constructor for the JCPAction object + * + *@param jcpPanel Description of the Parameter + *@param isPopupAction Description of the Parameter + */ + public JCPAction2D(JFrame jcpPanel, boolean isPopupAction) + { + this(jcpPanel, "", isPopupAction); + } + + + /** + * Constructor for the JCPAction object + * + *@param jcpPanel Description of the Parameter + */ + public JCPAction2D(JFrame jcpPanel) + { + this(jcpPanel, false); + } + + + /** + * Constructor for the JCPAction object + */ + public JCPAction2D() + { + this(null); + } + + + /** + * Sets the type attribute of the JCPAction object + * + *@param type The new type value + */ + public void setType(String type) + { + this.type = type; + } + + + /** + * Sets the jChemPaintPanel attribute of the JCPAction object + * + *@param jcpPanel The new jChemPaintPanel value + */ + public void setJChemPaintPanel(JFrame jcpPanel) + { + this.jcpPanel = jcpPanel; + } + + + /** + * Is this action runnable? + * + *@return The enabled value + */ + public boolean isEnabled() + { + return true; + } + + + /** + * Gets the popupAction attribute of the JCPAction object + * + *@return The popupAction value + */ + public boolean isPopupAction() + { + return isPopupAction; + } + + + /** + * Sets the isPopupAction attribute of the JCPAction object + * + *@param isPopupAction The new isPopupAction value + */ + public void setIsPopupAction(boolean isPopupAction) + { + this.isPopupAction = isPopupAction; + } + + + /** + * Dummy method. + * + *@param e Description of the Parameter + */ + public void actionPerformed(ActionEvent e) + { + } + + + /** + * Gets the source attribute of the JCPAction object + * + *@param event Description of the Parameter + *@return The source value + */ + public IChemObject getSource(ActionEvent event) + { + Object source = event.getSource(); + logger.debug("event source: ", source); + if (source instanceof JMenuItem) + { + Container parent = ((JMenuItem) source).getComponent().getParent(); + // logger.debug("event source parent: " + parent); + if (parent instanceof CDKPopupMenu) + { + return ((CDKPopupMenu) parent).getSource(); + } else if (parent instanceof JPop... [truncated message content] |