[Cdk-commits] SF.net SVN: cdk:[14465] jchempaint/trunk/src/main/org/openscience

[<sh...@us...>]

Revision: 14465
          http://cdk.svn.sourceforge.net/cdk/?rev=14465&view=rev
Author:   shk3
Date:     2009-03-12 10:49:34 +0000 (Thu, 12 Mar 2009)

Log Message:
-----------
Some minor changes, bug fixes for jcp

Modified Paths:
--------------
    jchempaint/trunk/src/main/org/openscience/jchempaint/action/AddHydrogenAction.java
    jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.java

Added Paths:
-----------
    jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingChangeHydrogenCountEdit.java

Removed Paths:
-------------
    jchempaint/trunk/src/main/org/openscience/cdk/

Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/AddHydrogenAction.java
===================================================================
--- jchempaint/trunk/src/main/org/openscience/jchempaint/action/AddHydrogenAction.java	2009-03-12 10:26:24 UTC (rev 14464)
+++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/AddHydrogenAction.java	2009-03-12 10:49:34 UTC (rev 14465)
@@ -29,30 +29,8 @@
 package org.openscience.jchempaint.action;
 
 import java.awt.event.ActionEvent;
-import java.util.HashMap;
-import java.util.Iterator;
 
-import javax.swing.undo.UndoableEdit;
-import javax.vecmath.Point2d;
 
-import org.openscience.cdk.Atom;
-import org.openscience.cdk.ChemModel;
-import org.openscience.cdk.applications.undoredo.AddHydrogenEdit;
-import org.openscience.cdk.atomtype.CDKAtomTypeMatcher;
-import org.openscience.cdk.geometry.GeometryTools;
-import org.openscience.cdk.interfaces.IAtom;
-import org.openscience.cdk.interfaces.IAtomContainer;
-import org.openscience.cdk.interfaces.IAtomType;
-import org.openscience.cdk.interfaces.IChemObject;
-import org.openscience.cdk.interfaces.IMolecule;
-import org.openscience.cdk.interfaces.IMoleculeSet;
-import org.openscience.cdk.layout.HydrogenPlacer;
-import org.openscience.cdk.tools.CDKHydrogenAdder;
-import org.openscience.cdk.tools.manipulator.AtomTypeManipulator;
-import org.openscience.cdk.tools.manipulator.ChemModelManipulator;
-import org.openscience.cdk.tools.manipulator.ReactionSetManipulator;
-
-
 /**
  * An action triggering everything related to hydrogens
  *

Added: jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingChangeHydrogenCountEdit.java
===================================================================
--- jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingChangeHydrogenCountEdit.java	                        (rev 0)
+++ jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingChangeHydrogenCountEdit.java	2009-03-12 10:49:34 UTC (rev 14465)
@@ -0,0 +1,71 @@
+/*
+ *  $RCSfile$
+ *  $Author: egonw $
+ *  $Date: 2007-01-04 17:26:00 +0000 (Thu, 04 Jan 2007) $
+ *  $Revision: 7634 $
+ *
+ *  Copyright (C) 2008 Stefan Kuhn
+ *
+ *  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 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.jchempaint.undoredo;
+
+import java.util.Map;
+
+import javax.swing.undo.UndoableEdit;
+
+import org.openscience.cdk.controller.undoredo.ChangeHydrogenCountEdit;
+import org.openscience.cdk.interfaces.IAtom;
+
+/**
+ * A swing undo-redo implementation for clean up
+ *
+ */
+public class SwingChangeHydrogenCountEdit extends ChangeHydrogenCountEdit implements UndoableEdit{
+
+	public SwingChangeHydrogenCountEdit(Map<IAtom, int[]> atomCoordsMap, String type) {
+		super(atomCoordsMap, type);
+	}
+
+	public boolean addEdit(UndoableEdit arg0) {
+		return false;
+	}
+
+	public void die() {
+	}
+
+	public String getRedoPresentationName() {
+		return getPresentationName();
+	}
+
+	public String getUndoPresentationName() {
+		return getPresentationName();
+	}
+
+	public boolean isSignificant() {
+		return true;
+	}
+
+	public boolean replaceEdit(UndoableEdit arg0) {
+		return false;
+	}
+
+}

Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.java
===================================================================
--- jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.java	2009-03-12 10:26:24 UTC (rev 14464)
+++ jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.java	2009-03-12 10:49:34 UTC (rev 14465)
@@ -122,4 +122,9 @@
 		return new SwingMergeMoleculesEdit( deletedAtom, containerWhereAtomWasIn, deletedBonds, bondsWithReplacedAtom, offset, atomwhichwasmoved, type, c2dm);
 	}
 
+	public IUndoRedoable getChangeHydrogenCountEdit(
+			Map<IAtom, int[]> atomHydrogenCountsMap, String type) {
+		return new SwingChangeHydrogenCountEdit(atomHydrogenCountsMap, type);
+	}
+
 }


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