Skip to content

Commit 5c2fc48

Browse files
BobHansonBobHanson
committed
updated _j2sclasslist.txt; better closure
1 parent ca00318 commit 5c2fc48

File tree

3 files changed

+90
-78
lines changed

3 files changed

+90
-78
lines changed

‎sources/net.sf.j2s.java.core/_j2sclasslist.txt‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ java/awt/GraphicsCallback.js
7272
java/awt/GraphicsConfiguration.js
7373
java/awt/GraphicsDevice.js
7474
java/awt/GraphicsEnvironment.js
75+
java/awt/Image.js
7576
java/awt/image/ImageObserver.js
7677
java/awt/Insets.js
7778
java/awt/ItemSelectable.js
@@ -125,6 +126,9 @@ java/lang/ThreadGroup.js
125126
java/math/RoundingMode.js
126127
java/net/URL.js
127128
java/net/URLStreamHandlerFactory.js
129+
java/net/HttpURLConnection.js
130+
java/net/URLStreamHandler.js
131+
javax/net/ssl/HttpsUrlConnection.js
128132
java/text/CharacterIterator.js
129133
java/text/DecimalFormat.js
130134
java/text/DecimalFormatSymbols.js
@@ -173,8 +177,8 @@ javajs/util/AU.js
173177
javajs/util/JSThread.js
174178
javajs/util/Lst.js
175179
javajs/util/PT.js
180+
javajs/util/Rdr.js
176181
javajs/util/SB.js
177-
javax/net/ssl/HttpsUrlConnection.js
178182
javax/swing/AbstractAction.js
179183
javax/swing/AbstractButton.js
180184
javax/swing/AbstractListModel.js
@@ -189,6 +193,7 @@ javax/swing/border/CompoundBorder.js
189193
javax/swing/border/EmptyBorder.js
190194
javax/swing/border/EtchedBorder.js
191195
javax/swing/border/LineBorder.js
196+
javax/swing/border/TitledBorder.js
192197
javax/swing/BorderFactory.js
193198
javax/swing/BoundedRangeModel.js
194199
javax/swing/BoxLayout.js
@@ -221,6 +226,8 @@ javax/swing/LayoutFocusTraversalPolicy.js
221226
javax/swing/SortingFocusTraversalPolicy.js
222227
javax/swing/SwingContainerOrderFocusTraversalPolicy.js
223228
javax/swing/SwingDefaultFocusTraversalPolicy.js
229+
javax/swing/Icon.js
230+
javax/swing/ImageIcon.js
224231
javax/swing/InputMap.js
225232
javax/swing/JApplet.js
226233
javax/swing/JButton.js
@@ -317,6 +324,10 @@ sun/awt/RequestFocusController.js
317324
sun/awt/SunToolkit.js
318325
sun/awt/WindowClosingListener.js
319326
sun/awt/WindowClosingSupport.js
327+
sun/awt/image/DataStealer.js
328+
sun/awt/image/IntegerComponentRaster.js
329+
sun/awt/image/IntegerInterleavedRaster.js
330+
sun/awt/image/SunWritableRaster.js
320331
sun/font/FontDesignMetrics.js
321332
sun/swing/DefaultLookup.js
322333
sun/swing/SwingLazyValue.js
@@ -348,6 +359,8 @@ swingjs/JSFrameViewer.js
348359
swingjs/JSGraphics2D.js
349360
swingjs/JSGraphicsConfiguration.js
350361
swingjs/JSGraphicsEnvironment.js
362+
swingjs/JSImage.js
363+
swingjs/JSImagekit.js
351364
swingjs/JSMouse.js
352365
swingjs/JSNullComponentPeer.js
353366
swingjs/JSScreenDevice.js

‎sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ var getZOrders = function(z) {
123123
window.J2S = J2S = (function() {
124124
var z = J2S.z || 9000;
125125
var j = {
126-
clazzGlobals: {},
127-
setClazzGlobal: function(a, v) { J2S.clazzGlobals[a] = v },
128-
getClazzGlobal: function(a) { return J2S.clazzGlobals[a] },
126+
Globals: {},
127+
setGlobal: function(a, v) { J2S.Globals[a] = v },
128+
getGlobal: function(a) { return J2S.Globals[a] },
129129

130130
_alertNoBinary : true,
131131
_allowedAppletSize : [ 25, 2048, 500 ], // min, max, default
@@ -1015,8 +1015,8 @@ console.log("J2S._getRawDataFromServer " + J2S._serverUrl + " for " + query);
10151015
format || (format = "string");
10161016
var id = "filereader" + ("" + Math.random()).split(".")[1]
10171017
var nfiles = 1;
1018-
var map = (format == "java.util.Map" ? Clazz.new_(Clazz.load("java.util.Hashtable")) : null);
1019-
var arr = (format == "java.util.Array" ? Clazz.array(Clazz.new_(Clazz.load("java.io.File")), [0]) : null);
1018+
var map = (format == "java.util.Map" ? Clazz.new_("java.util.Hashtable") : null);
1019+
var arr = (format == "java.util.Array" ? Clazz.array(Clazz.new_("java.io.File"), [0]) : null);
10201020
var isMultiple = !!(map || arr);
10211021
var readFiles = function(files) {
10221022
nfiles = files.length;
@@ -1152,7 +1152,7 @@ console.log("J2S._getRawDataFromServer " + J2S._serverUrl + " for " + query);
11521152
.indexOf(".jpeg") >= 0 ? "image/jpg"
11531153
: ""));
11541154
var isString = (typeof data == "string");
1155-
data = Clazz.load("javajs.util.Base64").getBase64$BA(
1155+
data = Clazz.loadClass("javajs.util.Base64").getBase64$BA(
11561156
isString ? data.getBytes$S("UTF-8") : data).toString();
11571157
encoding || (encoding = "base64");
11581158
var url = J2S._serverUrl;
@@ -1199,7 +1199,7 @@ console.log("J2S._getRawDataFromServer " + J2S._serverUrl + " for " + query);
11991199
if (Clazz.instanceOf(s, self.ArrayBuffer))
12001200
return J2S._toBytes(s);
12011201
if (s.indexOf(";base64,") == 0) {
1202-
return Clazz.load("javajs.util.Base64").decodeBase64$S(
1202+
return Clazz.loadClass("javajs.util.Base64").decodeBase64$S(
12031203
s.substring(8));
12041204
}
12051205
// not UTF-8
@@ -2231,7 +2231,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
22312231
// but it will be only a URL, not an actual file.
22322232

22332233

2234-
Clazz.load("swingjs.JSDnD")
2234+
Clazz.loadClass("swingjs.JSDnD")
22352235
.drop$javax_swing_JComponent$O$S$BA$I$I(comp,
22362236
oe.dataTransfer, null, null, x, y);
22372237
return;
@@ -2250,7 +2250,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
22502250
arr.push([name, bytes]);
22512251
System.out.println("j2sApplet DnD kind=" + kind + " type=" + type + " name=" + name + " size="+ bytes.length);
22522252
if (--nfiles == 0) {
2253-
Clazz.load("swingjs.JSDnD")
2253+
Clazz.loadClass("swingjs.JSDnD")
22542254
.drop$javax_swing_JComponent$O$OAA$I$I(comp, oe.dataTransfer, arr, x, y);
22552255
}
22562256
}
@@ -2577,7 +2577,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
25772577
}
25782578

25792579
proto._setupJS = function() {
2580-
J2S.setClazzGlobal("j2s.lib", {
2580+
J2S.setGlobal("j2s.lib", {
25812581
base : this._j2sPath + "/",
25822582
alias : ".",
25832583
console : this._console,
@@ -2603,7 +2603,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
26032603
if (J2S._version.indexOf("$Date: ") == 0)
26042604
J2S._version = (J2S._version.substring(7) + " -").split(" -")[0]
26052605
+ " (J2S)";
2606-
Clazz.load("java.lang.Class");
2606+
Clazz.loadClass("java.lang.Class");
26072607
J2S._registerApplet(applet._id, applet);
26082608
if (!applet.__Info.args || applet.__Info.args == "?") {
26092609
if (J2S._appArgs)
@@ -2621,7 +2621,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
26212621
applet.__Info.code = clazz;
26222622
}
26232623

2624-
var cl = Clazz.load(clazz);Clazz.load(cl,2);
2624+
var cl = Clazz.loadClass(clazz);
26252625
if (clazz.indexOf("_.") == 0)
26262626
J2S.setWindowVar(clazz.substring(2), cl);
26272627
if (isApp && cl.j2sHeadless)
@@ -2636,8 +2636,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
26362636
System.exit$(0);
26372637
} else {
26382638

2639-
var viewerOptions = Clazz.new_(Clazz
2640-
.load("java.util.Hashtable"));
2639+
var viewerOptions = Clazz.new_("java.util.Hashtable");
26412640
viewerOptions.put = viewerOptions.put$TK$TV;
26422641
J2S._setAppletParams(applet._availableParams,
26432642
viewerOptions, applet.__Info, true);
@@ -2814,9 +2813,9 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
28142813
+ id)
28152814
}
28162815
image.src = (typeof bytes == "string" ? bytes : "data:"
2817-
+ Clazz.load("javajs.util.Rdr")
2816+
+ Clazz.loadClass("javajs.util.Rdr")
28182817
.guessMimeTypeForBytes$BA(bytes) + ";base64,"
2819-
+ Clazz.load("javajs.util.Base64").getBase64$BA(bytes));
2818+
+ Clazz.loadClass("javajs.util.Base64").getBase64$BA(bytes));
28202819
}
28212820
var width = image.width;
28222821
var height = image.height;

0 commit comments

Comments
 (0)