Index: core/src/org/netbeans/core/NbTopManager.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/NbTopManager.java,v
retrieving revision 1.154
diff -c -r1.154 NbTopManager.java
*** core/src/org/netbeans/core/NbTopManager.java	23 Jul 2002 12:55:18 -0000	1.154
--- core/src/org/netbeans/core/NbTopManager.java	25 Jul 2002 17:08:02 -0000
***************
*** 824,830 ****
          */
          public Lkp () {
              super (new Lookup[] {
!                        Lookup.EMPTY,
                         // #14722: pay attention also to META-INF/services/class.Name resources:
                         createMetaInfServicesLookup(false),
                         createInitialErrorManagerLookup(),
--- 824,830 ----
          */
          public Lkp () {
              super (new Lookup[] {
!                        Lookup.EMPTY, // place for FolderLookup
                         // #14722: pay attention also to META-INF/services/class.Name resources:
                         createMetaInfServicesLookup(false),
                         createInitialErrorManagerLookup(),
***************
*** 883,899 ****
                  if (lookup instanceof Lkp) {
                      Lkp lkp = (Lkp)lookup;
                      Lookup[] old = lkp.getLookups();
!                     if (old.length !=  6) throw new IllegalStateException();
                      Lookup[] nue = new Lookup[] {
!                         old[0], // TMLookup
                          // maybe replace it now with module-based lookup, if PROP_ENABLED_MODULES
                          // has not taken care of it yet
                          propModulesReceived > 0 ? old[1] : createMetaInfServicesLookup(true),
                          // do NOT include initialErrorManagerLookup; this is now replaced by the layer entry
                          // Services/Hidden/org-netbeans-core-default-error-manager.instance
                          old[3], // NbTM.instanceLookup
!                         old[4], // FolderLookup
!                         old[5], // moduleLookup
                      };
                      lkp.setLookups(nue);
                  }
--- 883,898 ----
                  if (lookup instanceof Lkp) {
                      Lkp lkp = (Lkp)lookup;
                      Lookup[] old = lkp.getLookups();
!                     if (old.length !=  5) throw new IllegalStateException();
                      Lookup[] nue = new Lookup[] {
!                         old[0], // FolderLookup
                          // maybe replace it now with module-based lookup, if PROP_ENABLED_MODULES
                          // has not taken care of it yet
                          propModulesReceived > 0 ? old[1] : createMetaInfServicesLookup(true),
                          // do NOT include initialErrorManagerLookup; this is now replaced by the layer entry
                          // Services/Hidden/org-netbeans-core-default-error-manager.instance
                          old[3], // NbTM.instanceLookup
!                         old[4], // moduleLookup
                      };
                      lkp.setLookups(nue);
                  }
***************
*** 981,993 ****
  
              // extend the lookup
              Lookup[] arr = new Lookup[] {
!                 getLookups ()[0], // TMLookup
                  getLookups()[1], // metaInfServicesLookup; still keep classpath one till later...
                  // Include initialErrorManagerLookup provisionally, until the folder lookup
                  // is actually ready and usable
                  getLookups()[2], // initialErrorManagerLookup
                  NbTopManager.get ().getInstanceLookup (),
-                 nue,
                  NbTopManager.get().getModuleSystem().getManager().getModuleLookup(),
              };
              StartLog.logProgress ("prepared other Lookups"); // NOI18N
--- 980,991 ----
  
              // extend the lookup
              Lookup[] arr = new Lookup[] {
!                 nue,
                  getLookups()[1], // metaInfServicesLookup; still keep classpath one till later...
                  // Include initialErrorManagerLookup provisionally, until the folder lookup
                  // is actually ready and usable
                  getLookups()[2], // initialErrorManagerLookup
                  NbTopManager.get ().getInstanceLookup (),
                  NbTopManager.get().getModuleSystem().getManager().getModuleLookup(),
              };
              StartLog.logProgress ("prepared other Lookups"); // NOI18N