Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git

[jalviewjs.git] / site / swingjs / j2s / swingjs / JSFontMetrics.js

diff --git a/site/swingjs/j2s/swingjs/JSFontMetrics.js b/site/swingjs/j2s/swingjs/JSFontMetrics.js
index 0fc2e9b..cd4440e 100644 (file)
--- a/site/swingjs/j2s/swingjs/JSFontMetrics.js
+++ b/site/swingjs/j2s/swingjs/JSFontMetrics.js
@@ -1,59 +1,59 @@
-Clazz.declarePackage ("swingjs");\r
-Clazz.load (["java.awt.FontMetrics"], "swingjs.JSFontMetrics", ["swingjs.JSToolkit"], function () {\r
-c$ = Clazz.decorateAsClass (function () {\r
-this.widths = null;\r
-this.iwidths = null;\r
-Clazz.instantialize (this, arguments);\r
-}, swingjs, "JSFontMetrics", java.awt.FontMetrics);\r
-Clazz.makeConstructor (c$, \r
-function () {\r
-Clazz.superConstructor (this, swingjs.JSFontMetrics, [null]);\r
-});\r
-Clazz.defineMethod (c$, "setFont", \r
-function (f) {\r
-this.font = f;\r
-}, "java.awt.Font");\r
-Clazz.overrideMethod (c$, "getLeading", \r
-function () {\r
-return Clazz.doubleToInt (this.font.getSize () / 20) + 1;\r
-});\r
-Clazz.overrideMethod (c$, "getAscent", \r
-function () {\r
-return this.font.getSize ();\r
-});\r
-Clazz.overrideMethod (c$, "getDescent", \r
-function () {\r
-return Clazz.doubleToInt (this.font.getSize () / 4) + 1;\r
-});\r
-Clazz.defineMethod (c$, "charWidth", \r
-function (pt) {\r
-return (pt.charCodeAt (0) < 256 ? Clazz.floatToInt (this.getWidthsFloat ()[pt.charCodeAt (0)]) : this.stringWidth ("" + pt));\r
-}, "~S");\r
-Clazz.defineMethod (c$, "charWidth", \r
-function (pt) {\r
-return (pt < 256 ? Clazz.floatToInt (this.getWidthsFloat ()[pt]) : this.stringWidth ("" + String.fromCharCode (pt)));\r
-}, "~N");\r
-Clazz.overrideMethod (c$, "stringWidth", \r
-function (s) {\r
-return Clazz.floatToInt (swingjs.JSToolkit.getStringWidth (null, this.font, s));\r
-}, "~S");\r
-Clazz.overrideMethod (c$, "getWidths", \r
-function () {\r
-if (this.iwidths != null) return this.iwidths;\r
-this.iwidths =  Clazz.newIntArray (256, 0);\r
-this.getWidthsFloat ();\r
-for (var ch = 0; ch < 256; ch++) {\r
-this.iwidths[ch] = Clazz.floatToInt (this.widths[ch]);\r
-}\r
-return this.iwidths;\r
-});\r
-Clazz.defineMethod (c$, "getWidthsFloat", \r
-function () {\r
-if (this.widths != null) return this.widths;\r
-this.widths =  Clazz.newFloatArray (256, 0);\r
-for (var ch = 0; ch < 256; ch++) {\r
-this.widths[ch] = swingjs.JSToolkit.getStringWidth (null, this.font, "" + String.fromCharCode (ch));\r
-}\r
-return this.widths;\r
-});\r
-});\r
+Clazz.declarePackage ("swingjs");
+Clazz.load (["java.awt.FontMetrics"], "swingjs.JSFontMetrics", ["swingjs.JSToolkit"], function () {
+c$ = Clazz.decorateAsClass (function () {
+this.widths = null;
+this.iwidths = null;
+Clazz.instantialize (this, arguments);
+}, swingjs, "JSFontMetrics", java.awt.FontMetrics);
+Clazz.makeConstructor (c$, 
+function () {
+Clazz.superConstructor (this, swingjs.JSFontMetrics, [null]);
+});
+Clazz.defineMethod (c$, "setFont", 
+function (f) {
+this.font = f;
+}, "java.awt.Font");
+Clazz.overrideMethod (c$, "getLeading", 
+function () {
+return Clazz.doubleToInt (this.font.getSize () / 20) + 1;
+});
+Clazz.overrideMethod (c$, "getAscent", 
+function () {
+return this.font.getSize ();
+});
+Clazz.overrideMethod (c$, "getDescent", 
+function () {
+return Clazz.doubleToInt (this.font.getSize () / 4) + 1;
+});
+Clazz.defineMethod (c$, "charWidth", 
+function (pt) {
+return (pt.charCodeAt (0) < 256 ? Clazz.floatToInt (this.getWidthsFloat ()[pt.charCodeAt (0)]) : this.stringWidth ("" + pt));
+}, "~S");
+Clazz.defineMethod (c$, "charWidth", 
+function (pt) {
+return (pt < 256 ? Clazz.floatToInt (this.getWidthsFloat ()[pt]) : this.stringWidth ("" + String.fromCharCode (pt)));
+}, "~N");
+Clazz.overrideMethod (c$, "stringWidth", 
+function (s) {
+return Clazz.floatToInt (swingjs.JSToolkit.getStringWidth (null, this.font, s));
+}, "~S");
+Clazz.overrideMethod (c$, "getWidths", 
+function () {
+if (this.iwidths != null) return this.iwidths;
+this.iwidths =  Clazz.newIntArray (256, 0);
+this.getWidthsFloat ();
+for (var ch = 0; ch < 256; ch++) {
+this.iwidths[ch] = Clazz.floatToInt (this.widths[ch]);
+}
+return this.iwidths;
+});
+Clazz.defineMethod (c$, "getWidthsFloat", 
+function () {
+if (this.widths != null) return this.widths;
+this.widths =  Clazz.newFloatArray (256, 0);
+for (var ch = 0; ch < 256; ch++) {
+this.widths[ch] = swingjs.JSToolkit.getStringWidth (null, this.font, "" + String.fromCharCode (ch));
+}
+return this.widths;
+});
+});