obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 125 insertions, 0 deletions

diff --git a/libjava/classpath/javax/activation/DataSourceDataContentHandler.java b/libjava/classpath/javax/activation/DataSourceDataContentHandler.java
new file mode 100644
index 000000000..8b16fd150
--- /dev/null
+++ b/libjava/classpath/javax/activation/DataSourceDataContentHandler.java
@@ -0,0 +1,125 @@
+/* DataSourceDataContentHolder.java -- DCH using an existing data source.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.activation;
+
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Data content handler using an existing DCH and a data source.
+ *
+ * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
+ * @version 1.1
+ */
+class DataSourceDataContentHandler
+  implements DataContentHandler
+{
+
+  private DataSource ds;
+  private DataFlavor[] flavors;
+  private DataContentHandler dch;
+
+  public DataSourceDataContentHandler(DataContentHandler dch, DataSource ds)
+  {
+    this.ds = ds;
+    this.dch = dch;
+  }
+
+  public Object getContent(DataSource ds)
+    throws IOException
+  {
+    if (dch != null)
+      {
+        return dch.getContent(ds);
+      }
+    else
+      {
+        return ds.getInputStream();
+      }
+  }
+
+  public Object getTransferData(DataFlavor flavor, DataSource ds)
+    throws UnsupportedFlavorException, IOException
+  {
+    if (dch != null)
+      {
+        return dch.getTransferData(flavor, ds);
+      }
+    DataFlavor[] tdf = getTransferDataFlavors();
+    if (tdf.length > 0 && flavor.equals(tdf[0]))
+      {
+        return ds.getInputStream();
+      }
+    else
+      {
+        throw new UnsupportedFlavorException(flavor);
+      }
+  }
+
+  public DataFlavor[] getTransferDataFlavors()
+  {
+    if (flavors == null)
+      {
+        if (dch != null)
+          {
+            flavors = dch.getTransferDataFlavors();
+          }
+        else
+          {
+            String mimeType = ds.getContentType();
+            flavors = new DataFlavor[1];
+            flavors[0] = new ActivationDataFlavor(mimeType, mimeType);
+          }
+      }
+    return flavors;
+  }
+
+  public void writeTo(Object obj, String mimeType, OutputStream out)
+    throws IOException
+  {
+    if (dch == null)
+      {
+        throw new UnsupportedDataTypeException("no DCH for content type " +
+                                               ds.getContentType());
+      }
+    dch.writeTo(obj, mimeType, out);
+  }
+
+}