From: <mar...@us...> - 2009-10-08 11:17:43
|
Revision: 14949 http://cdk.svn.sourceforge.net/cdk/?rev=14949&view=rev Author: mark_rynbeek Date: 2009-10-08 11:17:33 +0000 (Thu, 08 Oct 2009) Log Message: ----------- fix for shrink build to be able to write CML Modified Paths: -------------- jchempaint/trunk/build.xml jchempaint/trunk/src/main/org/openscience/jchempaint/action/SaveAsAction.java Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-10-08 11:10:39 UTC (rev 14948) +++ jchempaint/trunk/build.xml 2009-10-08 11:17:33 UTC (rev 14949) @@ -229,6 +229,7 @@ <shrink logfile="shrinklog.core.xml"> <entrypointjar name="${dist}/jar/jchempaint-applet-editor.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_io_cml.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar"/> @@ -247,12 +248,15 @@ <class name="org.openscience.cdk.controller.IChemModelRelay" methods="public" fields="none" /> <class name="org.openscience.cdk.tools.manipulator.AtomContainerManipulator" methods="public" fields="none" /> <class name="org.openscience.jchempaint.JChemPaintPanel$1" methods="public" fields="none" /> + <class name="org.openscience.cdk.tools.manipulator.ChemModelManipulator" methods="public" fields="none" /> <class name="org.openscience.cdk.renderer.selection.MultiSelection" methods="public" fields="none" /> + <class name="org.apache.log4j.Logger" methods="public" /> + <class name="org.apache.log4j.Category" methods="public" /> </keep> </shrink> </yguard> - <!-- shrink CDK jar --> + <!-- shrink CDK jar --> <yguard> <inoutpair in="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar" out="${dist}/jar/shrinkout/jchempaint-applet-org_openscience_cdk.jar"/> <externalclasses> @@ -267,21 +271,25 @@ <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_controller.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_io_cml.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_xmlcml.jar"/> <property name="error-checking" value="pedantic"/> <keep> <class classes="public"> <patternset> <include name="org.openscience.cdk.renderer.**.*"/> <include name="org.openscience.cdk.controller.**.*"/> + <include name="org.openscience.cdk.libio.**.*"/> </patternset> </class> <class name="org.openscience.cdk.PeriodicTableElement" /> <class name="org.openscience.cdk.renderer.selection.MultiSelection" /> + <class name="org.openscience.cdk.libio.cml.Convertor" methods="public" fields="none"/> </keep> </shrink> </yguard> - <!-- shrink IO jar --> + <!-- shrink IO jar --> <yguard> <inoutpair in="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar" out="${dist}/jar/shrinkout/jchempaint-applet-org_openscience_cdk_io.jar"/> <externalclasses> @@ -302,7 +310,7 @@ </yguard> - <!-- shrink config jar --> + <!-- shrink config jar --> <yguard> <inoutpair in="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar" out="${dist}/jar/shrinkout/jchempaint-applet-org_openscience_cdk_config.jar"/> <externalclasses> @@ -322,7 +330,7 @@ </yguard> - <!-- shrink tools jar --> + <!-- shrink tools jar --> <yguard> <inoutpair in="${dist}/jar/jchempaint-applet-org_openscience_cdk_tools.jar" out="${dist}/jar/shrinkout/jchempaint-applet-org_openscience_cdk_tools.jar"/> <externalclasses> @@ -342,6 +350,33 @@ </shrink> </yguard> + <!-- shrink xmlcml jar--> + <yguard> + <inoutpair in="${dist}/jar/jchempaint-applet-org_xmlcml.jar" out="${dist}/jar/shrinkout/jchempaint-applet-org_xmlcml.jar"/> + <externalclasses> + <fileset dir="${dist}/jar"> + <include name="**/*.jar"/> + <!--exclude name="**/jchempaint-applet-org_xmlcml.jar"/--> + </fileset> + </externalclasses> + <shrink logfile="shrinklogcml.xml"> + <entrypointjar name="${dist}/jar/jchempaint-applet-core.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar"/> + <property name="error-checking" value="pedantic"/> + <keep> + <class name="org.xmlcml.cml.attribute.main.CountExpressionAttribute" /> + <class name="org.xmlcml.cml.base.StringArraySTAttribute" methods="private" fields="private"/> + <class classes="public" methods="private" fields="private"> + <patternset> + <include name="org.xmlcml.cml.attribute.*"/> + </patternset> + </class> + </keep> + </shrink> + </yguard> <move todir="${dist}/jar"> <fileset dir="${dist}/jar/shrinkout"> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/SaveAsAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/SaveAsAction.java 2009-10-08 11:10:39 UTC (rev 14948) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/SaveAsAction.java 2009-10-08 11:17:33 UTC (rev 14949) @@ -49,7 +49,6 @@ import org.openscience.cdk.io.IChemObjectWriter; import org.openscience.cdk.io.MDLRXNWriter; import org.openscience.cdk.io.MDLWriter; -import org.openscience.cdk.io.SMILESReader; import org.openscience.cdk.io.SMILESWriter; import org.openscience.cdk.io.listener.SwingGUIListener; import org.openscience.cdk.tools.manipulator.ChemModelManipulator; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |