Skip to content

Add ability to set .j2s config filepath/name by setting property … #199

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

Add ability to set .j2s config filepath/name by setting property … #199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aff68ca
Add ability to set .j2s config filepath/name by setting property net.…
benzoid Dec 19, 2020
a6849cf
JAL-3789 Use j2s.config.altfileproperty to set a property lookup for …
benzoid 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
48 changes: 47 additions & 1 deletion 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 @@ -39,6 +39,8 @@ class Java2ScriptCompiler {
* The name of the J2S options file, aka as the "Dot-j2s" file.
*/
private static final String J2S_OPTIONS_FILE_NAME = ".j2s";

private static final String J2S_OPTIONS_ALT_FILE_CONF = "j2s.config.altfileproperty";

private int nResources, nSources, nJS, nHTML;

Expand Down Expand Up @@ -218,7 +220,51 @@ boolean initializeProject(IJavaProject project, boolean isCompilationParticipant
props = new Properties();
try {
File j2sFile = new File(projectFolder, J2S_OPTIONS_FILE_NAME);
props.load(new FileInputStream(j2sFile));
Properties j2sProps = new Properties();
j2sProps.load(new FileInputStream(j2sFile));
boolean j2sAltFileUsed = false;
if (j2sProps.getProperty(J2S_OPTIONS_ALT_FILE_CONF) != null) {
String j2sAltFileProperty = j2sProps
.getProperty(J2S_OPTIONS_ALT_FILE_CONF);
System.out.println(
"Alternative J2S configuration file property is set to '"
+ j2sAltFileProperty + "'");
String j2sAltFileName = System.getProperty(j2sAltFileProperty);
System.out
.println("Alternative J2S configuration file is set to '"
+ j2sAltFileName + "'");
if (j2sAltFileName != null) {
File j2sAltFile = new File(projectFolder, j2sAltFileName);
if (j2sAltFile.exists()) {
System.out
.println("Using alternative J2S configuration file '"
+ j2sAltFileName + "'");
props.load(new FileInputStream(j2sAltFile));
j2sAltFileUsed = true;
} else {
System.err.println(
"Alternative J2S configuration file property '"
+ j2sAltFileProperty + "' is set to '"
+ j2sAltFileName
+ "' but this file does not exist. Using original '"
+ J2S_OPTIONS_FILE_NAME + "' file.");
}
} else {
System.out.println(
"J2S did not find property value for j2s alt file property '"
+ j2sAltFileProperty + "'");
}
if (!j2sAltFileUsed) {
j2sProps.remove(J2S_OPTIONS_ALT_FILE_CONF);
props = j2sProps;
}
} else {
System.out.println("J2S did not find configuration for '"
+ J2S_OPTIONS_ALT_FILE_CONF + "' in "
+ j2sFile.getPath());
props = j2sProps;
}

String status = getProperty(J2S_COMPILER_STATUS, J2S_COMPILER_STATUS_ENABLED);
if (!J2S_COMPILER_STATUS_ENABLE.equalsIgnoreCase(status)
&& !J2S_COMPILER_STATUS_ENABLED.equalsIgnoreCase(status)) {
Expand Down