Merged gcj-eclipse branch to trunk.

From-SVN: r120621
This commit is contained in:
Tom Tromey 2007-01-09 19:58:05 +00:00
parent c648dedbde
commit 97b8365caf
17478 changed files with 606493 additions and 100744 deletions

View file

@ -98,9 +98,9 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
*
* @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>();
}
/**
@ -114,9 +114,9 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
*
* @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>();
}
/**
@ -263,13 +263,13 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
* specified native and a DataFlavor whose MIME type is a decoded
* version of the native.
*/
public List getFlavorsForNative (String nat)
public List<DataFlavor> getFlavorsForNative (String nat)
throws NotImplementedException
{
throw new Error ("Not implemented");
}
public List getNativesForFlavor (DataFlavor flav)
public List<String> getNativesForFlavor (DataFlavor flav)
throws NotImplementedException
{
throw new Error ("Not implemented");