[Jmol-commits] SF.net SVN: jmol: [5579] trunk/Jmol

[<ni...@us...>]

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.