FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged gcj-eclipse branch to trunk.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
libjava/classpath/javax/swing/UIDefaults.java
View file

@ -63,7 +63,7 @@ import javax.swing.plaf.InputMapUIResource;
*
* @author Ronald Veldema (rveldema@cs.vu.nl)
*/
public class UIDefaults extends Hashtable
public class UIDefaults extends Hashtable<Object, Object>
{
/** Our ResourceBundles. */
@ -672,7 +672,7 @@ public class UIDefaults extends Hashtable
*
* @return the UI class for <code>id</code>
*/
public Class getUIClass(String id, ClassLoader loader)
public Class<? extends ComponentUI> getUIClass(String id, ClassLoader loader)
{
String className = (String) get(id);
if (className == null)
@ -681,7 +681,7 @@ public class UIDefaults extends Hashtable
{
if (loader == null)
loader = ClassLoader.getSystemClassLoader();
return loader.loadClass (className);
return (Class<? extends ComponentUI>) loader.loadClass (className);
}
catch (Exception e)
{
@ -698,7 +698,7 @@ public class UIDefaults extends Hashtable
*
* @return the UI class for <code>id</code>
*/
public Class getUIClass(String id)
public Class<? extends ComponentUI> getUIClass(String id)
{
return getUIClass (id, null);
}