Correct Look & Feel to be native, analogous to DataShot

Author: GenieTim

.github/workflows/maven-prerelease.yml

@@ -30,7 +30,7 @@ jobs:
       run: mvn -B package --file pom.xml -P dist
     - name: Determine Prerelease Name
       id: name_determiner
-      run: echo "##[set-output name=name;]DataShot-$(date +'%Y%m%d')-beta"
+      run: echo "##[set-output name=name;]PreCapture-$(date +'%Y%m%d')-beta"
     - name: Create Pre-release
       id: create_prerelease
       if: success()

PRECAPTURE2.h2.db

@@ -3,7 +3,10 @@
   <component name="FacetManager">
     <facet type="hibernate" name="Hibernate">
       <configuration>
-        <datasource-map />
+        <datasource-map>
+          <unit-entry name="bin:hibernate.cfg.xml" />
+          <unit-entry name="hibernate.cfg.xml" />
+        </datasource-map>
         <naming-strategy-map />
         <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/bin/hibernate.cfg.xml" />
         <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/src/hibernate.cfg.xml" />

PreCaptureApp.iml

@@ -73,14 +73,6 @@ public class PreCaptureApp {
      */
     public static void main(String[] args) {
         try {
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-//            System.setProperty("apple.laf.useScreenMenuBar", "true");
-        } catch (UnsupportedLookAndFeelException | ClassNotFoundException | InstantiationException | IllegalAccessException e) {
-            log.error(e);
-        }
-
-        try {
-
             SplashScreen splashScreen = new SplashScreen();
             splashScreen.pack();
             splashScreen.setVisible(true);
@@ -205,7 +197,12 @@ public void run() {
                                     UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
                                 }
                             } else {
-                                UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+                                try {
+                                    UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+//                                  System.setProperty("apple.laf.useScreenMenuBar", "true");
+                                } catch (UnsupportedLookAndFeelException | ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+                                    log.error(e);
+                                }
                             }
 
                             // Support Command C/P/X for copy/paste/cut on OSX as well as Control C/P/X on other systems.

src/edu/harvard/mcz/precapture/PreCaptureApp.java

@@ -40,7 +40,8 @@ public class MainFrame implements WindowListener {
     private JFrame frame;
     private JTable tablePrintList;
     private boolean closing = false;
-    /** Set to true to use Napkin Look and Feel.
+    /**
+     * Set to true to use Napkin Look and Feel.
      */
     private ContainerEntryPanel folderPanel;
 
@@ -105,7 +106,6 @@ public void actionPerformed(ActionEvent e) {
             }
         });
 
-
         JPanel panel_4 = new ContainerListPanel(frame);
         tabbedPane.addTab("Print List", null, panel_4, null);
         tabbedPane.setMnemonicAt(1, KeyEvent.VK_L);