echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove redundant functions

Browse Source
This commit is contained in:
hankhill19580
2019-07-17 14:34:41 +00:00
parent 61f45b3a3a
commit 41128f1457
3 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
View File

@ -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) { private void getHttpClientSummary(StringBuilder buf) {
String description = getDescription(); String description = getDescription();

1
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java
View File

@ -884,7 +884,6 @@ public class TunnelControllerGroup implements ClientApp {
_controllersLock.readLock().lock(); _controllersLock.readLock().lock();
try { try {
List<TunnelController> rv = new ArrayList<TunnelController>(_controllers); List<TunnelController> rv = new ArrayList<TunnelController>(_controllers);
//Collections.sort(rv);
return rv; return rv;
} finally { } finally {
_controllersLock.readLock().unlock(); _controllersLock.readLock().unlock();

29
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
View File

@ -66,6 +66,7 @@ public class GeneralHelper {
public TunnelController getController(int tunnel) { public TunnelController getController(int tunnel) {
return getController(_group, tunnel); return getController(_group, tunnel);
} }
public static TunnelController getController(TunnelControllerGroup tcg, int tunnel) { public static TunnelController getController(TunnelControllerGroup tcg, int tunnel) {
if (tunnel < 0) return null; if (tunnel < 0) return null;
if (tcg == null) return null; if (tcg == null) return null;
@ -75,23 +76,11 @@ public class GeneralHelper {
else else
return null; 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) { public List<String> saveTunnel(int tunnel, TunnelConfig config) {
return saveTunnel(_context, _group, tunnel, config); return saveTunnel(_context, _group, tunnel, config);
} }
public static List<String> saveTunnel( public static List<String> saveTunnel(
I2PAppContext context, TunnelControllerGroup tcg, int tunnel, TunnelConfig config) { I2PAppContext context, TunnelControllerGroup tcg, int tunnel, TunnelConfig config) {
List<String> msgs = updateTunnelConfig(tcg, tunnel, config); List<String> msgs = updateTunnelConfig(tcg, tunnel, config);
@ -159,7 +148,7 @@ public class GeneralHelper {
tcg.saveConfig(cur); tcg.saveConfig(cur);
} catch (IOException ioe) { } catch (IOException ioe) {
msgs.add("Failed to save initial tunnel config after creation " + msgs.add("Failed to save initial tunnel config after creation " +
getTunnelName(tcg, cur) + ", check logs:" + ioe); cur.getName() + ", check logs:" + ioe);
} }
} else { } else {
cur.setConfig(props, ""); cur.setConfig(props, "");
@ -167,7 +156,7 @@ public class GeneralHelper {
tcg.saveConfig(cur); tcg.saveConfig(cur);
} catch (IOException ioe) { } catch (IOException ioe) {
msgs.add("Failed to save initial tunnel config after creation " + 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 // Only modify other shared tunnels
@ -195,7 +184,7 @@ public class GeneralHelper {
tcg.saveConfig(c); tcg.saveConfig(c);
} catch (IOException ioe) { } catch (IOException ioe) {
msgs.add("Failed to save initial tunnel config after creation " + 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 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) { public String getTunnelDescription(int tunnel) {
TunnelController tun = getController(tunnel); TunnelController tun = getController(tunnel);
return (tun != null && tun.getDescription() != null) ? tun.getDescription() : ""; return (tun != null && tun.getDescription() != null) ? tun.getDescription() : "";