phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve initialization output

Browse Source
This commit is contained in:
Clément Fournier 2019-02-22 00:56:24 +01:00
parent 50f99743a7
commit 7f7090f009
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java
View File

@ -34,23 +34,30 @@ import javafx.stage.Stage;
*/
public class Designer extends Application {
private boolean parseParameters(Parameters params) {
List<String> raw = params.getRaw();
if (!raw.contains("-v")
&& !raw.contains("--verbose")) {
// error output is disabled by default
private boolean isDeveloperMode;
private long initStartTimeMillis;
System.err.close();
return false;
public Designer() {
initStartTimeMillis = System.currentTimeMillis();
}
private void parseParameters(Parameters params) {
List<String> raw = params.getRaw();
// error output is disabled by default
if (raw.contains("-v") || raw.contains("--verbose")) {
isDeveloperMode = true;
}
return true;
}
@Override
public void start(Stage stage) throws IOException {
boolean isDeveloperMode = parseParameters(getParameters());
parseParameters(getParameters());
stage.setTitle("PMD Rule Designer (v " + PMDVersion.VERSION + ')');
setIcons(stage);
System.out.print(stage.getTitle() + " initializing... ");
FXMLLoader loader = new FXMLLoader(DesignerUtil.getFxml("designer.fxml"));
@ -66,6 +73,10 @@ public class Designer extends Application {
boolean needsRoot = Arrays.stream(type.getConstructors()).anyMatch(it -> ArrayUtils.contains(it.getParameterTypes(), DesignerRoot.class));
if (needsRoot) {
// Controls that need the DesignerRoot can declare a constructor
// with a parameter w/ signature @NamedArg("designerRoot") DesignerRoot
// to be injected with the relevant instance of the app.
// TODO Not everything has been refactored to use this mechanism for now
ProxyBuilder<Object> builder = new ProxyBuilder<>(type);
builder.put("designerRoot", owner);
return builder;
@ -99,11 +110,20 @@ public class Designer extends Application {
Parent root = loader.load();
Scene scene = new Scene(root);
stage.setTitle("PMD Rule Designer (v " + PMDVersion.VERSION + ')');
setIcons(stage);
stage.setScene(scene);
if (owner.isDeveloperMode()) {
// only close after initialization succeeded.
// but before stage.show to reduce unwanted noise
System.err.close();
}
stage.show();
long initTime = System.currentTimeMillis() - initStartTimeMillis;
System.out.println("done in " + initTime + "ms.");
System.out.println("Run with --verbose parameter to enable error output.");
}

2
pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/app/NodeSelectionSource.java
View File

@ -34,7 +34,7 @@ public interface NodeSelectionSource extends ApplicationComponent {
* Initialises this component. Must be called by the component somewhere.
*
* @param root Instance of the app. Should be the same as {@link #getDesignerRoot()},
* but a parameter here to make it clear that {@link #getDesignerRoot()}
* but the parameter here is to make it clear that {@link #getDesignerRoot()}
* must be initialized before this method is called.
* @param mySelectionEvents Stream of nodes that should push an event each
* @param alwaysHandleSelection Whether the component should handle selection events that originated from itself.