X Tutup
Skip to content

Commit 866e73b

Browse files
committed
refactored run-time Clazz methods; Jama -> gov.nist.jama
1 parent 0aaa901 commit 866e73b

File tree

10 files changed

+259
-223
lines changed

10 files changed

+259
-223
lines changed

sources/net.sf.j2s.core/test/dev/js/SJSApplet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ if (typeof(SwingJS) == "undefined") {
224224
this._viewerOptions = viewerOptions;
225225
// for now assigning this._applet here instead of in readyCallback
226226
Clazz.loadClass("swingjs.JSAppletViewer");
227-
this._appletPanel = Clazz.new(swingjs.JSAppletViewer.c$$java_util_Hashtable, [viewerOptions]);
227+
this._appletPanel = Clazz.new_(swingjs.JSAppletViewer.c$$java_util_Hashtable, [viewerOptions]);
228228
this._appletPanel.start();
229229
}
230230

sources/net.sf.j2s.core/test/dev/js/j2sApplet.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,17 +1699,19 @@ J2S.Cache.put = function(filename, data) {
16991699
// apps. So this will take some thinking. But the basic idea is that
17001700
// core file to load is
17011701

1702-
type = type.toLowerCase().split(".")[0]; // package name only
1703-
1704-
// return if type is already part of the set.
1705-
if (__coreSet.join("").indexOf(type) >= 0) return;
1706-
1707-
// create a concatenated lower-case name for a core file that includes
1708-
// all Java applets on the page
1709-
1710-
__coreSet.push(type);
1711-
__coreSet.sort();
1712-
J2S._coreFiles = [path + "/core/core" + __coreSet.join("") + ".z.js" ];
1702+
if (type) {
1703+
type = type.toLowerCase().split(".")[0]; // package name only
1704+
1705+
// return if type is already part of the set.
1706+
if (__coreSet.join("").indexOf(type) >= 0) return;
1707+
1708+
// create a concatenated lower-case name for a core file that includes
1709+
// all Java applets on the page
1710+
1711+
__coreSet.push(type);
1712+
__coreSet.sort();
1713+
J2S._coreFiles = [path + "/core/core" + __coreSet.join("") + ".z.js" ];
1714+
}
17131715
if (more && (more = more.split(" ")))
17141716
for (var i = 0; i < more.length; i++)
17151717
if (__coreMore.join("").indexOf(more[i]) < 0)
@@ -1901,7 +1903,7 @@ J2S.Cache.put = function(filename, data) {
19011903
if (applet.__Info.main && applet.__Info.headless) {
19021904
cl.main(applet.__Info.args || []);
19031905
} else {
1904-
var viewerOptions = Clazz.new(Clazz.load("java.util.Hashtable"));
1906+
var viewerOptions = Clazz.new_(Clazz.load("java.util.Hashtable"));
19051907
viewerOptions.put = viewerOptions.put$TK$TV;
19061908
J2S._setAppletParams(applet._availableParams, viewerOptions, applet.__Info, true);
19071909
viewerOptions.put("name", applet._id);// + "_object");
@@ -2204,8 +2206,7 @@ J2S._setDraggable = function(tag, targetOrArray) {
22042206
pageX0 = xy.x;
22052207
pageY0 = xy.y;
22062208
return false;
2207-
};
2208-
2209+
},
22092210
drag = function(ev) {
22102211
// we will move the frame's parent node and take the frame along with it
22112212
if (tag.isDragging && J2S._dmouseOwner == tag) {
@@ -2217,8 +2218,7 @@ J2S._setDraggable = function(tag, targetOrArray) {
22172218
$(target()).css({ top: y + 'px', left: x + 'px' })
22182219
}
22192220
}
2220-
};
2221-
2221+
},
22222222
up = function(ev) {
22232223
if (J2S._dmouseOwner == tag) {
22242224
tag.isDragging = false;

0 commit comments

Comments
 (0)
X Tutup