Adding Configuration to RUPS. RES-691

Author: michaeldemey

pom.xml

@@ -71,6 +71,11 @@
       <artifactId>logback-core</artifactId>
       <version>${logback.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.ibm.icu</groupId>
+      <artifactId>icu4j</artifactId>
+      <version>69.1</version>
+    </dependency>
     <dependency>
       <groupId>com.itextpdf</groupId>
       <artifactId>io</artifactId>
@@ -87,10 +92,11 @@
       <version>${dom4j.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.ibm.icu</groupId>
-      <artifactId>icu4j</artifactId>
-      <version>69.1</version>
+      <groupId>com.formdev</groupId>
+      <artifactId>flatlaf</artifactId>
+      <version>2.2</version>
     </dependency>
+
     <dependency>
       <groupId>com.itextpdf</groupId>
       <artifactId>pdftest</artifactId>
@@ -127,6 +133,11 @@
   <build>
     <finalName>${project.artifactId}-${project.version}</finalName>
     <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>5.1.4</version>
+      </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>${assembly-plugin.version}</version>
@@ -169,11 +180,6 @@
             </manifest>
           </archive>
         </configuration>
-      </plugin>
-	  <plugin>
-		<groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-		<version>5.1.4</version>
       </plugin>
     </plugins>
   </build>
@@ -328,4 +334,4 @@
       </build>
     </profile>
   </profiles>
-</project>
+</project>

src/main/java/com/itextpdf/rups/Rups.java

@@ -45,33 +45,35 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.actions.data.ITextCoreProductData;
 import com.itextpdf.rups.controller.IRupsController;
 import com.itextpdf.rups.controller.RupsController;
+import com.itextpdf.rups.model.LoggerHelper;
 import com.itextpdf.rups.view.Language;
 import com.itextpdf.rups.view.RupsDropTarget;
 import com.itextpdf.rups.view.RupsMenuBar;
 import com.itextpdf.rups.view.RupsTabbedPane;
 import com.itextpdf.rups.view.icons.FrameIconUtil;
 
+import com.formdev.flatlaf.FlatLightLaf;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.Toolkit;
 import java.io.File;
 import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
 
 public class Rups {
 
     /**
      * Initializes the main components of the Rups application.
      *
-     * @param f                a file that should be opened on launch
-     * @param onCloseOperation the close operation
+     * @param f a file that should be opened on launch
      */
-    public static void startNewApplication(final File f, final int onCloseOperation) {
+    public static void startNewApplication(final File f) {
         SwingUtilities.invokeLater(() -> {
             setLookandFeel();
-            IRupsController rupsController = initApplication(new JFrame(), onCloseOperation);
-            if ( f != null ) {
+            final IRupsController rupsController = initApplication(new JFrame());
+            if (f != null) {
                 loadDocumentFromFile(rupsController, f);
             }
         });
@@ -83,17 +85,17 @@ static void loadDocumentFromFile(IRupsController rupsController, File f) {
 
     static void setLookandFeel() {
         try {
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        } catch (Exception e) {
-            try {
-                UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
-            } catch (Exception ex) {
-                // WELP IDK
+            if ( !FlatLightLaf.setup()) {
+                UIManager.setLookAndFeel(RupsConfiguration.INSTANCE.getLookAndFeel());
             }
+        } catch (
+                ClassNotFoundException | InstantiationException |
+                        IllegalAccessException | UnsupportedLookAndFeelException e) {
+            LoggerHelper.error(Language.ERROR_LOOK_AND_FEEL.getString(), e, Rups.class);
         }
     }
 
-    static IRupsController initApplication(JFrame frame, final int onCloseOperation) {
+    static IRupsController initApplication(JFrame frame) {
         Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
         frame.setSize((int) (screen.getWidth() * .90), (int) (screen.getHeight() * .90));
         frame.setLocation((int) (screen.getWidth() * .05), (int) (screen.getHeight() * .05));
@@ -103,7 +105,7 @@ static IRupsController initApplication(JFrame frame, final int onCloseOperation)
         frame.setTitle(
                 String.format(Language.TITLE.getString(), ITextCoreProductData.getInstance().getVersion()));
         frame.setIconImages(FrameIconUtil.loadFrameIcons());
-        frame.setDefaultCloseOperation(onCloseOperation);
+        frame.setDefaultCloseOperation(RupsConfiguration.INSTANCE.getCloseOperation());
 
         final RupsTabbedPane rupsTabbedPane = new RupsTabbedPane();
         final RupsController rupsController = new RupsController(screen, rupsTabbedPane);