Skip to content

Commit b40f114

Browse files
hansonrhansonr
hansonr
authored and
hansonr
committed
fix for class resource loading with missing class
1 parent beb9cea commit b40f114

File tree

8 files changed

+5
-8
lines changed

8 files changed

+5
-8
lines changed

‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎

5 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190424222411
1+
20190425142129

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip‎

5 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190424222411
1+
20190425142129

‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎

5 Bytes
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/java/util/ResourceBundle.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2407,7 +2407,7 @@ public ResourceBundle newBundle(String baseName, Locale locale, String format, O
24072407
String bundleName = toBundleName(baseName, locale);
24082408
ResourceBundle bundle = null;
24092409
if (format.equals("java.class")) {
2410-
bundle = (ResourceBundle) Interface.getInstance(bundleName, false);
2410+
bundle = (ResourceBundle) Interface.getInstance(bundleName, true);
24112411
// try {
24122412
// Class<? extends ResourceBundle> bundleClass
24132413
// = (Class<? extends ResourceBundle>)loader.loadClass(bundleName);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2535,7 +2535,7 @@ Clazz._4Name = function(clazzName, applet, state, asClazz, initialize, isQuiet)
25352535
}
25362536
var cl = evalType(clazzName);
25372537
if (!cl){
2538-
if (isQuiet)
2538+
if (isQuiet || Clazz._isQuiet)
25392539
return null;
25402540
alert(clazzName + " could not be loaded");
25412541
doDebugger();

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12288,9 +12288,6 @@ if (!target) {
1228812288

1228912289
if (xym) {
1229012290
xym.push(scroll < 0 ? -1 : 1)
12291-
12292-
System.out.println("j2sApplet " + xym);
12293-
1229412291
who.applet._processEvent(507, xym, ev, who._frameViewer);
1229512292
}
1229612293
return !!(ui || target);
@@ -16187,7 +16184,7 @@ Clazz._4Name = function(clazzName, applet, state, asClazz, initialize, isQuiet)
1618716184
}
1618816185
var cl = evalType(clazzName);
1618916186
if (!cl){
16190-
if (isQuiet)
16187+
if (isQuiet || Clazz._isQuiet)
1619116188
return null;
1619216189
alert(clazzName + " could not be loaded");
1619316190
doDebugger();

0 commit comments

Comments
 (0)