Stop UI picking up illegal values from settings

Fixes a crash caused by IllegalArgumentException thrown by javax.swing.SpinnerNumberModel.
JOSM · May 2, 2020 · 0d3f8b2 · 0d3f8b2
1 parent 362482b
commit 0d3f8b2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/nl/jeroenhoek/josm/gridify/GridifySettings.java b/src/nl/jeroenhoek/josm/gridify/GridifySettings.java
@@ -18,15 +18,31 @@ public class GridifySettings {
     );
 
     public int getNumRows() {
-        return numRowsSetting.get();
+        int rows = numRowsSetting.get();
+
+        // Limit number of rows to permissible values.
+        if (rows < 1 || rows > 1000) {
+            setNumRows(2);
+            return 2;
+        }
+
+        return rows;
     }
 
     public void setNumRows(int numRows) {
         numRowsSetting.put(numRows);
     }
 
     public int getNumColumns() {
-        return numColsSetting.get();
+        int columns = numColsSetting.get();
+
+        // Limit number of rows to permissible values.
+        if (columns < 1 || columns > 1000) {
+            setNumColumns(4);
+            return 4;
+        }
+
+        return columns;
     }
 
     public void setNumColumns(int numColumns) {

diff --git a/src/nl/jeroenhoek/josm/gridify/ui/GridSizePanel.java b/src/nl/jeroenhoek/josm/gridify/ui/GridSizePanel.java
@@ -43,12 +43,14 @@ public GridSizePanel(ChangeCallback changeCallback, int rows, int columns) {
     }
 
     void setRowCount(int rows) {
+        if (rows < 1 || rows > 1000) return;
         this.rows = rows;
         this.spinnerRows.setValue(rows);
         changeCallback.changed(getRowCount(), getColumnCount());
     }
 
     void setColumnCount(int columns) {
+        if (columns < 1 || columns > 1000) return;
         this.columns = columns;
         this.spinnerColumns.setValue(columns);
         changeCallback.changed(getRowCount(), getColumnCount());