From e1b379c5e95df37110e2a075a142b69587832a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Thu, 29 Jul 2010 14:46:51 +0000
Subject: [PATCH]

---
 .../query/apt/QuerydslAnnotationProcessorTest.java   | 12 +++++++++---
 .../java/com/mysema/query/codegen/EntityType.java    |  4 +---
 .../java/com/mysema/query/codegen/TypeResolver.java  |  2 +-
 .../com/mysema/query/domain/CommonPersistence.java   |  1 +
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/QuerydslAnnotationProcessorTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/QuerydslAnnotationProcessorTest.java
index 603ba270b..6462daa80 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/QuerydslAnnotationProcessorTest.java
+++ b/querydsl-apt/src/test/java/com/mysema/query/apt/QuerydslAnnotationProcessorTest.java
@@ -22,9 +22,15 @@ public class QuerydslAnnotationProcessorTest extends AbstractProcessorTest{
     }
     
     @Test
-    public void processInheritance() throws IOException{
-        File file = new File("src/test/java/com/mysema/query/inheritance/", "Inheritance3Test.java");
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(file.getPath()),"qdsl");
+    public void processInheritance3() throws IOException{
+        String path = new File("src/test/java/com/mysema/query/inheritance/Inheritance3Test.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"inheritance");
+    }
+    
+    @Test
+    public void processInheritance8() throws IOException{
+        String path = new File("src/test/java/com/mysema/query/inheritance/Inheritance8Test.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"inheritance");
     }
 
     @Test
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/EntityType.java b/querydsl-core/src/main/java/com/mysema/query/codegen/EntityType.java
index 7b21b251d..1169b6c6f 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/EntityType.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/EntityType.java
@@ -211,9 +211,7 @@ public final class EntityType extends TypeAdapter implements Comparable<EntityTy
             addDelegate(delegate);
         }
         for (Property property : entityType.getProperties()){
-            if (!property.isInherited()){
-                addProperty(property.createCopy(this));
-            }
+            addProperty(property.createCopy(this));
         }
     }
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeResolver.java b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeResolver.java
index 11bfcf2cc..ef95b3177 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeResolver.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeResolver.java
@@ -13,7 +13,7 @@ package com.mysema.query.codegen;
  */
 public final class TypeResolver {
 
-    public static Type resolve(Type type, Type declaringType, EntityType context){
+    public static Type resolve(Type type, Type declaringType, EntityType context){        
         Type resolved = type;
 
         // handle generic types
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/CommonPersistence.java b/querydsl-core/src/test/java/com/mysema/query/domain/CommonPersistence.java
index 2ee83ef47..7e76fc89f 100644
--- a/querydsl-core/src/test/java/com/mysema/query/domain/CommonPersistence.java
+++ b/querydsl-core/src/test/java/com/mysema/query/domain/CommonPersistence.java
@@ -9,6 +9,7 @@ import com.mysema.query.annotations.QuerySupertype;
 
 @QuerySupertype
 public class CommonPersistence {
+    
     private Long version;
 
     public Long getVersion() {