Removed listAllInetAddress private method.

Also renamed getAllInetAddressByName to getAllInetAddressesByName.
jubeira · Jun 27, 2014 · 52d1449 · 52d1449
1 parent d02c924
commit 52d1449
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/rosjava/src/main/java/org/ros/address/InetAddressFactory.java b/rosjava/src/main/java/org/ros/address/InetAddressFactory.java
@@ -44,7 +44,13 @@ private static boolean isIpv4(InetAddress address) {
     return address.getAddress().length == 4;
   }
 
-  private static List<InetAddress> listAllInetAddress (Collection<NetworkInterface> networkInterfaces) {
+  private static Collection<InetAddress> getAllInetAddresses() {
+    List<NetworkInterface> networkInterfaces;
+    try {
+      networkInterfaces = Collections.list(NetworkInterface.getNetworkInterfaces());
+    } catch (SocketException e) {
+      throw new RosRuntimeException(e);
+    }
     List<InetAddress> inetAddresses = Lists.newArrayList();
     for (NetworkInterface networkInterface : networkInterfaces) {
       try {
@@ -58,16 +64,6 @@ private static List<InetAddress> listAllInetAddress (Collection<NetworkInterface
     return inetAddresses;
   }
 
-  private static Collection<InetAddress> getAllInetAddresses() {
-    List<NetworkInterface> networkInterfaces;
-    try {
-      networkInterfaces = Collections.list(NetworkInterface.getNetworkInterfaces());
-    } catch (SocketException e) {
-      throw new RosRuntimeException(e);
-    }
-    return listAllInetAddress(networkInterfaces);
-  }
-
   private static InetAddress filterInetAddresses (Collection<InetAddress> inetAddresses) {
     for (InetAddress address : inetAddresses) {
       // IPv4 only for now.
@@ -86,7 +82,7 @@ public static InetAddress newNonLoopbackForNetworkInterface(NetworkInterface net
     return filterInetAddresses(Collections.list(networkInterface.getInetAddresses()));
   }
 
-  private static Collection<InetAddress> getAllInetAddressByName(String host) {
+  private static Collection<InetAddress> getAllInetAddressesByName(String host) {
     InetAddress[] allAddressesByName;
     try {
       allAddressesByName = org.xbill.DNS.Address.getAllByName(host);
@@ -130,7 +126,7 @@ public static InetAddress newFromHostString(String host) {
     } catch (UnknownHostException e) {
       throw new RosRuntimeException(e);
     }
-    Collection<InetAddress> allAddressesByName = getAllInetAddressByName(host);
+    Collection<InetAddress> allAddressesByName = getAllInetAddressesByName(host);
     // First, try to find a non-loopback IPv4 address.
     for (InetAddress address : allAddressesByName) {
       if (!address.isLoopbackAddress() && isIpv4(address)) {