I'm checking this in on the gcjx branch.
This fixes some generics-related bugs in datatransfer pointed out by
japi.
Tom
2005-10-05 Tom Tromey <[EMAIL PROTECTED]>
* java/awt/datatransfer/SystemFlavorMap.java (getNativesForFlavors):
Genericized.
(getFlavorsForNatives): Likewise.
(getFlavorsForNative): Likewise.
(getNativesForFlavor): Likewise.
* java/awt/datatransfer/DataFlavor.java (DataFlavor): Genericized.
(getDefaultRepresentationClass): Likewise.
(getRepresentationClass): Likewise.
(tryToLoadClass): Likewise.
(representationClass): Likewise.
* java/awt/datatransfer/FlavorTable.java (getNativesForFlavor):
Genericized.
(getFlavorsForNative): Likewise.
* java/awt/datatransfer/FlavorMap.java (getFlavorsForNatives):
Genericized.
(getNativesForFlavors): Likewise.
Index: java/awt/datatransfer/DataFlavor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/datatransfer/DataFlavor.java,v
retrieving revision 1.20.2.4
diff -u -r1.20.2.4 DataFlavor.java
--- java/awt/datatransfer/DataFlavor.java 7 Aug 2005 18:34:10 -0000
1.20.2.4
+++ java/awt/datatransfer/DataFlavor.java 6 Oct 2005 00:57:40 -0000
@@ -146,7 +146,7 @@
private final String mimeType;
// The representation class for this flavor
-private final Class representationClass;
+private final Class<?> representationClass;
// The human readable name of this flavor
private String humanPresentableName;
@@ -169,7 +169,7 @@
*
* @exception ClassNotFoundException If the class cannot be loaded.
*/
-protected static final Class
+protected static final Class<?>
tryToLoadClass(String className, ClassLoader classLoader)
throws ClassNotFoundException
{
@@ -256,7 +256,7 @@
* @param humanPresentableName The display name of the object.
*/
public
-DataFlavor(Class representationClass, String humanPresentableName)
+DataFlavor(Class<?> representationClass, String humanPresentableName)
{
this(representationClass,
"application/x-java-serialized-object"
@@ -381,7 +381,7 @@
*
* @return The representation class for this flavor.
*/
-public Class
+public Class<?>
getRepresentationClass()
{
return(representationClass);
@@ -885,7 +885,7 @@
*
* @since 1.3
*/
-public final Class
+public final Class<?>
getDefaultRepresentationClass()
{
return(java.io.InputStream.class);
Index: java/awt/datatransfer/FlavorMap.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/datatransfer/FlavorMap.java,v
retrieving revision 1.7.2.1
diff -u -r1.7.2.1 FlavorMap.java
--- java/awt/datatransfer/FlavorMap.java 2 Aug 2005 20:12:15 -0000
1.7.2.1
+++ java/awt/datatransfer/FlavorMap.java 6 Oct 2005 00:57:40 -0000
@@ -58,7 +58,7 @@
*
* @return A <code>Map</code> of native data types.
*/
- Map getNativesForFlavors (DataFlavor[] flavors);
+ Map<DataFlavor, String> getNativesForFlavors (DataFlavor[] flavors);
/**
* Maps the specified native type names to <code>DataFlavor</code>'s.
@@ -71,5 +71,5 @@
*
* @return A <code>Map</code> of data flavors.
*/
- Map getFlavorsForNatives (String[] natives);
+ Map<String, DataFlavor> getFlavorsForNatives (String[] natives);
}
Index: java/awt/datatransfer/FlavorTable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/datatransfer/FlavorTable.java,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 FlavorTable.java
--- java/awt/datatransfer/FlavorTable.java 2 Aug 2005 20:12:15 -0000
1.1.2.3
+++ java/awt/datatransfer/FlavorTable.java 6 Oct 2005 00:57:40 -0000
@@ -59,7 +59,7 @@
* @param flavor the flavor to look up, or null to return all natives
* @return the sorted list of natives
*/
- List getNativesForFlavor(DataFlavor flavor);
+ List<String> getNativesForFlavor(DataFlavor flavor);
/**
* Returns a list of flavors corresponding to the given String native. The
@@ -69,5 +69,5 @@
* @param name the native name to look up, or null to return all flavors
* @return the sorted list of flavors
*/
- List getFlavorsForNative(String name);
+ List<DataFlavor> getFlavorsForNative(String name);
}
Index: java/awt/datatransfer/SystemFlavorMap.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/awt/datatransfer/SystemFlavorMap.java,v
retrieving revision 1.4.2.2
diff -u -r1.4.2.2 SystemFlavorMap.java
--- java/awt/datatransfer/SystemFlavorMap.java 2 Aug 2005 20:12:15 -0000
1.4.2.2
+++ java/awt/datatransfer/SystemFlavorMap.java 6 Oct 2005 00:57:40 -0000
@@ -76,9 +76,9 @@
*
* @return A <code>Map</code> of native data types to data flavors.
*/
- public Map getNativesForFlavors (DataFlavor[] flavors)
+ public Map<DataFlavor, String> getNativesForFlavors (DataFlavor[] flavors)
{
- return new HashMap();
+ return new HashMap<DataFlavor, String>();
}
/**
@@ -92,9 +92,9 @@
*
* @return A <code>Map</code> of data flavors to native type names.
*/
- public Map getFlavorsForNatives (String[] natives)
+ public Map<String, DataFlavor> getFlavorsForNatives (String[] natives)
{
- return new HashMap();
+ return new HashMap<String, DataFlavor>();
}
/**
@@ -156,12 +156,12 @@
return null;
}
- public List getFlavorsForNative (String nat)
+ public List<DataFlavor> getFlavorsForNative (String nat)
{
throw new Error ("Not implemented");
}
- public List getNativesForFlavor (DataFlavor flav)
+ public List<String> getNativesForFlavor (DataFlavor flav)
{
throw new Error ("Not implemented");
}
_______________________________________________
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
