Skip to content

Hanson1 - Jalview Java 11 transpiler with j2s.config.altfileproperty #201

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 2 commits into from
Dec 22, 2020
Merged

Hanson1 - Jalview Java 11 transpiler with j2s.config.altfileproperty #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
059547a
Java2ScriptCompiler j2s.config.altfileproperty
Dec 22, 2020
11d40a1
Java 11 transpiler for Jalview
Dec 22, 2020
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
Binary file modified sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core-j11.jar
View file
Open in desktop
Binary file not shown.
Binary file modified sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20201222082136
20201222130550
Binary file modified sources/net.sf.j2s.core/dist/swingjs/ver/3.2.10-j11/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
Binary file modified sources/net.sf.j2s.core/dist/swingjs/ver/3.2.10-j11/net.sf.j2s.core-j11.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/ver/3.2.10-j11/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20201219185136
20201222130550
Binary file modified sources/net.sf.j2s.core/dist/swingjs/ver/3.2.10/net.sf.j2s.core.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/ver/3.2.10/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20201222082136
20201222130056
16 changes: 10 additions & 6 deletions sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,8 @@ boolean initializeProject(IJavaProject project, boolean isCompilationParticipant
}

/**
* Iteratively look for a .j2s file to use for configuration information.
* Up to five iterations are allowed.
* Iteratively look for a .j2s file to use for configuration information. Up to
* five iterations are allowed.
*
* @param j2sFile
* @param level
Expand All @@ -381,10 +381,14 @@ private void initializeUsing(File j2sFile, int level) {
newProps.load(os);
os.close();
String j2sAltFileProperty = newProps.getProperty(J2S_OPTIONS_ALTFILEPROPERTY);
String j2sAltFileName = (j2sAltFileProperty == null ? null : System.getProperty(j2sAltFileProperty));
if (j2sAltFileName != null && j2sAltFileName.length() > 0) {
initializeUsing(new File(projectFolder, j2sAltFileName), level);
return;
if (j2sAltFileProperty != null) {
System.out.println(J2S_OPTIONS_ALTFILEPROPERTY + " = " + j2sAltFileProperty);
String j2sAltFileName = System.getProperty(j2sAltFileProperty);
System.out.println("J2S System.getProperty(\"" + j2sAltFileProperty + "\") = " + j2sAltFileName);
if (j2sAltFileName != null && j2sAltFileName.length() > 0) {
initializeUsing(new File(projectFolder, j2sAltFileName), level);
return;
}
}
props = newProps;
} catch (Exception e) {
Expand Down
1 change: 1 addition & 0 deletions sources/net.sf.j2s.java.core/.j2s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#j2s.config.altfileproperty=j2s.alt.file
j2s.compiler.status=enable

# read.annotations to false to not record annotations
Expand Down
24 changes: 24 additions & 0 deletions sources/net.sf.j2s.java.core/.j2s1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
j2s.compiler.status=enable

# read.annotations to false to not record annotations
j2s.compiler.read.annotations=true

# customizable list for what annotations to skip
j2s.compiler.ignored.annotations=CallerSensitive;ConstructorProperties;Deprecated;Override;SaveVarargs;SuppressWarnings;

#j2s.compiler.nonqualified.packages=org.w3c.dom

#output file name for logging methods declared - delete the file to regenerate a listing
#j2s.log.methods.declared=methodsDeclared.csv

#output file name for logging methods called - delete the file to regenerate a listing
#j2s.log.methods.called=methodsCalled.csv

#if set, every instance of methods called will be logged
#otherwise, only the first call to a method will be logged
#output will be comma-separated: called method,caller class
#j2s.log.all.calls=true

#a semicolon-separated list of package-level file paths to be excluded
#j2s.excluded.paths=test;testng