fixed small bugs and added Launcher for fat jar

Author: vadimkim

Diff for: .gitignore

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

Diff for: README.md

@@ -10,9 +10,12 @@ Main features:
 - OpenJFX
 
 # Running 
+There are several ways to run the application. If you have JDK installed you can use maven wrapper to compile and run application.
 ```shell script
 ./mvnw javafx:run
 ```
+
+Another way is to download binary package and run shell script `run.sh` or `run.bat` from the command line. 
 # 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")

Diff for: pom.xml

@@ -8,17 +8,44 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>13</maven.compiler.source>
         <maven.compiler.target>13</maven.compiler.target>
+        <javafx.version>13.0.1</javafx.version>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>13.0.1</version>
+            <version>${javafx.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
-            <version>13.0.1</version>
+            <version>${javafx.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.13</version>
+        </dependency>
+
+        <!-- Uncomment for cross-platform fat jar-->
+          <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-graphics</artifactId>
+            <version>${javafx.version}</version>
+            <classifier>win</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-graphics</artifactId>
+            <version>${javafx.version}</version>
+            <classifier>linux</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-graphics</artifactId>
+            <version>${javafx.version}</version>
+            <classifier>mac</classifier>
         </dependency>
     </dependencies>
     <build>
@@ -36,16 +63,32 @@
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.3</version>
 		        <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>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>project-classifier</shadedClassifierName>
+                            <outputFile>shade\${project.artifactId}.jar</outputFile>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>ee.ant.dotmatrix.Launcher</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

Diff for: run.bat

@@ -1,2 +1,2 @@
 @ECHO OFF
-java -jar target\dotmatrix-1.0.0-RELEASE.jar 
+java -jar shade\dot-matrix.jar

Diff for: run.sh

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

Diff for: src/main/java/ee/ant/dotmatrix/App.java

@@ -8,8 +8,6 @@
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
 
-import java.util.Objects;
-
 /**
  * JavaFX App
  */

Diff for: src/main/java/ee/ant/dotmatrix/Launcher.java

@@ -0,0 +1,8 @@
+package ee.ant.dotmatrix;
+
+public class Launcher {
+
+    public static void main(String[] args) {
+        App.main(args);
+    }
+}

Diff for: src/main/java/ee/ant/dotmatrix/PrimaryController.java

@@ -8,10 +8,11 @@
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Base64;
 import java.util.List;
 
 public class PrimaryController {
@@ -71,7 +72,13 @@ private void initialize() {
         rbutton1616.setOnAction(event -> createEmptyMatrix(16, 16));
 
         // Handle draw button event
-        drawButton.setOnAction(event -> parseHexString(hexString.getText()));
+        drawButton.setOnAction(event -> {
+            try {
+                parseHexString(hexString.getText());
+            } catch (DecoderException e) {
+                e.printStackTrace();
+            }
+        });
 
         // default is 5x8 matrix
         createEmptyMatrix(8, 5);
@@ -151,7 +158,7 @@ private void drawLines(int columns) {
      *
      * @param text - line with symbol hex code. Either for single segment or 4 segments
      */
-    private void parseHexString(String text) {
+    private void parseHexString(String text) throws DecoderException {
         // Assume that hex string contains words separated by comas like
         // 0x00, 0x07, 0x05, 0x07, 0x00
         // create corresponding byte[] array
@@ -160,7 +167,8 @@ private void parseHexString(String text) {
                 .replace("0x", "")
                 .replace(",", "")
                 .replace(" ", "");
-        var bytes = Base64.getMimeDecoder().decode(binaryString.getBytes());
+
+        var bytes = Hex.decodeHex(binaryString);
         fillMatrixWithDots(bytes);
     }