Mercurial > hg > truffle

diff graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/OrganizedImports.java @ 18756:c22714b214d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle-DSL: fixed auto import if imported class is declared in super class but is also a super class.
author Christian Humer <christian.humer@gmail.com>
date Mon, 29 Dec 2014 23:38:34 +0100
parents 93e061157811
children 0ec5f5a2e720
line wrap: on
line diff
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/OrganizedImports.java	Mon Dec 29 23:38:30 2014 +0100
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/OrganizedImports.java	Mon Dec 29 23:38:34 2014 +0100
@@ -54,7 +54,6 @@
     private void organizeImpl() {
         ImportTypeReferenceVisitor reference = new ImportTypeReferenceVisitor();
         topLevelClass.accept(reference, null);
-
     }
 
     public String createTypeReference(Element enclosedElement, TypeMirror type) {
@@ -212,7 +211,9 @@
         for (TypeElement superType : superTypes) {
             List<TypeElement> declaredTypes = getDeclaredTypes(superType);
             for (TypeElement declaredType : declaredTypes) {
-                autoImportedTypes.add(getQualifiedName(declaredType));
+                if (!superTypes.contains(declaredType)) {
+                    autoImportedTypes.add(getQualifiedName(declaredType));
+                }
             }
         }
     }