From: <ha...@us...> - 2013-10-17 15:35:30
|
Revision: 18804 http://sourceforge.net/p/jmol/code/18804 Author: hansonr Date: 2013-10-17 15:35:23 +0000 (Thu, 17 Oct 2013) Log Message: ----------- javajs integrated into Jmol Modified Paths: -------------- trunk/Jmol/src/org/jmol/awtjs2d/Mouse.java trunk/Jmol/src/org/jmol/exportjs/JSExporter.java trunk/Jmol/src/org/jmol/i18n/GT.java trunk/Jmol/src/org/jmol/i18n/Resource.java trunk/Jmol/src/org/jmol/io2/ZipUtil.java trunk/Jmol/src/org/jmol/modelset/Group.java trunk/Jmol/src/org/jmol/util/Geodesic.java trunk/Jmol/src/org/jmol/util/Logger.java trunk/Jmol/src/org/jmol/util/Normix.java trunk/Jmol/src/org/jmol/viewer/JC.java trunk/Jmol/src/org/jmol/viewer/StateManager.java trunk/Jmol/src/org/jmol/viewer/Viewer.java Added Paths: ----------- trunk/Jmol/src/javajs/J2SIgnoreImport.java trunk/Jmol/src/javajs/J2SRequireImport.java Removed Paths: ------------- trunk/Jmol/src/org/jmol/util/J2SIgnoreImport.java trunk/Jmol/src/org/jmol/util/J2SRequireImport.java Copied: trunk/Jmol/src/javajs/J2SIgnoreImport.java (from rev 18796, trunk/Jmol/src/org/jmol/util/J2SIgnoreImport.java) =================================================================== --- trunk/Jmol/src/javajs/J2SIgnoreImport.java (rev 0) +++ trunk/Jmol/src/javajs/J2SIgnoreImport.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -0,0 +1,7 @@ +package javajs; + +public @interface J2SIgnoreImport { + + Class<?>[] value(); + +} Copied: trunk/Jmol/src/javajs/J2SRequireImport.java (from rev 18796, trunk/Jmol/src/org/jmol/util/J2SRequireImport.java) =================================================================== --- trunk/Jmol/src/javajs/J2SRequireImport.java (rev 0) +++ trunk/Jmol/src/javajs/J2SRequireImport.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -0,0 +1,7 @@ +package javajs; + +public @interface J2SRequireImport { + + Class<?>[] value(); + +} Modified: trunk/Jmol/src/org/jmol/awtjs2d/Mouse.java =================================================================== --- trunk/Jmol/src/org/jmol/awtjs2d/Mouse.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/awtjs2d/Mouse.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -33,8 +33,9 @@ import org.jmol.api.PlatformViewer; import org.jmol.script.T; import org.jmol.util.Escape; -import org.jmol.util.J2SRequireImport; import org.jmol.util.Logger; + +import javajs.J2SRequireImport; import javajs.vec.V3; import org.jmol.viewer.Viewer; Modified: trunk/Jmol/src/org/jmol/exportjs/JSExporter.java =================================================================== --- trunk/Jmol/src/org/jmol/exportjs/JSExporter.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/exportjs/JSExporter.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -32,8 +32,9 @@ import org.jmol.java.BS; import org.jmol.util.GData; -import org.jmol.util.J2SRequireImport; import org.jmol.util.JmolFont; + +import javajs.J2SRequireImport; import javajs.vec.P3; import javajs.vec.Tuple3f; import javajs.vec.V3; Modified: trunk/Jmol/src/org/jmol/i18n/GT.java =================================================================== --- trunk/Jmol/src/org/jmol/i18n/GT.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/i18n/GT.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -28,7 +28,8 @@ import java.util.Hashtable; import java.util.Map; -import org.jmol.util.J2SRequireImport; +import javajs.J2SRequireImport; + import org.jmol.util.Logger; /** Modified: trunk/Jmol/src/org/jmol/i18n/Resource.java =================================================================== --- trunk/Jmol/src/org/jmol/i18n/Resource.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/i18n/Resource.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -3,9 +3,10 @@ import java.util.Locale; import java.util.ResourceBundle; +import javajs.J2SIgnoreImport; + import org.jmol.util.Txt; -import org.jmol.util.J2SIgnoreImport; import org.jmol.util.Logger; @J2SIgnoreImport({java.util.ResourceBundle.class,java.util.Locale.class}) Modified: trunk/Jmol/src/org/jmol/io2/ZipUtil.java =================================================================== --- trunk/Jmol/src/org/jmol/io2/ZipUtil.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/io2/ZipUtil.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -32,6 +32,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.StringReader; + +import javajs.J2SIgnoreImport; import javajs.util.List; import java.util.Hashtable; @@ -56,7 +58,6 @@ import org.jmol.util.Txt; import org.jmol.viewer.FileManager; -import org.jmol.util.J2SIgnoreImport; @J2SIgnoreImport({java.io.BufferedOutputStream.class, java.util.zip.ZipOutputStream.class}) public class ZipUtil implements JmolZipUtility { Modified: trunk/Jmol/src/org/jmol/modelset/Group.java =================================================================== --- trunk/Jmol/src/org/jmol/modelset/Group.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/modelset/Group.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -24,13 +24,13 @@ package org.jmol.modelset; +import javajs.J2SRequireImport; import javajs.array.ArrayUtil; import org.jmol.util.BSUtil; import javajs.util.List; import org.jmol.util.Logger; import javajs.vec.P3; import org.jmol.util.Quaternion; -import org.jmol.util.J2SRequireImport; import javajs.vec.V3; import org.jmol.viewer.JC; import org.jmol.constant.EnumStructure; Modified: trunk/Jmol/src/org/jmol/util/Geodesic.java =================================================================== --- trunk/Jmol/src/org/jmol/util/Geodesic.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/util/Geodesic.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -27,6 +27,7 @@ import java.util.Hashtable; import java.util.Map; +import javajs.J2SRequireImport; import javajs.vec.V3; /** Deleted: trunk/Jmol/src/org/jmol/util/J2SIgnoreImport.java =================================================================== --- trunk/Jmol/src/org/jmol/util/J2SIgnoreImport.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/util/J2SIgnoreImport.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -1,7 +0,0 @@ -package org.jmol.util; - -public @interface J2SIgnoreImport { - - Class<?>[] value(); - -} Deleted: trunk/Jmol/src/org/jmol/util/J2SRequireImport.java =================================================================== --- trunk/Jmol/src/org/jmol/util/J2SRequireImport.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/util/J2SRequireImport.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -1,7 +0,0 @@ -package org.jmol.util; - -public @interface J2SRequireImport { - - Class<?>[] value(); - -} Modified: trunk/Jmol/src/org/jmol/util/Logger.java =================================================================== --- trunk/Jmol/src/org/jmol/util/Logger.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/util/Logger.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -28,7 +28,9 @@ import java.util.Hashtable; import java.util.Map; +import javajs.J2SIgnoreImport; + /** * Logger mechanism. */ Modified: trunk/Jmol/src/org/jmol/util/Normix.java =================================================================== --- trunk/Jmol/src/org/jmol/util/Normix.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/util/Normix.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -24,6 +24,7 @@ package org.jmol.util; +import javajs.J2SRequireImport; import javajs.vec.V3; import org.jmol.java.BS; Modified: trunk/Jmol/src/org/jmol/viewer/JC.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JC.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/viewer/JC.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -26,9 +26,10 @@ import org.jmol.script.T; import org.jmol.util.Elements; -import org.jmol.util.J2SRequireImport; import org.jmol.util.Logger; import org.jmol.util.Parser; + +import javajs.J2SRequireImport; import javajs.lang.SB; import org.jmol.util.Txt; import javajs.vec.V3; Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -41,9 +41,9 @@ import org.jmol.util.Escape; import org.jmol.util.BSUtil; -import org.jmol.util.J2SIgnoreImport; import org.jmol.util.Logger; +import javajs.J2SIgnoreImport; import javajs.vec.Matrix3f; import javajs.vec.P3; import javajs.lang.SB; Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-10-17 15:31:39 UTC (rev 18803) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-10-17 15:35:23 UTC (rev 18804) @@ -86,6 +86,8 @@ import org.jmol.constant.EnumStructure; import org.jmol.constant.EnumStereoMode; import org.jmol.constant.EnumVdw; + +import javajs.J2SIgnoreImport; import javajs.array.ArrayUtil; import org.jmol.util.BSUtil; import org.jmol.util.BoxInfo; @@ -96,7 +98,6 @@ import javajs.awt.Dimension; import org.jmol.util.Elements; import org.jmol.util.Escape; -import org.jmol.util.J2SIgnoreImport; import org.jmol.util.JmolFont; import org.jmol.util.GData; import org.jmol.util.JmolMolecule; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |