Scan summary by double clicking scan cell in table and scrollable tables!

Author: lilstiffy

src/main/java/org/pwss/Start.java

@@ -33,7 +33,7 @@ public static void main(String[] args) {
                 NavigationEvents.setListener(navigator::navigateTo);
 
                 // Start with Login screen
-                navigator.navigateTo(Screen.LOGIN);
+                navigator.navigateTo(Screen.LOGIN, null);
 
                 // Finally, show the main frame hosting the screens :)
                 frame.setVisible(true);

src/main/java/org/pwss/model/entity/File.java

@@ -10,7 +10,7 @@
  * @param basename  Base name of the file (name without directory path).
  * @param directory Directory path where the file is located.
  * @param size      Size of the file in bytes.
- * @param mTime     Last modification time of the file.
+ * @param mtime     Last modification time of the file.
  */
-public record File(long id, String path, String basename, String directory, long size, Date mTime) {
+public record File(long id, String path, String basename, String directory, long size, Date mtime) {
 }

src/main/java/org/pwss/model/table/MonitoredDirectoryTableModel.java

@@ -1,17 +1,14 @@
 package org.pwss.model.table;
 
 import org.pwss.model.entity.MonitoredDirectory;
-import org.pwss.model.entity.Time;
 
 import javax.swing.table.AbstractTableModel;
-import java.util.Date;
 import java.util.List;
 
 public class MonitoredDirectoryTableModel extends AbstractTableModel {
     private final List<MonitoredDirectory> directories;
     private final String[] columnNames = {
-            "ID", "Path", "Active", "Added At", "Last Scanned",
-            "Notes", "Baseline Established", "Include Subdirectories"
+            "Path", "Active", "Last Scanned", "Baseline Established", "Include Subdirectories"
     };
 
     public MonitoredDirectoryTableModel(List<MonitoredDirectory> directories) {
@@ -36,26 +33,21 @@ public String getColumnName(int column) {
     @Override
     public Class<?> getColumnClass(int columnIndex) {
         return switch (columnIndex) {
-            case 0 -> Long.class;
-            case 2, 6, 7 -> Boolean.class;
-            case 3 -> Time.class;
-            case 4 -> Date.class;
-            default -> String.class;
+            case 1, 3, 4 -> Boolean.class;
+            default -> super.getColumnClass(columnIndex);
         };
     }
 
+
     @Override
     public Object getValueAt(int rowIndex, int columnIndex) {
         MonitoredDirectory dir = directories.get(rowIndex);
         return switch (columnIndex) {
-            case 0 -> dir.id();
-            case 1 -> dir.path();
-            case 2 -> dir.isActive();
-            case 3 -> dir.addedAt().created();
-            case 4 -> dir.lastScanned();
-            case 5 -> dir.notes() != null ? dir.notes().notes() : "";
-            case 6 -> dir.baselineEstablished();
-            case 7 -> dir.includeSubdirectories();
+            case 0 -> dir.path();
+            case 1 -> dir.isActive();
+            case 2 -> dir.lastScanned();
+            case 3 -> dir.baselineEstablished();
+            case 4 -> dir.includeSubdirectories();
             default -> null;
         };
     }
@@ -72,6 +64,5 @@ public MonitoredDirectory getDirectoryAt(int rowIndex) {
         }
         return null;
     }
-
 }
 

src/main/java/org/pwss/model/table/ScanSummaryTableModel.java

@@ -0,0 +1,54 @@
+package org.pwss.model.table;
+
+import org.pwss.model.entity.ScanSummary;
+
+import javax.swing.table.AbstractTableModel;
+import java.util.List;
+
+public class ScanSummaryTableModel extends AbstractTableModel {
+    private final List<ScanSummary> data;
+    private final String[] columns = {"File Path", "Last modified", "Notes"};
+
+    public ScanSummaryTableModel(List<ScanSummary> data) {
+        this.data = data;
+    }
+
+    @Override
+    public int getRowCount() {
+        return data.size();
+    }
+
+    @Override
+    public int getColumnCount() {
+        return columns.length;
+    }
+
+    @Override
+    public String getColumnName(int column) {
+        return columns[column];
+    }
+
+    @Override
+    public Object getValueAt(int rowIndex, int columnIndex) {
+        ScanSummary summary = data.get(rowIndex);
+        return switch (columnIndex) {
+            case 0 -> summary.file().path();
+            case 1 -> summary.file().mtime();
+            case 2 -> summary.scan().notes().notes();
+            default -> null;
+        };
+    }
+
+    /**
+     * Get the ScanSummary object at the specified row index.
+     *
+     * @param rowIndex the index of the row in the table.
+     * @return the ScanSummary object at the specified row index, or null if the index is out of bounds.
+     */
+    public ScanSummary getSummaryAt(int rowIndex) {
+        if (rowIndex >= 0 && rowIndex < data.size()) {
+            return data.get(rowIndex);
+        }
+        return null;
+    }
+}

src/main/java/org/pwss/model/table/ScanTableModel.java

@@ -8,7 +8,7 @@
 public class ScanTableModel extends AbstractTableModel {
     private final List<Scan> scans;
     private final String[] columnNames = {
-            "ID", "Scan Time", "Status", "Notes", "Directory", "Baseline"
+            "Directory", "Scan Time", "Status", "Notes"
     };
 
     public ScanTableModel(List<Scan> scans) {
@@ -34,13 +34,24 @@ public String getColumnName(int column) {
     public Object getValueAt(int rowIndex, int columnIndex) {
         Scan scan = scans.get(rowIndex);
         return switch (columnIndex) {
-            case 0 -> scan.id();
+            case 0 -> scan.monitoredDirectory().path();
             case 1 -> scan.scanTime().created();
             case 2 -> scan.status();
             case 3 -> scan.notes() != null ? scan.notes().notes() : "";
-            case 4 -> scan.monitoredDirectory() != null ? scan.monitoredDirectory().path() : "";
-            case 5 -> scan.isBaselineScan();
             default -> null;
         };
     }
+
+    /**
+     * Returns the Scan object at the specified row index.
+     *
+     * @param rowIndex the index of the row in the table.
+     * @return the Scan object at the specified row index, or null if the index is out of bounds.
+     */
+    public Scan getScanAt(int rowIndex) {
+        if (rowIndex >= 0 && rowIndex < scans.size()) {
+            return scans.get(rowIndex);
+        }
+        return null;
+    }
 }

src/main/java/org/pwss/navigation/NavigationEvents.java

@@ -1,5 +1,7 @@
 package org.pwss.navigation;
 
+import org.pwss.presenter.util.NavigationContext;
+
 /**
  * Handles navigation events within the application.
  */
@@ -22,10 +24,11 @@ public static void setListener(NavigationListener l) {
      * Navigates to the specified screen by invoking the listener's `onNavigate` method.
      *
      * @param screen The `Screen` to navigate to.
+     * @param context The `NavigationContext` containing data for the new screen.
      */
-    public static void navigateTo(Screen screen) {
+    public static void navigateTo(Screen screen, NavigationContext context) {
         if (listener != null) {
-            listener.onNavigate(screen);
+            listener.onNavigate(screen, context);
         }
     }
 }

src/main/java/org/pwss/navigation/NavigationHandler.java

@@ -8,6 +8,7 @@
 
 import org.pwss.presenter.BasePresenter;
 import org.pwss.presenter.factory.PresenterFactory;
+import org.pwss.presenter.util.NavigationContext;
 import org.pwss.view.screen.BaseScreen;
 
 /**
@@ -41,13 +42,16 @@ public NavigationHandler(JFrame frame, PresenterFactory factory) {
     }
 
     /**
-     * Navigates to the specified screen by retrieving or creating its presenter,
-     * updating the frame's content pane with the presenter's view, and refreshing the frame.
+     * Navigates to the specified screen, creating its presenter if it doesn't already exist.
+     * The presenter is set with the provided navigation context, and its data is reloaded.
      *
-     * @param screen The `Screen` to navigate to.
+     * @param screen  The `Screen` to navigate to.
+     * @param context The `NavigationContext` containing data for the new screen.
      */
-    public void navigateTo(Screen screen) {
+    public void navigateTo(Screen screen, NavigationContext context) {
         BasePresenter<?> presenter = presenters.computeIfAbsent(screen, factory::createPresenter);
+        // Set the navigation context for the presenter
+        presenter.setContext(context);
         BaseScreen baseScreen = presenter.getScreen();
         // Ensure the presenter reloads its data when navigating to the screen
         presenter.reloadData();
@@ -57,5 +61,8 @@ public void navigateTo(Screen screen) {
         frame.getContentPane().add(baseScreen.getRootPanel());
         frame.revalidate();
         frame.repaint();
+
+        // Notify the presenter that its screen is now visible
+        presenter.onShow();
     }
 }

src/main/java/org/pwss/navigation/NavigationListener.java

@@ -1,5 +1,7 @@
 package org.pwss.navigation;
 
+import org.pwss.presenter.util.NavigationContext;
+
 /**
  * A listener interface for handling navigation events within the application.
  */
@@ -8,6 +10,7 @@ public interface NavigationListener {
      * Called when a navigation event occurs.
      *
      * @param screen The `Screen` to navigate to.
+     * @param context The `NavigationContext` containing data for the new screen.
      */
-    void onNavigate(Screen screen);
+    void onNavigate(Screen screen, NavigationContext context);
 }

src/main/java/org/pwss/navigation/Screen.java

@@ -12,12 +12,17 @@ public enum Screen {
     /**
      * The home screen displayed after successful login.
      */
-    HOME(600, 400),
+    HOME(800, 600),
 
     /**
      * The screen for creating a new monitored directory.
      */
-    NEW_DIRECTORY(400, 250);
+    NEW_DIRECTORY(400, 250),
+
+    /**
+     * The screen for viewing scan summaries.
+     */
+    SCAN_SUMMARY(800, 600);
 
     /**
      * The width of the frame for this screen.

src/main/java/org/pwss/presenter/BasePresenter.java

@@ -1,5 +1,6 @@
 package org.pwss.presenter;
 
+import org.pwss.presenter.util.NavigationContext;
 import org.pwss.view.screen.BaseScreen;
 
 
@@ -14,6 +15,28 @@ public abstract class BasePresenter<Screen extends BaseScreen> {
      */
     protected Screen screen;
 
+    /**
+     * The navigation context for passing data between different parts of the application during navigation.
+     */
+    private NavigationContext context;
+
+    /**
+     * Retrieves the current navigation context.
+     *
+     * @return The `NavigationContext` instance associated with this presenter.
+     */
+    protected NavigationContext getContext() {
+        return context;
+    }
+
+    /**
+     * Sets the navigation context for the presenter.
+     *
+     * @param context
+     */
+    public void setContext(NavigationContext context) {
+        this.context = context;
+    }
 
     /**
      * Constructs a `BasePresenter` with the specified view.
@@ -56,4 +79,13 @@ public void reloadData() {
     public Screen getScreen() {
         return screen;
     }
+
+    /**
+     * Method called when the view is shown.
+     * Subclasses can override this method to perform actions when the view becomes visible.
+     * The default implementation does nothing.
+     */
+    public void onShow() {
+        // Default implementation does nothing
+    }
 }