2003-10-08 Michael Koch <konqueror@gmx.de>

	* gnu/gcj/protocol/core/Connection.java,
	gnu/gcj/protocol/core/CoreInputStream.java,
	gnu/gcj/protocol/core/Handler.java,
	gnu/gcj/protocol/core/natCoreInputStream.cc,
	gnu/gcj/protocol/file/Connection.java,
	gnu/gcj/protocol/file/Handler.java,
	gnu/gcj/protocol/gcjlib/Connection.java,
	gnu/gcj/protocol/gcjlib/Handler.java,
	gnu/gcj/protocol/http/Connection.java,
	gnu/gcj/protocol/http/Handler.java,
	gnu/gcj/protocol/jar/Connection.java,
	gnu/gcj/protocol/jar/Handler.java: Moved to gnu/java/net/protocol.
	* gnu/java/net/protocol/core/Connection.java,
	gnu/java/net/protocol/core/CoreInputStream.java,
	gnu/java/net/protocol/core/Handler.java,
	gnu/java/net/protocol/core/natCoreInputStream.cc,
	gnu/java/net/protocol/file/Connection.java,
	gnu/java/net/protocol/file/Handler.java,
	gnu/java/net/protocol/gcjlib/Connection.java,
	gnu/java/net/protocol/gcjlib/Handler.java,
	gnu/java/net/protocol/http/Connection.java,
	gnu/java/net/protocol/http/Handler.java,
	gnu/java/net/protocol/jar/Connection.java,
	gnu/java/net/protocol/jar/Handler.java: Moved from gnu/gcj/protocol.
	* gnu/gcj/runtime/FirstThread.java,
	java/net/URL.java: Use moved protocol handlers.
	* Makefile.am
	(ordinary_java_source_files): Moved files.
	(nat_source_files): Likewise.
	* Makefile.in: Regenerated.


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

4 files changed, 0 insertions, 336 deletions

diff --git a/libjava/gnu/gcj/protocol/core/Connection.java b/libjava/gnu/gcj/protocol/core/Connection.java
deleted file mode 100644
index 95d709630ac..00000000000
--- a/libjava/gnu/gcj/protocol/core/Connection.java
+++ /dev/null
@@ -1,169 +0,0 @@
-// Connection.java - Implementation of URLConnection for core protocol.
-
-/* Copyright (C) 2001, 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.protocol.core;
-
-import gnu.gcj.Core;
-import java.net.*;
-import java.io.*;
-import java.util.Map;
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-/**
- * @author Anthony Green <green@redhat.com>
- * @date August 13, 2001
- */
-
-class Connection extends URLConnection
-{
-  private Hashtable hdrHash = new Hashtable();
-  private Vector hdrVec = new Vector();
-  private boolean gotHeaders = false;
-
-  private Core core;
-
-  public Connection(URL url)
-  {
-    super(url);
-  }
-
-  // Implementation of abstract method.
-  public void connect() throws IOException
-  {
-    // Call is ignored if already connected.
-    if (connected)
-      return;
-
-    // If not connected, then file needs to be opened.
-    core = Core.create (url.getFile());
-    connected = true;
-  }
-
-  public InputStream getInputStream() throws IOException
-  {
-    if (!connected)
-      connect();
-
-    if (! doInput)
-      throw new ProtocolException("Can't open InputStream if doInput is false");
-    return new CoreInputStream (core);
-  }
-
-  // Override default method in URLConnection.
-  public String getHeaderField(String name)
-  {
-    try
-      {
-	getHeaders();
-      }
-    catch (IOException x)
-      {
-	return null;
-      }
-    return (String) hdrHash.get(name.toLowerCase());
-  }
-
-  // Override default method in URLConnection.
-  public Map getHeaderFields()
-  {
-    try
-      {
-	getHeaders();
-      }
-    catch (IOException x)
-      {
-	return null;
-      }
-    return hdrHash;
-  }
-
-  // Override default method in URLConnection.
-  public String getHeaderField(int n)
-  {
-    try
-      {
-	getHeaders();
-      }
-    catch (IOException x)
-      {
-	return null;
-      }
-    if (n < hdrVec.size())
-      return getField((String) hdrVec.elementAt(n));
-
-    return null;
-  }
-
-  // Override default method in URLConnection.
-  public String getHeaderFieldKey(int n)
-  {
-    try
-      {
-	getHeaders();
-      }
-    catch (IOException x)
-      {
-	return null;
-      }
-    if (n < hdrVec.size())
-      return getKey((String) hdrVec.elementAt(n));
-
-    return null;
-  }
-
-  private String getKey(String str)
-  {
-    if (str == null)
-      return null;
-    int index = str.indexOf(':');
-    if (index >= 0)
-      return str.substring(0, index);
-    else
-      return null;
-  }
-
-  private String getField(String str)
-  {
-    if (str == null)
-      return null;
-    int index = str.indexOf(':');
-    if (index >= 0)
-      return str.substring(index + 1).trim();
-    else
-      return str;
-  }
-
-  private void getHeaders() throws IOException
-  {
-    if (gotHeaders)
-      return;
-    gotHeaders = true;
-
-    connect();
-
-    // Yes, it is overkill to use the hash table and vector here since
-    // we're only putting one header in the file, but in case we need
-    // to add others later and for consistency, we'll implement it this way.
-
-    // Add the only header we know about right now:  Content-length.
-    long len = core.length;
-    String line = "Content-length: " + len;
-    hdrVec.addElement(line);
-
-    // The key will never be null in this scenario since we build up the
-    // headers ourselves.  If we ever rely on getting a header from somewhere
-    // else, then we may have to check if the result of getKey() is null.
-    String key = getKey(line);
-    hdrHash.put(key.toLowerCase(), Long.toString(len));
-  }
-}
-
diff --git a/libjava/gnu/gcj/protocol/core/CoreInputStream.java b/libjava/gnu/gcj/protocol/core/CoreInputStream.java
deleted file mode 100644
index 3dd0524f162..00000000000
--- a/libjava/gnu/gcj/protocol/core/CoreInputStream.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// Handler.java - URLStreamHandler for core protocol.
-
-/* Copyright (C) 2001  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.protocol.core;
-
-import java.io.*;
-import gnu.gcj.Core;
-import gnu.gcj.RawData;
-
-public class CoreInputStream extends InputStream
-{
-  /* A pointer to the object in memory.  */
-  protected RawData ptr;
-
-  /* Position of the next byte in core to be read. */
-  protected int pos;
-
-  /* The currently marked position in the stream. */
-  protected int mark;
-
-  /* The index in core one greater than the last valid character. */
-  protected int count;
-
-  private native int unsafeGetByte (long offset);
-  private native int copyIntoByteArray (byte[] dest, int offset, int numBytes);
-
-  public CoreInputStream (Core core)
-  {
-    ptr = core.ptr;
-    count = core.length;
-  }
-
-  public synchronized int available()
-  {
-    return count - pos;
-  }
-
-  public synchronized void mark(int readAheadLimit)
-  {
-    // readAheadLimit is ignored per Java Class Lib. book, p.220.
-    mark = pos;
-  }
-
-  public boolean markSupported()
-  {
-    return true;
-  }
-
-  public synchronized int read()
-  {
-    if (pos < count)
-      return ((int) unsafeGetByte(pos++)) & 0xFF;
-    return -1;
-  }
-
-  public synchronized int read(byte[] b, int off, int len)
-  {
-    if (pos >= count)
-      return -1;
-
-    int numBytes = Math.min(count - pos, len);
-    copyIntoByteArray (b, off, numBytes);
-    pos += numBytes;
-    return numBytes;
-  }
-
-  public synchronized void reset()
-  {
-    pos = mark;
-  }
-
-  public synchronized long skip(long n)
-  {
-    // Even though the var numBytes is a long, in reality it can never
-    // be larger than an int since the result of subtracting 2 positive
-    // ints will always fit in an int.  Since we have to return a long
-    // anyway, numBytes might as well just be a long.
-    long numBytes = Math.min((long) (count - pos), n < 0 ? 0L : n);
-    pos += numBytes;
-    return numBytes;
-  }
-}
diff --git a/libjava/gnu/gcj/protocol/core/Handler.java b/libjava/gnu/gcj/protocol/core/Handler.java
deleted file mode 100644
index 474ae6fdab0..00000000000
--- a/libjava/gnu/gcj/protocol/core/Handler.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Handler.java - URLStreamHandler for core protocol.
-
-/* Copyright (C) 2001  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-package gnu.gcj.protocol.core;
-
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-import java.io.IOException;
-
-/**
- * @author Anthony Green <green@redhat.com>
- * @date August 13, 2001.
- */
-
-public class Handler extends URLStreamHandler
-{
-  protected URLConnection openConnection(URL url) throws IOException
-  {
-    return new Connection(url);
-  }
-}
diff --git a/libjava/gnu/gcj/protocol/core/natCoreInputStream.cc b/libjava/gnu/gcj/protocol/core/natCoreInputStream.cc
deleted file mode 100644
index 0a61ec074f4..00000000000
--- a/libjava/gnu/gcj/protocol/core/natCoreInputStream.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-// natCoreInputStream.cc -- C++ side of CoreInputStream
-
-/* Copyright (C) 2001  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-/* Author: Anthony Green <green@redhat.com>.  */
-
-#include <config.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-#include <string.h>
-
-#include <java/lang/NullPointerException.h>
-#include <java/lang/ArrayIndexOutOfBoundsException.h>
-#include <gnu/gcj/protocol/core/CoreInputStream.h>
-
-jint
-gnu::gcj::protocol::core::CoreInputStream::unsafeGetByte (jlong offset)
-{
-  return ((char *)ptr)[offset];
-}
-
-jint
-gnu::gcj::protocol::core::CoreInputStream::copyIntoByteArray (jbyteArray dest,
-							      jint offset,
-							      jint numBytes)
-{
-  if (! dest)
-    throw new java::lang::NullPointerException; 
-  jsize destSize = JvGetArrayLength (dest);
-  if (offset < 0 || numBytes < 0 || offset + numBytes < 0
-      || offset + numBytes > destSize
-      || pos + numBytes > count)
-    throw new java::lang::ArrayIndexOutOfBoundsException;
-
-  void *pcore = (void *) &((char*)ptr)[pos];
-  void *pdest = (void *) (elements (dest) + offset);
-
-  memcpy (pdest, pcore, numBytes);
-
-  return 0;
-}
-