From e85604e3b6fa8676092f6b71537015506c106b34 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Mon, 22 May 2017 12:28:51 +0200
Subject: [PATCH] fixed two findbugs issues

---
 .../de/neemann/digital/core/NodeException.java |  2 +-
 .../draw/library/NumStringComparator.java      | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/neemann/digital/core/NodeException.java b/src/main/java/de/neemann/digital/core/NodeException.java
index c33c8e2b5..cba475e13 100644
--- a/src/main/java/de/neemann/digital/core/NodeException.java
+++ b/src/main/java/de/neemann/digital/core/NodeException.java
@@ -105,7 +105,7 @@ public class NodeException extends Exception {
                             }
 
                         }
-                    } catch (Exception e) {
+                    } catch (IllegalAccessException | NoSuchFieldException e) {
                         // ignore an error accessing the ElementTypeDescription
                     }
             }
diff --git a/src/main/java/de/neemann/digital/draw/library/NumStringComparator.java b/src/main/java/de/neemann/digital/draw/library/NumStringComparator.java
index 4b4eca667..b2347906a 100644
--- a/src/main/java/de/neemann/digital/draw/library/NumStringComparator.java
+++ b/src/main/java/de/neemann/digital/draw/library/NumStringComparator.java
@@ -70,6 +70,24 @@ public final class NumStringComparator implements Comparator<String> {
             }
         }
 
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+
+            NumString numString = (NumString) o;
+
+            if (num != numString.num) return false;
+            return str != null ? str.equalsIgnoreCase(numString.str) : numString.str == null;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = num;
+            result = 31 * result + (str != null ? str.toLowerCase().hashCode() : 0);
+            return result;
+        }
+
         @Override
         public int compareTo(NumString other) {
             if (isNum && other.isNum) {