[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: NetworkInterface cleanup

Kaffe CVS cvs-commits at kaffe.org
Tue Apr 19 09:49:33 PDT 2005


PatchSet 5713 
Date: 2005/04/19 16:44:21
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: NetworkInterface cleanup

2005-04-19  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-04-12  Michael Koch  <konqueror at gmx.de>

        * java/net/NetworkInterface.java
        (NetworkInterface): Made constructor package private.
        Introduced another constructor for more addresses on one
        interface.

Members: 
	ChangeLog:1.3880->1.3881 
	libraries/javalib/java/net/NetworkInterface.java:1.14->1.15 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3880 kaffe/ChangeLog:1.3881
--- kaffe/ChangeLog:1.3880	Tue Apr 19 16:15:18 2005
+++ kaffe/ChangeLog	Tue Apr 19 16:44:21 2005
@@ -2,6 +2,17 @@
 
         Resynced with GNU Classpath.
 
+	2005-04-12  Michael Koch  <konqueror at gmx.de>
+
+        * java/net/NetworkInterface.java
+        (NetworkInterface): Made constructor package private.
+        Introduced another constructor for more addresses on one
+        interface.
+
+2005-04-19  Dalibor Topic  <robilad at kaffe.org>
+
+        Resynced with GNU Classpath.
+
 	* libraries/clib/native/InetAddress.c:
         All native methods moved to class VMInetAddress.
 
Index: kaffe/libraries/javalib/java/net/NetworkInterface.java
diff -u kaffe/libraries/javalib/java/net/NetworkInterface.java:1.14 kaffe/libraries/javalib/java/net/NetworkInterface.java:1.15
--- kaffe/libraries/javalib/java/net/NetworkInterface.java:1.14	Tue Apr 19 16:15:27 2005
+++ kaffe/libraries/javalib/java/net/NetworkInterface.java	Tue Apr 19 16:44:23 2005
@@ -61,11 +61,20 @@
   private String name;
   private Vector inetAddresses;
 
-  private NetworkInterface(String name, InetAddress address)
+  NetworkInterface(String name, InetAddress address)
   {
     this.name = name;
     this.inetAddresses = new Vector(1, 1);
     this.inetAddresses.add(address);
+  }
+
+  NetworkInterface(String name, InetAddress[] addresses)
+  {
+    this.name = name;
+    this.inetAddresses = new Vector(addresses.length, 1);
+
+    for (int i = 0; i < addresses.length; i++)
+      this.inetAddresses.add(addresses[i]);
   }
 
   /**




More information about the kaffe mailing list