git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
577b0bf
)
j2sNative cleanup; fix for JTextArea preferred height miscalculation
author
hansonr
<hansonr@STO24954W.ad.stolaf.edu>
Thu, 4 Apr 2019 21:31:44 +0000
(16:31 -0500)
committer
hansonr
<hansonr@STO24954W.ad.stolaf.edu>
Thu, 4 Apr 2019 21:31:44 +0000
(16:31 -0500)
src/com/stevesoft/pat/wrap/RandomAccessFileWrap.java
patch
|
blob
|
history
src/jalview/gui/AnnotationColumnChooser.java
patch
|
blob
|
history
swingjs/SwingJS-site.zip
patch
|
blob
|
history
swingjs/timestamp
patch
|
blob
|
history
swingjs/ver/3.2.4/SwingJS-site.zip
patch
|
blob
|
history
swingjs/ver/3.2.4/timestamp
patch
|
blob
|
history
diff --git
a/src/com/stevesoft/pat/wrap/RandomAccessFileWrap.java
b/src/com/stevesoft/pat/wrap/RandomAccessFileWrap.java
index
66a1014
..
d4411b9
100755
(executable)
--- 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;
}
this.raf = raf;
}
+ @Override
public char charAt(int i)
{
if (i >= i0 && i < iend)
public char charAt(int i)
{
if (i >= i0 && i < iend)
@@
-96,11
+97,13
@@
public class RandomAccessFileWrap implements StringLike
Integer.valueOf(iend).toString() }));
}
Integer.valueOf(iend).toString() }));
}
+ @Override
public String toString()
{
throw new Error(MessageManager.getString("error.not_implemented"));
}
public String toString()
{
throw new Error(MessageManager.getString("error.not_implemented"));
}
+ @Override
public int length()
{
try
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();
public String substring(int i1, int i2)
{
StringBuffer sb = new StringBuffer();
@@
-127,11
+131,18
@@
public class RandomAccessFileWrap implements StringLike
return sb.toString();
}
return sb.toString();
}
+ @Override
public Object unwrap()
{
return raf;
}
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++)
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();
}
public BasicStringBufferLike newStringBufferLike()
{
return new StringBufferWrap();
}
+ @Override
public int indexOf(char c)
{
for (int i = 0; i < length(); i++)
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
(file)
--- 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.io.cache.JvCacheableInputBox;
import jalview.schemes.AnnotationColourGradient;
import jalview.util.MessageManager;
+import jalview.util.Platform;
import jalview.viewmodel.annotationfilter.AnnotationFilterParameter;
import java.awt.BorderLayout;
import jalview.viewmodel.annotationfilter.AnnotationFilterParameter;
import java.awt.BorderLayout;
@@
-88,11
+89,8
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
private HiddenColumns oldHiddenColumns;
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)
{
public AnnotationColumnChooser(AlignViewport av, final AlignmentPanel ap)
{
diff --git
a/swingjs/SwingJS-site.zip
b/swingjs/SwingJS-site.zip
index
6c6d9f5
..
b6dc997
100644
(file)
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
(file)
--- 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
(file)
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
(file)
--- a/
swingjs/ver/3.2.4/timestamp
+++ b/
swingjs/ver/3.2.4/timestamp
@@
-1
+1
@@
-20190403175448
+20190404154041