commit f8dfd5ed45383c47a58747bbbbc25a219b57f304
author Matthias Villiger <mvi@bsiag.com> Fri Dec 04 10:56:46 2015 +0100
committer Matthias Villiger <mvi@bsiag.com> Fri Dec 04 11:01:28 2015 +0100
tree 83dfcc52eee076d4505797af049e53aaf7472851
parent accd289a337eb9619638b06afc1f83a9219a8c90

Fix @Extends annotation value for TableField extensions

org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/internal/workspace/dto/DtoUtility.java

diff --git a/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/internal/workspace/dto/DtoUtility.java b/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/internal/workspace/dto/DtoUtility.java
index 4dcc785..09ec5f2 100644
--- a/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/internal/workspace/dto/DtoUtility.java
+++ b/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/internal/workspace/dto/DtoUtility.java
@@ -87,17 +87,26 @@
       IType extendedType = ScoutTypeUtility.getExtendedType((IType) element, modelLocalHierarchy);
       if (extendedType != null) {
         IType primaryType = TypeUtility.getPrimaryType(extendedType);
-        ITypeHierarchy extendedTypeSuperHierarchy = TypeUtility.getSupertypeHierarchy(primaryType);
-        if (extendedTypeSuperHierarchy != null) {
+        ITypeHierarchy primaryTypeSuperHierarchy = TypeUtility.getSupertypeHierarchy(primaryType);
+        if (primaryTypeSuperHierarchy != null) {
           IType extendedDto = null;
-          if (extendedTypeSuperHierarchy.contains(TypeUtility.getType(IRuntimeClasses.IForm)) || extendedTypeSuperHierarchy.contains(TypeUtility.getType(IRuntimeClasses.IFormField))) {
-            extendedDto = ScoutTypeUtility.findDtoForForm(primaryType);
+          if (primaryTypeSuperHierarchy.contains(TypeUtility.getType(IRuntimeClasses.IForm)) || primaryTypeSuperHierarchy.contains(TypeUtility.getType(IRuntimeClasses.IFormField))) {
+            ITypeHierarchy extendedTypeSuperHierarchy = TypeUtility.getSupertypeHierarchy(extendedType);
+            if (extendedTypeSuperHierarchy.contains(TypeUtility.getType(IRuntimeClasses.ITable)) && extendedType.getDeclaringType() != null) {
+              IType tableFieldDto = getFormDataType(extendedType.getDeclaringType(), extendedTypeSuperHierarchy);
+              extendedDto = getRowDataFor(tableFieldDto);
+            }
+            else {
+              extendedDto = ScoutTypeUtility.findDtoForForm(primaryType);
+            }
           }
-          else if (extendedTypeSuperHierarchy.contains(TypeUtility.getType(IRuntimeClasses.IPageWithTable))) {
+          else if (primaryTypeSuperHierarchy.contains(TypeUtility.getType(IRuntimeClasses.IExtension))) {
+            extendedDto = ScoutTypeUtility.findDtoForPage(primaryType);
+          }
+          else if (primaryTypeSuperHierarchy.contains(TypeUtility.getType(IRuntimeClasses.IPageWithTable))) {
             IType pageDto = ScoutTypeUtility.findDtoForPage(primaryType);
-
-            Set<IType> rowDataInPageDto = TypeUtility.getInnerTypes(pageDto, TypeFilters.getSubtypeFilter(TypeUtility.getType(IRuntimeClasses.AbstractTableRowData)));
-            extendedDto = CollectionUtility.firstElement(rowDataInPageDto);
+            Set<IType> innerTypes = TypeUtility.getInnerTypes(pageDto, TypeFilters.getSubtypeFilter(IRuntimeClasses.AbstractTableRowData));
+            extendedDto = CollectionUtility.firstElement(innerTypes);
           }
 
           if (extendedDto != null) {
@@ -118,6 +127,14 @@
     return null;
   }
 
+  private static IType getRowDataFor(IType tableDto) {
+    if (tableDto == null) {
+      return null;
+    }
+    Set<IType> innerTypes = TypeUtility.getInnerTypes(tableDto, TypeFilters.getSubtypeFilter(IRuntimeClasses.AbstractTableRowData));
+    return CollectionUtility.firstElement(innerTypes);
+  }
+
   public static void addFormDataAdditionalInterfaces(FormDataAnnotation formDataAnnotation, ITypeSourceBuilder sourceBuilder, IJavaProject formDataJavaProject) {
     Set<String> interfaceSignatures = formDataAnnotation.getInterfaceSignatures();
     if (interfaceSignatures.isEmpty()) {