From 22ee16b09b941097421d91173103a14d3708f1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Thu, 31 Aug 2017 14:29:43 +0200 Subject: [PATCH] Icons --- .../pmd/util/fxdesigner/Designer.java | 37 ++++++- .../pmd/util/fxdesigner/designer.fxml | 91 +++++------------- .../util/fxdesigner/icons/app/pmd-logo.png | Bin 0 -> 5034 bytes .../fxdesigner/icons/app/pmd-logo_big.png | Bin 0 -> 11778 bytes .../fxdesigner/icons/app/pmd_logo_small.png | Bin 0 -> 4671 bytes .../fxdesigner/icons/app/pmd_logo_tiny.png | Bin 0 -> 1247 bytes 6 files changed, 57 insertions(+), 71 deletions(-) create mode 100644 pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/icons/app/pmd-logo.png create mode 100644 pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/icons/app/pmd-logo_big.png create mode 100644 pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/icons/app/pmd_logo_small.png create mode 100644 pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/icons/app/pmd_logo_tiny.png diff --git a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java index 50eb0e0b3c..8c3b2155bc 100644 --- a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java +++ b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/Designer.java @@ -5,13 +5,19 @@ package net.sourceforge.pmd.util.fxdesigner; import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; import net.sourceforge.pmd.PMD; import javafx.application.Application; +import javafx.collections.ObservableList; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; +import javafx.scene.image.Image; import javafx.stage.Stage; /** @@ -19,10 +25,6 @@ import javafx.stage.Stage; */ public class Designer extends Application { - public static void main(String[] args) { - launch(args); - } - @Override public void start(Stage stage) throws IOException { Parent root = FXMLLoader.load(getClass().getResource("designer.fxml")); @@ -30,7 +32,34 @@ public class Designer extends Application { Scene scene = new Scene(root, 900, 600); stage.setTitle("PMD Rule Designer (v " + PMD.VERSION + ')'); + setIcons(stage); + stage.setScene(scene); stage.show(); } + + + private void setIcons(Stage primaryStage) { + ObservableList icons = primaryStage.getIcons(); + final String dirPrefix = "icons/app/"; + List imageNames = Arrays.asList("pmd-logo.png", + "pmd-logo_small.png", + "pmd-logo_tiny.png", + "pmd-logo_big.png"); + + List images = imageNames.stream() + .map(s -> dirPrefix + s) + .map(s -> getClass().getResourceAsStream(s)) + .filter(Objects::nonNull) + .map(Image::new) + .collect(Collectors.toList()); + + + icons.addAll(images); + } + + + public static void main(String[] args) { + launch(args); + } } diff --git a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/designer.fxml b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/designer.fxml index 72f26a5085..fa3a1dfa31 100644 --- a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/designer.fxml +++ b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/designer.fxml @@ -14,120 +14,77 @@ - + + - + - + - + - +
- + - -