From 9aac7900c0858eb44b81c4ed1dd80f3cb44b85bb Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 5 Jun 2022 20:14:16 +0200
Subject: Refactor: Make KeyValue final

The class has a complicated internal logic, it is no longer reasonable
to extend it.
---
 srcs/juloo.keyboard2/Emoji.java | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'srcs/juloo.keyboard2/Emoji.java')

diff --git a/srcs/juloo.keyboard2/Emoji.java b/srcs/juloo.keyboard2/Emoji.java
index b75069d..28c4f9f 100644
--- a/srcs/juloo.keyboard2/Emoji.java
+++ b/srcs/juloo.keyboard2/Emoji.java
@@ -8,19 +8,30 @@ import java.io.BufferedReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-public class Emoji extends KeyValue
+public class Emoji
 {
+  private final KeyValue _kv;
   private final String _desc;
 
   private static HashMap<String, Emoji> emojis_by_name = new HashMap<String, Emoji>();
 
   protected Emoji(String name, String bytecode, String desc)
   {
-    super(name, bytecode, KIND_STRING, 0, 0);
+    _kv = new KeyValue(name, bytecode, KeyValue.KIND_STRING, 0, 0);
     _desc = desc;
     emojis_by_name.put(name, this);
   }
 
+  public String name()
+  {
+    return _kv.name;
+  }
+
+  public KeyValue kv()
+  {
+    return _kv;
+  }
+
   public String getDescription()
   {
     return (_desc);
-- 
cgit v1.2.3