Skip to content

Commit 8011928

Browse files
hansonrhansonr
hansonr
authored and
hansonr
committed
refactoring J2SInterface; removing "_" in filenames
1 parent 72cef74 commit 8011928

37 files changed

+469
-849
lines changed

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

780 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-
20180821150349
1+
20180822113443

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

780 Bytes
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20180821150349
1+
20180822113443

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

780 Bytes
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/java/awt/geom/Path2D.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,6 @@ public abstract class Path2D implements Shape, Cloneable {
143143
abstract int rectCrossings(double rxmin, double rymin,
144144
double rxmax, double rymax);
145145

146-
/**
147-
* SwingJS j2s compiler error requires that inner classes be declared prior to use
148-
* *
149-
*/
150146
static abstract class Iterator implements PathIterator {
151147
int typeIdx;
152148
int pointIdx;

‎sources/net.sf.j2s.java.core/src/java/lang/Class.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2339,10 +2339,10 @@ public InputStream getResourceAsStream(String name) {
23392339
} catch (e) {
23402340
return null;
23412341
}
2342-
var fileCache = J2S._getSetJavaFileCache(null);
2342+
var fileCache = J2S.getSetJavaFileCache(null);
23432343
var data = fileCache && fileCache.get$O(javapath);
23442344
if (!data)
2345-
data = J2S._getFileData(fname.toString(),null,1,1);
2345+
data = J2S.getFileData(fname.toString(),null,1,1);
23462346
23472347
if (data == null || data == "error" || data.indexOf && data.indexOf("[Exception") == 0)
23482348
return null;

‎sources/net.sf.j2s.java.core/src/java/net/URL.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ public final InputStream openStream() throws IOException {
10991099

11001100
/**
11011101
* same as openStream(), except here we might get string buffer data, not
1102-
* bytes, since we will call J2S._doAjax(false), not J2S._doAjax(true), which
1102+
* bytes, since we will call J2S.doAjax(false), not J2S.doAjax(true), which
11031103
* will only return binary data for known binary file types (see j2sApplet)
11041104
*
11051105
* @return input stream

‎sources/net.sf.j2s.java.core/src/java/package.js‎

Lines changed: 0 additions & 340 deletions
This file was deleted.

‎sources/net.sf.j2s.java.core/src/javajs/api/js/J2SObjectInterface.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package javajs.api.js;
22

33
/**
4-
* methods in JSmol JavaScript accessed in Jmol
4+
* methods in JSmol JavaScript accessed in Jmol
55
*/
66
public interface J2SObjectInterface {
77

8-
Object _doAjax(Object url, String postOut, Object bytesOrStringOut, boolean isBinary);
8+
Object doAjax(String url, String postOut, Object bytesOrStringOut, boolean isBinary);
99

10-
void _apply(Object func, Object data);
10+
void applyFunc(Object func, Object data);
1111

1212
}

0 commit comments

Comments
 (0)