From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Tue, 4 Dec 2018 08:31:45 +0000 (-0600)
Subject: SwingJS upgrade -- tables smoother, faster; more to do?
X-Git-Tag: Release_2_11_4_0~45^2~18^2~359
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b8ca8662f13663b2349b4c20d944899c3b624a55;p=jalview.git

SwingJS upgrade -- tables smoother, faster; more to do?

Still a problem with FeatureTypeSettings not responding to color chooser
OK properly. (Color is not setting.)
---

diff --git a/build-site.xml b/build-site.xml
index b2d88e2..29f2745 100644
--- a/build-site.xml
+++ b/build-site.xml
@@ -28,9 +28,12 @@
   	<!-- location of third-party jar contents as precompiled zipped .js files to copy to site/ -->
   	<property name="libjs.dir" value="libjs" />
  
-  	<!-- non-Java resources to copy to site/ -->
+  	<!-- non-Java resources to copy to site/swingjs/j2s -->
     <property name="resource.dir" value="resources" />  	
   	
+  	<!-- non-Java resources to copy to site/ -->
+    <property name="site-resource.dir" value="site-resources" />  	
+  	
 	<!-- output directories -->
 
   	<property name="site.dir" value="site" />
@@ -75,6 +78,13 @@
   	</fileset>
     </copy>
       		
+  	<echo> Copying ${site-resource.dir} files into ${site.dir} </echo>
+  	<copy todir="${site.dir}">
+      <fileset dir="${site-resource.dir}">
+      	<include name="**"/>
+  	</fileset>
+    </copy>
+      		
 </target>
 	
 
diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index 04e8568..bee9d83 100644
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/timestamp b/swingjs/timestamp
index f084faf..00a8235 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1 @@
-20181126062738 
+20181204022550 
diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip
index 04e8568..bee9d83 100644
Binary files a/swingjs/ver/3.2.4/SwingJS-site.zip and b/swingjs/ver/3.2.4/SwingJS-site.zip differ
diff --git a/swingjs/ver/3.2.4/timestamp b/swingjs/ver/3.2.4/timestamp
index f084faf..00a8235 100644
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20181126062738 
+20181204022550