Skip to content

Commit 53cb03a

Browse files
committed
*: Refactor the logic about verbose output
Signed-off-by: Ce Gao <[email protected]>
1 parent 3e2177a commit 53cb03a

10 files changed

+29
-11
lines changed

src/rprocessing/RLangPApplet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
public class RLangPApplet extends PApplet {
2323

24-
public static boolean VERBOSE = Boolean.getBoolean("verbose");
24+
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
2525

2626
private static void log(String msg) {
2727
if (!VERBOSE) {

src/rprocessing/Runner.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class Runner {
2525
private static final String CORE_TEXT = RScriptReader.readResourceAsText(Runner.class,
2626
"r/core.R");
2727

28-
public static boolean VERBOSE = Boolean.getBoolean("verbose");
28+
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
2929

3030
private static void log(final Object... objs) {
3131
if (!VERBOSE) {

src/rprocessing/lancher/StandaloneSketch.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
*/
2020
public class StandaloneSketch implements RunnableSketch {
2121

22+
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
23+
2224
static void log(final Object... objs) {
23-
if (!Runner.VERBOSE) {
25+
if (!VERBOSE) {
2426
return;
2527
}
2628
for (final Object o : objs) {

src/rprocessing/mode/RLangEditor.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.io.IOException;
1010
import java.nio.file.Files;
1111
import java.nio.file.Path;
12+
import java.util.Properties;
1213
import java.util.UUID;
1314

1415
import javax.swing.AbstractAction;
@@ -44,8 +45,10 @@
4445
*/
4546
public class RLangEditor extends Editor {
4647

48+
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
49+
4750
private static void log(final String msg) {
48-
if (RLangMode.VERBOSE) {
51+
if (VERBOSE) {
4952
System.err.println(RLangEditor.class.getSimpleName() + ": " + msg);
5053
}
5154
}
@@ -80,6 +83,7 @@ public String getId() {
8083
protected RLangEditor(Base base, String path, EditorState state, Mode mode)
8184
throws EditorException {
8285
super(base, path, state, mode);
86+
log("Initialize RLangEditor now.");
8387

8488
id = UUID.randomUUID().toString();
8589

src/rprocessing/mode/RLangMode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public RLangMode(final Base base, final File folder) {
2727
sketchServiceManager = new SketchServiceManager(this);
2828
}
2929

30-
public static final boolean VERBOSE = Boolean.parseBoolean(System
30+
private static final boolean VERBOSE = Boolean.parseBoolean(System
3131
.getenv("VERBOSE_RLANG_MODE"));
3232

3333
/**

src/rprocessing/mode/RLangToolbar.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
public class RLangToolbar extends EditorToolbar {
1515

16-
public static boolean VERBOSE = Boolean.getBoolean("verbose");
16+
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
1717

1818
static void log(String msg) {
1919
if (!VERBOSE) {

src/rprocessing/mode/run/RMIUtils.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@
1313
* @author github.com/gaocegege
1414
*/
1515
public class RMIUtils {
16+
1617
private static final boolean EXTREMELY_VERBOSE = false;
1718

1819
static final int RMI_PORT = 8221;
1920

21+
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
22+
2023
static {
2124
System.setProperty("sun.rmi.transport.tcp.localHostNameTimeOut", "1000");
2225
System.setProperty("java.rmi.server.hostname", "127.0.0.1");
@@ -33,7 +36,7 @@ public class RMIUtils {
3336
}
3437

3538
private static void log(final String msg) {
36-
if (RLangMode.VERBOSE) {
39+
if (VERBOSE) {
3740
System.err.println(RMIUtils.class.getSimpleName() + ": " + msg);
3841
}
3942
}

src/rprocessing/mode/run/SketchRunner.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
* @author github.com/gaocegege
1919
*/
2020
public class SketchRunner implements SketchService {
21+
22+
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
23+
2124
private static void log(final String msg) {
22-
if (RLangMode.VERBOSE) {
25+
if (VERBOSE) {
2326
System.err.println(SketchRunner.class.getSimpleName() + ": " + msg);
2427
}
2528
}

src/rprocessing/mode/run/SketchServiceManager.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@
1515
* @author github.com/gaocegege
1616
*/
1717
public class SketchServiceManager implements ModeService {
18+
1819
private static final String DEBUG_SKETCH_RUNNER_KEY = "$SKETCHRUNNER$";
1920

21+
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
22+
2023
@SuppressWarnings("unused")
2124
private static void log(final String msg) {
22-
if (RLangMode.VERBOSE) {
25+
if (VERBOSE) {
2326
System.err.println(SketchServiceManager.class.getSimpleName() + ": " + msg);
2427
}
2528
}

src/rprocessing/mode/run/SketchServiceRunner.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@
3131
* @author github.com/gaocegege
3232
*/
3333
public class SketchServiceRunner {
34+
35+
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
36+
3437
private static void log(final String msg) {
35-
if (RLangMode.VERBOSE) {
38+
if (VERBOSE) {
3639
System.err.println(SketchServiceRunner.class.getSimpleName() + ": " + msg);
3740
}
3841
}
@@ -100,7 +103,7 @@ private ProcessBuilder createServerCommand() {
100103
command.add("-Xdock:name=Processing");
101104
}
102105

103-
if (RLangMode.VERBOSE) {
106+
if (VERBOSE) {
104107
command.add("-Dverbose=true");
105108
}
106109

0 commit comments

Comments
 (0)