From 41128f14573a4fd4df6f549eea34396a8e1179e9 Mon Sep 17 00:00:00 2001
From: hankhill19580 <hankhill19580@gmail.com>
Date: Wed, 17 Jul 2019 14:34:41 +0000
Subject: [PATCH] remove redundant functions

---
 .../net/i2p/i2ptunnel/TunnelController.java   | 12 --------
 .../i2p/i2ptunnel/TunnelControllerGroup.java  |  1 -
 .../net/i2p/i2ptunnel/ui/GeneralHelper.java   | 29 ++++---------------
 3 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
index d04985678..ca1c23a93 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
@@ -1152,18 +1152,6 @@ public class TunnelController implements Logging {
        ****/
     }
 
-    public boolean equals(Object o) {
-        if (!(o instanceof TunnelController)) {
-            return false;
-        }
-        TunnelController other = (TunnelController) o;
-        return getName().equals(other.getName());
-    }
-
-    public int hashCode() {
-        return getName().hashCode();
-    }
-
   /****
     private void getHttpClientSummary(StringBuilder buf) {
         String description = getDescription();
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java
index 8dd12c113..157b857e3 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java
@@ -884,7 +884,6 @@ public class TunnelControllerGroup implements ClientApp {
         _controllersLock.readLock().lock();
         try {
             List<TunnelController> rv = new ArrayList<TunnelController>(_controllers);
-            //Collections.sort(rv);
             return rv;
         } finally {
             _controllersLock.readLock().unlock();
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
index 17589e154..c79ef8a0d 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
@@ -66,6 +66,7 @@ public class GeneralHelper {
     public TunnelController getController(int tunnel) {
         return getController(_group, tunnel);
     }
+
     public static TunnelController getController(TunnelControllerGroup tcg, int tunnel) {
         if (tunnel < 0) return null;
         if (tcg == null) return null;
@@ -75,23 +76,11 @@ public class GeneralHelper {
         else
             return null;
     }
-    public static TunnelController getController(TunnelControllerGroup tcg, TunnelController tc) {
-        if (tcg == null) return null;
-        List<TunnelController> controllers = tcg.getControllers();
-        int i = 0;
-        for (TunnelController controller : controllers){
-            if (controller.getName().equals(tc.getName())) {
-                return controllers.get(i);
-            }
-            i++;
-        }
-
-        return null;
-    }
 
     public List<String> saveTunnel(int tunnel, TunnelConfig config) {
         return saveTunnel(_context, _group, tunnel, config);
     }
+
     public static List<String> saveTunnel(
             I2PAppContext context, TunnelControllerGroup tcg, int tunnel, TunnelConfig config) {
         List<String> msgs = updateTunnelConfig(tcg, tunnel, config);
@@ -159,7 +148,7 @@ public class GeneralHelper {
                 tcg.saveConfig(cur);
             } catch (IOException ioe) {
                 msgs.add("Failed to save initial tunnel config after creation " +
-                    getTunnelName(tcg, cur) + ", check logs:" + ioe);
+                    cur.getName() + ", check logs:" + ioe);
             }
         } else {
             cur.setConfig(props, "");
@@ -167,7 +156,7 @@ public class GeneralHelper {
                 tcg.saveConfig(cur);
             } catch (IOException ioe) {
                 msgs.add("Failed to save initial tunnel config after creation " +
-                    getTunnelName(tcg, cur) + ", check logs:" + ioe);
+                    cur.getName() + ", check logs:" + ioe);
             }
         }
         // Only modify other shared tunnels
@@ -195,7 +184,7 @@ public class GeneralHelper {
                         tcg.saveConfig(c);
                     } catch (IOException ioe) {
                         msgs.add("Failed to save initial tunnel config after creation " +
-                            getTunnelName(tcg, c) + ", check logs:" + ioe);
+                            cur.getName() + ", check logs:" + ioe);
                     }
                 }
             }
@@ -313,14 +302,6 @@ public class GeneralHelper {
         return tun != null ? tun.getName() : null;
     }
 
-    /**
-     *  @return null if unset
-     */
-    public static String getTunnelName(TunnelControllerGroup tcg, TunnelController tunnel) {
-        TunnelController tun = getController(tcg, tunnel);
-        return tun != null ? tun.getName() : null;
-    }
-
     public String getTunnelDescription(int tunnel) {
         TunnelController tun = getController(tunnel);
         return (tun != null && tun.getDescription() != null) ? tun.getDescription() : "";