SpreadsheetIntegerBox.addXXXListener addEventListener

mP1 · Jan 15, 2025 · 811edd0 · 811edd0
1 parent 68b789d
commit 811edd0
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/src/main/java/walkingkooka/spreadsheet/dominokit/value/SpreadsheetIntegerBox.java b/src/main/java/walkingkooka/spreadsheet/dominokit/value/SpreadsheetIntegerBox.java
@@ -82,43 +82,42 @@ public SpreadsheetIntegerBox addChangeListener(final ChangeListener<Optional<Int
 
     @Override
     public SpreadsheetIntegerBox addClickListener(final EventListener listener) {
-        Objects.requireNonNull(listener, "listener");
-
-        this.integerBox.addEventListener(
+        return this.addEventListener(
             EventType.click,
             listener
         );
-        return this;
     }
 
     @Override
     public SpreadsheetIntegerBox addFocusListener(final EventListener listener) {
-        Objects.requireNonNull(listener, "listener");
-        this.integerBox.getInputElement()
-            .addEventListener(
-                EventType.focus,
-                listener::handleEvent
-            );
-        return this;
+        return this.addEventListener(
+            EventType.focus,
+            listener
+        );
     }
 
     @Override
     public SpreadsheetIntegerBox addKeydownListener(final EventListener listener) {
-        Objects.requireNonNull(listener, "listener");
-
-        this.integerBox.addEventListener(
+        return this.addEventListener(
             EventType.keydown,
             listener
         );
-        return this;
     }
 
     @Override
     public SpreadsheetIntegerBox addKeyupListener(final EventListener listener) {
+        return this.addEventListener(
+            EventType.keyup,
+            listener
+        );
+    }
+
+    private SpreadsheetIntegerBox addEventListener(final EventType eventType,
+                                                final EventListener listener) {
         Objects.requireNonNull(listener, "listener");
 
         this.integerBox.addEventListener(
-            EventType.keyup,
+            eventType,
             listener
         );
         return this;