Handling der Seiten beim Scannen korrigiert

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

src/main/java/de/srsoftware/belegscanner/Worker.java

@@ -125,28 +125,29 @@ public class Worker {
         int rotation = this.rotationAngle;
         File targetFile = prepareProject(project);
         var type = getType();
+        var page = project.addPage(new File(targetFile+".jpg"));
         scanJpeg(targetFile,project);
         improveJpeg(targetFile,project,rotation);
 
+        preview(page);
+
         if (JPG.equals(type)) {
             docTable.setState(project, t("Image scanned"));
-            var page = project.addPage(new File(targetFile+".jpg"));
-            preview(page);
             return;
         };
-        mainFrame.preview(new File(targetFile+".jpg"));
+
         convertToPdf(targetFile,type, project);
 
         if (PDF.equals(type)) {
-            var page = project.addPage(new File(targetFile+".pdf"));
+            page.updateFile(new File(targetFile+".pdf"));
-            docTable.setState(project, t("PDF created"));
             preview(page);
+            docTable.setState(project, t("PDF created"));
             return;
         }
 
         performTextRecognition(targetFile,project);
 
-        var page = project.addPage(new File(targetFile+".pdf"));
+        page.updateFile(new File(targetFile+".pdf"));
         preview(page);
     }
 

src/main/java/de/srsoftware/belegscanner/model/ScanProject.java

@@ -62,12 +62,7 @@ private static final String PAGE = t(Constants.PAGE);
 
     @Override
     public Page addPage(File file) {
-        Page newPage = new Page() {
+        Page newPage = new ScannedPage(file);
-            @Override
-            public File file() {
-                return file;
-            }
-        };
         pageList.add(newPage);
         return newPage;
     }

src/main/java/de/srsoftware/belegscanner/model/ScannedPage.java

@@ -0,0 +1,24 @@
+package de.srsoftware.belegscanner.model;
+
+import de.srsoftware.belegscanner.model.api.Page;
+
+import java.io.File;
+
+public class ScannedPage implements Page {
+    private File file;
+
+    public ScannedPage(File file) {
+        updateFile(file);
+    }
+
+    @Override
+    public File file() {
+        return file;
+    }
+
+    @Override
+    public Page updateFile(File file) {
+        this.file = file;
+        return this;
+    }
+}

src/main/java/de/srsoftware/belegscanner/model/api/Page.java

@@ -4,4 +4,6 @@ import java.io.File;
 
 public interface Page {
     public File file();
+
+    Page updateFile(File file);
 }