Review remarks. RES-691

Author: michaeldemey

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

@@ -52,7 +52,6 @@ This file is part of the iText (R) project.
 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;

src/main/java/com/itextpdf/rups/view/Language.java

@@ -158,6 +158,7 @@ public enum Language {
     KEEP_CHUNKS_AS_LITERALS,
 
     LOADING,
+    LOCALE,
     LOG_TREE_NODE_CREATED,
 
     MENU_BAR_ABOUT,
@@ -192,6 +193,7 @@ public enum Language {
     PLAINTEXT_DESCRIPTION,
     PREFERENCES,
     PREFERENCES_ALLOW_DUPLICATE_FILES,
+    PREFERENCES_NEED_RESTART,
     PREFERENCES_OPEN_FOLDER,
     PREFERENCES_RESET_TO_DEFAULTS,
     PREFERENCES_RESET_TO_DEFAULTS_CONFIRM,

src/main/java/com/itextpdf/rups/view/PreferencesWindow.java

@@ -7,6 +7,9 @@
 import java.awt.Component;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
 import java.util.Locale;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -38,6 +41,8 @@ public class PreferencesWindow {
     // Fields to reset
     private JCheckBox openDuplicateFiles;
     private JTextField pathField;
+    private JLabel restartLabel;
+    private JComboBox<String> localeBox;
 
     public PreferencesWindow() {
         initializeJDialog();
@@ -59,6 +64,13 @@ private void initializeJDialog() {
         this.jDialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
         this.jDialog.setModal(true);
         this.jDialog.setLayout(new BorderLayout());
+        this.jDialog.addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosing(WindowEvent e) {
+                RupsConfiguration.INSTANCE.cancelTemporaryChanges();
+                resetView();
+            }
+        });
     }
 
     private void initializeLayout() {
@@ -115,24 +127,29 @@ private void createGeneralSettingsTab() {
     }
 
     private void createVisualSettingsTab() {
-        final JComboBox<String> localeBox = new JComboBox<>();
-        localeBox.addItem("nl-NL");
-        localeBox.addItem("en-US");
-        localeBox.setSelectedItem(RupsConfiguration.INSTANCE.getUserLocale().toLanguageTag());
-        final JLabel localeLabel = new JLabel("Locale");
+        this.localeBox = new JComboBox<>();
+        this.localeBox.addItem("nl-NL");
+        this.localeBox.addItem("en-US");
+        this.localeBox.setSelectedItem(RupsConfiguration.INSTANCE.getUserLocale().toLanguageTag());
+        final JLabel localeLabel = new JLabel(Language.LOCALE.getString());
         localeLabel.setLabelFor(localeBox);
 
-        localeBox.addActionListener(e -> {
+        this.restartLabel = new JLabel(Language.PREFERENCES_NEED_RESTART.getString());
+        this.restartLabel.setVisible(false);
+
+        this.localeBox.addActionListener(e -> {
             Object selectedItem = localeBox.getSelectedItem();
             String selectedString = (String) selectedItem;
             RupsConfiguration.INSTANCE.setUserLocale(Locale.forLanguageTag(selectedString));
+            this.restartLabel.setVisible(true);
         });
 
         this.visualPanel = new JPanel();
         this.visualPanel.setLayout(this.gridBagLayout);
 
         this.visualPanel.add(localeLabel, this.left);
-        this.visualPanel.add(localeBox, this.right);
+        this.visualPanel.add(this.localeBox, this.right);
+        this.visualPanel.add(this.restartLabel, this.right);
     }
 
     private void createTabbedPane() {
@@ -150,6 +167,7 @@ private void createSaveCancelResetSection() {
         JButton save = new JButton(Language.SAVE.getString());
         save.addActionListener(e -> {
             RupsConfiguration.INSTANCE.saveConfiguration();
+            resetView();
             this.jDialog.dispose();
         });
         buttons.add(save);
@@ -176,7 +194,6 @@ private void createSaveCancelResetSection() {
                     Language.PREFERENCES_RESET_TO_DEFAULTS_CONFIRM.getString());
             if (choice == JOptionPane.OK_OPTION) {
                 RupsConfiguration.INSTANCE.resetToDefaultProperties();
-
                 resetView();
             }
         });
@@ -193,6 +210,8 @@ private void completeJDialogCreation() {
     private void resetView() {
         this.pathField.setText(RupsConfiguration.INSTANCE.getHomeFolder().getPath());
         this.openDuplicateFiles.setSelected(RupsConfiguration.INSTANCE.canOpenDuplicateFiles());
+        this.localeBox.setSelectedItem(RupsConfiguration.INSTANCE.getUserLocale().toLanguageTag());
+        this.restartLabel.setVisible(false);
     }
 
     public void show(Component component) {

src/main/java/com/itextpdf/rups/view/itext/contentstream/ContentStreamWriter.java

@@ -110,7 +110,7 @@ private Element handleHexContent(Element initElement, ElementIterator it) throws
             final int start = current.getStartOffset();
             final int end = current.getEndOffset();
             try {
-                hexBuf.append(doc.getText(start, end - start).toLowerCase(Locale.getDefault()));
+                hexBuf.append(doc.getText(start, end - start).toLowerCase(Locale.ROOT));
             } catch (BadLocationException e) {
                 throw new ITextException(Language.ERROR_QUERY_CONTENT_STREAM.getString(), e);
             }

src/main/resources/bundles/rups-lang.properties

@@ -109,6 +109,7 @@ INSPECT_OBJECT=Inspect Object
 KEEP_CHUNKS_AS_LITERALS=Do you want to keep those chunks as Literals?
 
 LOADING=Loading...
+LOCALE=Locale
 LOG_TREE_NODE_CREATED=Tree node was successfully created for new indirect object
 
 MENU_BAR_ABOUT=About
@@ -150,6 +151,7 @@ PLAINTEXT_DESCRIPTION=Plain text representation of the PDF
 
 PREFERENCES=Preferences
 PREFERENCES_ALLOW_DUPLICATE_FILES=Allow duplicate files in viewer
+PREFERENCES_NEED_RESTART=RUPS needs to be restarted when changing this value.
 PREFERENCES_OPEN_FOLDER=Default Open File Folder
 PREFERENCES_RESET_TO_DEFAULTS=Reset to Defaults
 PREFERENCES_RESET_TO_DEFAULTS_CONFIRM=Do you want to reset all settings?

src/main/resources/bundles/rups-lang_nl_NL.properties

@@ -106,6 +106,7 @@ INSPECT_OBJECT=Object inspecteren
 KEEP_CHUNKS_AS_LITERALS=Wilt u deze chunks behouden als Literals?
 
 LOADING=Laden...
+LOCALE=Taalinstelling
 LOG_TREE_NODE_CREATED=Tree node werd aangemaakt voor het nieuwe indirect object
 
 MENU_BAR_ABOUT=Over
@@ -146,6 +147,7 @@ PLAINTEXT_DESCRIPTION=Plain text representatie van het PDF bestand
 
 PREFERENCES=Voorkeuren
 PREFERENCES_ALLOW_DUPLICATE_FILES=Sta het openen van duplicate bestanden toe
+PREFERENCES_NEED_RESTART=RUPS moet herstarten na het aanpassen van deze voorkeur.
 PREFERENCES_OPEN_FOLDER=Standaard folder om bestanden te openen
 PREFERENCES_RESET_TO_DEFAULTS=Herstel beginwaarden
 PREFERENCES_RESET_TO_DEFAULTS_CONFIRM=Wilt u de beginwaarden herstellen?