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

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

diff --git a/site/j2s/jalview/appletgui/RotatableCanvas.js b/site/j2s/jalview/appletgui/RotatableCanvas.js
index 5e61dea..ea77229 100644 (file)
--- a/site/j2s/jalview/appletgui/RotatableCanvas.js
+++ b/site/j2s/jalview/appletgui/RotatableCanvas.js
@@ -1,5 +1,5 @@
 Clazz.declarePackage ("jalview.appletgui");
-Clazz.load (["awt2swing.Panel", "jalview.api.RotatableCanvasI", "java.awt.event.KeyListener", "$.MouseListener", "$.MouseMotionListener", "jalview.math.RotatableMatrix"], "jalview.appletgui.RotatableCanvas", ["jalview.appletgui.PaintRefresher", "jalview.datamodel.SequenceGroup", "jalview.util.Format", "$.MessageManager", "java.awt.Color", "$.Dimension", "$.Font"], function () {
+Clazz.load (["awt2swing.Panel", "jalview.api.RotatableCanvasI", "java.awt.event.KeyListener", "$.MouseListener", "$.MouseMotionListener", "jalview.math.RotatableMatrix"], "jalview.appletgui.RotatableCanvas", ["awt2swing.Util", "jalview.appletgui.PaintRefresher", "jalview.datamodel.SequenceGroup", "jalview.util.Format", "$.MessageManager", "java.awt.Color", "$.Dimension", "$.Font"], function () {
 c$ = Clazz.decorateAsClass (function () {
 this.idmat = null;
 this.objmat = null;
@@ -173,7 +173,7 @@ Clazz.defineMethod (c$, "PaintComponent",
 function (g) {
 if (this.points == null) {
 g.setFont ( new java.awt.Font ("Verdana", 0, 18));
-g.drawString (jalview.util.MessageManager.getString ("label.calculating_pca") + "....", 20, Clazz.doubleToInt (this.getSize ().height / 2));
+awt2swing.Util.drawString (g, jalview.util.MessageManager.getString ("label.calculating_pca") + "....", 20, Clazz.doubleToInt (this.getSize ().height / 2));
 } else {
 if ((this.img == null) || (this.prefsize.width != this.getSize ().width) || (this.prefsize.height != this.getSize ().height)) {
 this.prefsize.width = this.getSize ().width;
@@ -187,7 +187,7 @@ if (this.$drawAxes == true) {
 this.drawAxes (this.ig);
 }if (this.tooltip != null) {
 this.ig.setColor (java.awt.Color.red);
-this.ig.drawString (this.tooltip, this.toolx, this.tooly);
+awt2swing.Util.drawString (this.ig, this.tooltip, this.toolx, this.tooly);
 }g.drawImage (this.img, 0, 0, this);
 }}, "java.awt.Graphics");
 Clazz.defineMethod (c$, "drawAxes", 
@@ -223,7 +223,7 @@ g.setColor (g.getColor ().darker ());
 }g.fillRect (x - 3, y - 3, 6, 6);
 if (this.$showLabels) {
 g.setColor (java.awt.Color.red);
-g.drawString ((this.points.elementAt (i)).sequence.getName (), x - 3, y - 4);
+awt2swing.Util.drawString (g, (this.points.elementAt (i)).sequence.getName (), x - 3, y - 4);
 }}
 }, "java.awt.Graphics");
 Clazz.defineMethod (c$, "minimumsize",