[Cdk-commits] SF.net SVN: cdk:[15436] jchempaint/branches/3_0/src/main/org/openscience/ jchempaint

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

Revision: 15436
          http://cdk.svn.sourceforge.net/cdk/?rev=15436&view=rev
Author:   shk3
Date:     2010-02-24 15:31:00 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
solves bug #75

Modified Paths:
--------------
    jchempaint/branches/3_0/src/main/org/openscience/jchempaint/controller/ControllerHub.java
    jchempaint/branches/3_0/src/main/org/openscience/jchempaint/dialog/FieldTablePanel.java
    jchempaint/branches/3_0/src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java
    jchempaint/branches/3_0/src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java

Modified: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/controller/ControllerHub.java
===================================================================
--- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/controller/ControllerHub.java	2010-02-24 14:52:22 UTC (rev 15435)
+++ jchempaint/branches/3_0/src/main/org/openscience/jchempaint/controller/ControllerHub.java	2010-02-24 15:31:00 UTC (rev 15436)
@@ -425,6 +425,7 @@
 	//OK TODO this could do with less partitioning
 	public IAtomContainer removeAtom(IAtom atom) {
 		IAtomContainer ac = removeAtomWithoutUndo(atom);
+        removeEmptyContainers(chemModel);
 	    if(getUndoRedoFactory()!=null && getUndoRedoHandler()!=null){
 		    IUndoRedoable undoredo = getUndoRedoFactory().getRemoveAtomsAndBondsEdit(getIChemModel(), ac, "Remove Atom",this);
 		    getUndoRedoHandler().postEdit(undoredo);

Modified: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/dialog/FieldTablePanel.java
===================================================================
--- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/dialog/FieldTablePanel.java	2010-02-24 14:52:22 UTC (rev 15435)
+++ jchempaint/branches/3_0/src/main/org/openscience/jchempaint/dialog/FieldTablePanel.java	2010-02-24 15:31:00 UTC (rev 15436)
@@ -62,6 +62,7 @@
         if(hasTabs){
             setLayout(new BorderLayout());
             tabbedPane = new JTabbedPane();
+            tabbedPane.setName("tabs");
             add( tabbedPane, BorderLayout.CENTER );
         }else{
             setLayout(new GridBagLayout());

Modified: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java
===================================================================
--- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java	2010-02-24 14:52:22 UTC (rev 15435)
+++ jchempaint/branches/3_0/src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java	2010-02-24 15:31:00 UTC (rev 15436)
@@ -82,6 +82,7 @@
         JPanel buttonPanel = new JPanel();
         buttonPanel.setLayout ( new FlowLayout(FlowLayout.RIGHT) );
         JButton ok = new JButton(GT._("OK"));
+        ok.setName("ok");
         ok.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 OKPressed();
@@ -90,6 +91,7 @@
         buttonPanel.add( ok );
         getRootPane().setDefaultButton(ok);
         JButton apply = new JButton(GT._("Apply"));
+        apply.setName("apply");
         apply.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 ApplyPressed(false);
@@ -97,6 +99,7 @@
         );
         buttonPanel.add( apply );
         JButton cancel = new JButton(GT._("Cancel"));
+        cancel.setName("cancel");
         cancel.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 closeFrame();

Modified: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java
===================================================================
--- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java	2010-02-24 14:52:22 UTC (rev 15435)
+++ jchempaint/branches/3_0/src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java	2010-02-24 15:31:00 UTC (rev 15436)
@@ -317,6 +317,7 @@
             languagesstrings[i] = gtlanguages[i].language;
         }
         language = new JComboBox(languagesstrings);
+        language.setName("language");
         for(int i=0;i<languagesstrings.length;i++){
             if(gtlanguages[i].code.equals(GT.getLanguage()))
                 language.setSelectedIndex(i);


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