Skip to content

Commit 4b1616c

Browse files
BobHansonBobHanson
committed
final refactoring -- Helpers to inner static classes
1 parent d7f0278 commit 4b1616c

28 files changed

+1983
-4230
lines changed

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

-12.6 KB
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-
20231122230517
1+
20231125155705

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20231122230517
1+
20231125155705

‎sources/net.sf.j2s.core/src/j2s/jmol/Java2ScriptLegacyCompiler.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
import j2s.CorePlugin;
1414
import j2s.core.Java2ScriptCompiler;
15-
import j2s.jmol.common.Java2ScriptScriptVisitor;
16-
import j2s.jmol.common.Java2ScriptDependencyVisitor;
15+
import j2s.jmol.common.Java2ScriptPrimaryVisitor;
16+
import j2s.jmol.common.J2SDependencyVisitor;
1717

1818
public class Java2ScriptLegacyCompiler extends Java2ScriptCompiler {
1919

@@ -94,7 +94,7 @@ public boolean compileToJavaScript(IFile javaSource, String trailer) {
9494
astParser.setResolveBindings(true);
9595
astParser.setSource(createdUnit);
9696
CompilationUnit root = (CompilationUnit) astParser.createAST(null);
97-
Java2ScriptDependencyVisitor dvisitor = new Java2ScriptDependencyVisitor(this);
97+
J2SDependencyVisitor dvisitor = new J2SDependencyVisitor(this);
9898
boolean errorOccurs = false;
9999
try {
100100
root.accept(dvisitor);
@@ -119,10 +119,8 @@ public boolean compileToJavaScript(IFile javaSource, String trailer) {
119119
return false;
120120
}
121121

122-
Java2ScriptScriptVisitor visitor = new Java2ScriptScriptVisitor();
122+
Java2ScriptPrimaryVisitor visitor = new Java2ScriptPrimaryVisitor();
123123
isDebugging = "debug".equals(props.getProperty("j2s.compiler.mode"));
124-
visitor.setDebugging(isDebugging);
125-
dvisitor.setDebugging(isDebugging);
126124
errorOccurs = false;
127125
try {
128126
root.accept(visitor);
@@ -147,9 +145,9 @@ public boolean compileToJavaScript(IFile javaSource, String trailer) {
147145
return false;
148146
}
149147

150-
private void outputJavaScript(Java2ScriptScriptVisitor visitor, Java2ScriptDependencyVisitor dvisitor, CompilationUnit fRoot,
148+
private void outputJavaScript(Java2ScriptPrimaryVisitor visitor, J2SDependencyVisitor dvisitor, CompilationUnit fRoot,
151149
String outputPath, String trailer, String sourceLocation) {
152-
String js = finalFixes(dvisitor.cleanLoadCalls(visitor.getBuffer()));
150+
String js = finalFixes(dvisitor.cleanLoadCalls(visitor));
153151
String elementName = fRoot.getJavaElement().getElementName();
154152
elementName = elementName.substring(0, elementName.lastIndexOf('.'));
155153
String packageName = visitor.getPackageName();

‎sources/net.sf.j2s.core/src/j2s/jmol/common/BindingHelper.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,4 +1445,15 @@ static String removeBrackets(String qName) {
14451445
qName = buf.toString().trim();
14461446
return qName;
14471447
}
1448+
1449+
/**
1450+
* Discard generic type from the given full class name. There are no generic
1451+
* types in JavaScript.
1452+
*
1453+
* @param name
1454+
* @return
1455+
*/
1456+
public static String discardGenericType(String name) {
1457+
return (name == null ? null : removeBrackets(name));
1458+
}
14481459
}

‎sources/net.sf.j2s.core/src/j2s/jmol/common/IHelper.java

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

0 commit comments

Comments
 (0)