# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /Users/catlan/Projekte/netbeans/form/src/org/netbeans/modules/form
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 endcoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: GandalfPersistenceManager.java
*** /Users/catlan/Projekte/netbeans/form/src/org/netbeans/modules/form/GandalfPersistenceManager.java Base (1.152)
--- /Users/catlan/Projekte/netbeans/form/src/org/netbeans/modules/form/GandalfPersistenceManager.java Locally Modified (Based On 1.152)
***************
*** 297,302 ****
--- 297,304 ----
              }
              Iterator classIter = classifiers.iterator();
              
+ 	    Class superclass = null;
+ 	    
              while (classIter.hasNext()) {
                  ClassDefinition javaClass = (ClassDefinition)classIter.next();
                  String className = javaClass.getName();
***************
*** 304,315 ****
                  className = (dotIndex == -1) ? className : className.substring(dotIndex+1);
                  if (className.equals(javaFile.getName())) {
                      declaredSuperclassName = javaClass.getSuperClass().getName();
                      break;
                  }
              }
              
!             Class superclass = declaredSuperclassName != null ?
!                 FormUtils.loadClass(declaredSuperclassName, formFile) : Object.class;
              formBaseClass = checkDeclaredSuperclass(superclass, formInfoName);
  
              if (formBaseClass != superclass && !underTest)
--- 306,324 ----
                  className = (dotIndex == -1) ? className : className.substring(dotIndex+1);
                  if (className.equals(javaFile.getName())) {
                      declaredSuperclassName = javaClass.getSuperClass().getName();
+ 		    superclass = FormUtils.loadClass(declaredSuperclassName, formFile);
+ 		    if (Modifier.isAbstract( superclass.getModifiers() )) {
+ 			superclass = null;
+ 			declaredSuperclassName = javaClass.getSuperClass().getSuperClass().getName();
+ 		    }
                      break;
                  }
              }
              
! 	    if (superclass == null) {
! 		superclass = declaredSuperclassName != null ?
! 		    FormUtils.loadClass(declaredSuperclassName, formFile) : Object.class;
! 	    }
              formBaseClass = checkDeclaredSuperclass(superclass, formInfoName);
  
              if (formBaseClass != superclass && !underTest)