aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog12
-rw-r--r--libjava/java/net/HttpURLConnection.java2
-rw-r--r--libjava/java/net/MulticastSocket.java14
-rw-r--r--libjava/java/net/URLDecoder.java2
-rw-r--r--libjava/java/net/URLEncoder.java2
5 files changed, 27 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2df21af..9a296ea 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,17 @@
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
(getMagicCaretPosition): Fixed typo in method name.
* javax/swing/text/DefaultCaret.java
diff --git a/libjava/java/net/HttpURLConnection.java b/libjava/java/net/HttpURLConnection.java
index ebc0f81..4cdeaf1 100644
--- 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 dca1a85..481c8e3 100644
--- 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 0a90671..4fe77d3 100644
--- 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 0f106e8..f03b8a1 100644
--- 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)
{