Merge branch 'master' into extensionmethod

Conflicts:
	build.xml

1 files changed, 8 insertions, 2 deletions

diff --git a/src/stubs/com/sun/tools/javac/code/Symbol.java b/src/stubs/com/sun/tools/javac/code/Symbol.java
index 4aef63ad..15b04148 100644
--- a/src/stubs/com/sun/tools/javac/code/Symbol.java
+++ b/src/stubs/com/sun/tools/javac/code/Symbol.java
@@ -18,12 +18,13 @@ import javax.lang.model.element.TypeParameterElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 
+import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.util.Name;
 
 public abstract class Symbol implements Element {
 	public Type type;
 	public Name name;
-	
+
 	public long flags() { return 0; }
 	public boolean isStatic() { return false; }
 	public boolean isConstructor() { return false; }
@@ -37,10 +38,13 @@ public abstract class Symbol implements Element {
 	@Override public Name getSimpleName() { return null; }
 	@Override public java.util.List<Symbol> getEnclosedElements() { return null; }
 	@Override public Element getEnclosingElement() { return null; }
-	
+	public void appendAttributes(List<Attribute.Compound> l) {
+	}
+
 	public static abstract class TypeSymbol extends Symbol {}
 	
 	public static class MethodSymbol extends Symbol implements ExecutableElement {
+		public List<Symbol.VarSymbol> params = null;
 		public MethodSymbol(long flags, Name name, Type type, Symbol owner) {}
 		@Override public ElementKind getKind() { return null; }
 		@Override public Set<Modifier> getModifiers() { return null; }
@@ -58,6 +62,8 @@ public abstract class Symbol implements Element {
 	
 	public static class VarSymbol extends Symbol implements VariableElement {
 		public Type type;
+		public VarSymbol(long flags, Name name, Type type, Symbol owner) {
+		}
 		@Override public ElementKind getKind() { return null; }
 		@Override public Set<Modifier> getModifiers() { return null; }
 		@Override public <R, P> R accept(ElementVisitor<R, P> v, P p) { return null; }