1.1 --- a/src/share/classes/com/sun/tools/javac/code/Type.java Tue Feb 15 08:35:05 2011 -0800 1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Type.java Wed Feb 16 10:27:00 2011 -0800 1.3 @@ -270,10 +270,6 @@ 1.4 public Type getUpperBound() { return null; } 1.5 public Type getLowerBound() { return null; } 1.6 1.7 - public void setThrown(List<Type> ts) { 1.8 - throw new AssertionError(); 1.9 - } 1.10 - 1.11 /** Navigation methods, these will work for classes, type variables, 1.12 * foralls, but will return null for arrays and methods. 1.13 */ 1.14 @@ -388,14 +384,6 @@ 1.15 */ 1.16 public void complete() {} 1.17 1.18 - public Object clone() { 1.19 - try { 1.20 - return super.clone(); 1.21 - } catch (CloneNotSupportedException e) { 1.22 - throw new AssertionError(e); 1.23 - } 1.24 - } 1.25 - 1.26 public TypeSymbol asElement() { 1.27 return tsym; 1.28 } 1.29 @@ -817,8 +805,7 @@ 1.30 } 1.31 } 1.32 1.33 - public static class MethodType extends Type 1.34 - implements Cloneable, ExecutableType { 1.35 + public static class MethodType extends Type implements ExecutableType { 1.36 1.37 public List<Type> argtypes; 1.38 public Type restype; 1.39 @@ -880,10 +867,6 @@ 1.40 public Type getReturnType() { return restype; } 1.41 public List<Type> getThrownTypes() { return thrown; } 1.42 1.43 - public void setThrown(List<Type> t) { 1.44 - thrown = t; 1.45 - } 1.46 - 1.47 public boolean isErroneous() { 1.48 return 1.49 isErroneous(argtypes) || 1.50 @@ -1068,12 +1051,10 @@ 1.51 public List<Type> getThrownTypes() { return qtype.getThrownTypes(); } 1.52 public List<Type> allparams() { return qtype.allparams(); } 1.53 public Type getUpperBound() { return qtype.getUpperBound(); } 1.54 - public Object clone() { DelegatedType t = (DelegatedType)super.clone(); t.qtype = (Type)qtype.clone(); return t; } 1.55 public boolean isErroneous() { return qtype.isErroneous(); } 1.56 } 1.57 1.58 - public static class ForAll extends DelegatedType 1.59 - implements Cloneable, ExecutableType { 1.60 + public static class ForAll extends DelegatedType implements ExecutableType { 1.61 public List<Type> tvars; 1.62 1.63 public ForAll(List<Type> tvars, Type qtype) { 1.64 @@ -1092,16 +1073,6 @@ 1.65 1.66 public List<Type> getTypeArguments() { return tvars; } 1.67 1.68 - public void setThrown(List<Type> t) { 1.69 - qtype.setThrown(t); 1.70 - } 1.71 - 1.72 - public Object clone() { 1.73 - ForAll result = (ForAll)super.clone(); 1.74 - result.qtype = (Type)result.qtype.clone(); 1.75 - return result; 1.76 - } 1.77 - 1.78 public boolean isErroneous() { 1.79 return qtype.isErroneous(); 1.80 }