prepare runtime

Author: Vadim Kimlaychuk

.gitignore

@@ -1,3 +1,4 @@
 .idea
 out/
 target/
+*.iml

README.md

@@ -5,6 +5,14 @@ Main features:
 - generates empty matrix for creating fonts from 5x8 to 16x16 pixel size
 - can draw font, provided as hex string from 5x8 to 16x16 pixel size by using "Draw" button
 
+# Dependencies
+- Java 13
+- OpenJFX
+
+# Running 
+```shell script
+./mvnw javafx:run
+```
 # Example sreenshots
 ![](https://github.com/vadimkim/dotmatrix/raw/master/images/single_segment.png "single segment")
 ![](https://github.com/vadimkim/dotmatrix/raw/master/images/multi_segment.png "multi segment")

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ant.ee</groupId>
     <artifactId>dot-matrix</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1.0</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>13</maven.compiler.source>
@@ -35,10 +35,17 @@
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.3</version>
-                <configuration>
+		        <configuration>
+		            <stripDebug>true</stripDebug>
+                    <compress>2</compress>
+                    <noHeaderFiles>true</noHeaderFiles>
+                    <noManPages>true</noManPages>
+                    <launcher>dotmatrix</launcher>
+                    <jlinkImageName>dotmatrix</jlinkImageName>
+                    <jlinkZipName>dotmatrix.zip</jlinkZipName>
                     <mainClass>ee.ant.dotmatrix.App</mainClass>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

run.sh

@@ -1,2 +1,3 @@
 #!/bin/sh
-java -jar target/dotmatrix-1.0.0-RELEASE.jar 
+./mvnw clean package
+java -jar target/dot-matrix-1.1.0.jar

src/main/java/ee/ant/dotmatrix/App.java

@@ -20,11 +20,11 @@ public class App extends Application {
     @Override
     public void start(Stage primaryStage) throws Exception{
         services = getHostServices();
-        Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getClassLoader().getResource("primary.fxml")));
+        Parent root = FXMLLoader.load(getClass().getResource("primary.fxml"));
         primaryStage.setTitle("Dot matrix font generator");
-        primaryStage.getIcons().add(new Image("ant.png"));
-        Scene main = new Scene(root, 800, 500);
-        main.getStylesheets().add("styles.css");
+        primaryStage.getIcons().add(new Image("ee/ant/dotmatrix/ant.png"));
+        var main = new Scene(root, 800, 500);
+        main.getStylesheets().add("ee/ant/dotmatrix/styles.css");
         primaryStage.setScene(main);
         primaryStage.show();
     }

src/main/java/ee/ant/dotmatrix/PrimaryController.java

@@ -1,6 +1,5 @@
 package ee.ant.dotmatrix;
 
-import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
@@ -12,6 +11,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.List;
 
 public class PrimaryController {
@@ -81,12 +81,12 @@ private void initialize() {
      * Show promotion
      */
     private void showAbout() {
-        String uri = "www.ant.ee";
-        Alert alert = new Alert(Alert.AlertType.INFORMATION);
+        var uri = "www.ant.ee";
+        var alert = new Alert(Alert.AlertType.INFORMATION);
         alert.setTitle("About author");
         alert.setHeaderText("");
-        alert.setGraphic(new ImageView(new Image("ant.png")));
-        Hyperlink link = new Hyperlink(uri);
+        alert.setGraphic(new ImageView(new Image("ee/ant/dotmatrix/ant.png")));
+        var link = new Hyperlink(uri);
         link.setOnAction(event -> App.openURL(uri + "/?dotmatrix"));
         alert.getDialogPane().contentProperty().set(link);
         alert.showAndWait();
@@ -103,11 +103,11 @@ private void createEmptyMatrix(int rows, int columns) {
         hexString.clear();
         for (int i = 0; i < columns; i++) {
             for (int j = 0; j < rows; j++) {
-                Button btn = new Button();
+                var btn = new Button();
                 btn.setMinSize(16.0, 16.0);
                 btn.setMaxSize(16.0, 16.0);
                 btn.setOnAction(((ActionEvent click) -> {
-                    ObservableList classes = btn.getStyleClass();
+                    var classes = btn.getStyleClass();
                     if (classes.size() == 1) {
                         btn.getStyleClass().add("buttonOn");
                     } else {
@@ -131,13 +131,13 @@ private void createEmptyMatrix(int rows, int columns) {
     private void drawLines(int columns) {
         // Draw horizontal line
         for (int i = 0; i < columns; i++) {
-            Button btn = (Button) dotMatrix.getChildren().get(2 * i * 8 + 7);
+            var btn = (Button) dotMatrix.getChildren().get(2 * i * 8 + 7);
             btn.setBorder(new Border(new BorderStroke(Color.BLACK, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, new BorderWidths(0, 0, 1, 0))));
         }
 
         // Draw vertical line
         for (int i = 0; i < 16; i++) {
-            Button btn = (Button) dotMatrix.getChildren().get(i + 8 * columns);
+            var btn = (Button) dotMatrix.getChildren().get(i + 8 * columns);
             if (i == 7) { // One button has both bottom and left lines
                 btn.setBorder(new Border(new BorderStroke(Color.BLACK, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, new BorderWidths(0, 0, 1, 1))));
             } else {
@@ -155,13 +155,13 @@ private void parseHexString(String text) {
         // Assume that hex string contains words separated by comas like
         // 0x00, 0x07, 0x05, 0x07, 0x00
         // create corresponding byte[] array
-        String binaryString = text.replace("{", "")
+        var binaryString = text.replace("{", "")
                 .replace("}", "")
                 .replace("0x", "")
                 .replace(",", "")
                 .replace(" ", "");
-       // byte[] bytes = DatatypeConverter.parseHexBinary(binaryString);  TODO refactor
-       // fillMatrixWithDots(bytes);
+        var bytes = Base64.getMimeDecoder().decode(binaryString.getBytes());
+        fillMatrixWithDots(bytes);
     }
 
     /**
@@ -171,7 +171,7 @@ private void parseHexString(String text) {
      * @param bytes byte array that encodes symbol
      */
     private void fillMatrixWithDots(byte[] bytes) {
-        int colums = bytes.length;
+        var colums = bytes.length;
         if (bytes.length > 8) {
             // there are 4 segments
             colums = bytes.length / 2;
@@ -213,7 +213,7 @@ private void fillMatrixWithDots(byte[] bytes) {
      */
     private void drawSegment(byte[] bytes) {
         for (int i = 0; i < bytes.length; i++) {
-            byte column = bytes[i];
+            var column = bytes[i];
             for (int j = 0; j < 8; j++) {
                 if ((column & 1) == 1) {
                     dotMatrix.getChildren().get(i * 8 + j).getStyleClass().add("buttonOn");
@@ -233,7 +233,7 @@ private void drawSegment(byte[] bytes) {
      */
     private void drawSegment(int offsetCol, int offsetRaw, byte[] bytes) {
         for (int i = 0; i < bytes.length; i++) {
-            byte column = bytes[i];
+            var column = bytes[i];
             for (int j = offsetCol; j < offsetCol + 8; j++) {
                 if ((column & 1) == 1) {
                     dotMatrix.getChildren().get(i * 16 + j + offsetRaw * 16).getStyleClass().add("buttonOn");
@@ -247,7 +247,7 @@ private void drawSegment(int offsetCol, int offsetRaw, byte[] bytes) {
      * Create font hex string and display it
      */
     private void generateHexString() {
-        StringBuilder hexOut = new StringBuilder();
+        var hexOut = new StringBuilder();
 
         if (dotMatrix.getChildren().size() > 64) {
             // Multi- segment
@@ -260,7 +260,7 @@ private void generateHexString() {
             hexOut.append(getSegmentHex(dotMatrix.getChildren()));
         }
 
-        String out = hexOut.toString();
+        var out = hexOut.toString();
         hexString.setText("{ " + out.substring(0, out.length() - 1) + " }");
     }
 
@@ -274,7 +274,7 @@ private void generateHexString() {
      */
     private char[] readSegment(int offsetCol, int offsetRaw) {
 
-        List<Node> segment = new ArrayList<>();
+        var segment = new ArrayList<Node>();
         for (int i=offsetCol; i < offsetCol + dotMatrix.getChildren().size()/32; i++) {
             for (int j=offsetRaw; j < offsetRaw + 8; j++) {
                 segment.add(dotMatrix.getChildren().get(i*16 + j));
@@ -290,11 +290,11 @@ private char[] readSegment(int offsetCol, int offsetRaw) {
      * @return hex string
      */
     private String getSegmentHex(List<Node> segment) {
-        StringBuilder hexOut = new StringBuilder();
+        var hexOut = new StringBuilder();
         // Single segment code
         byte element = 0; // initial byte
         for (int i = 0; i < segment.size(); i++) {
-            Node button = segment.get(i);
+            var button = segment.get(i);
             // reset element each 8 bits
             if (i % 8 == 0) {
                 element = 0;