fix: better error handling for bad config!

tobybatch · tobybatch · commit 5e3251fbc4fe · 2023-04-24T10:50:54.000+01:00
diff --git a/README.md b/README.md
@@ -56,4 +56,6 @@ mvn clean compile assembly:single
 
 ```bash
 java -jar target/kimai-ui-1.0-SNAPSHOT-jar-with-dependencies.jar
-```
+```
+
+java -Dswing.aatext=true -Dswing.plaf.metal.controlFont=Tahoma -Dswing.plaf.metal.userFont=Tahoma 
diff --git a/src/main/java/uk/co/neontribe/kimai/Main.java b/src/main/java/uk/co/neontribe/kimai/Main.java
@@ -27,11 +27,15 @@ public class Main {
      * @throws IOException                   Thrown if we can't read from the file system
      */
     public static void main(String[] args) throws IOException {
+//        System.setProperty("swing.plaf.metal.userFont", "Dialog-32");
+//        System.setProperty("swing.plaf.metal.systemFont", "Dialog-32");
+//        System.setProperty("swing.plaf.metal.controlFont", "Dialog-Bold-32");
+
         // Create a new application frame and show it.
         // UIManager.setLookAndFeel ("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
         frame = new KimaiUiFrame();
         frame.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
-        // frame.setSize(800, 600);
+        // frame.setSize(1024, 768);
         frame.pack();
         frame.setVisible(true);
 
diff --git a/src/main/java/uk/co/neontribe/kimai/api/Entity.java b/src/main/java/uk/co/neontribe/kimai/api/Entity.java
@@ -27,7 +27,7 @@ public int getId() {
     }
 
     public static HttpURLConnection makeHttpConnection(URL url, Settings settings) throws IOException {
-        System.out.println("makeHttpConnection: " + settings.getKimaiUsername() + ", " + settings.getKimaiPassword() + ", " + ", " + settings.getKimaiUri());
+        System.out.println("makeHttpConnection: " + settings.getKimaiUsername() + ", " + settings.getKimaiUri());
         HttpURLConnection con = (HttpURLConnection) url.openConnection();
         con.setRequestProperty("X-AUTH-USER", settings.getKimaiUsername());
         con.setRequestProperty("X-AUTH-TOKEN", settings.getKimaiPassword());
diff --git a/src/main/java/uk/co/neontribe/kimai/config/Settings.java b/src/main/java/uk/co/neontribe/kimai/config/Settings.java
@@ -82,11 +82,10 @@ public LastAccessed getLastAccessed() {
         return lastAccessed;
     }
 
-    public int getFontSize() {
-        return this.fontSize;
-    }
-
     public void setKimaiUri(String kimaiUri) {
+        if (kimaiUri.endsWith("/")) {
+            kimaiUri = kimaiUri.substring(0, kimaiUri.length() -1);
+        }
         if (!this.kimaiUri.equals(kimaiUri)) {
             this.kimaiUri = kimaiUri;
             this.dirty = true;
@@ -137,10 +136,6 @@ public void setLastAccessedActivity(Activity activity) {
         }
     }
 
-//    public void setFontSize(int fontSize) {
-//        this.fontSize = fontSize;
-//    }
-
     public boolean isDirty() {
         return this.dirty;
     }
diff --git a/src/main/java/uk/co/neontribe/kimai/desktop/ConfigFrame.java b/src/main/java/uk/co/neontribe/kimai/desktop/ConfigFrame.java
@@ -1,5 +1,6 @@
 package uk.co.neontribe.kimai.desktop;
 
+import uk.co.neontribe.kimai.Main;
 import uk.co.neontribe.kimai.config.Settings;
 
 import javax.swing.*;
@@ -16,10 +17,12 @@ public class ConfigFrame extends JDialog implements ActionListener {
     private final JTextField uri;
     private final JTextField username;
     private final JTextField password;
-//    private final JTextField fontSize;
 
     public ConfigFrame(Settings settings) {
         this.settings = settings;
+        if (this.settings == null) {
+            this.settings = new Settings();
+        }
         this.setLayout(new BorderLayout(5, 5));
         this.setTitle("Settings");
 
@@ -30,14 +33,12 @@ public ConfigFrame(Settings settings) {
         gridRight.add(uri = new JTextField(this.settings.getKimaiUri(), 30));
         gridRight.add(username = new JTextField(this.settings.getKimaiUsername(), 30));
         gridRight.add(password = new JPasswordField("", 30));
-//        gridRight.add(fontSize = new JTextField("", settings.getFontSize()));
         this.add(gridRight, BorderLayout.CENTER);
 
         JPanel gridLeft = new JPanel(new GridLayout(0, 1, 5, 5));
         gridLeft.add(new JLabel("Your Kimai Uri:"));
         gridLeft.add(new JLabel("Username:"));
         gridLeft.add(new JLabel("Password:"));
-//        gridLeft.add(new JLabel("Font size:"));
         this.add(gridLeft, BorderLayout.WEST);
 
         JButton save = new JButton("Save");
@@ -82,7 +83,6 @@ public void actionPerformed(ActionEvent e) {
             if (this.password.getText().length() > 0) {
                 settings.setKimaiPassword(this.password.getText());
             }
-//            settings.setFontSize(Integer.parseInt(this.fontSize.getText()));
             configFrame.setVisible(false);
         } catch (Exception ex) {
             System.err.println("Unreachable");
diff --git a/src/main/java/uk/co/neontribe/kimai/desktop/StatusPanel.java b/src/main/java/uk/co/neontribe/kimai/desktop/StatusPanel.java
@@ -71,6 +71,10 @@ public void setOpeKimaiUrl(String url) {
         this.openKimai.setText(url);
     }
 
+    public void setSettings(Settings settings) {
+        this.settings = settings;
+    }
+
     public void setText(String text) {
         this.statusBar.setText(text);
     }
diff --git a/src/main/java/uk/co/neontribe/kimai/desktop/TimeEntryPanel.java b/src/main/java/uk/co/neontribe/kimai/desktop/TimeEntryPanel.java
@@ -129,20 +129,19 @@ public TimeEntryPanel() {
 
         try {
             this.settings = Settings.load();
-
-            customer.addListSelectionListener(listSelectionEvent -> updateProjectCombo());
-            project.addListSelectionListener(listSelectionEvent -> updateActivityCombo());
-            activity.addListSelectionListener(listSelectionEvent -> saveLastAccessedActivity());
-
-            this.statusPanel.setOpeKimaiUrl(this.settings.getKimaiUri());
-
-            updateCustomerCombo();
-            updateProjectCombo();
         } catch (IOException | ConfigNotInitialisedException e) {
-            throw new RuntimeException(e);
+            this.openConfigDialog();
         }
 
-        Main.changeFont(this, new Font(Font.SANS_SERIF, Font.PLAIN, settings.getFontSize()));
+        customer.addListSelectionListener(listSelectionEvent -> updateProjectCombo());
+        project.addListSelectionListener(listSelectionEvent -> updateActivityCombo());
+        activity.addListSelectionListener(listSelectionEvent -> saveLastAccessedActivity());
+
+        this.statusPanel.setSettings(this.settings);
+        this.statusPanel.setOpeKimaiUrl(this.settings.getKimaiUri());
+
+        updateCustomerCombo();
+        updateProjectCombo();
     }
 
     private void _setCursor(Cursor cursor) {
@@ -170,8 +169,10 @@ private void updateCustomerCombo() {
                     }
                 }
             }
+            this.statusPanel.setText("");
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            this.statusPanel.setText("Error: " + e.getMessage());
+            e.printStackTrace();
         }
     }
 
@@ -198,8 +199,10 @@ private void updateProjectCombo() {
                 }
             }
             this.settings.save();
+            this.statusPanel.setText("");
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            this.statusPanel.setText("Error: " + e.getMessage());
+            e.printStackTrace();
         }
         this._setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
     }
@@ -227,8 +230,10 @@ private void updateActivityCombo() {
                 }
             }
             this.settings.save();
+            this.statusPanel.setText("");
         } catch (IOException e) {
-            this.openConfigDialog();
+            this.statusPanel.setText("Error: " + e.getMessage());
+            e.printStackTrace();
         }
         this._setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
     }
@@ -274,13 +279,7 @@ public void actionPerformed(ActionEvent actionEvent) {
             cal.setTime(_begin);
             Date _end = new Date(cal.getTimeInMillis() + (60L * minutes * 1000));
 
-            TimeSheet timesheet = new TimeSheet(
-                    _notes,
-                    _begin,
-                    _end,
-                    _project,
-                    _activity,
-                    user);
+            TimeSheet timesheet = new TimeSheet(_notes, _begin, _end, _project, _activity, user);
 
             Component topLevelFrame = ConfigFrame.getParentFrame(this);
             if (topLevelFrame != null) {
@@ -294,6 +293,7 @@ public void actionPerformed(ActionEvent actionEvent) {
             if (topLevelFrame != null) {
                 topLevelFrame.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
             }
+            this.statusPanel.setText("");
         } catch (Exception e) {
             e.printStackTrace();
             if (e.getMessage() == null) {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public int getId() {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public static HttpURLConnection makeHttpConnection(URL url, Settings settings) throws IOException {`
`30`		`- System.out.println("makeHttpConnection: " + settings.getKimaiUsername() + ", " + settings.getKimaiPassword() + ", " + ", " + settings.getKimaiUri());`
	`30`	`+ System.out.println("makeHttpConnection: " + settings.getKimaiUsername() + ", " + settings.getKimaiUri());`
`31`	`31`	`HttpURLConnection con = (HttpURLConnection) url.openConnection();`
`32`	`32`	`con.setRequestProperty("X-AUTH-USER", settings.getKimaiUsername());`
`33`	`33`	`con.setRequestProperty("X-AUTH-TOKEN", settings.getKimaiPassword());`
Original file line number	Diff line number	Diff line change
`@@ -82,11 +82,10 @@ public LastAccessed getLastAccessed() {`
`82`	`82`	`return lastAccessed;`
`83`	`83`	`}`
`84`	`84`
`85`		`- public int getFontSize() {`
`86`		`- return this.fontSize;`
`87`		`- }`
`88`		`-`
`89`	`85`	`public void setKimaiUri(String kimaiUri) {`
	`86`	`+ if (kimaiUri.endsWith("/")) {`
	`87`	`+ kimaiUri = kimaiUri.substring(0, kimaiUri.length() -1);`
	`88`	`+ }`
`90`	`89`	`if (!this.kimaiUri.equals(kimaiUri)) {`
`91`	`90`	`this.kimaiUri = kimaiUri;`
`92`	`91`	`this.dirty = true;`
`@@ -137,10 +136,6 @@ public void setLastAccessedActivity(Activity activity) {`
`137`	`136`	`}`
`138`	`137`	`}`
`139`	`138`
`140`		`-// public void setFontSize(int fontSize) {`
`141`		`-// this.fontSize = fontSize;`
`142`		`-// }`
`143`		`-`
`144`	`139`	`public boolean isDirty() {`
`145`	`140`	`return this.dirty;`
`146`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,10 @@ public void setOpeKimaiUrl(String url) {`
`71`	`71`	`this.openKimai.setText(url);`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ public void setSettings(Settings settings) {`
	`75`	`+ this.settings = settings;`
	`76`	`+ }`
	`77`	`+`
`74`	`78`	`public void setText(String text) {`
`75`	`79`	`this.statusBar.setText(text);`
`76`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,20 +129,19 @@ public TimeEntryPanel() {`
`129`	`129`
`130`	`130`	`try {`
`131`	`131`	`this.settings = Settings.load();`
`132`		`-`
`133`		`- customer.addListSelectionListener(listSelectionEvent -> updateProjectCombo());`
`134`		`- project.addListSelectionListener(listSelectionEvent -> updateActivityCombo());`
`135`		`- activity.addListSelectionListener(listSelectionEvent -> saveLastAccessedActivity());`
`136`		`-`
`137`		`- this.statusPanel.setOpeKimaiUrl(this.settings.getKimaiUri());`
`138`		`-`
`139`		`- updateCustomerCombo();`
`140`		`- updateProjectCombo();`
`141`	`132`	`} catch (IOException \| ConfigNotInitialisedException e) {`
`142`		`- throw new RuntimeException(e);`
	`133`	`+ this.openConfigDialog();`
`143`	`134`	`}`
`144`	`135`
`145`		`- Main.changeFont(this, new Font(Font.SANS_SERIF, Font.PLAIN, settings.getFontSize()));`
	`136`	`+ customer.addListSelectionListener(listSelectionEvent -> updateProjectCombo());`
	`137`	`+ project.addListSelectionListener(listSelectionEvent -> updateActivityCombo());`
	`138`	`+ activity.addListSelectionListener(listSelectionEvent -> saveLastAccessedActivity());`
	`139`	`+`
	`140`	`+ this.statusPanel.setSettings(this.settings);`
	`141`	`+ this.statusPanel.setOpeKimaiUrl(this.settings.getKimaiUri());`
	`142`	`+`
	`143`	`+ updateCustomerCombo();`
	`144`	`+ updateProjectCombo();`
`146`	`145`	`}`
`147`	`146`
`148`	`147`	`private void _setCursor(Cursor cursor) {`
`@@ -170,8 +169,10 @@ private void updateCustomerCombo() {`
`170`	`169`	`}`
`171`	`170`	`}`
`172`	`171`	`}`
	`172`	`+ this.statusPanel.setText("");`
`173`	`173`	`} catch (IOException e) {`
`174`		`- throw new RuntimeException(e);`
	`174`	`+ this.statusPanel.setText("Error: " + e.getMessage());`
	`175`	`+ e.printStackTrace();`
`175`	`176`	`}`
`176`	`177`	`}`
`177`	`178`
`@@ -198,8 +199,10 @@ private void updateProjectCombo() {`
`198`	`199`	`}`
`199`	`200`	`}`
`200`	`201`	`this.settings.save();`
	`202`	`+ this.statusPanel.setText("");`
`201`	`203`	`} catch (IOException e) {`
`202`		`- throw new RuntimeException(e);`
	`204`	`+ this.statusPanel.setText("Error: " + e.getMessage());`
	`205`	`+ e.printStackTrace();`
`203`	`206`	`}`
`204`	`207`	`this._setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));`
`205`	`208`	`}`
`@@ -227,8 +230,10 @@ private void updateActivityCombo() {`
`227`	`230`	`}`
`228`	`231`	`}`
`229`	`232`	`this.settings.save();`
	`233`	`+ this.statusPanel.setText("");`
`230`	`234`	`} catch (IOException e) {`
`231`		`- this.openConfigDialog();`
	`235`	`+ this.statusPanel.setText("Error: " + e.getMessage());`
	`236`	`+ e.printStackTrace();`
`232`	`237`	`}`
`233`	`238`	`this._setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));`
`234`	`239`	`}`
`@@ -274,13 +279,7 @@ public void actionPerformed(ActionEvent actionEvent) {`
`274`	`279`	`cal.setTime(_begin);`
`275`	`280`	`Date _end = new Date(cal.getTimeInMillis() + (60L * minutes * 1000));`
`276`	`281`
`277`		`- TimeSheet timesheet = new TimeSheet(`
`278`		`- _notes,`
`279`		`- _begin,`
`280`		`- _end,`
`281`		`- _project,`
`282`		`- _activity,`
`283`		`- user);`
	`282`	`+ TimeSheet timesheet = new TimeSheet(_notes, _begin, _end, _project, _activity, user);`
`284`	`283`
`285`	`284`	`Component topLevelFrame = ConfigFrame.getParentFrame(this);`
`286`	`285`	`if (topLevelFrame != null) {`
`@@ -294,6 +293,7 @@ public void actionPerformed(ActionEvent actionEvent) {`
`294`	`293`	`if (topLevelFrame != null) {`
`295`	`294`	`topLevelFrame.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));`
`296`	`295`	`}`
	`296`	`+ this.statusPanel.setText("");`
`297`	`297`	`} catch (Exception e) {`
`298`	`298`	`e.printStackTrace();`
`299`	`299`	`if (e.getMessage() == null) {`