diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-02 20:11:13 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-02 20:11:13 +0000 |
| commit | 6925627dd32112ce4618d441303f5193c325dc32 (patch) | |
| tree | f1d0183da4d102a6b1b12b9e632f4d6c471e2c3b /libjava | |
| parent | 9ffd661f11e88f45057b1b54fa8996086da8be8f (diff) | |
| download | gcc-6925627dd32112ce4618d441303f5193c325dc32.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@63679 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 12 | ||||
| -rw-r--r-- | libjava/java/net/HttpURLConnection.java | 2 | ||||
| -rw-r--r-- | libjava/java/net/MulticastSocket.java | 14 | ||||
| -rw-r--r-- | libjava/java/net/URLDecoder.java | 2 | ||||
| -rw-r--r-- | libjava/java/net/URLEncoder.java | 2 |
5 files changed, 27 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2df21af4e82..9a296eacfd3 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 ebc0f8175f4..4cdeaf19712 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 dca1a85678b..481c8e356a9 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 0a9067160b2..4fe77d3c933 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 0f106e820de..f03b8a1d8f8 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) { |