2003-03-02 Michael Koch <konqueror@gmx.de>

	* java/net/HttpURLConnection.java
	(HTTP_SERVER_ERROR): Deprecated.
	* java/net/MulticastSocket.java
	(send): Replaced checkMulticast with appropriate checkPermission call,
	deprecated.
	* java/net/URLDecoder.java
	(decode): Deprecated.
	* java/net/URLEncoder.java
	(encode): Deprecated.

From-SVN: r63679

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2df21af4e823418e51b2808ebd4b172b8610604a..9a296eacfd36e065aad9c81da67089309a12c435 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,15 @@
+2003-03-02  Michael Koch  <konqueror@gmx.de>
+
+       * java/net/HttpURLConnection.java
+       (HTTP_SERVER_ERROR): Deprecated.
+       * java/net/MulticastSocket.java
+       (send): Replaced checkMulticast with appropriate checkPermission call,
+       deprecated.
+       * java/net/URLDecoder.java
+       (decode): Deprecated.
+       * java/net/URLEncoder.java
+       (encode): Deprecated.
+
 2003-03-02  Michael Koch  <konqueror@gmx.de>
 
        * javax/swing/text/Caret.java

diff --git a/libjava/java/net/HttpURLConnection.java b/libjava/java/net/HttpURLConnection.java
index ebc0f8175f46325f703cd73fc5e185dbfb29dc6b..4cdeaf19712e96e8ac858fa30d893b68dc50f50f 100644 (file)
--- a/libjava/java/net/HttpURLConnection.java
+++ b/libjava/java/net/HttpURLConnection.java
@@ -242,6 +242,8 @@ public abstract class HttpURLConnection extends URLConnection
 
   /**
    * This error code indicates that some sort of server error occurred.
+   *
+   * @deprecated
    */
   public static final int HTTP_SERVER_ERROR    = 500;
 

diff --git a/libjava/java/net/MulticastSocket.java b/libjava/java/net/MulticastSocket.java
index dca1a85678b082a4a009a80d8bbd7ac699fd63d2..481c8e356a9564e2e3014cd91cbc1a2b21776700 100644 (file)
--- a/libjava/java/net/MulticastSocket.java
+++ b/libjava/java/net/MulticastSocket.java
@@ -426,17 +426,21 @@ public class MulticastSocket extends DatagramSocket
    * @exception IOException If an error occurs
    * @exception SecurityException If a security manager exists and its
    * checkConnect or checkMulticast method doesn't allow the operation
+   *
+   * @deprecated
    */
   public synchronized void send(DatagramPacket p, byte ttl) throws IOException
   {
     SecurityManager s = System.getSecurityManager();
     if (s != null)
       {
-       InetAddress addr = p.getAddress();
-       if (addr.isMulticastAddress())
-         s.checkMulticast(addr, ttl);
-       else
-         s.checkConnect(addr.getHostAddress(), p.getPort());
+        InetAddress addr = p.getAddress();
+        if (addr.isMulticastAddress())
+          s.checkPermission (new SocketPermission
+                             (addr.getHostName () + p.getPort (),
+                              "accept,connect"));
+        else
+          s.checkConnect(addr.getHostAddress(), p.getPort());
       }
 
     int oldttl = impl.getTimeToLive();

diff --git a/libjava/java/net/URLDecoder.java b/libjava/java/net/URLDecoder.java
index 0a9067160b2751b13131b587397f2854c3320d34..4fe77d3c93322fdaf19c2c2d5975e30765d78851 100644 (file)
--- a/libjava/java/net/URLDecoder.java
+++ b/libjava/java/net/URLDecoder.java
@@ -77,6 +77,8 @@ public class URLDecoder
    * @param s the String to convert
    *
    * @return the converted String
+   *
+   * @deprecated
    */
   public static String decode(String s)
   {

diff --git a/libjava/java/net/URLEncoder.java b/libjava/java/net/URLEncoder.java
index 0f106e820de64bc527b72120c5ac13451d3fbf30..f03b8a1d8f85bde68aa78ede17d56a1ce087282f 100644 (file)
--- a/libjava/java/net/URLEncoder.java
+++ b/libjava/java/net/URLEncoder.java
@@ -71,6 +71,8 @@ public class URLEncoder
    * @param s The String to convert
    *
    * @return The converted String
+   *
+   * @deprecated
    */
   public static String encode(String s)
   {