From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Thu, 16 Aug 2018 02:11:55 +0000 (-0500)
Subject: Java2Script 3.2.2_04 fixes Clazz._exceptionOf P$ issue
X-Git-Tag: Release_2_11_4_0~45^2~18^2~489
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1fc8c5636e8f9f98b24011d588e14c594ddb1ce6;p=jalview.git

Java2Script 3.2.2_04 fixes Clazz._exceptionOf P$ issue
---

diff --git a/.classpath b/.classpath
index aba05fb..5fe0354 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
+	<!-- classpathentry kind="src" path="test"/  -->
 	<classpathentry kind="src" path="src2"/>
 	<classpathentry kind="src" path="utils"/>
 	<classpathentry kind="lib" path="lib/activation.jar"/>
diff --git a/build-libjs.xml b/build-libjs.xml
index ef8847a..d8edc9f 100644
--- a/build-libjs.xml
+++ b/build-libjs.xml
@@ -7,13 +7,13 @@
     xmlns:unless="ant:unless">
 
   	<!-- inputs directories -->
-    <property name="resourceDir" value="resources" />  	
-  	<property name="libjsDir" value="libjs"/>
-    <property name="swingjsDir" value="swingjs"/>
+    <property name="resource.dir" value="resources" />  	
+  	<property name="libjs.dir" value="libjs"/>
+    <property name="swingjs.dir" value="swingjs"/>
 	<!-- output directories -->
-  	<property name="site" value="site"/>
-  	<property name="j2sDir" value="${site}/swingjs/j2s"/>
-  	<property name="libjsDir" value="libjs"/>
+  	<property name="site.dir" value="site"/>
+  	<property name="j2s.dir" value="${site.dir}/swingjs/j2s"/>
+  	<property name="libjs.dir" value="libjs"/>
 
 	<target name="zipall" depends="zipvarna,zipmig,zipjson">
 		
@@ -22,35 +22,35 @@
 
   <target name="zipvarna">
     <!-- VARNA -->
-	    <property name="varna.zip" value="${libjsDir}/VARNA-site.zip" />	  	  	
+	    <property name="varna.zip" value="${libjs.dir}/VARNA-site.zip" />	  	  	
 	  	<echo> Zipping up ${varna.zip} </echo>
-	  	<zip destfile="${varna.zip}" basedir="${site}" includes="fr_*.html,swingjs/j2s/fr/**" />
+	  	<zip destfile="${varna.zip}" basedir="${site.dir}" includes="fr_*.html,swingjs/j2s/fr/**" />
 	</target>
 
 	<target name="zipmig">
 		  <!-- net.miginfo.com MiGLayout -->
-		    <property name="mig.zip" value="${libjsDir}/MiGLayout-site.zip" />	  	  	
+		    <property name="mig.zip" value="${libjs.dir}/MiGLayout-site.zip" />	  	  	
 		  	<echo> Zipping up ${mig.zip} </echo>
-		  	<zip destfile="${mig.zip}" basedir="${site}" includes="swingjs/j2s/net/miginfocom/**" />
+		  	<zip destfile="${mig.zip}" basedir="${site.dir}" includes="swingjs/j2s/net/miginfocom/**" />
 	</target>
 
-	<!-- log4j minimal implementation is in jalview/javascript
+	<target name="zipjson">
+		  <!-- org.json.simple -->
+		    <property name="json.zip" value="${libjs.dir}/jsonsimple-site.zip" />	  	  	
+		  	<echo> Zipping up ${json.zip} </echo>
+		  	<zip destfile="${json.zip}" basedir="${site.dir}" includes="swingjs/j2s/org/json/**" />
+	</target>
+
+	<!-- log4j minimal implementation is already in jalview/javascript
 	      and is mapped from org.apache.log4j by the following .j2s line:
 	      
 	      j2s.class.replacements=org.apache.log4j.->jalview.javascript.log4j.
 	       
 	<target name="ziplog4j">
 		  <!- org.apache.log4j ->
-		    <property name="log4j.zip" value="${libjsDir}/log4j-site.zip" />	  	  	
+		    <property name="log4j.zip" value="${libjs.dir}/log4j-site.zip" />	  	  	
 		  	<echo> Zipping up ${log4j.zip} </echo>
-		  	<zip destfile="${log4j.zip}" basedir="${site}" includes="swingjs/j2s/org/apache/log4j/**" />
+		  	<zip destfile="${log4j.zip}" basedir="${site.dir}" includes="swingjs/j2s/org/apache/log4j/**" />
 	</target>
     -->
-	<target name="zipjson">
-		  <!-- org.json.simple -->
-		    <property name="json.zip" value="${libjsDir}/jsonsimple-site.zip" />	  	  	
-		  	<echo> Zipping up ${json.zip} </echo>
-		  	<zip destfile="${json.zip}" basedir="${site}" includes="swingjs/j2s/org/json/**" />
-	</target>
-
 </project>
diff --git a/build-site.xml b/build-site.xml
index edd9e5e..b2d88e2 100644
--- a/build-site.xml
+++ b/build-site.xml
@@ -5,13 +5,13 @@
  - requires tools/ant-contrib.jar
   
  - creates the site/ directory if it does not exist
- - unzip libjs *.zip into site/swingjs/j2s
- - unzips SwingJS-site.zip into site/
- - copies non-java resources into site/swingjs/j2s
+ - unzip libjs/*.zip into site/swingjs/j2s
+ - unzips swingjs/SwingJS-site.zip into site/
+ - copies non-java resources from resources/ into site/swingjs/j2s
  
 -->
 
-<project name="jalviewX" default="tosite" basedir="."
+<project name="swingjs-project" default="tosite" basedir="."
  xmlns:if="ant:if"
     xmlns:unless="ant:unless">
 	
diff --git a/libjs/MiGLayout-site.zip b/libjs/MiGLayout-site.zip
index 08819f2..51aba46 100644
Binary files a/libjs/MiGLayout-site.zip and b/libjs/MiGLayout-site.zip differ
diff --git a/libjs/VARNA-site.zip b/libjs/VARNA-site.zip
index a3ead5a..3dff86e 100644
Binary files a/libjs/VARNA-site.zip and b/libjs/VARNA-site.zip differ
diff --git a/libjs/jsonsimple-site.zip b/libjs/jsonsimple-site.zip
index b97e5e3..927ac87 100644
Binary files a/libjs/jsonsimple-site.zip and b/libjs/jsonsimple-site.zip differ
diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index 368075a..0472109 100644
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/net.sf.j2s.core.jar b/swingjs/net.sf.j2s.core.jar
index 65c2aa7..d10f0bf 100644
Binary files a/swingjs/net.sf.j2s.core.jar and b/swingjs/net.sf.j2s.core.jar differ
diff --git a/swingjs/timestamp b/swingjs/timestamp
index 91f58f0..a6e5252 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1 @@
-20180812000030 
+20180815190959 
diff --git a/swingjs/ver/3.2.2/SwingJS-site.zip b/swingjs/ver/3.2.2/SwingJS-site.zip
index 368075a..0472109 100644
Binary files a/swingjs/ver/3.2.2/SwingJS-site.zip and b/swingjs/ver/3.2.2/SwingJS-site.zip differ
diff --git a/swingjs/ver/3.2.2/net.sf.j2s.core.jar b/swingjs/ver/3.2.2/net.sf.j2s.core.jar
index 65c2aa7..d10f0bf 100644
Binary files a/swingjs/ver/3.2.2/net.sf.j2s.core.jar and b/swingjs/ver/3.2.2/net.sf.j2s.core.jar differ
diff --git a/swingjs/ver/3.2.2/timestamp b/swingjs/ver/3.2.2/timestamp
index 91f58f0..a6e5252 100644
--- a/swingjs/ver/3.2.2/timestamp
+++ b/swingjs/ver/3.2.2/timestamp
@@ -1 +1 @@
-20180812000030 
+20180815190959