Skip to content

java.nio work: Files, FileSystem, ByteChannel, FileChannel, Charset, ByteBuffer, CharBuffer #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BobHanson merged 22 commits into from
Jan 3, 2019
Merged

java.nio work: Files, FileSystem, ByteChannel, FileChannel, Charset, ByteBuffer, CharBuffer #98

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e7ae08c
missing JSSlider default font from HTML5LookAndFeel
Dec 29, 2018
58efdd9
allows error report for EventDispatchThread TypeError
Dec 29, 2018
844bd92
revising getMinimumSize/getPreferredSize/getMaximumSize defaults and use
Dec 29, 2018
3a59a35
fixes CSS "monospace" not "monospaced"
Dec 29, 2018
806843f
more getMin/getPref/getMax UI revisions
Dec 29, 2018
123b827
JEditorPaneUI key/mouse UI working; still no JScrollPane action
Dec 29, 2018
5a130f7
java.nio.file.Files,.Path,.FileSystem support -- preliminary
Jan 1, 2019
064474c
JSDnD upgrade; JEditorPane, JTextPane initial support
Jan 1, 2019
54029d9
removing unused JSFileChannel
Jan 3, 2019
ec8dfb8
removing ThreadLocal references
Jan 3, 2019
f0190a2
java.nio.ByteBuffer, CharBuffer
Jan 3, 2019
0b71303
Charset support
Jan 3, 2019
8a33a93
Java 9 String static fields and methods as java.lang.String9
Jan 3, 2019
703d997
java.nio.Files support, including swingjs.JSFileSystem
Jan 3, 2019
b56d3d0
Transpiler 3.2.4.06 fixes problem with Java 9 multiple resource
Jan 3, 2019
c08568f
String.getBytes(b, Charset.forName(...))
Jan 3, 2019
4ed689d
JTextPane, JEditorPane testing
Jan 3, 2019
de5630a
GBK Charset dump code
Jan 3, 2019
3d1d1f1
reverse compiler
Jan 3, 2019
50e01d6
gitignore for site1
Jan 3, 2019
08adf75
SwingJS 3.2.4.06 includes transpiler fix for try(res1,res2)
Jan 3, 2019
d881ab6
Merge pull request #80 from BobHanson/hanson1
BobHanson Jan 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Transpiler 3.2.4.06 fixes problem with Java 9 multiple resource
  • Loading branch information
hansonr authored and hansonr committed Jan 3, 2019
commit b56d3d082bcb26a167dd8a1663f0e46cc3f32e67
3 changes: 2 additions & 1 deletion sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public class CorePlugin extends Plugin {
* register the bundle version properly. So we use VERSION here instead.
*
*/
public static String VERSION = "3.2.4.05";
public static String VERSION = "3.2.4.06";
// BH 1/2/2019 -- 3.2.4.06 fixes try(resources) with more than one resource missing semicolon
// BH 12/13/2018 -- 3.2.4.05 fixes problem with OuterClass.this.foo() not using .apply()
// BH 11/10/2018 -- 3.2.4.04 additional support for JAXB
// BH 11/4/2018 -- 3.2.4.02 broad JAXB support
Expand Down
7 changes: 4 additions & 3 deletions sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,6 +1419,7 @@ public boolean visit(TryStatement node) {
ASTNode resource = resources.get(i);
if (resource instanceof VariableDeclarationExpression) {
resource.accept(this);
buffer.append(";");
} else {
// Java 9 -- just a Name.
buffer.append("/* Java 9 resource " + resource + "*/\r\n");
Expand Down Expand Up @@ -4560,13 +4561,13 @@ private String getFinalInnerClassList(String javaClassName) {
String s = getFinalInnerClassList(javaClassName);
if (doCache) {
Integer n = package_htIncludeNames.get(s);
if (n != null)
return "$I$(" + n + ")";
if (!s.endsWith("Exception'")) {
if (n == null && !s.endsWith("Exception'")) {
// count starts at 1, because i$[0] is the list
package_htIncludeNames.put(s, n = new Integer(++package_includeCount[0]));
package_includes.append(package_includeCount[0] == 1 ? ",I$=[[0," : ",").append(s);
}
if (n != null)
return "$I$(" + n + ")";
}
return "Clazz.load(" + s + ")";
}
Expand Down