JAL-1807 - Bob's last(?) before leaving Dundee -- adds fast file loading

[jalviewjs.git] / site / j2s / jalview / appletgui / SeqCanvas.js

diff --git a/site/j2s/jalview/appletgui/SeqCanvas.js b/site/j2s/jalview/appletgui/SeqCanvas.js
index faa6bae..1d1a64d 100644 (file)
--- a/site/j2s/jalview/appletgui/SeqCanvas.js
+++ b/site/j2s/jalview/appletgui/SeqCanvas.js
@@ -1,5 +1,5 @@
 Clazz.declarePackage ("jalview.appletgui");
-Clazz.load (["awt2swing.Panel"], "jalview.appletgui.SeqCanvas", ["jalview.appletgui.AnnotationPanel", "$.FeatureRenderer", "$.PaintRefresher", "$.SequenceRenderer", "jalview.util.Comparison", "java.awt.Color"], function () {
+Clazz.load (["awt2swing.Panel"], "jalview.appletgui.SeqCanvas", ["awt2swing.Util", "jalview.appletgui.AnnotationPanel", "$.FeatureRenderer", "$.PaintRefresher", "$.SequenceRenderer", "jalview.util.Comparison", "java.awt.Color"], function () {
 c$ = Clazz.decorateAsClass (function () {
 this.fr = null;
 this.sr = null;
@@ -54,7 +54,7 @@ for (var i = scalestartx; i < endx; i += 10) {
 var value = i;
 if (this.av.hasHiddenColumns ()) {
 value = this.av.getColumnSelection ().adjustForHiddenColumns (value);
-}g.drawString (String.valueOf (value), (i - startx - 1) * this.avcharWidth, ypos - (Clazz.doubleToInt (this.avcharHeight / 2)));
+}awt2swing.Util.drawString (g, String.valueOf (value), (i - startx - 1) * this.avcharWidth, ypos - (Clazz.doubleToInt (this.avcharHeight / 2)));
 g.drawLine (((i - startx - 1) * this.avcharWidth) + (Clazz.doubleToInt (this.avcharWidth / 2)), (ypos + 2) - (Clazz.doubleToInt (this.avcharHeight / 2)), ((i - startx - 1) * this.avcharWidth) + (Clazz.doubleToInt (this.avcharWidth / 2)), ypos - 2);
 }
 }, "java.awt.Graphics,~N,~N,~N");
@@ -81,7 +81,7 @@ break;
 }
 if (value != -1) {
 var x = this.LABEL_WEST - fm.stringWidth (String.valueOf (value)) - Clazz.doubleToInt (this.avcharWidth / 2);
-g.drawString (value + "", x, (ypos + (i * this.avcharHeight)) - (Clazz.doubleToInt (this.avcharHeight / 5)));
+awt2swing.Util.drawString (g, value + "", x, (ypos + (i * this.avcharHeight)) - (Clazz.doubleToInt (this.avcharHeight / 5)));
 }}
 }, "java.awt.Graphics,~N,~N,~N");
 Clazz.defineMethod (c$, "drawEastScale", 
@@ -102,7 +102,7 @@ continue;
 break;
 }
 if (value != -1) {
-g.drawString (String.valueOf (value), 0, (ypos + (i * this.avcharHeight)) - (Clazz.doubleToInt (this.avcharHeight / 5)));
+awt2swing.Util.drawString (g, String.valueOf (value), 0, (ypos + (i * this.avcharHeight)) - (Clazz.doubleToInt (this.avcharHeight / 5)));
 }}
 }, "java.awt.Graphics,~N,~N,~N");
 Clazz.defineMethod (c$, "fastPaint",