From 4500f7dd6aef2fb186f6eb9e74a21c08dd38316e Mon Sep 17 00:00:00 2001
From: Lucas Chiesa <lucas.chiesa@gmail.com>
Date: Tue, 22 Oct 2013 08:27:38 -0700
Subject: [PATCH] Removed listAllInetAddress private method.
Also renamed getAllInetAddressByName to getAllInetAddressesByName.
---
.../org/ros/address/InetAddressFactory.java | 22 ++++++++-----------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/rosjava/src/main/java/org/ros/address/InetAddressFactory.java b/rosjava/src/main/java/org/ros/address/InetAddressFactory.java
index dc36fc6d..6ba321bc 100644
--- a/rosjava/src/main/java/org/ros/address/InetAddressFactory.java
+++ b/rosjava/src/main/java/org/ros/address/InetAddressFactory.java
@@ -44,7 +44,13 @@ public class InetAddressFactory {
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 @@ public class InetAddressFactory {
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 class InetAddressFactory {
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 class InetAddressFactory {
} 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)) {
--
GitLab