From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Thu, 4 Apr 2019 21:35:40 +0000 (-0500)
Subject: Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into... 
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~174
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=02cd62bf5796571c15a9d42774291bfa74b6b31c;hp=aac9e5a2d05c6947c237f84a3a4b9dcdf956ceec;p=jalview.git

Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into Jalview-JS/develop
---

diff --git a/src/com/stevesoft/pat/wrap/RandomAccessFileWrap.java b/src/com/stevesoft/pat/wrap/RandomAccessFileWrap.java
index 66a1014..d4411b9 100755
--- a/src/com/stevesoft/pat/wrap/RandomAccessFileWrap.java
+++ b/src/com/stevesoft/pat/wrap/RandomAccessFileWrap.java
@@ -63,6 +63,7 @@ public class RandomAccessFileWrap implements StringLike
     this.raf = raf;
   }
 
+  @Override
   public char charAt(int i)
   {
     if (i >= i0 && i < iend)
@@ -96,11 +97,13 @@ public class RandomAccessFileWrap implements StringLike
                 Integer.valueOf(iend).toString() }));
   }
 
+  @Override
   public String toString()
   {
     throw new Error(MessageManager.getString("error.not_implemented"));
   }
 
+  @Override
   public int length()
   {
     try
@@ -117,6 +120,7 @@ public class RandomAccessFileWrap implements StringLike
     }
   }
 
+  @Override
   public String substring(int i1, int i2)
   {
     StringBuffer sb = new StringBuffer();
@@ -127,11 +131,18 @@ public class RandomAccessFileWrap implements StringLike
     return sb.toString();
   }
 
+  @Override
   public Object unwrap()
   {
     return raf;
   }
 
+  /**
+   * @j2sIgnore
+   * 
+   * @param files
+   * @throws IOException
+   */
   public static void main(String[] files) throws IOException
   {
     for (int i = 0; i < files.length; i++)
@@ -159,11 +170,13 @@ public class RandomAccessFileWrap implements StringLike
     }
   }
 
+  @Override
   public BasicStringBufferLike newStringBufferLike()
   {
     return new StringBufferWrap();
   }
 
+  @Override
   public int indexOf(char c)
   {
     for (int i = 0; i < length(); i++)
diff --git a/src/jalview/gui/AnnotationColumnChooser.java b/src/jalview/gui/AnnotationColumnChooser.java
index 8046902..fbc93b5 100644
--- a/src/jalview/gui/AnnotationColumnChooser.java
+++ b/src/jalview/gui/AnnotationColumnChooser.java
@@ -25,6 +25,7 @@ import jalview.datamodel.HiddenColumns;
 import jalview.io.cache.JvCacheableInputBox;
 import jalview.schemes.AnnotationColourGradient;
 import jalview.util.MessageManager;
+import jalview.util.Platform;
 import jalview.viewmodel.annotationfilter.AnnotationFilterParameter;
 
 import java.awt.BorderLayout;
@@ -88,11 +89,8 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
 
   private HiddenColumns oldHiddenColumns;
 
-  // J2SHIDDENCODE
-  protected static int MIN_WIDTH = (/** @j2sNative 370||*/420);
-
-  // J2SHIDDENCODE
-  protected static int MIN_HEIGHT = (/** @j2sNative 370||*/430);
+  protected static int MIN_WIDTH = (Platform.isJS() ? 370 : 420);
+  protected static int MIN_HEIGHT = (Platform.isJS() ? 370 : 430);
 
   public AnnotationColumnChooser(AlignViewport av, final AlignmentPanel ap)
   {
diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index 6c6d9f5..b6dc997 100644
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/timestamp b/swingjs/timestamp
index 6860e8b..ef6e255 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1 @@
-20190403175448 
+20190404154041 
diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip
index 6c6d9f5..b6dc997 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 6860e8b..ef6e255 100644
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20190403175448 
+20190404154041