From: <sh...@us...> - 2008-11-24 14:06:48
|
Revision: 13248 http://cdk.svn.sourceforge.net/cdk/?rev=13248&view=rev Author: shk3 Date: 2008-11-24 14:06:43 +0000 (Mon, 24 Nov 2008) Log Message: ----------- correct usage of enterelement/element draw mode Modified Paths: -------------- jchempaint/trunk/src/main/org/openscience/jchempaint/JCPToolBar.java jchempaint/trunk/src/main/org/openscience/jchempaint/action/JCPActionChangeMode.java jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/JCPToolBar.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/JCPToolBar.java 2008-11-24 13:37:33 UTC (rev 13247) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/JCPToolBar.java 2008-11-24 14:06:43 UTC (rev 13248) @@ -174,7 +174,6 @@ } }else{ //FIXME: make the correct actionlistener for the atom types? or whatever these are.... - b=new JButton(key); JCPActionChangeMode a = new JCPActionChangeMode (); a.setJChemPaintPanel(chemPaintPanel); @@ -183,7 +182,6 @@ b.setEnabled(a.isEnabled()); if(JCPLocalizationHandler.getInstance().getString("singleelementTooltip")!=null) b.setToolTipText(JCPLocalizationHandler.getInstance().getString("singleelementTooltip")+" "+key); - b.setSize(30,15); b.setPreferredSize(new Dimension(30,15)); b.setMaximumSize(new Dimension(30,15)); Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/JCPActionChangeMode.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/JCPActionChangeMode.java 2008-11-24 13:37:33 UTC (rev 13247) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/JCPActionChangeMode.java 2008-11-24 14:06:43 UTC (rev 13248) @@ -71,8 +71,7 @@ else if (type.length() == 1) { //I assume something with length of 1 is an atom name (C/H/O/N/etc.) // module = new Controller2DModuleAddAtom(key); - //FIXME: is ENTERELEMENT the correct name? :] - drawMode = Controller2DModel.DrawMode.ENTERELEMENT; + drawMode = Controller2DModel.DrawMode.ELEMENT; drawElement = type; } if (this.jcpPanel.getActionButton() != null) Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties 2008-11-24 13:37:33 UTC (rev 13247) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties 2008-11-24 14:06:43 UTC (rev 13248) @@ -221,7 +221,6 @@ eraserAction=org.openscience.jchempaint.action.JCPActionChangeMode@eraser moveAction=org.openscience.jchempaint.action.JCPActionChangeMode@move symbolAction=org.openscience.cdk.applications.jchempaint.action.ChemAction@symbol -elementAction=org.openscience.cdk.applications.jchempaint.action.ChemAction@element enterelementAction=org.openscience.cdk.applications.jchempaint.action.ChemAction@enterelement plusAction=org.openscience.jchempaint.action.JCPActionChangeMode@plus minusAction=org.openscience.jchempaint.action.JCPActionChangeMode@minus This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |