Merge pull request #10 from LS31/dev

Moving to version 2.2.0
LS31 · Jun 19, 2021 · 4063cc7 · 4063cc7
2 parents f220d12 + 4d82a84
commit 4063cc7
Show file tree

Hide file tree

Showing 27 changed files with 710 additions and 617 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,3 +72,4 @@ fabric.properties
 
 /target/
 /.idea/
+/dependency-reduced-pom.xml
diff --git a/README.md b/README.md
@@ -19,17 +19,22 @@ Good QR code recognition has been attained with documents that were scanned at a
 The [provided executable JAR](https://github.com/LS31/qrscan/releases) is ready to use. The current version runs with Java 14. You need to have a recent Java Virtual Machine ([Java Runtime Environment](https://java.com/en/download/)) installed to execute the JAR file. On Windows, simply double-click the JAR file to execute. 
 
 # Acknowledgements
-A big thanks to the following projects: [PDFBox by The Apache Software Foundation](https://pdfbox.apache.org/), [Java Advanced Imaging Image I/O Tools API](https://github.com/jai-imageio/jai-imageio-jpeg2000), and the [ZXing project](https://github.com/zxing).
+A big thanks to the following projects: [PDFBox by The Apache Software Foundation](https://pdfbox.apache.org/)
+, [Java Advanced Imaging Image I/O Tools API](https://github.com/jai-imageio/jai-imageio-jpeg2000)
+, [TwelveMonkeys ImageIO](https://haraldk.github.io/TwelveMonkeys/), and the [ZXing project](https://github.com/zxing).
 
 # Release history
 * **1.0.0**
   * First release.
 * **2.0.0**
-  * Update to JDK/JRE 13; use Java Platform Module System.
+  * Update to JDK 13; use Java Platform Module System.
   * Minor changes in lay-out.
 * **2.1.0**
   * Remember previous settings when restarting program.
   * Added progress dialog windows.
   * Updated logging (and simplified for end user).
-  * Updated to JDK/JRE 14.
-  * Updated versions of all dependencies.
+  * Updated to JDK 14.
+  * Updated versions of dependencies.
+* **2.2.0**
+  * Show detailed results after scanning or renaming.
+  * Updated versions of dependencies.
diff --git a/pom.xml b/pom.xml
@@ -4,52 +4,49 @@
 
     <groupId>nl.ls31</groupId>
     <artifactId>qrscan</artifactId>
-    <version>2.1.0</version>
-    <name>QRScan</name>
+    <version>2.2.0</version>
+    <name>qrscan</name>
+    <packaging>jar</packaging>
     <url>https://github.com/LS31/qrscan</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.release>14</maven.compiler.release>
-        <javafx.version>14.0.1</javafx.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>${javafx.version}</version>
+            <version>16</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
-            <version>${javafx.version}</version>
+            <version>16</version>
         </dependency>
         <dependency>
-            <groupId>com.github.jai-imageio</groupId>
-            <artifactId>jai-imageio-core</artifactId>
-            <version>1.4.0</version>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-jpeg</artifactId>
+            <version>3.7.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.jai-imageio</groupId>
             <artifactId>jai-imageio-jpeg2000</artifactId>
-            <version>1.3.0</version>
+            <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>core</artifactId>
-            <version>3.4.0</version>
+            <version>3.4.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>javase</artifactId>
-            <version>3.4.0</version>
+            <version>3.4.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>jbig2-imageio</artifactId>
-            <!--groupId>com.levigo.jbig2</groupId>
-            <artifactId>levigo-jbig2-imageio</artifactId-->
             <version>3.0.3</version>
         </dependency>
         <dependency>
@@ -60,27 +57,27 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>xmpbox</artifactId>
-            <version>2.0.19</version>
+            <version>2.0.24</version>
         </dependency>
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox-tools</artifactId>
-            <version>2.0.19</version>
+            <version>2.0.21</version>
         </dependency>
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>fontbox</artifactId>
-            <version>2.0.18</version>
+            <version>2.0.24</version>
         </dependency>
         <dependency>
             <groupId>org.tinylog</groupId>
             <artifactId>tinylog-api</artifactId>
-            <version>2.1.2</version>
+            <version>2.3.2</version>
         </dependency>
         <dependency>
             <groupId>org.tinylog</groupId>
             <artifactId>tinylog-impl</artifactId>
-            <version>2.1.2</version>
+            <version>2.3.2</version>
         </dependency>
     </dependencies>
 
@@ -91,9 +88,10 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <release>${maven.compiler.release}</release>
+                    <release>14</release>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -119,13 +117,32 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.4</version>
+                <version>0.0.6</version>
                 <configuration>
                     <mainClass>nl.ls31.qrscan.Launcher</mainClass> <!-- launcher is a dirty fix -->
-                    <release>${maven.compiler.release}</release>
+                    <release>14</release>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -8,6 +8,7 @@
     requires org.tinylog.api;
     requires java.prefs;
 
-    opens nl.ls31.qrscan.ui.view to javafx.fxml;
+    opens nl.ls31.qrscan.controller to javafx.fxml;
+    opens nl.ls31.qrscan.model to javafx.base;
     exports nl.ls31.qrscan;
 }
diff --git a/src/main/java/nl/ls31/qrscan/Launcher.java b/src/main/java/nl/ls31/qrscan/Launcher.java
@@ -10,6 +10,6 @@
 public class Launcher {
 
     public static void main(String[] args) {
-        App.main(args);
+        MainApp.main(args);
     }
 }
diff --git a/src/main/java/nl/ls31/qrscan/App.java → src/main/java/nl/ls31/qrscan/MainApp.java b/src/main/java/nl/ls31/qrscan/App.java → src/main/java/nl/ls31/qrscan/MainApp.java
@@ -6,11 +6,9 @@
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
-import nl.ls31.qrscan.ui.model.CreateSettings;
-import nl.ls31.qrscan.ui.model.ManualTagSettings;
-import nl.ls31.qrscan.ui.model.ScanSettings;
-import nl.ls31.qrscan.ui.view.RootController;
-import nl.ls31.qrscan.ui.view.ScanController;
+import nl.ls31.qrscan.controller.RootController;
+import nl.ls31.qrscan.controller.ScanPdfsController;
+import nl.ls31.qrscan.model.AppSettings;
 import org.tinylog.Logger;
 
 import java.io.IOException;
@@ -20,20 +18,16 @@
  *
  * @author Lars Steggink
  */
-public class App extends Application {
+public class MainApp extends Application {
     private Stage primaryStage;
     private BorderPane rootLayout;
-    private final ScanSettings scanSettings;
-    private final CreateSettings createSettings;
-    private final ManualTagSettings manualTagSettings;
+    private final AppSettings appSettings;
 
     /**
      * Main application.
      */
-    public App() {
-        this.scanSettings = new ScanSettings();
-        this.createSettings = new CreateSettings();
-        this.manualTagSettings = new ManualTagSettings();
+    public MainApp() {
+        this.appSettings = new AppSettings();
     }
 
     /**
@@ -46,21 +40,12 @@ public static void main(String[] args) {
     }
 
     /**
-     * Gets the current create settings.
+     * Gets the current settings.
      *
-     * @return create settings
+     * @return current settings
      */
-    public CreateSettings getCreateSettings() {
-        return createSettings;
-    }
-
-    /**
-     * Gets the current manual tagging settings.
-     *
-     * @return manual tagging settings
-     */
-    public ManualTagSettings getManualTagSettings() {
-        return manualTagSettings;
+    public AppSettings getAppSettings() {
+        return appSettings;
     }
 
     /**
@@ -72,15 +57,6 @@ public Stage getPrimaryStage() {
         return primaryStage;
     }
 
-    /**
-     * Gets the current scan settings.
-     *
-     * @return scan settings
-     */
-    public ScanSettings getScanSettings() {
-        return scanSettings;
-    }
-
     /**
      * Starts the main application.
      */
@@ -90,8 +66,8 @@ public void start(Stage primaryStage) {
         this.primaryStage.setTitle("QRScan");
 
         // Load layouts from FXML file.
-        FXMLLoader loader = new FXMLLoader(App.class.getResource("/fxml/RootLayout.fxml"));
-        FXMLLoader scanViewLoader = new FXMLLoader(App.class.getResource("/fxml/ScanView.fxml"));
+        FXMLLoader loader = new FXMLLoader(MainApp.class.getResource("/fxml/RootLayout.fxml"));
+        FXMLLoader scanViewLoader = new FXMLLoader(MainApp.class.getResource("/fxml/ScanPdfsView.fxml"));
         try {
             rootLayout = loader.load();
         } catch (IOException e) {
@@ -109,8 +85,8 @@ public void start(Stage primaryStage) {
         } catch (IOException e) {
             Logger.error(e, "Scan layout not found.");
         }
-        ScanController scanController = scanViewLoader.getController();
-        scanController.setMainApp(this);
-        scanController.updateControlsByModel();
+        ScanPdfsController scanPdfsController = scanViewLoader.getController();
+        scanPdfsController.setMainApp(this);
+        scanPdfsController.updateControlsByModel();
     }
 }