--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeElement.java	Mon Aug 11 15:53:05 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeElement.java	Mon Aug 11 15:53:05 2014 +0200
@@ -28,10 +28,9 @@
 
 import javax.lang.model.element.*;
 
-import com.oracle.truffle.dsl.processor.api.element.*;
 import com.oracle.truffle.dsl.processor.codewriter.*;
 
-public abstract class CodeElement<E extends Element> implements WritableElement, GeneratedElement {
+public abstract class CodeElement<E extends Element> implements Element, GeneratedElement {
 
     private final Set<Modifier> modifiers;
     private List<AnnotationMirror> annotations;
@@ -46,6 +45,10 @@
         this.modifiers = new LinkedHashSet<>();
     }
 
+    public CodeElement(Set<Modifier> modifiers) {
+        this.modifiers = new LinkedHashSet<>(modifiers);
+    }
+
     @Override
     public void setGeneratorAnnotationMirror(AnnotationMirror mirror) {
         this.generatorAnnotationMirror = mirror;
@@ -66,10 +69,6 @@
         return generatorElement;
     }
 
-    public CodeElement(Set<Modifier> modifiers) {
-        this.modifiers = new LinkedHashSet<>(modifiers);
-    }
-
     public E add(E element) {
         if (element == null) {
             throw new NullPointerException();
@@ -137,7 +136,6 @@
         throw new UnsupportedOperationException();
     }
 
-    @Override
     public void addAnnotationMirror(AnnotationMirror annotationMirror) {
         getAnnotationMirrors().add(annotationMirror);
     }