From: <mig...@us...> - 2006-03-25 21:06:20
|
Revision: 4704 Author: migueljmol Date: 2006-03-25 13:06:12 -0800 (Sat, 25 Mar 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4704&view=rev Log Message: ----------- prerelease 10.00.49 Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-03-25 20:27:08 UTC (rev 4703) +++ trunk/Jmol/build.xml 2006-03-25 21:06:12 UTC (rev 4704) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.00.48" /> + <property name="version" value="10.00.49" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-03-25 20:27:08 UTC (rev 4703) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-03-25 21:06:12 UTC (rev 4704) @@ -42,8 +42,9 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.00.48"; - public final static String cvsDate = "$Date$"; + public final static String version = "10.00.49"; + public final static String cvsDate = + "$Date$"; public final static String date = cvsDate.substring(7, 23); public final static boolean officialRelease = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mig...@us...> - 2006-03-28 14:29:37
|
Revision: 4834 Author: migueljmol Date: 2006-03-28 06:29:32 -0800 (Tue, 28 Mar 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4834&view=rev Log Message: ----------- prerelease 10.00.50 - rollback to 10.00.48 and selectively apply patches Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-03-28 13:40:55 UTC (rev 4833) +++ trunk/Jmol/build.xml 2006-03-28 14:29:32 UTC (rev 4834) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.00.49" /> + <property name="version" value="10.00.50" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-03-28 13:40:55 UTC (rev 4833) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-03-28 14:29:32 UTC (rev 4834) @@ -30,7 +30,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.00.49"; + public final static String version = "10.00.50"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mig...@us...> - 2006-03-30 04:27:54
|
Revision: 4845 Author: migueljmol Date: 2006-03-29 20:27:48 -0800 (Wed, 29 Mar 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4845&view=rev Log Message: ----------- prerelease 10.00.51 Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-03-30 04:23:25 UTC (rev 4844) +++ trunk/Jmol/build.xml 2006-03-30 04:27:48 UTC (rev 4845) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.00.50" /> + <property name="version" value="10.00.51" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-03-30 04:23:25 UTC (rev 4844) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-03-30 04:27:48 UTC (rev 4845) @@ -30,7 +30,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.00.50"; + public final static String version = "10.00.51"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mig...@us...> - 2006-03-31 00:41:21
|
Revision: 4860 Author: migueljmol Date: 2006-03-30 16:41:14 -0800 (Thu, 30 Mar 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4860&view=rev Log Message: ----------- prerelease 10.00.52 Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-03-31 00:32:06 UTC (rev 4859) +++ trunk/Jmol/build.xml 2006-03-31 00:41:14 UTC (rev 4860) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.00.51" /> + <property name="version" value="10.00.52" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-03-31 00:32:06 UTC (rev 4859) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-03-31 00:41:14 UTC (rev 4860) @@ -30,7 +30,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.00.51"; + public final static String version = "10.00.52"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mig...@us...> - 2006-04-02 19:11:49
|
Revision: 4882 Author: migueljmol Date: 2006-04-02 12:11:43 -0700 (Sun, 02 Apr 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4882&view=rev Log Message: ----------- prerelease 10.00.53 Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-04-02 19:10:27 UTC (rev 4881) +++ trunk/Jmol/build.xml 2006-04-02 19:11:43 UTC (rev 4882) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.00.52" /> + <property name="version" value="10.00.53" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-02 19:10:27 UTC (rev 4881) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-02 19:11:43 UTC (rev 4882) @@ -30,7 +30,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.00.52"; + public final static String version = "10.00.53"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mig...@us...> - 2006-04-03 01:53:10
|
Revision: 4889 Author: migueljmol Date: 2006-04-02 18:53:05 -0700 (Sun, 02 Apr 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4889&view=rev Log Message: ----------- prerelease 10.00.54 Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-04-03 01:50:45 UTC (rev 4888) +++ trunk/Jmol/build.xml 2006-04-03 01:53:05 UTC (rev 4889) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.00.53" /> + <property name="version" value="10.00.54" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-03 01:50:45 UTC (rev 4888) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-03 01:53:05 UTC (rev 4889) @@ -30,7 +30,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.00.53"; + public final static String version = "10.00.54"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mig...@us...> - 2006-04-04 14:09:27
|
Revision: 4898 Author: migueljmol Date: 2006-04-04 07:09:21 -0700 (Tue, 04 Apr 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4898&view=rev Log Message: ----------- prerelease 10.00.55 -- somewhat messed up. I forgot to commit prerelease 10.00.55. Bob checked in polyhedra changes after I made the 'release', but before this checkin. Oh well ... Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-04-04 06:49:05 UTC (rev 4897) +++ trunk/Jmol/build.xml 2006-04-04 14:09:21 UTC (rev 4898) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.00.54" /> + <property name="version" value="10.00.55" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-04 06:49:05 UTC (rev 4897) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-04 14:09:21 UTC (rev 4898) @@ -30,7 +30,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.00.54"; + public final static String version = "10.00.55"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mig...@us...> - 2006-04-04 14:33:25
|
Revision: 4901 Author: migueljmol Date: 2006-04-04 07:33:19 -0700 (Tue, 04 Apr 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4901&view=rev Log Message: ----------- prerelease 10.00.56 Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-04-04 14:23:42 UTC (rev 4900) +++ trunk/Jmol/build.xml 2006-04-04 14:33:19 UTC (rev 4901) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.00.55" /> + <property name="version" value="10.00.56" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-04 14:23:42 UTC (rev 4900) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-04 14:33:19 UTC (rev 4901) @@ -30,7 +30,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.00.55"; + public final static String version = "10.00.56"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mig...@us...> - 2006-04-04 20:26:04
|
Revision: 4910 Author: migueljmol Date: 2006-04-04 13:25:52 -0700 (Tue, 04 Apr 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4910&view=rev Log Message: ----------- prerelease 10.00.57 Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-04-04 19:56:22 UTC (rev 4909) +++ trunk/Jmol/build.xml 2006-04-04 20:25:52 UTC (rev 4910) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.00.56" /> + <property name="version" value="10.00.57" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-04 19:56:22 UTC (rev 4909) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-04 20:25:52 UTC (rev 4910) @@ -30,7 +30,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.00.56"; + public final static String version = "10.00.57"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mig...@us...> - 2006-04-06 00:06:19
|
Revision: 4919 Author: migueljmol Date: 2006-04-05 17:06:01 -0700 (Wed, 05 Apr 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4919&view=rev Log Message: ----------- prerelease 10.00.58 Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/translation/JmolApplet/JmolApplet.pot trunk/Jmol/src/org/jmol/translation/JmolApplet/ca.po trunk/Jmol/src/org/jmol/translation/JmolApplet/de.po trunk/Jmol/src/org/jmol/translation/JmolApplet/es.po trunk/Jmol/src/org/jmol/translation/JmolApplet/et.po trunk/Jmol/src/org/jmol/translation/JmolApplet/fr.po trunk/Jmol/src/org/jmol/translation/JmolApplet/nl.po trunk/Jmol/src/org/jmol/translation/JmolApplet/pt.po trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-04-05 23:56:31 UTC (rev 4918) +++ trunk/Jmol/build.xml 2006-04-06 00:06:01 UTC (rev 4919) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.00.57" /> + <property name="version" value="10.00.58" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/translation/JmolApplet/JmolApplet.pot =================================================================== --- trunk/Jmol/src/org/jmol/translation/JmolApplet/JmolApplet.pot 2006-04-05 23:56:31 UTC (rev 4918) +++ trunk/Jmol/src/org/jmol/translation/JmolApplet/JmolApplet.pot 2006-04-06 00:06:01 UTC (rev 4919) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2006-04-05 22:50+0200\n" +"POT-Creation-Date: 2006-04-05 20:05-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -335,6 +335,10 @@ msgid "Scale {0}" msgstr "" +#: org/jmol/popup/PopupResourceBundle.java:783 +msgid "Stereographic" +msgstr "" + #: org/jmol/popup/PopupResourceBundle.java:785 msgid "Red+Cyan glasses" msgstr "" Modified: trunk/Jmol/src/org/jmol/translation/JmolApplet/ca.po =================================================================== --- trunk/Jmol/src/org/jmol/translation/JmolApplet/ca.po 2006-04-05 23:56:31 UTC (rev 4918) +++ trunk/Jmol/src/org/jmol/translation/JmolApplet/ca.po 2006-04-06 00:06:01 UTC (rev 4919) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Jmol\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2006-04-05 22:50+0200\n" +"POT-Creation-Date: 2006-04-05 20:05-0400\n" "PO-Revision-Date: 2006-01-30 03:37+0100\n" "Last-Translator: Toni Hermoso Pulido <to...@so...>\n" "Language-Team: Catalan <Jmo...@li...>\n" @@ -335,6 +335,10 @@ msgid "Scale {0}" msgstr "Escala {0}" +#: org/jmol/popup/PopupResourceBundle.java:783 +msgid "Stereographic" +msgstr "" + #: org/jmol/popup/PopupResourceBundle.java:785 msgid "Red+Cyan glasses" msgstr "Ulleres vermell+cian" Modified: trunk/Jmol/src/org/jmol/translation/JmolApplet/de.po =================================================================== --- trunk/Jmol/src/org/jmol/translation/JmolApplet/de.po 2006-04-05 23:56:31 UTC (rev 4918) +++ trunk/Jmol/src/org/jmol/translation/JmolApplet/de.po 2006-04-06 00:06:01 UTC (rev 4919) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: JmolApplet 10\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2006-04-05 22:50+0200\n" +"POT-Creation-Date: 2006-04-05 20:05-0400\n" "PO-Revision-Date: 2005-12-21 19:44+0100\n" "Last-Translator: Daniel Leidert <dle...@us...>\n" "Language-Team: none\n" @@ -335,6 +335,10 @@ msgid "Scale {0}" msgstr "Skalierung {0}" +#: org/jmol/popup/PopupResourceBundle.java:783 +msgid "Stereographic" +msgstr "" + #: org/jmol/popup/PopupResourceBundle.java:785 msgid "Red+Cyan glasses" msgstr "Brillengläser Rot+Cyan" Modified: trunk/Jmol/src/org/jmol/translation/JmolApplet/es.po =================================================================== --- trunk/Jmol/src/org/jmol/translation/JmolApplet/es.po 2006-04-05 23:56:31 UTC (rev 4918) +++ trunk/Jmol/src/org/jmol/translation/JmolApplet/es.po 2006-04-06 00:06:01 UTC (rev 4919) @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: Jmol\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2006-04-05 22:50+0200\n" +"POT-Creation-Date: 2006-04-05 20:05-0400\n" "PO-Revision-Date: 2006-03-24 20:09+0100\n" "Last-Translator: Angel Herráez <ang...@ua...>\n" "Language-Team: Spanish <Jmo...@li...>\n" @@ -332,6 +332,10 @@ msgid "Scale {0}" msgstr "Escala {0}" +#: org/jmol/popup/PopupResourceBundle.java:783 +msgid "Stereographic" +msgstr "" + #: org/jmol/popup/PopupResourceBundle.java:785 msgid "Red+Cyan glasses" msgstr "Gafas rojo+cian" Modified: trunk/Jmol/src/org/jmol/translation/JmolApplet/et.po =================================================================== --- trunk/Jmol/src/org/jmol/translation/JmolApplet/et.po 2006-04-05 23:56:31 UTC (rev 4918) +++ trunk/Jmol/src/org/jmol/translation/JmolApplet/et.po 2006-04-06 00:06:01 UTC (rev 4919) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Jmol\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2006-04-05 22:50+0200\n" +"POT-Creation-Date: 2006-04-05 20:05-0400\n" "PO-Revision-Date: 2006-03-17 20:19+0100\n" "Last-Translator: Ivo Sarak <iv...@ra...>\n" "Language-Team: Estonian <Jmo...@li...>\n" @@ -336,6 +336,10 @@ msgid "Scale {0}" msgstr "Skaala {0}" +#: org/jmol/popup/PopupResourceBundle.java:783 +msgid "Stereographic" +msgstr "" + #: org/jmol/popup/PopupResourceBundle.java:785 msgid "Red+Cyan glasses" msgstr "" Modified: trunk/Jmol/src/org/jmol/translation/JmolApplet/fr.po =================================================================== --- trunk/Jmol/src/org/jmol/translation/JmolApplet/fr.po 2006-04-05 23:56:31 UTC (rev 4918) +++ trunk/Jmol/src/org/jmol/translation/JmolApplet/fr.po 2006-04-06 00:06:01 UTC (rev 4919) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Jmol\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2006-04-05 22:50+0200\n" +"POT-Creation-Date: 2006-04-05 20:05-0400\n" "PO-Revision-Date: 2006-02-06 22:48+0100\n" "Last-Translator: Nicolas Vervelle <ni...@us...>\n" "Language-Team: French <Jmo...@li...>\n" @@ -337,6 +337,10 @@ msgid "Scale {0}" msgstr "Echelle {0}" +#: org/jmol/popup/PopupResourceBundle.java:783 +msgid "Stereographic" +msgstr "" + #: org/jmol/popup/PopupResourceBundle.java:785 msgid "Red+Cyan glasses" msgstr "Lunettes Rouge+Cyan" Modified: trunk/Jmol/src/org/jmol/translation/JmolApplet/nl.po =================================================================== --- trunk/Jmol/src/org/jmol/translation/JmolApplet/nl.po 2006-04-05 23:56:31 UTC (rev 4918) +++ trunk/Jmol/src/org/jmol/translation/JmolApplet/nl.po 2006-04-06 00:06:01 UTC (rev 4919) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2006-04-05 22:50+0200\n" +"POT-Creation-Date: 2006-04-05 20:05-0400\n" "PO-Revision-Date: 2005-10-08 19:41+0100\n" "Last-Translator: Nicolas Vervelle <ni...@us...>\n" "Language-Team: Nederlands <kde...@kd...>\n" @@ -338,6 +338,10 @@ msgid "Scale {0}" msgstr "Schaal {0}" +#: org/jmol/popup/PopupResourceBundle.java:783 +msgid "Stereographic" +msgstr "" + #: org/jmol/popup/PopupResourceBundle.java:785 msgid "Red+Cyan glasses" msgstr "Rood+Cyaan-bril" Modified: trunk/Jmol/src/org/jmol/translation/JmolApplet/pt.po =================================================================== --- trunk/Jmol/src/org/jmol/translation/JmolApplet/pt.po 2006-04-05 23:56:31 UTC (rev 4918) +++ trunk/Jmol/src/org/jmol/translation/JmolApplet/pt.po 2006-04-06 00:06:01 UTC (rev 4919) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Jmol\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2006-04-05 22:50+0200\n" +"POT-Creation-Date: 2006-04-05 20:05-0400\n" "PO-Revision-Date: 2005-12-20 07:44-0000\n" "Last-Translator: Metro <por...@gm...>\n" "Language-Team: Portugal@Folding <Jmo...@li...>\n" @@ -336,6 +336,10 @@ msgid "Scale {0}" msgstr "Escala 0.2" +#: org/jmol/popup/PopupResourceBundle.java:783 +msgid "Stereographic" +msgstr "" + #: org/jmol/popup/PopupResourceBundle.java:785 msgid "Red+Cyan glasses" msgstr "Óculo Vermelho+Turquesa" Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-05 23:56:31 UTC (rev 4918) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-06 00:06:01 UTC (rev 4919) @@ -30,7 +30,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.00.57"; + public final static String version = "10.00.58"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-04-09 17:38:50
|
Revision: 4948 Author: nicove Date: 2006-04-09 10:38:42 -0700 (Sun, 09 Apr 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4948&view=rev Log Message: ----------- prerelease 10.00.60 Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-04-09 17:31:29 UTC (rev 4947) +++ trunk/Jmol/build.xml 2006-04-09 17:38:42 UTC (rev 4948) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.00.59" /> + <property name="version" value="10.00.60" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-09 17:31:29 UTC (rev 4947) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-09 17:38:42 UTC (rev 4948) @@ -30,7 +30,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.00.59"; + public final static String version = "10.00.60"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-04-14 18:06:22
|
Revision: 4977 Author: nicove Date: 2006-04-14 11:06:13 -0700 (Fri, 14 Apr 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4977&view=rev Log Message: ----------- Release 10.2.0 Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-04-14 18:00:46 UTC (rev 4976) +++ trunk/Jmol/build.xml 2006-04-14 18:06:13 UTC (rev 4977) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.00.60" /> + <property name="version" value="10.2.0" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-14 18:00:46 UTC (rev 4976) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-14 18:06:13 UTC (rev 4977) @@ -30,7 +30,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.00.60"; + public final static String version = "10.2.0"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-04-14 19:30:23
|
Revision: 4980 Author: nicove Date: 2006-04-14 12:30:13 -0700 (Fri, 14 Apr 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4980&view=rev Log Message: ----------- Starting 10.3.x branch. The 10.3 branch (trunk) is the development branch of Jmol. The 10.2 branch is the stable branch of Jmol and should now only contain bug fixes Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-04-14 18:10:02 UTC (rev 4979) +++ trunk/Jmol/build.xml 2006-04-14 19:30:13 UTC (rev 4980) @@ -16,7 +16,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.2.0" /> + <property name="version" value="10.3.0" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-14 18:10:02 UTC (rev 4979) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-04-14 19:30:13 UTC (rev 4980) @@ -30,7 +30,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.2.0"; + public final static String version = "10.3.0"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-04-18 07:04:41
|
Revision: 4989 Author: nicove Date: 2006-04-18 00:04:31 -0700 (Tue, 18 Apr 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4989&view=rev Log Message: ----------- Forcing EOL style depending on the target platform Modified Paths: -------------- trunk/Jmol/jmol.bat Property Changed: ---------------- trunk/Jmol/jmol trunk/Jmol/jmol.bat trunk/Jmol/jmol.sh Property changes on: trunk/Jmol/jmol ___________________________________________________________________ Name: svn:eol-style - native + LF Modified: trunk/Jmol/jmol.bat =================================================================== --- trunk/Jmol/jmol.bat 2006-04-17 07:23:30 UTC (rev 4988) +++ trunk/Jmol/jmol.bat 2006-04-18 07:04:31 UTC (rev 4989) @@ -1,5 +1,5 @@ -@echo off -rem Set JMOL_HOME to the Jmol installation directory. -rem -if "%JMOL_HOME%x"=="x" set JMOL_HOME="." -java -Xmx512m -jar "%JMOL_HOME%\Jmol.jar" %1 %2 %3 %4 %5 %6 %7 %8 %9 +@echo off +rem Set JMOL_HOME to the Jmol installation directory. +rem +if "%JMOL_HOME%x"=="x" set JMOL_HOME="." +java -Xmx512m -jar "%JMOL_HOME%\Jmol.jar" %1 %2 %3 %4 %5 %6 %7 %8 %9 Property changes on: trunk/Jmol/jmol.bat ___________________________________________________________________ Name: svn:eol-style - native + CRLF Property changes on: trunk/Jmol/jmol.sh ___________________________________________________________________ Name: svn:eol-style - native + LF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mig...@us...> - 2006-05-10 15:22:51
|
Revision: 5095 Author: migueljmol Date: 2006-05-10 08:22:48 -0700 (Wed, 10 May 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=5095&view=rev Log Message: ----------- added org.jmol.vecmath.* to applet.classes and put it in JmolApplet5.jar also moved org.jmol.smiles from JmolApplet6 to JmolApplet5 I observer that JmolApplet6 is much larger than the others ... not good Modified Paths: -------------- trunk/Jmol/applet.classes trunk/Jmol/build.xml Modified: trunk/Jmol/applet.classes =================================================================== --- trunk/Jmol/applet.classes 2006-05-10 15:22:10 UTC (rev 5094) +++ trunk/Jmol/applet.classes 2006-05-10 15:22:48 UTC (rev 5095) @@ -10,6 +10,7 @@ org/jmol/adapter/smarter/*.java org/jmol/smiles/*.java org/jmol/jcamp/*.java +org/jmol/vecmath/*.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-05-10 15:22:10 UTC (rev 5094) +++ trunk/Jmol/build.xml 2006-05-10 15:22:48 UTC (rev 5095) @@ -474,13 +474,14 @@ <include name="org/openscience/jmol/**" /> <include name="org/jmol/bspt/**" /> <include name="org/jmol/util/**" /> + <include name="org/jmol/smiles/**" /> + <include name="org/jmol/vecmath/**" /> </fileset> </jar> <jar destfile="JmolApplet6.jar" manifest="manifest/applet6.txt" > <fileset dir="${applet.classes.dir}"> <include name="org/jmol/viewer/**" /> - <include name="org/jmol/smiles/**" /> </fileset> </jar> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-09-13 20:04:32
|
Revision: 5529 http://svn.sourceforge.net/jmol/?rev=5529&view=rev Author: nicove Date: 2006-09-13 13:04:21 -0700 (Wed, 13 Sep 2006) Log Message: ----------- 10.9.58 Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-09-13 20:00:56 UTC (rev 5528) +++ trunk/Jmol/build.xml 2006-09-13 20:04:21 UTC (rev 5529) @@ -15,7 +15,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.9.57" /> + <property name="version" value="10.9.58" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-09-13 20:00:56 UTC (rev 5528) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-09-13 20:04:21 UTC (rev 5529) @@ -42,7 +42,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.9.57"; + public final static String version = "10.9.58"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-09-13 20:59:37
|
Revision: 5534 http://svn.sourceforge.net/jmol/?rev=5534&view=rev Author: nicove Date: 2006-09-13 13:58:11 -0700 (Wed, 13 Sep 2006) Log Message: ----------- Docbook update Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/doc/source/JmolDevelopersGuide.docbook.xml trunk/Jmol/doc/source/applet/browsers.docbook.xml trunk/Jmol/doc/source/applet/browsers_fr.docbook.xml trunk/Jmol/doc/source/applet/hardware.docbook.xml trunk/Jmol/doc/source/applet/hardware_fr.docbook.xml trunk/Jmol/doc/source/applet/intro.docbook.xml trunk/Jmol/doc/source/applet/intro_fr.docbook.xml trunk/Jmol/doc/source/applet/serverconfig.docbook.xml trunk/Jmol/doc/source/applet/serverconfig_fr.docbook.xml trunk/Jmol/doc/source/applet/usage.docbook.xml trunk/Jmol/doc/source/applet/usage_fr.docbook.xml trunk/Jmol/doc/source/guide/commandline.docbook.xml trunk/Jmol/doc/source/guide/commandline_fr.docbook.xml trunk/Jmol/doc/source/guide/menus.docbook.xml trunk/Jmol/doc/source/guide/menus_fr.docbook.xml trunk/Jmol/doc/source/guide/scripts.docbook.xml trunk/Jmol/doc/source/guide/scripts_fr.docbook.xml Added Paths: ----------- trunk/Jmol/doc/docbook-xsl-1.71.0.tar.gz Removed Paths: ------------- trunk/Jmol/doc/docbook-xsl-1.69.0.tar.gz Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/build.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -28,7 +28,7 @@ <property name="apisio.classes.dir" value="build/apisio-classes" /> <property name="tests.dir" value="build/unit.tests" /> <property name="javadoc.dir" value="javadoc" /> - <property name="docbook-xsl" value="docbook-xsl-1.69.0" /> + <property name="docbook-xsl" value="docbook-xsl-1.71.0" /> <property name="docbook-xml" value="docbook-xml-4.4" /> <!-- you can set this by defining it in ~/.jmol.build.properties --> Deleted: trunk/Jmol/doc/docbook-xsl-1.69.0.tar.gz =================================================================== (Binary files differ) Added: trunk/Jmol/doc/docbook-xsl-1.71.0.tar.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol/doc/docbook-xsl-1.71.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Jmol/doc/source/JmolDevelopersGuide.docbook.xml =================================================================== --- trunk/Jmol/doc/source/JmolDevelopersGuide.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/JmolDevelopersGuide.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -623,7 +623,7 @@ </listitem> </orderedlist> - <sect2> + <sect2 id="JavaExeLocation"> <title>Identifying the location of the Java executables</title> <para> Ant needs to know where to find <filename>javac(.exe)</filename> @@ -642,7 +642,7 @@ </para> </sect2> - <sect2> + <sect2 id="JavaLibLocation"> <title>Identifying the location of the Java library</title> <para> Ant needs to know where to find @@ -661,7 +661,7 @@ </para> </sect2> - <sect2> + <sect2 id="MatchingJavaCompiler"> <title>Matching the Java compiler to the Java Runtime Environment</title> <para> From <menuchoice> Modified: trunk/Jmol/doc/source/applet/browsers.docbook.xml =================================================================== --- trunk/Jmol/doc/source/applet/browsers.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/applet/browsers.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -1,4 +1,4 @@ -<chapter> +<chapter id="SupportedBrowsers"> <title>Supported Browsers</title> <para> @@ -16,7 +16,7 @@ that is used. </para> - <section> + <section id="TestingResults"> <title>Testing results</title> <para> @@ -152,7 +152,7 @@ </listitem> </itemizedlist> </section> - <section> + <section id="XHTMLSupport"> <title>XHTML support</title> <para> It is possible to use the JmolApplet within an XML/XHTML environment. This is entirely irrelevant for most people's purposes - if you don't know that you need this capability, then you don't. Modified: trunk/Jmol/doc/source/applet/browsers_fr.docbook.xml =================================================================== --- trunk/Jmol/doc/source/applet/browsers_fr.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/applet/browsers_fr.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -2,7 +2,7 @@ French translation Translated from default version : browsers.docbook.xml (v 1.5) --> -<chapter> +<chapter id="SupportedBrowsers"> <title>Navigateurs Supportés</title> <para> L'applet est testée et fonctionne avec Internet Explorer, Netscape, @@ -19,7 +19,7 @@ du navigateur, du système d'exploitation et de la machine virtuelle java qui sont utilisés. </para> - <section> + <section id="TestingResults"> <title>Résultats des Tests</title> <para> L'Applet Jmol a été testée avec succès sur Modified: trunk/Jmol/doc/source/applet/hardware.docbook.xml =================================================================== --- trunk/Jmol/doc/source/applet/hardware.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/applet/hardware.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -1,4 +1,4 @@ -<chapter> +<chapter id="HardwareOSRequirements"> <title>Hardware and OS Requirements</title> <para> We recommend a machine with a 600 Mhz CPU and 256 Mb of RAM. This Modified: trunk/Jmol/doc/source/applet/hardware_fr.docbook.xml =================================================================== --- trunk/Jmol/doc/source/applet/hardware_fr.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/applet/hardware_fr.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -2,7 +2,7 @@ French translation Translated from default version : hardware.docbook.xml (v 1.2) --> -<chapter> +<chapter id="HardwareOSRequirements"> <title>Exigences Matériel et Système d'exploitation</title> <para> Nous recommandons une machine avec un processeur à 600 MHz et Modified: trunk/Jmol/doc/source/applet/intro.docbook.xml =================================================================== --- trunk/Jmol/doc/source/applet/intro.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/applet/intro.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -1,4 +1,4 @@ -<chapter> +<chapter id="Introduction"> <title>Introduction</title> <para> The Jmol Applet allows the 3D display of molecules within a web page. Modified: trunk/Jmol/doc/source/applet/intro_fr.docbook.xml =================================================================== --- trunk/Jmol/doc/source/applet/intro_fr.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/applet/intro_fr.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -2,7 +2,7 @@ French translation Translated from default version : intro.docbook.xml (v 1.2) --> -<chapter> +<chapter id="Introduction"> <title>Introduction</title> <para> L'Applet Jmol permet un affichage 3D de molécules dans une page web. Modified: trunk/Jmol/doc/source/applet/serverconfig.docbook.xml =================================================================== --- trunk/Jmol/doc/source/applet/serverconfig.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/applet/serverconfig.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -1,4 +1,4 @@ -<chapter> +<chapter id="WebServerConfiguration"> <title>Web Server configuration for the JmolApplet</title> <para> The JmolApplet is configured on the web server just like any other Modified: trunk/Jmol/doc/source/applet/serverconfig_fr.docbook.xml =================================================================== --- trunk/Jmol/doc/source/applet/serverconfig_fr.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/applet/serverconfig_fr.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -2,7 +2,7 @@ French translation Translated from default version : serverconfig.docbook.xml (v 1.4) --> -<chapter> +<chapter id="WebServerConfiguration"> <title>Configuration du Serveur Web pour l'Applet Jmol</title> <para> L'Applet Jmol est configurée sur le serveur web comme toute autre Modified: trunk/Jmol/doc/source/applet/usage.docbook.xml =================================================================== --- trunk/Jmol/doc/source/applet/usage.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/applet/usage.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -1,4 +1,4 @@ -<chapter> +<chapter id="AppletUsage"> <title>Jmol Applet Usage</title> <para> Use the Jmol.js JavaScript library as documented Modified: trunk/Jmol/doc/source/applet/usage_fr.docbook.xml =================================================================== --- trunk/Jmol/doc/source/applet/usage_fr.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/applet/usage_fr.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -2,7 +2,7 @@ French translation Translated from default version : usage.docbook.xml (v 1.4) --> -<chapter> +<chapter id="AppletUsage"> <title>Utilisation de l'Applet Jmol</title> <para> L'utilisation de la librairie JavaScript Jmol.js est documentée Modified: trunk/Jmol/doc/source/guide/commandline.docbook.xml =================================================================== --- trunk/Jmol/doc/source/guide/commandline.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/guide/commandline.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -19,7 +19,7 @@ <arg><replaceable>FILE</replaceable></arg> </cmdsynopsis> - <section> + <section id="OptionHelp"> <title>-h,--help</title> <variablelist> <title>Syntax</title> @@ -37,7 +37,7 @@ </variablelist> </section> - <section> + <section id="OptionScript"> <title>-s,--script</title> <variablelist> <title>Syntax</title> @@ -58,7 +58,7 @@ </variablelist> </section> - <section> + <section id="OptionGeometry"> <title>-g,--geometry</title> <variablelist> <title>Syntax</title> @@ -78,7 +78,7 @@ </variablelist> </section> - <section> + <section id="OptionLanguage"> <title>-Duser.language</title> <variablelist> <title>Syntax</title> @@ -124,7 +124,7 @@ </variablelist> </section> - <section> + <section id="OptionSpeed"> <title>-Ddisplay.speed</title> <variablelist> <title>Syntax</title> @@ -144,7 +144,7 @@ </variablelist> </section> - <section> + <section id="OptionPluginDir"> <title>-Dplugin.dir</title> <variablelist> <title>Syntax</title> @@ -166,7 +166,7 @@ </variablelist> </section> - <section> + <section id="OptionXmx"> <title>-Xmx</title> <variablelist> <title>Syntax</title> Modified: trunk/Jmol/doc/source/guide/commandline_fr.docbook.xml =================================================================== --- trunk/Jmol/doc/source/guide/commandline_fr.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/guide/commandline_fr.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -24,14 +24,14 @@ <arg choice="req"><replaceable>file</replaceable></arg> </cmdsynopsis> </para> - <section> + <section id="OptionGeometry"> <title>--geometry</title> <para> Cette option permet de spécifier la taille de la fenêtre. Par défaut, elle est de 500x500. </para> </section> - <section> + <section id="OptionLanguage"> <title>-Duser.language</title> <para> En plus des options ci-dessus, il y a une option Java importante: @@ -54,7 +54,7 @@ utilisée. </para> </section> - <section> + <section id="OptionSpeed"> <title>-Ddisplay.speed</title> <para> L'option <cmdsynopsis><arg>-Ddisplay.speed=fps</arg></cmdsynopsis> @@ -63,7 +63,7 @@ millisecondes par image. </para> </section> - <section> + <section id="OptionXmx"> <title>-Xmx</title> <para> Avec cette option vous pouvez changer la taille maximum du tas que la Modified: trunk/Jmol/doc/source/guide/menus.docbook.xml =================================================================== --- trunk/Jmol/doc/source/guide/menus.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/guide/menus.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -1,10 +1,10 @@ <chapter id="menudesc"> <title>Menu description</title> - <section> + <section id="FileMenu"> <title>The File menu</title> - <section> + <section id="FileMenuOpen"> <title>Open</title> <para> Open files in Jmol. Jmol can read a large number of file types, @@ -52,7 +52,7 @@ </itemizedlist> </section> - <section> + <section id="FileMenuRecentFiles"> <title>Recent Files...</title> <para> Brings up a dialog with a list of the @@ -63,7 +63,7 @@ </para> </section> - <section> + <section id="FileMenuScript"> <title>Script...</title> <para> Opens a window where Jmol/RasMol/Chime scripting commands @@ -72,10 +72,10 @@ </para> </section> - <section> + <section id="FileMenuExport"> <title>Export</title> - <section> + <section id="FileMenuExportImage"> <title>Export -> Export Image...</title> <para> Jmol can export 24 bit color images of the following types: @@ -93,7 +93,7 @@ </itemizedlist> </section> - <section> + <section id="FileMenuExportPovray"> <title>Export -> Render in pov-ray...</title> <para> For high quality images, Jmol interfaces with the POV-Ray ray tracer. @@ -104,14 +104,14 @@ </section> </section> - <section> + <section id="FileMenuPrint"> <title>Print</title> <para> Postscript files can be exported directly to printer and to file. </para> </section> - <section> + <section id="FileMenuExit"> <title>Exit</title> <para> Quits this Jmol session. @@ -119,23 +119,23 @@ </section> </section> - <section> + <section id="EditMenu"> <title>The Edit menu</title> - <section> + <section id="EditMenuSelectAll"> <title>Select All</title> <para> Selects all atoms in the view screen. </para> </section> - <section> + <section id="EditMenuDeselectAll"> <title>Deselect All</title> <para> Deselects all atoms in the view screen. </para> </section> - <section> + <section id="EditMenuPreferences"> <title>Preferences...</title> <para> This menu opens a dialog to change settings and make user customized @@ -144,7 +144,7 @@ </section> </section> - <section> + <section id="DisplayMenu"> <title>The Display menu</title> <para> In this menu display settings/styles can be changed. @@ -162,10 +162,10 @@ </para> </section> - <section> + <section id="ViewMenu"> <title>The View menu</title> - <section> + <section id="ViewMenuDirection"> <title>Front/Top/Bottom/Right/Left</title> <para> Self explanatory. Useful with crystal structures. @@ -173,31 +173,31 @@ </section> </section> - <section> + <section id="HelpMenu"> <title>The Help menu</title> - <section> + <section id="HelpMenuAbout"> <title>About Jmol</title> <para> Popups a window with copyright notice for this software. </para> </section> - <section> + <section id="HelpMenuUserGuide"> <title>User Guide</title> <para> Shows this documentation. </para> </section> - <section> + <section id="HelpMenuNew"> <title>What's New</title> <para> Shows the changes from version to version. </para> </section> - <section> + <section id="HelpMenuConsole"> <title>Jmol Console</title> <para> Shows the output to the System.out and System.err output streams. Modified: trunk/Jmol/doc/source/guide/menus_fr.docbook.xml =================================================================== --- trunk/Jmol/doc/source/guide/menus_fr.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/guide/menus_fr.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -4,9 +4,9 @@ --> <chapter id="menudesc"> <title>Description des Menus</title> - <section> + <section id="FileMenu"> <title>Le menu Fichier</title> - <section> + <section id="FileMenuOpen"> <title>Ouvrir</title> <para> Ouvre des fichiers dans Jmol. @@ -33,7 +33,7 @@ </itemizedlist> </para> </section> - <section> + <section id="FileMenuRecentFiles"> <title>Fichiers Récents...</title> <para> Ouvre une boîte de dialogue qui contient une des fichiers ouverts @@ -42,7 +42,7 @@ bouton Ouvrir. </para> </section> - <section> + <section id="FileMenuScript"> <title>Script...</title> <para> Ouvre une fenêtre où des commandes de script @@ -52,9 +52,9 @@ </para> </section> - <section> + <section id="FileMenuExport"> <title>Exporter</title> - <section> + <section id="FileMenuExportImage"> <title>Exporter -> Exporter une Image...</title> <para> Jmol peut exporter des images couleur 24 bits des types suivants: @@ -65,7 +65,7 @@ </itemizedlist> </para> </section> - <section> + <section id="FileMenuExportPovray"> <title>Exporter -> Rendu dans pov-ray...</title> <para> Pour des images de haute qualité, Jmol s'interface avec le @@ -77,35 +77,35 @@ </para> </section> </section> - <section> + <section id="FileMenuPrint"> <title>Imprimer</title> <para> Des fichiers Postscript peuvent être exportées directement vers l'imprimante ou vers un fichier. </para> </section> - <section> + <section id="FileMenuExit"> <title>Quitter</title> <para>Quitte cette session Jmol.</para> </section> </section> - <section> + <section id="EditMenu"> <title>Le menu Edition</title> - <section> + <section id="EditMenuSelectAll"> <title>Tout sélectionner</title> <para> Sélectionne tous les atomes dans l'écran de visualisation. </para> </section> - <section> + <section id="EditMenuDeselectAll"> <title>Tout Désélectionner</title> <para> Désélectionne tous les atomes dans l'écran de visualisation. </para> </section> - <section> + <section id="EditMenuPreferences"> <title>Options...</title> <para> Ce menu ouvre une boîte de dialogue pour modifier les @@ -115,7 +115,7 @@ </para> </section> </section> - <section> + <section id="DisplayMenu"> <title>Le menu Affichage</title> <para> Dans ce menu les réglages/styles d'affichage peuvent être @@ -134,9 +134,9 @@ le curseur de sélection ou en utilisant des commandes de script. </para> </section> - <section> + <section id="ViewMenu"> <title>Le menu Vue</title> - <section> + <section id="ViewMenuDirection"> <title>Face/Haut/Bas/Droite/Gauche</title> <para> S'explique de soi-même. Utile avec les structures @@ -144,24 +144,24 @@ </para> </section> </section> - <section> + <section id="HelpMenu"> <title>Le menu Aide</title> - <section> + <section id="HelpMenuAbout"> <title>A propos de Jmol</title> <para> Ouvre une fenêtre avec des informations de copyright pour ce logiciel. </para> </section> - <section> + <section id="HelpMenuUserGuide"> <title>Guide Utilisateur</title> <para>Affiche cette documentation.</para> </section> - <section> + <section id="HelpMenuNew"> <title>Les Nouveautés</title> <para>Montre les modifications entre versions.</para> </section> - <section> + <section id="HelpMenuConsole"> <title>Console Jmol</title> <para> Montre la sortie de System.out et System.err. Modified: trunk/Jmol/doc/source/guide/scripts.docbook.xml =================================================================== --- trunk/Jmol/doc/source/guide/scripts.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/guide/scripts.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -37,7 +37,7 @@ no implemented. This will help us prioritize future development. </para> - <section> + <section id="RasMolChimeCommands"> <title>RasMol/Chime commands</title> <para> This documentation is autogenerated from the content on this website: Modified: trunk/Jmol/doc/source/guide/scripts_fr.docbook.xml =================================================================== --- trunk/Jmol/doc/source/guide/scripts_fr.docbook.xml 2006-09-13 20:27:06 UTC (rev 5533) +++ trunk/Jmol/doc/source/guide/scripts_fr.docbook.xml 2006-09-13 20:58:11 UTC (rev 5534) @@ -52,7 +52,7 @@ Ceci nous aidera à mettre des priorités dans nos futurs développements. </para> - <section> + <section id="RasMolChimeCommands"> <title>Commandes RasMol/Chime</title> <para> Cette documentation est générée automatiquement This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2006-09-14 17:13:57
|
Revision: 5543 http://svn.sourceforge.net/jmol/?rev=5543&view=rev Author: hansonr Date: 2006-09-14 10:13:51 -0700 (Thu, 14 Sep 2006) Log Message: ----------- updated Jmol.js (aka Jmol-11.js); renamed old Jmol.js Jmol-10.js; keep for reference. Modified Paths: -------------- trunk/Jmol/build.xml Added Paths: ----------- trunk/Jmol/appletweb/Jmol-10.js Removed Paths: ------------- trunk/Jmol/appletweb/Jmol.js Copied: trunk/Jmol/appletweb/Jmol-10.js (from rev 5537, trunk/Jmol/appletweb/Jmol.js) =================================================================== --- trunk/Jmol/appletweb/Jmol-10.js (rev 0) +++ trunk/Jmol/appletweb/Jmol-10.js 2006-09-14 17:13:51 UTC (rev 5543) @@ -0,0 +1,843 @@ +/* $RCSfile$ + * $Author$ + * $Date$ + * $Revision$ + * + * Copyright (C) 2004-2005 Miguel, Jmol Development, www.jmol.org + * + * Contact: mi...@jm... + * + * This library 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. + * + * This library 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 library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + * 02111-1307 USA. + */ + +// for documentation see www.jmol.org/jslibrary + +var undefined; // for IE 5 ... wherein undefined is undefined + +//////////////////////////////////////////////////////////////// +// Basic Scripting infrastruture +//////////////////////////////////////////////////////////////// + +function jmolInitialize(codebaseDirectory, useSignedApplet) { + if (_jmol.initialized) { + alert("jmolInitialize() should only be called *ONCE* within a page"); + return; + } + if (! codebaseDirectory) { + alert("codebaseDirectory is a required parameter to jmolInitialize"); + codebaseDirectory = "."; + } + if (codebaseDirectory.indexOf("http://") == 0 || + codebaseDirectory.indexOf("https://") == 0) + alert("An absolute URL is not recommended for codebaseDirectory.\n" + + "A directory or docroot relative reference is recommended.\n\n" + + "If you are experienced enough to go 'off piste' then you\n" + + "can override this warning by inserting a space before\n" + + "http in your URL."); + _jmolSetCodebase(codebaseDirectory); + _jmolUseSignedApplet(useSignedApplet); + _jmolOnloadResetForms(); + _jmol.initialized = true; +} + +function jmolSetDocument(doc) { + _jmol.currentDocument = doc; +} + +function jmolSetAppletColor(boxbgcolor, boxfgcolor, progresscolor) { + _jmolInitCheck(); + _jmol.boxbgcolor = boxbgcolor; + if (boxfgcolor) + _jmol.boxfgcolor = boxfgcolor + else if (boxbgcolor == "white" || boxbgcolor == "#FFFFFF") + _jmol.boxfgcolor = "black"; + else + _jmol.boxfgcolor = "white"; + if (progresscolor) + _jmol.progresscolor = progresscolor; + if (_jmol.debugAlert) + alert(" boxbgcolor=" + _jmol.boxbgcolor + + " boxfgcolor=" + _jmol.boxfgcolor + + " progresscolor=" + _jmol.progresscolor); +} + +function jmolApplet(size, script, nameSuffix) { + _jmolInitCheck(); + return _jmolApplet(size, null, script, nameSuffix); +} + +//////////////////////////////////////////////////////////////// +// Basic controls +//////////////////////////////////////////////////////////////// + +function jmolButton(script, label, id) { + _jmolInitCheck(); + if (id == undefined || id == null) + id = "jmolButton" + _jmol.buttonCount; + if (label == undefined || label == null) + label = script.substring(0, 32); + ++_jmol.buttonCount; + var scriptIndex = _jmolAddScript(script); + var t = "<input type='button' name='" + id + "' id='" + id + + "' value='" + label + + "' onClick='_jmolClick(" + scriptIndex + _jmol.targetText + + ")' onMouseover='_jmolMouseOver(" + scriptIndex + + ");return true' onMouseout='_jmolMouseOut()' " + + _jmol.buttonCssText + "/>"; + if (_jmol.debugAlert) + alert(t); + return _jmolDocumentWrite(t); +} + +function jmolCheckbox(scriptWhenChecked, scriptWhenUnchecked, + labelHtml, isChecked, id) { + _jmolInitCheck(); + if (id == undefined || id == null) + id = "jmolCheckbox" + _jmol.checkboxCount; + ++_jmol.checkboxCount; + if (scriptWhenChecked == undefined || scriptWhenChecked == null || + scriptWhenUnchecked == undefined || scriptWhenUnchecked == null) { + alert("jmolCheckbox requires two scripts"); + return; + } + if (labelHtml == undefined || labelHtml == null) { + alert("jmolCheckbox requires a label"); + return; + } + var indexChecked = _jmolAddScript(scriptWhenChecked); + var indexUnchecked = _jmolAddScript(scriptWhenUnchecked); + var t = "<input type='checkbox' name='" + id + "' id='" + id + + "' onClick='_jmolCbClick(this," + + indexChecked + "," + indexUnchecked + _jmol.targetText + + ")' onMouseover='_jmolCbOver(this," + indexChecked + "," + + indexUnchecked + + ");return true' onMouseout='_jmolMouseOut()' " + + (isChecked ? "checked " : "") + _jmol.checkboxCssText + "/>" + + labelHtml; + if (_jmol.debugAlert) + alert(t); + return _jmolDocumentWrite(t); +} + +function jmolRadioGroup(arrayOfRadioButtons, separatorHtml, groupName) { + _jmolInitCheck(); + var type = typeof arrayOfRadioButtons; + if (type != "object" || type == null || ! arrayOfRadioButtons.length) { + alert("invalid arrayOfRadioButtons"); + return; + } + if (separatorHtml == undefined || separatorHtml == null) + separatorHtml = " "; + var length = arrayOfRadioButtons.length; + var t = ""; + jmolStartNewRadioGroup(); + for (var i = 0; i < length; ++i) { + var radio = arrayOfRadioButtons[i]; + type = typeof radio; + if (type == "object") { + t += _jmolRadio(radio[0], radio[1], radio[2], separatorHtml, groupName); + } else { + t += _jmolRadio(radio, null, null, separatorHtml, groupName); + } + } + if (_jmol.debugAlert) + alert(t); + return _jmolDocumentWrite(t); +} + +function jmolLink(script, label, id) { + _jmolInitCheck(); + if (id == undefined || id == null) + id = "jmolLink" + _jmol.linkCount; + if (label == undefined || label == null) + label = script.substring(0, 32); + ++_jmol.linkCount; + var scriptIndex = _jmolAddScript(script); + var t = "<a name='" + id + "' id='" + id + + "' href='javascript:_jmolClick(" + scriptIndex + + _jmol.targetText + + ");' onMouseover='_jmolMouseOver(" + scriptIndex + + ");return true;' onMouseout='_jmolMouseOut()' " + + _jmol.linkCssText + ">" + label + "</a>"; + if (_jmol.debugAlert) + alert(t); + return _jmolDocumentWrite(t); +} + +function jmolMenu(arrayOfMenuItems, size, id) { + _jmolInitCheck(); + if (id == undefined || id == null) + id = "jmolMenu" + _jmol.menuCount; + ++_jmol.menuCount; + var type = typeof arrayOfMenuItems; + if (type != null && type == "object" && arrayOfMenuItems.length) { + var length = arrayOfMenuItems.length; + if (typeof size != "number" || size == 1) + size = null; + else if (size < 0) + size = length; + var sizeText = size ? " size='" + size + "' " : ""; + var t = "<select name='" + id + "' id='" + id + + "' onChange='_jmolMenuSelected(this" + + _jmol.targetText + ")'" + + sizeText + _jmol.menuCssText + ">"; + for (var i = 0; i < length; ++i) { + var menuItem = arrayOfMenuItems[i]; + type = typeof menuItem; + var script, text; + var isSelected = undefined; + if (type == "object" && menuItem != null) { + script = menuItem[0]; + text = menuItem[1]; + isSelected = menuItem[2]; + } else { + script = text = menuItem; + } + if (text == undefined || text == null) + text = script; + var scriptIndex = _jmolAddScript(script); + var selectedText = isSelected ? "' selected>" : "'>"; + t += "<option value='" + scriptIndex + selectedText + text + "</option>"; + } + t += "</select>"; + if (_jmol.debugAlert) + alert(t); + return _jmolDocumentWrite(t); + } +} + +function jmolHtml(html) { + return _jmolDocumentWrite(html); +} + +function jmolBr() { + return _jmolDocumentWrite("<br />"); +} + +//////////////////////////////////////////////////////////////// +// advanced scripting functions +//////////////////////////////////////////////////////////////// + +function jmolDebugAlert(enableAlerts) { + _jmol.debugAlert = (enableAlerts == undefined || enableAlerts) +} + +function jmolAppletInline(size, inlineModel, script, nameSuffix) { + return _jmolApplet(size, _jmolSterilizeInline(inlineModel), + script, nameSuffix); +} + +function jmolSetTarget(targetSuffix) { + _jmol.targetSuffix = targetSuffix; + _jmol.targetText = targetSuffix ? ",\"" + targetSuffix + "\"" : ""; +} + +function jmolScript(script, targetSuffix) { + if (script) { + _jmolCheckBrowser(); + if (targetSuffix == "all") { + with (_jmol) { + for (var i = 0; i < appletSuffixes.length; ++i) { + var target = "jmolApplet" + appletSuffixes[i]; + var applet = _jmolFindApplet(target); + if (applet) + applet.script(script); + else + alert("could not find applet " + target); + } + } + } else { + var target = "jmolApplet" + (targetSuffix ? targetSuffix : "0"); + var applet = _jmolFindApplet(target); + if (applet) + return applet.script(script); + else + alert("could not find applet " + target); + } + } +} + +function jmolLoadInline(model, targetSuffix) { + if (model) { + var target = "jmolApplet" + (targetSuffix ? targetSuffix : "0"); +// while (! _jmol.ready[target]) +// alert("The Jmol applet " + target + " is not loaded yet"); +// if (! _jmol.ready[target]) +// alert("The Jmol applet " + target + " is not loaded yet"); +// if (document.applets[target] && ! document.applets[target].isActive()) +// alert("The Jmol applet " + target + " is not yet active"); +// else { + var applet = _jmolFindApplet(target); + if (applet) + return applet.loadInline(model); + else + alert("could not find applet " + target); +// } + } +} + +function jmolStartNewRadioGroup() { + ++_jmol.radioGroupCount; +} + +function jmolRadio(script, labelHtml, isChecked, separatorHtml, groupName) { + _jmolInitCheck(); + if (_jmol.radioGroupCount == 0) + ++_jmol.radioGroupCount; + var t = _jmolRadio(script, labelHtml, isChecked, separatorHtml, groupName); + if (_jmol.debugAlert) + alert(t); + return _jmolDocumentWrite(t); +} + +function jmolCheckBrowser(action, urlOrMessage, nowOrLater) { + if (typeof action == "string") { + action = action.toLowerCase(); + if (action != "alert" && action != "redirect" && action != "popup") + action = null; + } + if (typeof action != "string") + alert("jmolCheckBrowser(action, urlOrMessage, nowOrLater)\n\n" + + "action must be 'alert', 'redirect', or 'popup'"); + else { + if (typeof urlOrMessage != "string") + alert("jmolCheckBrowser(action, urlOrMessage, nowOrLater)\n\n" + + "urlOrMessage must be a string"); + else { + _jmol.checkBrowserAction = action; + _jmol.checkBrowserUrlOrMessage = urlOrMessage; + } + } + if (typeof nowOrLater == "string" && nowOrLater.toLowerCase() == "now") + _jmolCheckBrowser(); +} + +function _jmolDocumentWrite(text) { + if (_jmol.currentDocument) + _jmol.currentDocument.write(text); + return text; +} + +//////////////////////////////////////////////////////////////// +// Cascading Style Sheet Class support +//////////////////////////////////////////////////////////////// + +function jmolSetAppletCssClass(appletCssClass) { + if (_jmol.hasGetElementById) { + _jmol.appletCssClass = appletCssClass; + _jmol.appletCssText = appletCssClass ? "class='" + appletCssClass + "' " : ""; + } +} + +function jmolSetButtonCssClass(buttonCssClass) { + if (_jmol.hasGetElementById) { + _jmol.buttonCssClass = buttonCssClass; + _jmol.buttonCssText = buttonCssClass ? "class='" + buttonCssClass + "' " : ""; + } +} + +function jmolSetCheckboxCssClass(checkboxCssClass) { + if (_jmol.hasGetElementById) { + _jmol.checkboxCssClass = checkboxCssClass; + _jmol.checkboxCssText = checkboxCssClass ? "class='" + checkboxCssClass + "' " : ""; + } +} + +function jmolSetRadioCssClass(radioCssClass) { + if (_jmol.hasGetElementById) { + _jmol.radioCssClass = radioCssClass; + _jmol.radioCssText = radioCssClass ? "class='" + radioCssClass + "' " : ""; + } +} + +function jmolSetLinkCssClass(linkCssClass) { + if (_jmol.hasGetElementById) { + _jmol.linkCssClass = linkCssClass; + _jmol.linkCssText = linkCssClass ? "class='" + linkCssClass + "' " : ""; + } +} + +function jmolSetMenuCssClass(menuCssClass) { + if (_jmol.hasGetElementById) { + _jmol.menuCssClass = menuCssClass; + _jmol.menuCssText = menuCssClass ? "class='" + menuCssClass + "' " : ""; + } +} + +//////////////////////////////////////////////////////////////// +// functions for INTERNAL USE ONLY which are subject to change +// use at your own risk ... you have been WARNED! +//////////////////////////////////////////////////////////////// + +var _jmol = { + currentDocument: document, + + debugAlert: false, + bgcolor: "black", + progresscolor: "blue", + boxbgcolor: "black", + boxfgcolor: "white", + boxmessage: "Downloading JmolApplet ...", + + codebase: ".", + modelbase: ".", + + appletCount: 0, + appletSuffixes: [], + + buttonCount: 0, + checkboxCount: 0, + linkCount: 0, + menuCount: 0, + radioCount: 0, + radioGroupCount: 0, + + appletCssClass: null, + appletCssText: "", + buttonCssClass: null, + buttonCssText: "", + checkboxCssClass: null, + checkboxCssText: "", + radioCssClass: null, + radioCssText: "", + linkCssClass: null, + linkCssText: "", + menuCssClass: null, + menuCssText: "", + + targetSuffix: 0, + targetText: "", + scripts: [""], + + ua: navigator.userAgent.toLowerCase(), + uaVersion: parseFloat(navigator.appVersion), + + os: "unknown", + browser: "unknown", + browserVersion: 0, + hasGetElementById: !!document.getElementById, + isJavaEnabled: navigator.javaEnabled(), + isNetscape47Win: false, + isIEWin: false, + useIEObject: false, + useHtml4Object: false, + + windowsClassId: "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93", + windowsCabUrl: + "http://java.sun.com/update/1.5.0/jinstall-1_5_0_07-windows-i586.cab", + + isBrowserCompliant: false, + isJavaCompliant: false, + isFullyCompliant: false, + + initialized: false, + initChecked: false, + + browserChecked: false, + checkBrowserAction: "alert", + checkBrowserUrlOrMessage: null, + + archivePath: null, // JmolApplet0.jar OR JmolAppletSigned0.jar + + previousOnloadHandler: null, + ready: {} +} + +with (_jmol) { + + function _jmolTestUA(candidate) { + var ua = _jmol.ua; + var index = ua.indexOf(candidate); + if (index < 0) + return false; + _jmol.browser = candidate; + _jmol.browserVersion = parseFloat(ua.substring(index+candidate.length+1)); + return true; + } + + function _jmolTestOS(candidate) { + if (_jmol.ua.indexOf(candidate) < 0) + return false; + _jmol.os = candidate; + return true; + } + + _jmolTestUA("konqueror") || + _jmolTestUA("safari") || + _jmolTestUA("omniweb") || + _jmolTestUA("opera") || + _jmolTestUA("webtv") || + _jmolTestUA("icab") || + _jmolTestUA("msie") || + (_jmol.ua.indexOf("compatible") < 0 && _jmolTestUA("mozilla")); + + _jmolTestOS("linux") || + _jmolTestOS("unix") || + _jmolTestOS("mac") || + _jmolTestOS("win"); + + isNetscape47Win = (os == "win" && browser == "mozilla" && + browserVersion >= 4.78 && browserVersion <= 4.8); + + if (os == "win") { + isBrowserCompliant = hasGetElementById; + } else if (os == "mac") { // mac is the problem child :-( + if (browser == "mozilla" && browserVersion >= 5) { + // miguel 2004 11 17 + // checking the plugins array does not work because + // Netscape 7.2 OS X still has Java 1.3.1 listed even though + // javaplugin.sf.net is installed to upgrade to 1.4.2 + eval("try {var v = java.lang.System.getProperty('java.version');" + + " _jmol.isBrowserCompliant = v >= '1.4.2';" + + " } catch (e) { }"); + } else if (browser == "opera" && browserVersion <= 7.54) { + isBrowserCompliant = false; + } else { + isBrowserCompliant = hasGetElementById && + !((browser == "msie") || + (browser == "safari" && browserVersion < 125.12)); + } + } else if (os == "linux" || os == "unix") { + if (browser == "konqueror" && browserVersion <= 3.3) + isBrowserCompliant = false; + else + isBrowserCompliant = hasGetElementById; + } else { // other OS + isBrowserCompliant = hasGetElementById; + } + + // possibly more checks in the future for this + isJavaCompliant = isJavaEnabled; + + isFullyCompliant = isBrowserCompliant && isJavaCompliant; + + // IE5.5 works just fine ... but let's push them to Sun Java + isIEWin = (os == "win" && browser == "msie" && browserVersion >= 5.5); + useIEObject = isIEWin; + useHtml4Object = + (os != "mac" && browser == "mozilla" && browserVersion >= 5) || + (os == "win" && browser == "opera" && browserVersion >= 8) || + (os == "mac" && browser == "safari" && browserVersion >= 412.2); +} + +function _jmolUseSignedApplet(useSignedApplet) { + _jmol.archivePath = + (useSignedApplet ? "JmolAppletSigned" : "JmolApplet") + "0.jar"; +} + +function _jmolApplet(size, inlineModel, script, nameSuffix) { + with (_jmol) { + if (! nameSuffix) + nameSuffix = appletCount; + appletSuffixes.push(nameSuffix); + ++appletCount; + if (! script) + script = "select *"; + var sz = _jmolGetAppletSize(size); + var widthAndHeight = " width='" + sz[0] + "' height='" + sz[1] + "' "; + + var tHeader, tFooter; + + if (useIEObject) { // use MSFT IE6 object tag with .cab file reference + var winCodebase = ""; + if (windowsCabUrl) + winCodebase = " codebase='" + windowsCabUrl + "'\n"; + tHeader = + "<object name='jmolApplet" + nameSuffix + + "' id='jmolApplet" + nameSuffix + "' " + appletCssText + "\n" + + " classid='" + windowsClassId + "'\n" + + winCodebase + widthAndHeight + ">\n" + + " <param name='code' value='JmolApplet' />\n" + + " <param name='archive' value='" + archivePath + "' />\n" + + " <param name='mayscript' value='true' />\n" + + " <param name='codebase' value='" + codebase + "' />\n"; + tFooter = "</object>"; + } else if (useHtml4Object) { // use HTML4 object tag + tHeader = + "<object name='jmolApplet" + nameSuffix + + "' id='jmolApplet" + nameSuffix + "' " + appletCssText + "\n" + + " classid='java:JmolApplet'\n" + + " type='application/x-java-applet'\n" + + widthAndHeight + ">\n" + + " <param name='archive' value='" + archivePath + "' />\n" + + " <param name='mayscript' value='true' />\n" + + " <param name='codebase' value='" + codebase + "' />\n"; + tFooter = "</object>"; + } else { // use applet tag + tHeader = + "<applet name='jmolApplet" + nameSuffix + + "' id='jmolApplet" + nameSuffix + + "' " + appletCssText + + " code='JmolApplet'" + + " archive='" + archivePath + "' codebase='" + codebase + "'\n" + + " width='" + sz[0] + "' height='" + sz[1] + + "' mayscript='true'>\n"; + tFooter = "</applet>"; + } + var tParams = + " <param name='progressbar' value='true' />\n" + + " <param name='progresscolor' value='" + + progresscolor + "' />\n" + + " <param name='boxmessage' value='" + + boxmessage + "' />\n" + + " <param name='boxbgcolor' value='" + + boxbgcolor + "' />\n" + + " <param name='boxfgcolor' value='" + + boxfgcolor + "' />\n" + + " <param name='ReadyCallback' value='_jmolReadyCallback' />\n"; + + if (inlineModel) + tParams += " <param name='loadInline' value='" + inlineModel + "' />\n"; + if (script) + tParams += " <param name='script' value='" + + _jmolSterilizeScript(script) + "' />\n"; + var visitJava; + if (isIEWin || useHtml4Object) { + visitJava = + "<p style='background-color:yellow;" + + "width:" + sz[0] + ";height:" + sz[1] + ";" + + // why doesn't this vertical-align work? + "text-align:center;vertical-align:middle;'>\n" + + "You do not have Java applets<br />\n" + + "enabled in your web browser.<br />\n" + + "Install the Java Runtime Environment<br />\n" + + "from <a href='http://www.java.com'>www.java.com</a><br />" + + "and/or enable Java applets in<br />\n" + + "your web browser preferences." + + "</p>"; + } else { + visitJava = + "<table bgcolor='yellow' width='" + sz[0] + "'><tr>" + + "<td align='center' valign='middle' height='" + sz[1] + "'>\n" + + "You do not have the<br />\n" + + "Java Runtime Environment<br />\n" + + "installed for applet support.<br />\n" + + "Visit <a href='http://www.java.com'>www.java.com</a>" + + "</td></tr></table>"; + } + + var t = tHeader + tParams + visitJava + tFooter; + jmolSetTarget(nameSuffix); + ready["jmolApplet" + nameSuffix] = false; + if (_jmol.debugAlert) + alert(t); + return _jmolDocumentWrite(t); + } +} + +function _jmolInitCheck() { + if (_jmol.initChecked) + return; + _jmol.initChecked = true; + if (_jmol.initialized) + return; + alert("jmolInitialize({codebase}, {useSignedApplet})\n" + + " must be called before any other Jmol.js functions"); +} + +function _jmolCheckBrowser() { + with (_jmol) { + if (browserChecked) + return; + browserChecked = true; + + if (isFullyCompliant) + return true; + + if (checkBrowserAction == "redirect") + location.href = checkBrowserUrlOrMessage; + else if (checkBrowserAction == "popup") + _jmolPopup(checkBrowserUrlOrMessage); + else { + var msg = checkBrowserUrlOrMessage; + if (msg == null) + msg = "Your web browser is not fully compatible with Jmol\n\n" + + "browser: " + browser + + " version: " + browserVersion + + " os: " + os + + "\n\n" + ua; + alert(msg); + } + } + return false; +} + +function _jmolPopup(url) { + var popup = window.open(url, "JmolPopup", + "left=150,top=150,height=400,width=600," + + "directories=yes,location=yes,menubar=yes," + + "toolbar=yes," + + "resizable=yes,scrollbars=yes,status=yes"); + if (popup.focus) + poup.focus(); +} + +function _jmolReadyCallback(name) { + if (_jmol.debugAlert) + alert(name + " is ready"); + _jmol.ready["" + name] = true; +} + +function _jmolSterilizeScript(script) { + var inlineScript = script.replace(/'/g, "'"); + if (_jmol.debugAlert) + alert("script:\n" + inlineScript); + return inlineScript; +} + +function _jmolSterilizeInline(model) { + var inlineModel = + model.replace(/\r|\n|\r\n/g, "|").replace(/'/g, "'"); + if (_jmol.debugAlert) + alert("inline model:\n" + inlineModel); + return inlineModel; +} + +function _jmolGetAppletSize(size) { + var width, height; + var type = typeof size; + if (type == "number") + width = height = size; + else if (type == "object" && size != null) { + width = size[0]; height = size[1]; + } + if (! (width >= 25 && width <= 2000)) + width = 300; + if (! (height >= 25 && height <= 2000)) + height = 300; + return [width, height]; +} + +function _jmolRadio(script, labelHtml, isChecked, separatorHtml, groupName) { + ++_jmol.radioCount; + if (groupName == undefined || groupName == null) + groupName = "jmolRadioGroup" + (_jmol.radioGroupCount - 1); + if (!script) + return ""; + if (labelHtml == undefined || labelHtml == null) + labelHtml = script.substring(0, 32); + if (! separatorHtml) + separatorHtml = ""; + var scriptIndex = _jmolAddScript(script); + return "<input name='" + groupName + + "' type='radio' onClick='_jmolClick(" + + scriptIndex + _jmol.targetText + + ");return true;' onMouseover='_jmolMouseOver(" + + scriptIndex + + ");return true;' onMouseout='_jmolMouseOut()' " + + (isChecked ? "checked " : "") + _jmol.radioCssText + "/>" + + labelHtml + separatorHtml; +} + +function _jmolFindApplet(target) { + // first look for the target in the current window + var applet = _jmolSearchFrames(window, target); + if (applet == undefined) + applet = _jmolSearchFrames(top, target); // look starting in top frame + return applet; +} + +function _jmolSearchFrames(win, target) { + var applet; + var frames = win.frames; + if (frames && frames.length) { // look in all the frames below this window + for (var i = 0; i < frames.length; ++i) { + applet = _jmolSearchFrames(frames[i], target); + if (applet) + break; + } + } else { // look for the applet in this window + var doc = win.document; +// getElementById fails on MacOSX Safari & Mozilla + if (_jmol.useHtml4Object || _jmol.useIEObject) + applet = doc.getElementById(target); + else if (doc.applets) + applet = doc.applets[target]; + else + applet = doc[target]; + } + return applet; +} + +function _jmolAddScript(script) { + if (! script) + return 0; + var index = _jmol.scripts.length; + _jmol.scripts[index] = script; + return index; +} + +function _jmolClick(scriptIndex, targetSuffix) { + jmolScript(_jmol.scripts[scriptIndex], targetSuffix); +} + +function _jmolMenuSelected(menuObject, targetSuffix) { + var scriptIndex = menuObject.value; + if (scriptIndex != undefined) { + jmolScript(_jmol.scripts[scriptIndex], targetSuffix); + return; + } + var length = menuObject.length; + if (typeof length == "number") { + for (var i = 0; i < length; ++i) { + if (menuObject[i].selected) { + _jmolClick(menuObject[i].value, targetSuffix); + return; + } + } + } + alert("?Que? menu selected bug #8734"); +} + +function _jmolCbClick(ckbox, whenChecked, whenUnchecked, targetSuffix) { + _jmolClick(ckbox.checked ? whenChecked : whenUnchecked, targetSuffix); +} + +function _jmolCbOver(ckbox, whenChecked, whenUnchecked) { + window.status = _jmol.scripts[ckbox.checked ? whenUnchecked : whenChecked]; +} + +function _jmolMouseOver(scriptIndex) { + window.status = _jmol.scripts[scriptIndex]; +} + +function _jmolMouseOut() { + window.status = " "; + return true; +} + +function _jmolSetCodebase(codebase) { + _jmol.codebase = codebase ? codebase : "."; + if (_jmol.debugAlert) + alert("jmolCodebase=" + _jmol.codebase); +} + +function _jmolOnloadResetForms() { + _jmol.previousOnloadHandler = window.onload; + window.onload = + function() { + with (_jmol) { + if (buttonCount+checkboxCount+menuCount+radioCount+radioGroupCount > 0) { + var forms = document.forms; + for (var i = forms.length; --i >= 0; ) + forms[i].reset(); + } + if (previousOnloadHandler) + previousOnloadHandler(); + } + } +} + Deleted: trunk/Jmol/appletweb/Jmol.js =================================================================== --- trunk/Jmol/appletweb/Jmol.js 2006-09-14 16:51:12 UTC (rev 5542) +++ trunk/Jmol/appletweb/Jmol.js 2006-09-14 17:13:51 UTC (rev 5543) @@ -1,843 +0,0 @@ -/* $RCSfile$ - * $Author$ - * $Date$ - * $Revision$ - * - * Copyright (C) 2004-2005 Miguel, Jmol Development, www.jmol.org - * - * Contact: mi...@jm... - * - * This library 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. - * - * This library 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 library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA. - */ - -// for documentation see www.jmol.org/jslibrary - -var undefined; // for IE 5 ... wherein undefined is undefined - -//////////////////////////////////////////////////////////////// -// Basic Scripting infrastruture -//////////////////////////////////////////////////////////////// - -function jmolInitialize(codebaseDirectory, useSignedApplet) { - if (_jmol.initialized) { - alert("jmolInitialize() should only be called *ONCE* within a page"); - return; - } - if (! codebaseDirectory) { - alert("codebaseDirectory is a required parameter to jmolInitialize"); - codebaseDirectory = "."; - } - if (codebaseDirectory.indexOf("http://") == 0 || - codebaseDirectory.indexOf("https://") == 0) - alert("An absolute URL is not recommended for codebaseDirectory.\n" + - "A directory or docroot relative reference is recommended.\n\n" + - "If you are experienced enough to go 'off piste' then you\n" + - "can override this warning by inserting a space before\n" + - "http in your URL."); - _jmolSetCodebase(codebaseDirectory); - _jmolUseSignedApplet(useSignedApplet); - _jmolOnloadResetForms(); - _jmol.initialized = true; -} - -function jmolSetDocument(doc) { - _jmol.currentDocument = doc; -} - -function jmolSetAppletColor(boxbgcolor, boxfgcolor, progresscolor) { - _jmolInitCheck(); - _jmol.boxbgcolor = boxbgcolor; - if (boxfgcolor) - _jmol.boxfgcolor = boxfgcolor - else if (boxbgcolor == "white" || boxbgcolor == "#FFFFFF") - _jmol.boxfgcolor = "black"; - else - _jmol.boxfgcolor = "white"; - if (progresscolor) - _jmol.progresscolor = progresscolor; - if (_jmol.debugAlert) - alert(" boxbgcolor=" + _jmol.boxbgcolor + - " boxfgcolor=" + _jmol.boxfgcolor + - " progresscolor=" + _jmol.progresscolor); -} - -function jmolApplet(size, script, nameSuffix) { - _jmolInitCheck(); - return _jmolApplet(size, null, script, nameSuffix); -} - -//////////////////////////////////////////////////////////////// -// Basic controls -//////////////////////////////////////////////////////////////// - -function jmolButton(script, label, id) { - _jmolInitCheck(); - if (id == undefined || id == null) - id = "jmolButton" + _jmol.buttonCount; - if (label == undefined || label == null) - label = script.substring(0, 32); - ++_jmol.buttonCount; - var scriptIndex = _jmolAddScript(script); - var t = "<input type='button' name='" + id + "' id='" + id + - "' value='" + label + - "' onClick='_jmolClick(" + scriptIndex + _jmol.targetText + - ")' onMouseover='_jmolMouseOver(" + scriptIndex + - ");return true' onMouseout='_jmolMouseOut()' " + - _jmol.buttonCssText + "/>"; - if (_jmol.debugAlert) - alert(t); - return _jmolDocumentWrite(t); -} - -function jmolCheckbox(scriptWhenChecked, scriptWhenUnchecked, - labelHtml, isChecked, id) { - _jmolInitCheck(); - if (id == undefined || id == null) - id = "jmolCheckbox" + _jmol.checkboxCount; - ++_jmol.checkboxCount; - if (scriptWhenChecked == undefined || scriptWhenChecked == null || - scriptWhenUnchecked == undefined || scriptWhenUnchecked == null) { - alert("jmolCheckbox requires two scripts"); - return; - } - if (labelHtml == undefined || labelHtml == null) { - alert("jmolCheckbox requires a label"); - return; - } - var indexChecked = _jmolAddScript(scriptWhenChecked); - var indexUnchecked = _jmolAddScript(scriptWhenUnchecked); - var t = "<input type='checkbox' name='" + id + "' id='" + id + - "' onClick='_jmolCbClick(this," + - indexChecked + "," + indexUnchecked + _jmol.targetText + - ")' onMouseover='_jmolCbOver(this," + indexChecked + "," + - indexUnchecked + - ");return true' onMouseout='_jmolMouseOut()' " + - (isChecked ? "checked " : "") + _jmol.checkboxCssText + "/>" + - labelHtml; - if (_jmol.debugAlert) - alert(t); - return _jmolDocumentWrite(t); -} - -function jmolRadioGroup(arrayOfRadioButtons, separatorHtml, groupName) { - _jmolInitCheck(); - var type = typeof arrayOfRadioButtons; - if (type != "object" || type == null || ! arrayOfRadioButtons.length) { - alert("invalid arrayOfRadioButtons"); - return; - } - if (separatorHtml == undefined || separatorHtml == null) - separatorHtml = " "; - var length = arrayOfRadioButtons.length; - var t = ""; - jmolStartNewRadioGroup(); - for (var i = 0; i < length; ++i) { - var radio = arrayOfRadioButtons[i]; - type = typeof radio; - if (type == "object") { - t += _jmolRadio(radio[0], radio[1], radio[2], separatorHtml, groupName); - } else { - t += _jmolRadio(radio, null, null, separatorHtml, groupName); - } - } - if (_jmol.debugAlert) - alert(t); - return _jmolDocumentWrite(t); -} - -function jmolLink(script, label, id) { - _jmolInitCheck(); - if (id == undefined || id == null) - id = "jmolLink" + _jmol.linkCount; - if (label == undefined || label == null) - label = script.substring(0, 32); - ++_jmol.linkCount; - var scriptIndex = _jmolAddScript(script); - var t = "<a name='" + id + "' id='" + id + - "' href='javascript:_jmolClick(" + scriptIndex + - _jmol.targetText + - ");' onMouseover='_jmolMouseOver(" + scriptIndex + - ");return true;' onMouseout='_jmolMouseOut()' " + - _jmol.linkCssText + ">" + label + "</a>"; - if (_jmol.debugAlert) - alert(t); - return _jmolDocumentWrite(t); -} - -function jmolMenu(arrayOfMenuItems, size, id) { - _jmolInitCheck(); - if (id == undefined || id == null) - id = "jmolMenu" + _jmol.menuCount; - ++_jmol.menuCount; - var type = typeof arrayOfMenuItems; - if (type != null && type == "object" && arrayOfMenuItems.length) { - var length = arrayOfMenuItems.length; - if (typeof size != "number" || size == 1) - size = null; - else if (size < 0) - size = length; - var sizeText = size ? " size='" + size + "' " : ""; - var t = "<select name='" + id + "' id='" + id + - "' onChange='_jmolMenuSelected(this" + - _jmol.targetText + ")'" + - sizeText + _jmol.menuCssText + ">"; - for (var i = 0; i < length; ++i) { - var menuItem = arrayOfMenuItems[i]; - type = typeof menuItem; - var script, text; - var isSelected = undefined; - if (type == "object" && menuItem != null) { - script = menuItem[0]; - text = menuItem[1]; - isSelected = menuItem[2]; - } else { - script = text = menuItem; - } - if (text == undefined || text == null) - text = script; - var scriptIndex = _jmolAddScript(script); - var selectedText = isSelected ? "' selected>" : "'>"; - t += "<option value='" + scriptIndex + selectedText + text + "</option>"; - } - t += "</select>"; - if (_jmol.debugAlert) - alert(t); - return _jmolDocumentWrite(t); - } -} - -function jmolHtml(html) { - return _jmolDocumentWrite(html); -} - -function jmolBr() { - return _jmolDocumentWrite("<br />"); -} - -//////////////////////////////////////////////////////////////// -// advanced scripting functions -//////////////////////////////////////////////////////////////// - -function jmolDebugAlert(enableAlerts) { - _jmol.debugAlert = (enableAlerts == undefined || enableAlerts) -} - -function jmolAppletInline(size, inlineModel, script, nameSuffix) { - return _jmolApplet(size, _jmolSterilizeInline(inlineModel), - script, nameSuffix); -} - -function jmolSetTarget(targetSuffix) { - _jmol.targetSuffix = targetSuffix; - _jmol.targetText = targetSuffix ? ",\"" + targetSuffix + "\"" : ""; -} - -function jmolScript(script, targetSuffix) { - if (script) { - _jmolCheckBrowser(); - if (targetSuffix == "all") { - with (_jmol) { - for (var i = 0; i < appletSuffixes.length; ++i) { - var target = "jmolApplet" + appletSuffixes[i]; - var applet = _jmolFindApplet(target); - if (applet) - applet.script(script); - else - alert("could not find applet " + target); - } - } - } else { - var target = "jmolApplet" + (targetSuffix ? targetSuffix : "0"); - var applet = _jmolFindApplet(target); - if (applet) - return applet.script(script); - else - alert("could not find applet " + target); - } - } -} - -function jmolLoadInline(model, targetSuffix) { - if (model) { - var target = "jmolApplet" + (targetSuffix ? targetSuffix : "0"); -// while (! _jmol.ready[target]) -// alert("The Jmol applet " + target + " is not loaded yet"); -// if (! _jmol.ready[target]) -// alert("The Jmol applet " + target + " is not loaded yet"); -// if (document.applets[target] && ! document.applets[target].isActive()) -// alert("The Jmol applet " + target + " is not yet active"); -// else { - var applet = _jmolFindApplet(target); - if (applet) - return applet.loadInline(model); - else - alert("could not find applet " + target); -// } - } -} - -function jmolStartNewRadioGroup() { - ++_jmol.radioGroupCount; -} - -function jmolRadio(script, labelHtml, isChecked, separatorHtml, groupName) { - _jmolInitCheck(); - if (_jmol.radioGroupCount == 0) - ++_jmol.radioGroupCount; - var t = _jmolRadio(script, labelHtml, isChecked, separatorHtml, groupName); - if (_jmol.debugAlert) - alert(t); - return _jmolDocumentWrite(t); -} - -function jmolCheckBrowser(action, urlOrMessage, nowOrLater) { - if (typeof action == "string") { - action = action.toLowerCase(); - if (action != "alert" && action != "redirect" && action != "popup") - action = null; - } - if (typeof action != "string") - alert("jmolCheckBrowser(action, urlOrMessage, nowOrLater)\n\n" + - "action must be 'alert', 'redirect', or 'popup'"); - else { - if (typeof urlOrMessage != "string") - alert("jmolCheckBrowser(action, urlOrMessage, nowOrLater)\n\n" + - "urlOrMessage must be a string"); - else { - _jmol.checkBrowserAction = action; - _jmol.checkBrowserUrlOrMessage = urlOrMessage; - } - } - if (typeof nowOrLater == "string" && nowOrLater.toLowerCase() == "now") - _jmolCheckBrowser(); -} - -function _jmolDocumentWrite(text) { - if (_jmol.currentDocument) - _jmol.currentDocument.write(text); - return text; -} - -//////////////////////////////////////////////////////////////// -// Cascading Style Sheet Class support -//////////////////////////////////////////////////////////////// - -function jmolSetAppletCssClass(appletCssClass) { - if (_jmol.hasGetElementById) { - _jmol.appletCssClass = appletCssClass; - _jmol.appletCssText = appletCssClass ? "class='" + appletCssClass + "' " : ""; - } -} - -function jmolSetButtonCssClass(buttonCssClass) { - if (_jmol.hasGetElementById) { - _jmol.buttonCssClass = buttonCssClass; - _jmol.buttonCssText = buttonCssClass ? "class='" + buttonCssClass + "' " : ""; - } -} - -function jmolSetCheckboxCssClass(checkboxCssClass) { - if (_jmol.hasGetElementById) { - _jmol.checkboxCssClass = checkboxCssClass; - _jmol.checkboxCssText = checkboxCssClass ? "class='" + checkboxCssClass + "' " : ""; - } -} - -function jmolSetRadioCssClass(radioCssClass) { - if (_jmol.hasGetElementById) { - _jmol.radioCssClass = radioCssClass; - _jmol.radioCssText = radioCssClass ? "class='" + radioCssClass + "' " : ""; - } -} - -function jmolSetLinkCssClass(linkCssClass) { - if (_jmol.hasGetElementById) { - _jmol.linkCssClass = linkCssClass; - _jmol.linkCssText = linkCssClass ? "class='" + linkCssClass + "' " : ""; - } -} - -function jmolSetMenuCssClass(menuCssClass) { - if (_jmol.hasGetElementById) { - _jmol.menuCssClass = menuCssClass; - _jmol.menuCssText = menuCssClass ? "class='" + menuCssClass + "' " : ""; - } -} - -//////////////////////////////////////////////////////////////// -// functions for INTERNAL USE ONLY which are subject to change -// use at your own risk ... you have been WARNED! -//////////////////////////////////////////////////////////////// - -var _jmol = { - currentDocument: document, - - debugAlert: false, - bgcolor: "black", - progresscolor: "blue", - boxbgcolor: "black", - boxfgcolor: "white", - boxmessage: "Downloading JmolApplet ...", - - codebase: ".", - modelbase: ".", - - appletCount: 0, - appletSuffixes: [], - - buttonCount: 0, - checkboxCount: 0, - linkCount: 0, - menuCount: 0, - radioCount: 0, - radioGroupCount: 0, - - appletCssClass: null, - appletCssText: "", - buttonCssClass: null, - buttonCssText: "", - checkboxCssClass: null, - checkboxCssText: "", - radioCssClass: null, - radioCssText: "", - linkCssClass: null, - linkCssText: "", - menuCssClass: null, - menuCssText: "", - - targetSuffix: 0, - targetText: "", - scripts: [""], - - ua: navigator.userAgent.toLowerCase(), - uaVersion: parseFloat(navigator.appVersion), - - os: "unknown", - browser: "unknown", - browserVersion: 0, - hasGetElementById: !!document.getElementById, - isJavaEnabled: navigator.javaEnabled(), - isNetscape47Win: false, - isIEWin: false, - useIEObject: false, - useHtml4Object: false, - - windowsClassId: "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93", - windowsCabUrl: - "http://java.sun.com/update/1.5.0/jinstall-1_5_0_07-windows-i586.cab", - - isBrowserCompliant: false, - isJavaCompliant: false, - isFullyCompliant: false, - - initialized: false, - initChecked: false, - - browserChecked: false, - checkBrowserAction: "alert", - checkBrowserUrlOrMessage: null, - - archivePath: null, // JmolApplet0.jar OR JmolAppletSigned0.jar - - previousOnloadHandler: null, - ready: {} -} - -with (_jmol) { - - function _jmolTestUA(candidate) { - var ua = _jmol.ua; - var index = ua.indexOf(candidate); - if (index < 0) - return false; - _jmol.browser = candidate; - _jmol.browserVersion = parseFloat(ua.substring(index+candidate.length+1)); - return true; - } - - function _jmolTestOS(candidate) { - if (_jmol.ua.indexOf(candidate) < 0) - return false; - _jmol.os = candidate; - return true; - } - - _jmolTestUA("konqueror") || - _jmolTestUA("safari") || - _jmolTestUA("omniweb") || - _jmolTestUA("opera") || - _jmolTestUA("webtv") || - _jmolTestUA("icab") || - _jmolTestUA("msie") || - (_jmol.ua.indexOf("compatible") < 0 && _jmolTestUA("mozilla")); - - _jmolTestOS("linux") || - _jmolTestOS("unix") || - _jmolTestOS("mac") || - _jmolTestOS("win"); - - isNetscape47Win = (os == "win" && browser == "mozilla" && - browserVersion >= 4.78 && browserVersion <= 4.8); - - if (os == "win") { - isBrowserCompliant = hasGetElementById; - } else if (os == "mac") { // mac is the problem child :-( - if (browser == "mozilla" && browserVersion >= 5) { - // miguel 2004 11 17 - // checking the plugins array does not work because - // Netscape 7.2 OS X still has Java 1.3.1 listed even though - // javaplugin.sf.net is installed to upgrade to 1.4.2 - eval("try {var v = java.lang.System.getProperty('java.version');" + - " _jmol.isBrowserCompliant = v >= '1.4.2';" + - " } catch (e) { }"); - } else if (browser == "opera" && browserVersion <= 7.54) { - isBrowserCompliant = false; - } else { - isBrowserCompliant = hasGetElementById && - !((browser == "msie") || - (browser == "safari" && browserVersion < 125.12)); - } - } else if (os == "linux" || os == "unix") { - if (browser == "konqueror" && browserVersion <= 3.3) - isBrowserCompliant = false; - else - isBrowserCompliant = hasGetElementById; - } else { // other OS - isBrowserCompliant = hasGetElementById; - } - - // possibly more checks in the future for this - isJavaCompliant = isJavaEnabled; - - isFullyCompliant = isBrowserCompliant && isJavaCompliant; - - // IE5.5 works just fine ... but let's push them to Sun Java - isIEWin = (os == "win" && browser == "msie" && browserVersion >= 5.5); - useIEObject = isIEWin; - useHtml4Object = - (os != "mac" && browser == "mozilla" && browserVersion >= 5) || - (os == "win" && browser == "opera" && browserVersion >= 8) || - (os == "mac" && browser == "safari" && browserVersion >= 412.2); -} - -function _jmolUseSignedApplet(useSignedApplet) { - _jmol.archivePath = - (useSignedApplet ? "JmolAppletSigned" : "JmolApplet") + "0.jar"; -} - -function _jmolApplet(size, inlineModel, script, nameSuffix) { - with (_jmol) { - if (! nameSuffix) - nameSuffix = appletCount; - appletSuffixes.push(nameSuffix); - ++appletCount; - if (! script) - script = "select *"; - var sz = _jmolGetAppletSize(size); - var widthAndHeight = " width='" + sz[0] + "' height='" + sz[1] + "' "; - - var tHeader, tFooter; - - if (useIEObject) { // use MSFT IE6 object tag with .cab file reference - var winCodebase = ""; - if (windowsCabUrl) - winCodebase = " codebase='" + windowsCabUrl + "'\n"; - tHeader = - "<object name='jmolApplet" + nameSuffix + - "' id='jmolApplet" + nameSuffix + "' " + appletCssText + "\n" + - " classid='" + windowsClassId + "'\n" + - winCodebase + widthAndHeight + ">\n" + - " <param name='code' value='JmolApplet' />\n" + - " <param name='archive' value='" + archivePath + "' />\n" + - " <param name='mayscript' value='true' />\n" + - " <param name='codebase' value='" + codebase + "' />\n"; - tFooter = "</object>"; - } else if (useHtml4Object) { // use HTML4 object tag - tHeader = - "<object name='jmolApplet" + nameSuffix + - "' id='jmolApplet" + nameSuffix + "' " + appletCssText + "\n" + - " classid='java:JmolApplet'\n" + - " type='application/x-java-applet'\n" + - widthAndHeight + ">\n" + - " <param name='archive' value='" + archivePath + "' />\n" + - " <param name='mayscript' value='true' />\n" + - " <param name='codebase' value='" + codebase + "' />\n"; - tFooter = "</object>"; - } else { // use applet tag - tHeader = - "<applet name='jmolApplet" + nameSuffix + - "' id='jmolApplet" + nameSuffix + - "' " + appletCssText + - " code='JmolApplet'" + - " archive='" + archivePath + "' codebase='" + codebase + "'\n" + - " width='" + sz[0] + "' height='" + sz[1] + - "' mayscript='true'>\n"; - tFooter = "</applet>"; - } - var tParams = - " <param name='progressbar' value='true' />\n" + - " <param name='progresscolor' value='" + - progresscolor + "' />\n" + - " <param name='boxmessage' value='" + - boxmessage + "' />\n" + - " <param name='boxbgcolor' value='" + - boxbgcolor + "' />\n" + - " <param name='boxfgcolor' value='" + - boxfgcolor + "' />\n" + - " <param name='ReadyCallback' value='_jmolReadyCallback' />\n"; - - if (inlineModel) - tParams += " <param name='loadInline' value='" + inlineModel + "' />\n"; - if (script) - tParams += " <param name='script' value='" + - _jmolSterilizeScript(script) + "' />\n"; - var visitJava; - if (isIEWin || useHtml4Object) { - visitJava = - "<p style='background-color:yellow;" + - "width:" + sz[0] + ";height:" + sz[1] + ";" + - // why doesn't this vertical-align work? - "text-align:center;vertical-align:middle;'>\n" + - "You do not have Java applets<br />\n" + - "enabled in your web browser.<br />\n" + - "Install the Java Runtime Environment<br />\n" + - "from <a href='http://www.java.com'>www.java.com</a><br />" + - "and/or enable Java applets in<br />\n" + - "your web browser preferences." + - "</p>"; - } else { - visitJava = - "<table bgcolor='yellow' width='" + sz[0] + "'><tr>" + - "<td align='center' valign='middle' height='" + sz[1] + "'>\n" + - "You do not have the<br />\n" + - "Java Runtime Environment<br />\n" + - "installed for applet support.<br />\n" + - "Visit <a href='http://www.java.com'>www.java.com</a>" + - "</td></tr></table>"; - } - - var t = tHeader + tParams + visitJava + tFooter; - jmolSetTarget(nameSuffix); - ready["jmolApplet" + nameSuffix] = false; - if (_jmol.debugAlert) - alert(t); - return _jmolDocumentWrite(t); - } -} - -function _jmolInitCheck() { - if (_jmol.initChecked) - return; - _jmol.initChecked = true; - if (_jmol.initialized) - return; - alert("jmolInitialize({codebase}, {useSignedApplet})\n" + - " must be called before any other Jmol.js functions"); -} - -function _jmolCheckBrowser() { - with (_jmol) { - if (browserChecked) - return; - browserChecked = true; - - if (isFullyCompliant) - return true; - - if (checkBrowserAction == "redirect") - location.href = checkBrowserUrlOrMessage; - else if (checkBrowserAction == "popup") - _jmolPopup(checkBrowserUrlOrMessage); - else { - var msg = checkBrowserUrlOrMessage; - if (msg == null) - msg = "Your web browser is not fully compatible with Jmol\n\n" + - "browser: " + browser + - " version: " + browserVersion + - " os: " + os + - "\n\n" + ua; - alert(msg); - } - } - return false; -} - -function _jmolPopup(url) { - var popup = window.open(url, "JmolPopup", - "left=150,top=150,height=400,width=600," + - "directories=yes,location=yes,menubar=yes," + - "toolbar=yes," + - "resizable=yes,scrollbars=yes,status=yes"); - if (popup.focus) - poup.focus(); -} - -function _jmolReadyCallback(name) { - if (_jmol.debugAlert) - alert(name + " is ready"); - _jmol.ready["" + name] = true; -} - -function _jmolSterilizeScript(script) { - var inlineScript = script.replace(/'/g, "'"); - if (_jmol.debugAlert) - alert("script:\n" + inlineScript); - return inlineScript; -} - -function _jmolSterilizeInline(model) { - var inlineModel = - model.replace(/\r|\n|\r\n/g, "|").replace(/'/g, "'"); - if (_jmol.debugAlert) - alert("inline model:\n" + inlineModel); - return inlineModel; -} - -function _jmolGetAppletSize(size) { - var width, height; - var type = typeof size; - if (type == "number") - width = height = size; - else if (type == "object" && size != null) { - width = size[0]; height = size[1]; - } - if (! (width >= 25 && width <= 2000)) - width = 300; - if (! (height >= 25 && height <= 2000)) - height = 300; - return [width, height]; -} - -function _jmolRadio(script, labelHtml, isChecked, separatorHtml, groupName) { - ++_jmol.radioCount; - if (groupName == undefined || groupName == null) - groupName = "jmolRadioGroup" + (_jmol.radioGroupCount - 1); - if (!script) - return ""; - if (labelHtml == undefined || labelHtml == null) - labelHtml = script.substring(0, 32); - if (! separatorHtml) - separatorHtml = ""; - var scriptIndex = _jmolAddScript(script); - return "<input name='" + groupName + - "' type='radio' onClick='_jmolClick(" + - scriptIndex + _jmol.targetText + - ");return true;' onMouseover='_jmolMouseOver(" + - scriptIndex + - ");return true;' onMouseout='_jmolMouseOut()' " + - (isChecked ? "checked " : "") + _jmol.radioCssText + "/>" + - labelHtml + separatorHtml; -} - -function _jmolFindApplet(target) { - // first look for the target in the current window - var applet = _jmolSearchFrames(window, target); - if (applet == undefined) - applet = _jmolSearchFrames(top, target); // look starting in top frame - return applet; -} - -function _jmolSearchFrames(win, target) { - var applet; - var frames = win.frames; - if (frames && frames.length) { // look in all the frames below this window - for (var i = 0; i < frames.length; ++i) { - applet = _jmolSearchFrames(frames[i], target); - if (applet) - break; - } - } else { // look for the applet in this window - var doc = win.document; -// getElementById fails on MacOSX Safari & Mozilla - if (_jmol.useHtml4Object || _jmol.useIEObject) - applet = doc.getElementById(target); - else if (doc.applets) - applet = doc.applets[target]; - else - applet = doc[target]; - } - return applet; -} - -function _jmolAddScript(script) { - if (! script) - return 0; - var index = _jmol.scripts.length; - _jmol.scripts[index] = script; - return index; -} - -function _jmolClick(scriptIndex, targetSuffix) { - jmolScript(_jmol.scripts[scriptIndex], targetSuffix); -} - -function _jmolMenuSelected(menuObject, targetSuffix) { - var scriptIndex = menuObject.value; - if (scriptIndex != undefined) { - jmolScript(_jmol.scripts[scriptIndex], targetSuffix); - return; - } - var length = menuObject.length; - if (typeof length == "number") { - for (var i = 0; i < length; ++i) { - if (menuObject[i].selected) { - _jmolClick(menuObject[i].value, targetSuffix); - return; - } - } - } - alert("?Que? menu selected bug #8734"); -} - -function _jmolCbClick(ckbox, whenChecked, whenUnchecked, targetSuffix) { - _jmolClick(ckbox.checked ? whenChecked : whenUnchecked, targetSuffix); -} - -function _jmolCbOver(ckbox, whenChecked, whenUnchecked) { - window.status = _jmol.scripts[ckbox.checked ? whenUnchecked : whenChecked]; -} - -function _jmolMouseOver(scriptIndex) { - window.status = _jmol.scripts[scriptIndex]; -} - -function _jmolMouseOut() { - window.status = " "; - return true; -} - -function _jmolSetCodebase(codebase) { - _jmol.codebase = codebase ? codebase : "."; - if (_jmol.debugAlert) - alert("jmolCodebase=" + _jmol.codebase); -} - -function _jmolOnloadResetForms() { - _jmol.previousOnloadHandler = window.onload; - window.onload = - function() { - with (_jmol) { - if (buttonCount+checkboxCount+menuCount+radioCount+radioGroupCount > 0) { - var forms = document.forms; - for (var i = forms.length; --i >= 0; ) - forms[i].reset(); - } - if (previousOnloadHandler) - previousOnloadHandler(); - } - } -} - Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-09-14 16:51:12 UTC (rev 5542) +++ trunk/Jmol/build.xml 2006-09-14 17:13:51 UTC (rev 5543) @@ -15,7 +15,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.9.58" /> + <property name="version" value="10.9.59" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2006-09-16 03:36:56
|
Revision: 5558 http://svn.sourceforge.net/jmol/?rev=5558&view=rev Author: hansonr Date: 2006-09-15 20:26:15 -0700 (Fri, 15 Sep 2006) Log Message: ----------- 10.9.60 Modified Paths: -------------- trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-09-16 03:23:07 UTC (rev 5557) +++ trunk/Jmol/build.xml 2006-09-16 03:26:15 UTC (rev 5558) @@ -15,7 +15,7 @@ <property name="deprecation" value="off" /> <property name="optimization" value="off" /> - <property name="version" value="10.9.59" /> + <property name="version" value="10.9.60" /> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-09-16 03:23:07 UTC (rev 5557) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-09-16 03:26:15 UTC (rev 5558) @@ -42,7 +42,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.9.59"; + public final static String version = "10.9.60"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-09-16 10:39:50
|
Revision: 5559 http://svn.sourceforge.net/jmol/?rev=5559&view=rev Author: nicove Date: 2006-09-16 03:39:34 -0700 (Sat, 16 Sep 2006) Log Message: ----------- Upgrade of vecmath library. vecmath.jar was extracter from java.net/java3d, file java3d-1_4_0_01-windows-i586 Modified Paths: -------------- trunk/Jmol/.classpath trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/adapter/smarter/Atom.java Added Paths: ----------- trunk/Jmol/jars/vecmath.jar Removed Paths: ------------- trunk/Jmol/jars/vecmath1.2-1.14.jar trunk/Jmol/jars/vecmath1.2-1.14.tar.gz Modified: trunk/Jmol/.classpath =================================================================== --- trunk/Jmol/.classpath 2006-09-16 03:26:15 UTC (rev 5558) +++ trunk/Jmol/.classpath 2006-09-16 10:39:34 UTC (rev 5559) @@ -7,11 +7,11 @@ <classpathentry kind="src" path="screensaver/src/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="jars/netscape.jar"/> - <classpathentry kind="lib" path="jars/vecmath1.2-1.14.jar"/> <classpathentry kind="lib" path="jars/Acme.jar"/> <classpathentry kind="lib" path="jars/commons-cli-1.0.jar"/> <classpathentry kind="lib" path="jars/itext-0.94.jar"/> <classpathentry kind="lib" path="screensaver/jars/saverbeans-api.jar"/> <classpathentry kind="lib" path="jars/junit.jar"/> + <classpathentry kind="lib" path="jars/vecmath.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-09-16 03:26:15 UTC (rev 5558) +++ trunk/Jmol/build.xml 2006-09-16 10:39:34 UTC (rev 5559) @@ -30,6 +30,7 @@ <property name="javadoc.dir" value="javadoc" /> <property name="docbook-xsl" value="docbook-xsl-1.71.0" /> <property name="docbook-xml" value="docbook-xml-4.4" /> + <property name="vecmath.jar" value="vecmath.jar" /> <!-- you can set this by defining it in ~/.jmol.build.properties --> <property name="keystore.name" value="Must be set by user." /> @@ -52,7 +53,7 @@ <path id="apisio-project.class.path"> <fileset dir="${lib.dir}"> - <include name="vecmath1.2-1.14.jar" /> + <include name="${vecmath.jar}" /> <include name="netscape.jar" /> <include name="gnujaxp.jar" /> </fileset> @@ -288,7 +289,7 @@ <condition property="libjars.uptodate"> <and> <uptodate targetfile="${appjars.dir}"> - <srcfiles dir="${lib.dir}" includes="vecmath1.2-1.14.jar"/> + <srcfiles dir="${lib.dir}" includes="${vecmath.jar}"/> <srcfiles dir="${lib.dir}" includes="Acme.jar"/> <srcfiles dir="${lib.dir}" includes="itext-0.94.jar"/> <srcfiles dir="${lib.dir}" includes="commons-cli-1.0.jar"/> @@ -319,7 +320,7 @@ <target name="libjars" id="libjars" depends="check.libjars" unless="libjars.uptodate"> <delete file="build/libjars.timestamp"/> <mkdir dir="${appjars.dir}"/> - <unjar dest="${appjars.dir}" src="${lib.dir}/vecmath1.2-1.14.jar"/> + <unjar dest="${appjars.dir}" src="${lib.dir}/${vecmath.jar}"/> <unjar dest="${appjars.dir}" src="${lib.dir}/Acme.jar"/> <unjar dest="${appjars.dir}" src="${lib.dir}/itext-0.94.jar"/> <unjar dest="${appjars.dir}" src="${lib.dir}/commons-cli-1.0.jar"/> @@ -389,7 +390,7 @@ <and> <uptodate targetfile="${appletjars.dir}"> <srcfiles dir="${lib.dir}" - includes="jmolappletcdk.jar,vecmath1.2-1.14.jar"/> + includes="jmolappletcdk.jar,${vecmath.jar}"/> </uptodate> <uptodate targetfile="build/appletjars.timestamp" srcfile="${appletjars.dir}"/> @@ -402,7 +403,7 @@ <delete file="build/appletjars.timestamp"/> <delete dir="${appletjars.dir}"/> <mkdir dir="${appletjars.dir}"/> - <unjar dest="${appletjars.dir}" src="${lib.dir}/vecmath1.2-1.14.jar"> + <unjar dest="${appletjars.dir}" src="${lib.dir}/${vecmath.jar}"> <patternset> <include name="**/Point3f.class"/> <include name="**/Vector3f.class"/> @@ -730,7 +731,7 @@ <copy todir="build/dist/jmolapisio-${version}/${lib.dir}" > <fileset dir="${lib.dir}"> <exclude name="**/CVS"/> - <include name="vecmath1.2-1.14.jar"/> + <include name="${vecmath.jar}"/> <include name="netscape.jar"/> </fileset> </copy> Added: trunk/Jmol/jars/vecmath.jar =================================================================== (Binary files differ) Property changes on: trunk/Jmol/jars/vecmath.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/Jmol/jars/vecmath1.2-1.14.jar =================================================================== (Binary files differ) Deleted: trunk/Jmol/jars/vecmath1.2-1.14.tar.gz =================================================================== (Binary files differ) Modified: trunk/Jmol/src/org/jmol/adapter/smarter/Atom.java =================================================================== --- trunk/Jmol/src/org/jmol/adapter/smarter/Atom.java 2006-09-16 03:26:15 UTC (rev 5558) +++ trunk/Jmol/src/org/jmol/adapter/smarter/Atom.java 2006-09-16 10:39:34 UTC (rev 5559) @@ -52,11 +52,7 @@ } Atom cloneAtom() { - try { - return (Atom)super.clone(); - } catch (CloneNotSupportedException cnse) { - return null; - } + return (Atom) clone(); } String getElementSymbol() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-09-17 07:36:45
|
Revision: 5577 http://svn.sourceforge.net/jmol/?rev=5577&view=rev Author: nicove Date: 2006-09-17 00:36:34 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Moving documentation Added Paths: ----------- trunk/Jmol-documentation/presentations/ Removed Paths: ------------- trunk/Jmol/presentations/ Copied: trunk/Jmol-documentation/presentations (from rev 5576, trunk/Jmol/presentations) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-09-17 07:39:01
|
Revision: 5578 http://svn.sourceforge.net/jmol/?rev=5578&view=rev Author: nicove Date: 2006-09-17 00:38:50 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Moving documentation Added Paths: ----------- trunk/Jmol-documentation/script_documentation/ Removed Paths: ------------- trunk/Jmol/script_documentation/ Copied: trunk/Jmol-documentation/script_documentation (from rev 5577, trunk/Jmol/script_documentation) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-09-17 09:38:03
|
Revision: 5579 http://svn.sourceforge.net/jmol/?rev=5579&view=rev Author: nicove Date: 2006-09-17 02:37:42 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Revert of vecmath lib change Modified Paths: -------------- trunk/Jmol/.classpath trunk/Jmol/build.xml trunk/Jmol/src/org/jmol/adapter/smarter/Atom.java Added Paths: ----------- trunk/Jmol/jars/vecmath1.2-1.14.jar trunk/Jmol/jars/vecmath1.2-1.14.tar.gz Removed Paths: ------------- trunk/Jmol/jars/vecmath.jar Modified: trunk/Jmol/.classpath =================================================================== --- trunk/Jmol/.classpath 2006-09-17 07:38:50 UTC (rev 5578) +++ trunk/Jmol/.classpath 2006-09-17 09:37:42 UTC (rev 5579) @@ -7,11 +7,11 @@ <classpathentry kind="src" path="screensaver/src/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="jars/netscape.jar"/> + <classpathentry kind="lib" path="jars/vecmath1.2-1.14.jar"/> <classpathentry kind="lib" path="jars/Acme.jar"/> <classpathentry kind="lib" path="jars/commons-cli-1.0.jar"/> <classpathentry kind="lib" path="jars/itext-0.94.jar"/> <classpathentry kind="lib" path="screensaver/jars/saverbeans-api.jar"/> <classpathentry kind="lib" path="jars/junit.jar"/> - <classpathentry kind="lib" path="jars/vecmath.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-09-17 07:38:50 UTC (rev 5578) +++ trunk/Jmol/build.xml 2006-09-17 09:37:42 UTC (rev 5579) @@ -30,7 +30,9 @@ <property name="javadoc.dir" value="javadoc" /> <property name="docbook-xsl" value="docbook-xsl-1.71.0" /> <property name="docbook-xml" value="docbook-xml-4.4" /> - <property name="vecmath.jar" value="vecmath.jar" /> + <property name="vecmath.jar" value="vecmath1.2-1.14.jar" /> + <property name="itext.jar" value="itext-0.94.jar" /> + <property name="commons-cli.jar" value="commons-cli-1.0.jar" /> <!-- you can set this by defining it in ~/.jmol.build.properties --> <property name="keystore.name" value="Must be set by user." /> @@ -291,8 +293,8 @@ <uptodate targetfile="${appjars.dir}"> <srcfiles dir="${lib.dir}" includes="${vecmath.jar}"/> <srcfiles dir="${lib.dir}" includes="Acme.jar"/> - <srcfiles dir="${lib.dir}" includes="itext-0.94.jar"/> - <srcfiles dir="${lib.dir}" includes="commons-cli-1.0.jar"/> + <srcfiles dir="${lib.dir}" includes="${itext.jar}"/> + <srcfiles dir="${lib.dir}" includes="${commons-cli.jar}"/> </uptodate> <uptodate targetfile="build/libjars.timestamp" srcfile="${appjars.dir}"/> @@ -322,8 +324,8 @@ <mkdir dir="${appjars.dir}"/> <unjar dest="${appjars.dir}" src="${lib.dir}/${vecmath.jar}"/> <unjar dest="${appjars.dir}" src="${lib.dir}/Acme.jar"/> - <unjar dest="${appjars.dir}" src="${lib.dir}/itext-0.94.jar"/> - <unjar dest="${appjars.dir}" src="${lib.dir}/commons-cli-1.0.jar"/> + <unjar dest="${appjars.dir}" src="${lib.dir}/${itext.jar}"/> + <unjar dest="${appjars.dir}" src="${lib.dir}/${commons-cli.jar}"/> <touch file="build/libjars.timestamp"/> </target> Deleted: trunk/Jmol/jars/vecmath.jar =================================================================== (Binary files differ) Copied: trunk/Jmol/jars/vecmath1.2-1.14.jar (from rev 5558, trunk/Jmol/jars/vecmath1.2-1.14.jar) =================================================================== (Binary files differ) Copied: trunk/Jmol/jars/vecmath1.2-1.14.tar.gz (from rev 5558, trunk/Jmol/jars/vecmath1.2-1.14.tar.gz) =================================================================== (Binary files differ) Modified: trunk/Jmol/src/org/jmol/adapter/smarter/Atom.java =================================================================== --- trunk/Jmol/src/org/jmol/adapter/smarter/Atom.java 2006-09-17 07:38:50 UTC (rev 5578) +++ trunk/Jmol/src/org/jmol/adapter/smarter/Atom.java 2006-09-17 09:37:42 UTC (rev 5579) @@ -52,7 +52,11 @@ } Atom cloneAtom() { - return (Atom) clone(); + try { + return (Atom)super.clone(); + } catch (CloneNotSupportedException cnse) { + return null; + } } String getElementSymbol() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-09-17 20:18:40
|
Revision: 5584 http://svn.sourceforge.net/jmol/?rev=5584&view=rev Author: nicove Date: 2006-09-17 13:18:19 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Making CommandHistory compatible with JDK 1.1 Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/ScriptWindow.java trunk/Jmol/test/org/jmol/util/AllTests.java Added Paths: ----------- trunk/Jmol/src/org/jmol/util/CommandHistory.java trunk/Jmol/test/org/jmol/util/TestCommandHistory.java Removed Paths: ------------- trunk/Jmol/src/org/openscience/jmol/app/CommandHistory.java Copied: trunk/Jmol/src/org/jmol/util/CommandHistory.java (from rev 5582, trunk/Jmol/src/org/openscience/jmol/app/CommandHistory.java) =================================================================== --- trunk/Jmol/src/org/jmol/util/CommandHistory.java (rev 0) +++ trunk/Jmol/src/org/jmol/util/CommandHistory.java 2006-09-17 20:18:19 UTC (rev 5584) @@ -0,0 +1,158 @@ +/* $RCSfile$ + * $Author$ + * $Date$ + * $Revision$ + * + * Copyright (C) 2003-2005 The Jmol Development Team + * + * Contact: jmo...@li... + * + * This library 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. + * + * This library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ +package org.jmol.util; + +/** + * Implements a queue for a bash-like command history. + */ +final public class CommandHistory { + + /** + * Array of commands. + */ + private String[] commandList = null; + + /** + * Position of the next command. + */ + private int nextCommand; + + /** + * Current position of the cursor; + */ + private int cursorPos; + + /** + * Creates a new instance. + * + * @param maxSize maximum size for the command queue + */ + public CommandHistory(int maxSize) { + reset(maxSize); + } + + /** + * Retrieves the following command from the bottom of the list, updates list position. + * + * @return the String value of a command. + */ + public String getCommandUp() { + cursorPos--; + if (cursorPos < 0) { + cursorPos = commandList.length - 1; + while ((cursorPos > 0) && (commandList[cursorPos] == null)) { + cursorPos--; + } + } + return getCommand(); + } + + /** + * Retrieves the following command from the top of the list, updates list position. + * + * @return the String value of a command. + */ + public String getCommandDown() { + cursorPos++; + if (cursorPos >= commandList.length) { + cursorPos = 0; + } + if (commandList[cursorPos] == null) { + cursorPos = 0; + } + return getCommand(); + } + + /** + * Calculates the command to return. + * + * @return the String value of a command. + */ + private String getCommand() { + return commandList[cursorPos]; + } + + /** + * Adds a new command to the bottom of the list, resets list position. + * + * @param command the String value of a command. + */ + public void addCommand(String command) { + if (nextCommand >= commandList.length) { + nextCommand = 0; + } + commandList[nextCommand] = command; + nextCommand++; + if (nextCommand >= commandList.length) { + nextCommand = 0; + } + cursorPos = nextCommand; + commandList[nextCommand] = ""; + } + + /** + * Resets maximum size of command queue. Cuts off extra commands. + * + * @param maxSize maximum size for the command queue. + */ + void setMaxSize(int maxSize) { + if (maxSize + 1 == commandList.length) { + return; + } + String[] tmpCommandList = new String[maxSize + 1]; + int lastCommand = commandList.length - 1; + while ((lastCommand > 0) && (commandList[lastCommand] == null)) { + lastCommand--; + } + if (tmpCommandList.length - 1 > lastCommand) { + for (int i = 0; i < lastCommand; i++) { + tmpCommandList[i] = commandList[i]; + } + return; + } + for (int i = 0; i < tmpCommandList.length; i++) { + tmpCommandList[tmpCommandList.length - i - 1] = commandList[commandList.length - i - 1]; + } + int delta = 0; + if (nextCommand >= tmpCommandList.length) { + delta = nextCommand - tmpCommandList.length + 1; + } + for (int i = 0; i <= nextCommand - delta; i++) { + tmpCommandList[nextCommand - delta - i] = commandList[nextCommand - i]; + } + commandList = tmpCommandList; + } + + /** + * Resets instance. + * + * @param maxSize maximum size for the command queue. + */ + void reset(int maxSize) { + commandList = new String[maxSize + 1]; + nextCommand = 0; + commandList[nextCommand] = ""; + cursorPos = 0; + } +} Deleted: trunk/Jmol/src/org/openscience/jmol/app/CommandHistory.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/CommandHistory.java 2006-09-17 18:27:15 UTC (rev 5583) +++ trunk/Jmol/src/org/openscience/jmol/app/CommandHistory.java 2006-09-17 20:18:19 UTC (rev 5584) @@ -1,190 +0,0 @@ -/* $RCSfile$ - * $Author$ - * $Date$ - * $Revision$ - * - * Copyright (C) 2003-2005 The Jmol Development Team - * - * Contact: jmo...@li... - * - * This library 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. - * - * This library 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 library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - */ -package org.openscience.jmol.app; - -import java.util.*; - -/** - * Implements a queue for a bash-like command history. - * - * - * @author Agust\u00ED S\u00E1nchez Furrasola - * @version $Revision$ 2003-07-28 - * - */ -final class CommandHistory -{ - private LinkedList commandList = new LinkedList(); - - private int maxSize; - - private int pos = 0; - - /** - * Creates a new instance. - * - * @param maxSize maximum size for the command queue - */ - CommandHistory(int maxSize) - { - this.maxSize = maxSize; - } - - /** - * Retrieves the following command from the bottom of the list, updates - * list position. - * @return the String value of a command - */ - String getCommandUp() - { - if (commandList.size() > 0) pos--; - return getCommand(); - } - - /** - * Retrieves the following command from the top of the list, updates - * list position. - * @return the String value of a command - */ - String getCommandDown() - { - if (commandList.size() > 0) pos++; - return getCommand(); - } - - /** - * Calculates the command to return. - * - * @return the String value of a command - */ - private String getCommand() { - if (pos == 0) { - return ""; - } - int size = commandList.size(); - if (size > 0){ - if (pos == (size+1)) { - return ""; // just beyond last one: "" - } else if (pos > size) { - pos = 1; // roll around to first command - } else if (pos < 0) { - pos = size; // roll around to last command - } - return (String) commandList.get(pos-1); - } - return ""; - } - - /** - * Adds a new command to the bottom of the list, resets - * list position. - * @param command the String value of a command - */ - void addCommand(String command) - { - // System.out.println(command); - - pos = 0; - - commandList.addLast(command); - - if (commandList.size() > maxSize) - { - commandList.removeFirst(); - } - } - - /** - * Resets maximum size of command queue. Cuts off extra commands. - * - * @param maxSize maximum size for the command queue - */ - void setMaxSize(int maxSize) - { - this.maxSize = maxSize; - - while (maxSize < commandList.size()) - { - commandList.removeFirst(); - } - } - - /** - * Resets instance. - * - * @param maxSize maximum size for the command queue - */ - void reset(int maxSize) - { - this.maxSize = maxSize; - commandList = new LinkedList(); - } - - public static void main(String[] args) throws Exception - { - CommandHistory h = new CommandHistory(4); - - h.addCommand("a"); - h.addCommand("b"); - h.addCommand("c"); - h.addCommand("d"); - - System.out.println(h.getCommandUp()); - System.out.println(h.getCommandUp()); - System.out.println(h.getCommandUp()); - System.out.println(h.getCommandUp()); - System.out.println(h.getCommandUp()); - System.out.println(h.getCommandUp()); - - System.out.println("******"); - System.out.println(h.getCommandDown()); - System.out.println(h.getCommandDown()); - System.out.println(h.getCommandDown()); - System.out.println(h.getCommandDown()); - System.out.println(h.getCommandDown()); - System.out.println(h.getCommandDown()); - System.out.println(h.getCommandDown()); - - - h.setMaxSize(2); - - - System.out.println(h.getCommandUp()); - System.out.println(h.getCommandUp()); - System.out.println(h.getCommandUp()); - System.out.println(h.getCommandUp()); - System.out.println(h.getCommandUp()); - System.out.println(h.getCommandUp()); - - System.out.println("******"); - System.out.println(h.getCommandDown()); - System.out.println(h.getCommandDown()); - System.out.println(h.getCommandDown()); - System.out.println(h.getCommandDown()); - System.out.println(h.getCommandDown()); - System.out.println(h.getCommandDown()); - System.out.println(h.getCommandDown()); - } - -} Modified: trunk/Jmol/src/org/openscience/jmol/app/ScriptWindow.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/ScriptWindow.java 2006-09-17 18:27:15 UTC (rev 5583) +++ trunk/Jmol/src/org/openscience/jmol/app/ScriptWindow.java 2006-09-17 20:18:19 UTC (rev 5584) @@ -46,6 +46,7 @@ import java.util.Vector; import org.jmol.i18n.GT; +import org.jmol.util.CommandHistory; import org.jmol.util.Logger; public final class ScriptWindow extends JDialog Modified: trunk/Jmol/test/org/jmol/util/AllTests.java =================================================================== --- trunk/Jmol/test/org/jmol/util/AllTests.java 2006-09-17 18:27:15 UTC (rev 5583) +++ trunk/Jmol/test/org/jmol/util/AllTests.java 2006-09-17 20:18:19 UTC (rev 5584) @@ -31,6 +31,7 @@ public static Test suite() { TestSuite suite = new TestSuite("Test for org.jmol.util"); //$JUnit-BEGIN$ + suite.addTestSuite(TestCommandHistory.class); suite.addTestSuite(TestIntInt2ObjHash.class); suite.addTestSuite(TestInt2ObjHash.class); //$JUnit-END$ Added: trunk/Jmol/test/org/jmol/util/TestCommandHistory.java =================================================================== --- trunk/Jmol/test/org/jmol/util/TestCommandHistory.java (rev 0) +++ trunk/Jmol/test/org/jmol/util/TestCommandHistory.java 2006-09-17 20:18:19 UTC (rev 5584) @@ -0,0 +1,93 @@ +/* $RCSfile$ + * $Author$ + * $Date$ + * $Revision$ + * + * Copyright (C) 2005 The Jmol Development Team + * + * Contact: jmo...@li... + * + * This library 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. + * + * This library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +package org.jmol.util; + +import junit.framework.TestCase; + +/** + * JUnit tests for CommandHistory + */ +public class TestCommandHistory extends TestCase { + + /** + * Constructor for tests. + * + * @param arg0 Test name. + */ + public TestCommandHistory(String arg0) { + super(arg0); + } + + /** + * Simple test of CommandHistory. + */ + public void testHistory() { + + // Initialisation of command history + CommandHistory h = new CommandHistory(4); + h.addCommand("a"); + h.addCommand("b"); + h.addCommand("c"); + h.addCommand("d"); + + // Testing getCommandUp() + assertEquals("d", h.getCommandUp()); + assertEquals("c", h.getCommandUp()); + assertEquals("b", h.getCommandUp()); + assertEquals("a", h.getCommandUp()); + assertEquals("" , h.getCommandUp()); + assertEquals("d", h.getCommandUp()); + + // Testing getCommandDown() + assertEquals("" , h.getCommandDown()); + assertEquals("a", h.getCommandDown()); + assertEquals("b", h.getCommandDown()); + assertEquals("c", h.getCommandDown()); + assertEquals("d", h.getCommandDown()); + assertEquals("" , h.getCommandDown()); + assertEquals("a", h.getCommandDown()); + + // Modifying history size + h.setMaxSize(2); + + // Testing getCommandUp() + assertEquals("" , h.getCommandUp()); + assertEquals("d", h.getCommandUp()); + assertEquals("c", h.getCommandUp()); + assertEquals("" , h.getCommandUp()); + assertEquals("d", h.getCommandUp()); + assertEquals("c", h.getCommandUp()); + + // Testing getCommandDown(); + assertEquals("d", h.getCommandDown()); + assertEquals("" , h.getCommandDown()); + assertEquals("c", h.getCommandDown()); + assertEquals("d", h.getCommandDown()); + assertEquals("" , h.getCommandDown()); + assertEquals("c", h.getCommandDown()); + assertEquals("d", h.getCommandDown()); + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-09-19 18:30:53
|
Revision: 5606 http://svn.sourceforge.net/jmol/?rev=5606&view=rev Author: nicove Date: 2006-09-19 11:30:12 -0700 (Tue, 19 Sep 2006) Log Message: ----------- Update of itext library Modified Paths: -------------- trunk/Jmol/.classpath trunk/Jmol/build.xml trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Added Paths: ----------- trunk/Jmol/jars/itext-1.4.5.jar Removed Paths: ------------- trunk/Jmol/jars/itext-0.94.jar Modified: trunk/Jmol/.classpath =================================================================== --- trunk/Jmol/.classpath 2006-09-19 16:05:23 UTC (rev 5605) +++ trunk/Jmol/.classpath 2006-09-19 18:30:12 UTC (rev 5606) @@ -10,7 +10,7 @@ <classpathentry kind="lib" path="jars/vecmath1.2-1.14.jar"/> <classpathentry kind="lib" path="jars/Acme.jar"/> <classpathentry kind="lib" path="jars/commons-cli-1.0.jar"/> - <classpathentry kind="lib" path="jars/itext-0.94.jar"/> + <classpathentry kind="lib" path="jars/itext-1.4.5.jar"/> <classpathentry kind="lib" path="screensaver/jars/saverbeans-api.jar"/> <classpathentry kind="lib" path="jars/junit.jar"/> <classpathentry kind="output" path="bin"/> Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2006-09-19 16:05:23 UTC (rev 5605) +++ trunk/Jmol/build.xml 2006-09-19 18:30:12 UTC (rev 5606) @@ -31,7 +31,7 @@ <property name="docbook-xsl" value="docbook-xsl-1.71.0" /> <property name="docbook-xml" value="docbook-xml-4.4" /> <property name="vecmath.jar" value="vecmath1.2-1.14.jar" /> - <property name="itext.jar" value="itext-0.94.jar" /> + <property name="itext.jar" value="itext-1.4.5.jar" /> <property name="commons-cli.jar" value="commons-cli-1.0.jar" /> <!-- you can set this by defining it in ~/.jmol.build.properties --> Deleted: trunk/Jmol/jars/itext-0.94.jar =================================================================== (Binary files differ) Added: trunk/Jmol/jars/itext-1.4.5.jar =================================================================== (Binary files differ) Property changes on: trunk/Jmol/jars/itext-1.4.5.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-09-19 16:05:23 UTC (rev 5605) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-09-19 18:30:12 UTC (rev 5606) @@ -1282,7 +1282,7 @@ exportChooser.setAccessory(null); int retval = exportChooser.showSaveDialog(Jmol.this); - if (retval == 0) { + if (retval == JFileChooser.APPROVE_OPTION) { File file = exportChooser.getSelectedFile(); if (file != null) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |