From c5af6bfeb5adfebfcbf7dfc15609227d006429aa Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Sun, 25 Aug 2019 14:23:17 +0200
Subject: [PATCH] simplified the key

---
 .../java/de/neemann/digital/core/element/Key.java    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/java/de/neemann/digital/core/element/Key.java b/src/main/java/de/neemann/digital/core/element/Key.java
index ae0bda4a5..a6ee425de 100644
--- a/src/main/java/de/neemann/digital/core/element/Key.java
+++ b/src/main/java/de/neemann/digital/core/element/Key.java
@@ -16,7 +16,6 @@ import java.io.File;
  */
 public class Key<VALUE> {
     private final String key;
-    private final VALUE def;
     private final DefaultFactory<VALUE> defFactory;
     private final String langKey;
     private boolean groupEditAllowed = false;
@@ -38,12 +37,9 @@ public class Key<VALUE> {
      * @param def the default value
      */
     public Key(String key, VALUE def) {
-        this.key = key;
-        langKey = "key_" + key.replace(" ", "");
+        this(key, () -> def);
         if (def == null)
             throw new NullPointerException();
-        this.def = def;
-        this.defFactory = null;
     }
 
     /**
@@ -58,7 +54,6 @@ public class Key<VALUE> {
         langKey = "key_" + key.replace(" ", "");
         if (defFactory == null)
             throw new NullPointerException();
-        this.def = null;
         this.defFactory = defFactory;
     }
 
@@ -87,10 +82,7 @@ public class Key<VALUE> {
      * @return the default value of this key
      */
     public VALUE getDefault() {
-        if (def != null)
-            return def;
-        else
-            return defFactory.createDefault();
+        return defFactory.createDefault();
     }
 
     /**