2003-05-25 Michael Koch <konqueror@gmx.de>

	* java/io/PushbackInputStream.java,
	java/net/Authenticator.java,
	java/net/ContentHandler.java,
	java/net/ContentHandlerFactory.java,
	java/net/DatagramSocket.java,
	java/net/DatagramSocketImpl.java,
	java/net/DatagramSocketImplFactory.java,
	java/net/FileNameMap.java,
	java/net/SocketImplFactory.java,
	java/net/SocketOptions.java,
	java/net/URLStreamHandlerFactory.java:
	Merged new versions from classpath.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67165 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 10 insertions, 11 deletions

diff --git a/libjava/java/net/FileNameMap.java b/libjava/java/net/FileNameMap.java
index 538dbe8e19a..b4f9e19160c 100644
--- a/libjava/java/net/FileNameMap.java
+++ b/libjava/java/net/FileNameMap.java
@@ -1,5 +1,5 @@
 /* FileNameMap.java -- Maps filenames to MIME types
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -54,16 +54,15 @@ package java.net;
   */
 public interface FileNameMap
 {
-/**
-  * This method is passed a filename and is responsible for determining
-  * the appropriate MIME type for that file.
-  *
-  * @param filename The name of the file to generate a MIME type for.
-  *
-  * @return The MIME type for the filename passed in.
-  */
-String
-getContentTypeFor(String filename);
+  /**
+    * This method is passed a filename and is responsible for determining
+    * the appropriate MIME type for that file.
+    *
+    * @param filename The name of the file to generate a MIME type for.
+    *
+    * @return The MIME type for the filename passed in.
+    */
+  public String getContentTypeFor(String filename);
 
 } // interface FileNameMap