[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath

[Kaffe CVS]

PatchSet 4461 
Date: 2004/02/25 19:01:26
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

2004-02-24  Dalibor Topic <robilad at kaffe.org>

        Resynced with GNU Classpath

        2004-02-06  Michael Koch  <konqueror at gmx.de>

        * java/awt/datatransfer/DataFlavor.java
        (imageFlavor): Javadoc added.
        (javaJVMLocalObjectType): Fixed.

Members: 
	ChangeLog:1.2041->1.2042 
	libraries/javalib/java/awt/datatransfer/DataFlavor.java:1.12->1.13 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2041 kaffe/ChangeLog:1.2042
--- kaffe/ChangeLog:1.2041	Wed Feb 25 18:52:12 2004
+++ kaffe/ChangeLog	Wed Feb 25 19:01:26 2004
@@ -2,6 +2,16 @@
 
         Resynced with GNU Classpath
 
+	2004-02-06  Michael Koch  <konqueror at gmx.de>
+
+        * java/awt/datatransfer/DataFlavor.java
+        (imageFlavor): Javadoc added.
+        (javaJVMLocalObjectType): Fixed.
+
+2004-02-24  Dalibor Topic <robilad at kaffe.org>
+
+        Resynced with GNU Classpath
+
 	2004-02-10  David Jee  <djee at redhat.com>
 
         * java/awt/GridBagLayout.java
Index: kaffe/libraries/javalib/java/awt/datatransfer/DataFlavor.java
diff -u kaffe/libraries/javalib/java/awt/datatransfer/DataFlavor.java:1.12 kaffe/libraries/javalib/java/awt/datatransfer/DataFlavor.java:1.13
--- kaffe/libraries/javalib/java/awt/datatransfer/DataFlavor.java:1.12	Sat Jan  3 01:55:49 2004
+++ kaffe/libraries/javalib/java/awt/datatransfer/DataFlavor.java	Wed Feb 25 19:01:27 2004
@@ -1,5 +1,5 @@
 /* DataFlavor.java -- A type of data to transfer via the clipboard.
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -60,11 +60,7 @@
 {
   static final long serialVersionUID = 8367026044764648243L;
 
-// FIXME: Serialization: Need to write methods for.
-
-/*
- * Static Variables
- */
+  // FIXME: Serialization: Need to write methods for.
 
 /**
  * This is the data flavor used for tranferring plain text.  The MIME
@@ -90,6 +86,10 @@
  */
 public static final DataFlavor javaFileListFlavor;
 
+/**
+ * This is an image flavor used for transferring images.  The
+ * representation type is a <code>java.awt.Image</code>.
+ */
 public static final DataFlavor imageFlavor;
 
 /**
@@ -105,7 +105,7 @@
  * being transferred.
  */
 public static final String javaJVMLocalObjectMimeType =
-  "application/x-java-jvm-local-object";
+  "application/x-java-jvm-local-objectref";
 
 /**
  * This is the MIME type used to transfer a link to a remote object.