TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-14 23:36:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplified the key

Browse Source
This commit is contained in:
hneemann 2019-08-25 14:23:17 +02:00
parent 61433b274c
commit c5af6bfeb5
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/neemann/digital/core/element/Key.java
View File

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