Skip to content

Commit 92abe09

Browse files
author
Andrew Lee
committed
Minimal patches to ensure j2s.core still exports
Made minimal edits in ASTScriptVisitor.java (Reverted Udos changes in commit bc64252 [6/22/17[)
1 parent 381cfb6 commit 92abe09

File tree

5 files changed

+32
-36
lines changed

5 files changed

+32
-36
lines changed

‎dist/plugins/net.sf.j2s.core_3.1.1.jar‎

2.43 KB
Binary file not shown.

‎sources/net.sf.j2s.ajax/.j2s‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
1-
#<<<<<<< HEAD
2-
#Java2Script Configuration
3-
#Fri Jul 17 23:11:27 CST 2009
4-
j2s.abandoned.resources.list=bin/net/sf/j2s/ajax/AjaxPlugin.js,bin/net/sf/j2s/ajax/AJAXVariableInitializer.js
5-
j2s.compiler.abbreviation=true
6-
j2s.compiler.status=enable
7-
j2s.compiler.abbreviation.prefix=$_
8-
j2s.compiler.mode=debug
9-
j2s.resources.list=../../plugins/net.sf.j2s.lib_3.1.1/j2slib/java.runtime.j2x,bin/net/sf/j2s/ajax/XHRCallbackSWTAdapter.js,bin/net/sf/j2s/ajax/XHRCallbackAdapter.js,bin/net/sf/j2s/ajax/IXHRCallback.js,bin/net/sf/j2s/ajax/HttpRequest.js,bin/net/sf/j2s/ajax/AClass.js,bin/net/sf/j2s/ajax/ASWTClass.js,bin/net/sf/j2s/ajax/ARunnable.js,bin/net/sf/j2s/ajax/Base64.js,bin/net/sf/j2s/ajax/SimpleSerializable.js,bin/net/sf/j2s/ajax/SimpleRPCRunnable.js,bin/net/sf/j2s/ajax/SimpleRPCHttpServlet.js,bin/net/sf/j2s/ajax/SimpleRPCRequest.js,bin/net/sf/j2s/ajax/SimpleRPCSWTRequest.js,bin/net/sf/j2s/ajax/SimpleFilter.js,bin/net/sf/j2s/ajax/SimplePipeHelper.js,bin/net/sf/j2s/ajax/SimplePipeHttpServlet.js,bin/net/sf/j2s/ajax/SimplePipeRPCHttpServlet.js,bin/net/sf/j2s/ajax/SimplePipeRequest.js,bin/net/sf/j2s/ajax/SimplePipeRunnable.js,bin/net/sf/j2s/ajax/SimplePipeSWTRequest.js,bin/net/sf/j2s/ajax/CompoundPipeRunnable.js,bin/net/sf/j2s/ajax/PipeManager.js,bin/net/sf/j2s/ajax/PipeObject.js,bin/net/sf/j2s/ajax/CompoundPipeRequest.js,bin/net/sf/j2s/ajax/CompoundSerializable.js,bin/net/sf/j2s/ajax/CompoundPipeSWTRequest.js,bin/net/sf/j2s/ajax/CompoundPipeSession.js,bin/net/sf/j2s/ajax/CompoundPipeRPCHttpServlet.js,bin/net/sf/j2s/ajax/SWTHelper.js,bin/net/sf/j2s/ajax/AWindowRunnable.js,bin/net/sf/j2s/ajax/AWindowDelegate.js,bin/net/sf/j2s/ajax/ISimplePipePriority.js,bin/net/sf/j2s/annotation/J2SIgnore.js,bin/net/sf/j2s/annotation/J2SIngoreSuperConstructor.js,bin/net/sf/j2s/annotation/J2SKeep.js,bin/net/sf/j2s/annotation/J2SOverride.js,bin/net/sf/j2s/annotation/J2SDebug.js,bin/net/sf/j2s/annotation/J2SIgnoreImport.js,bin/net/sf/j2s/annotation/J2SRequireImport.js,bin/net/sf/j2s/annotation/J2SOptionalImport.js,bin/net/sf/j2s/annotation/J2SNative.js,bin/net/sf/j2s/annotation/J2SNativeSrc.js,bin/net/sf/j2s/annotation/J2SSuffix.js,bin/net/sf/j2s/annotation/J2SPrefix.js,bin/net/sf/j2s/store/IStore.js,bin/net/sf/j2s/store/SimpleStore.js,bin/net/sf/j2s/store/CookieStore.js,bin/net/sf/j2s/store/INIFileStore.js,bin/net/sf/j2s/store/XSSCookieStore.js,bin/net/sf/j2s/ajax/ManagedCompoundPipeRunnable.js,bin/net/sf/j2s/ajax/ManagedCompoundPipeSession.js,bin/net/sf/j2s/ajax/ManagedPipeHelper.js,bin/net/sf/j2s/ajax/IManagedPipe.js
10-
j2s.compiler.whitespace=false
11-
j2s.output.path=bin
12-
j2s.compiler.linebreak=\r\n
13-
#=======
141
#Java2Script Configuration
15-
#Tue Jun 27 12:46:23 CEST 2017
16-
#j2s.resources.list=
17-
#j2s.abandoned.resources.list=
18-
#j2s.output.path=bin
19-
#j2s.compiler.status=enable
20-
#>>>>>>> master
2+
#Wed Jul 05 11:01:01 CDT 2017
3+
j2s.abandoned.resources.list=bin/net/sf/j2s/ajax/AjaxPlugin.js,bin/net/sf/j2s/ajax/AJAXVariableInitializer.js
4+
j2s.compiler.abbreviation=true
5+
j2s.compiler.status=enable
6+
j2s.compiler.abbreviation.prefix=$_
7+
j2s.compiler.mode=debug
8+
j2s.resources.list=../../plugins/net.sf.j2s.lib_3.1.1/j2slib/java.runtime.j2x,bin/net/sf/j2s/ajax/XHRCallbackSWTAdapter.js,bin/net/sf/j2s/ajax/XHRCallbackAdapter.js,bin/net/sf/j2s/ajax/IXHRCallback.js,bin/net/sf/j2s/ajax/HttpRequest.js,bin/net/sf/j2s/ajax/AClass.js,bin/net/sf/j2s/ajax/ASWTClass.js,bin/net/sf/j2s/ajax/ARunnable.js,bin/net/sf/j2s/ajax/Base64.js,bin/net/sf/j2s/ajax/SimpleSerializable.js,bin/net/sf/j2s/ajax/SimpleRPCRunnable.js,bin/net/sf/j2s/ajax/SimpleRPCHttpServlet.js,bin/net/sf/j2s/ajax/SimpleRPCRequest.js,bin/net/sf/j2s/ajax/SimpleRPCSWTRequest.js,bin/net/sf/j2s/ajax/SimpleFilter.js,bin/net/sf/j2s/ajax/SimplePipeHelper.js,bin/net/sf/j2s/ajax/SimplePipeHttpServlet.js,bin/net/sf/j2s/ajax/SimplePipeRPCHttpServlet.js,bin/net/sf/j2s/ajax/SimplePipeRequest.js,bin/net/sf/j2s/ajax/SimplePipeRunnable.js,bin/net/sf/j2s/ajax/SimplePipeSWTRequest.js,bin/net/sf/j2s/ajax/CompoundPipeRunnable.js,bin/net/sf/j2s/ajax/PipeManager.js,bin/net/sf/j2s/ajax/PipeObject.js,bin/net/sf/j2s/ajax/CompoundPipeRequest.js,bin/net/sf/j2s/ajax/CompoundSerializable.js,bin/net/sf/j2s/ajax/CompoundPipeSWTRequest.js,bin/net/sf/j2s/ajax/CompoundPipeSession.js,bin/net/sf/j2s/ajax/CompoundPipeRPCHttpServlet.js,bin/net/sf/j2s/ajax/SWTHelper.js,bin/net/sf/j2s/ajax/AWindowRunnable.js,bin/net/sf/j2s/ajax/AWindowDelegate.js,bin/net/sf/j2s/ajax/ISimplePipePriority.js,bin/net/sf/j2s/annotation/J2SIgnore.js,bin/net/sf/j2s/annotation/J2SIngoreSuperConstructor.js,bin/net/sf/j2s/annotation/J2SKeep.js,bin/net/sf/j2s/annotation/J2SOverride.js,bin/net/sf/j2s/annotation/J2SDebug.js,bin/net/sf/j2s/annotation/J2SIgnoreImport.js,bin/net/sf/j2s/annotation/J2SRequireImport.js,bin/net/sf/j2s/annotation/J2SOptionalImport.js,bin/net/sf/j2s/annotation/J2SNative.js,bin/net/sf/j2s/annotation/J2SNativeSrc.js,bin/net/sf/j2s/annotation/J2SSuffix.js,bin/net/sf/j2s/annotation/J2SPrefix.js,bin/net/sf/j2s/store/IStore.js,bin/net/sf/j2s/store/SimpleStore.js,bin/net/sf/j2s/store/CookieStore.js,bin/net/sf/j2s/store/INIFileStore.js,bin/net/sf/j2s/store/XSSCookieStore.js,bin/net/sf/j2s/ajax/ManagedCompoundPipeRunnable.js,bin/net/sf/j2s/ajax/ManagedCompoundPipeSession.js,bin/net/sf/j2s/ajax/ManagedPipeHelper.js,bin/net/sf/j2s/ajax/IManagedPipe.js
9+
j2s.compiler.whitespace=false
10+
j2s.output.path=bin
11+
j2s.compiler.linebreak=\r\n

‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -685,20 +685,25 @@ public boolean visit(ClassInstanceCreation node) {
685685
buffer.append(")");
686686
} else {
687687
ITypeBinding binding = node.resolveTypeBinding();
688-
// BEGIN MERGE 7/5/17 (Pulled from java2script/java2script Commit bc6425216b915bd9b4ad6111c8bb9f24fa666277)
689-
// String anonClassName = null;
690-
// if (binding.isAnonymous() || binding.isLocal()) {
691-
// String binaryName = binding.getBinaryName();
692-
// if (binaryName == null) {
693-
// String bindingKey = binding.getKey();
694-
// if (bindingKey != null) {
695-
// binaryName = bindingKey = bindingKey.substring(1, bindingKey.length() - 1).replace('/', '.');
696-
// }
697-
// }
698-
// anonClassName = assureQualifiedName(shortenQualifiedName(binaryName));
699-
// } else {
700-
// anonClassName = assureQualifiedName(shortenQualifiedName(binding.getQualifiedName()));
701-
// }
688+
// BEGIN MERGE 7/5/17 (Removed in java2script/java2script Commit bc6425216b915bd9b4ad6111c8bb9f24fa666277 [6/22/17])
689+
// need to retain because without it we get the following error when exporting
690+
// 89. ERROR in .../java2script/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java (at line 750)
691+
// buffer.append(anonClassName);
692+
// ^^^^^^^^^^^^^
693+
// anonClassName cannot be resolved to a variable
694+
String anonClassName = null;
695+
if (binding.isAnonymous() || binding.isLocal()) {
696+
String binaryName = binding.getBinaryName();
697+
if (binaryName == null) {
698+
String bindingKey = binding.getKey();
699+
if (bindingKey != null) {
700+
binaryName = bindingKey = bindingKey.substring(1, bindingKey.length() - 1).replace('/', '.');
701+
}
702+
}
703+
anonClassName = assureQualifiedName(shortenQualifiedName(binaryName));
704+
} else {
705+
anonClassName = assureQualifiedName(shortenQualifiedName(binding.getQualifiedName()));
706+
}
702707
// END MERGE 7/5/17
703708

704709
// String baseClassName = assureQualifiedName(shortenQualifiedName(getFullClassName()));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Java2Script Configuration
2-
#Thu Jun 15 16:28:15 CDT 2017
2+
#Wed Jul 05 11:13:03 CDT 2017
33
j2s.compiler.visitor=SWTScriptVisitor
44
j2s.abandoned.resources.list=
55
j2s.compiler.abbreviation=true

0 commit comments

Comments
 (0)