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

@ -51,7 +51,7 @@ public class CannotProceedException extends NamingException
// Serialized fields.
protected Name remainingNewName;
protected Hashtable environment;
protected Hashtable<?, ?> environment;
protected Name altName;
protected Context altNameCtx;
@ -65,12 +65,12 @@ public class CannotProceedException extends NamingException
super (msg);
}
public Hashtable getEnvironment()
public Hashtable<?, ?> getEnvironment()
{
return environment;
}
public void setEnvironment(Hashtable environment)
public void setEnvironment(Hashtable<?, ?> environment)
{
this.environment = environment;
}