/[classpath]/classpath/java/net/NetworkInterface.java
ViewVC logotype

Diff of /classpath/java/net/NetworkInterface.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.8.2.6 by gnu_andrew, Tue Aug 16 16:22:37 2005 UTC revision 1.8.2.7 by gnu_andrew, Sun Oct 16 17:12:07 2005 UTC
# Line 59  import java.util.Vector; Line 59  import java.util.Vector;
59  public final class NetworkInterface  public final class NetworkInterface
60  {  {
61    private String name;    private String name;
62    private Vector inetAddresses;    private Vector<InetAddress> inetAddresses;
63    
64    NetworkInterface(String name, InetAddress address)    NetworkInterface(String name, InetAddress address)
65    {    {
# Line 97  public final class NetworkInterface Line 97  public final class NetworkInterface
97     *     *
98     * @return An enumeration of all addresses.     * @return An enumeration of all addresses.
99     */     */
100    public Enumeration getInetAddresses()    public Enumeration<InetAddress> getInetAddresses()
101    {    {
102      SecurityManager s = System.getSecurityManager();      SecurityManager s = System.getSecurityManager();
103    
104      if (s == null)      if (s == null)
105        return inetAddresses.elements();        return inetAddresses.elements();
106    
107      Vector tmpInetAddresses = new Vector(1, 1);      Vector<InetAddress> tmpInetAddresses = new Vector<InetAddress>(1, 1);
108    
109      for (Enumeration addresses = inetAddresses.elements();      for (Enumeration<InetAddress> addresses = inetAddresses.elements();
110           addresses.hasMoreElements();)           addresses.hasMoreElements();)
111        {        {
112          InetAddress addr = (InetAddress) addresses.nextElement();          InetAddress addr = addresses.nextElement();
113          try          try
114            {            {
115              s.checkConnect(addr.getHostAddress(), 58000);              s.checkConnect(addr.getHostAddress(), 58000);
# Line 231  public final class NetworkInterface Line 231  public final class NetworkInterface
231     *     *
232     * @exception SocketException If an error occurs     * @exception SocketException If an error occurs
233     */     */
234    public static Enumeration getNetworkInterfaces() throws SocketException    public static Enumeration<NetworkInterface> getNetworkInterfaces()
235        throws SocketException
236    {    {
237      Vector networkInterfaces = VMNetworkInterface.getInterfaces();      Vector<NetworkInterface> networkInterfaces =
238          VMNetworkInterface.getInterfaces();
239    
240      if (networkInterfaces.isEmpty())      if (networkInterfaces.isEmpty())
241        return null;        return null;

Legend:
Removed from v.1.8.2.6  
changed lines
  Added in v.1.8.2.7

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26