# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: E:\Repositories\nb_all\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: src/org/netbeans/modules/form/FormUtils.java
*** E:\Repositories\nb_all\form\src\org\netbeans\modules\form\FormUtils.java Base (1.109)
--- E:\Repositories\nb_all\form\src\org\netbeans\modules\form\FormUtils.java Locally Modified (Based On 1.109)
***************
*** 977,983 ****
          if (loader == null)
              throw new ClassNotFoundException();
  
!         return loader.loadClass(name);
      }
  
      // ---------
--- 977,983 ----
          if (loader == null)
              throw new ClassNotFoundException();
  
!         return Class.forName(name, true, loader);
      }
  
      // ---------
***************
*** 996,1014 ****
              throws IOException, ClassNotFoundException
          {
              String name = streamCls.getName();
-             if (name.startsWith("[")) { // NOI18N
-                 // load array element class first to avoid failure
-                 for (int i=1, n=name.length(); i < n; i++) {
-                     char c = name.charAt(i);
-                     if (c == 'L' && name.endsWith(";")) { // NOI18N
-                         String clsName = name.substring(i+1, n-1);
-                         loadClass(clsName);
-                         break;
-                     }
-                     else if (c != '[')
-                         return super.resolveClass(streamCls);
-                 }
-             }
              return loadClass(name);
          }
          
--- 996,1001 ----
***************
*** 1015,1021 ****
          private Class loadClass(String name) throws ClassNotFoundException {
              if (classLoader != null) {
                  try {
!                     return classLoader.loadClass(name);
                  } catch (ClassNotFoundException ex) {}
              }
              return FormUtils.loadClass(name, formModel);
--- 1002,1008 ----
          private Class loadClass(String name) throws ClassNotFoundException {
              if (classLoader != null) {
                  try {
!                     return Class.forName(name, true, classLoader);
                  } catch (ClassNotFoundException ex) {}
              }
              return FormUtils.loadClass(name, formModel);
Index: src/org/netbeans/modules/form/project/ClassPathUtils.java
*** E:\Repositories\nb_all\form\src\org\netbeans\modules\form\project\ClassPathUtils.java Base (1.18)
--- E:\Repositories\nb_all\form\src\org\netbeans\modules\form\project\ClassPathUtils.java Locally Modified (Based On 1.18)
***************
*** 56,62 ****
      public static Class loadClass(String name, FileObject fileInProject)
          throws ClassNotFoundException
      {
!         return getFormClassLoader(fileInProject).loadClass(name);
          // LinkageError left uncaught
      }
  
--- 56,62 ----
      public static Class loadClass(String name, FileObject fileInProject)
          throws ClassNotFoundException
      {
!         return Class.forName(name, true, getFormClassLoader(fileInProject));
          // LinkageError left uncaught
      }