? 83343.diff
? maven-subproject
? editor/maven-subproject
? j2seproject/maven-subproject
Index: j2seproject/arch.xml
===================================================================
RCS file: /cvs/java/j2seproject/arch.xml,v
retrieving revision 1.14
diff -u -r1.14 arch.xml
--- j2seproject/arch.xml	18 Sep 2006 11:28:10 -0000	1.14
+++ j2seproject/arch.xml	18 Sep 2006 14:00:24 -0000
@@ -1079,6 +1079,14 @@
        It's content is expected to be <code>NodeFactory</code> instances.
      </p>
     </api>
+    <api group="layer" name="J2SELookup" type="export" category="official">
+     <p>
+       "Projects/org-netbeans-modules-java-j2seproject/Lookup" folder's content is used to construct the project's additional lookup.
+       It's content is expected to be <code>LookupProvider</code> instances. J2SE project provides <code>LookupMerger</code>s 
+       for <code>Sources</code>, <code>PrivilegedTemplates</code> and <code>RecommendedTemplates</code>. Implementations added by 3rd parties 
+       will be merged into a single instance in the project's lookup.
+     </p>
+    </api>
 
  </answer>
 
Index: j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java,v
retrieving revision 1.65
diff -u -r1.65 J2SEProject.java
--- j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java	13 Sep 2006 22:38:45 -0000	1.65
+++ j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java	18 Sep 2006 14:00:24 -0000
@@ -52,6 +52,7 @@
 import org.netbeans.spi.project.AuxiliaryConfiguration;
 import org.netbeans.spi.project.SubprojectProvider;
 import org.netbeans.spi.project.ant.AntArtifactProvider;
+import org.netbeans.spi.project.support.LookupProviderSupport;
 import org.netbeans.spi.project.support.ant.AntProjectEvent;
 import org.netbeans.spi.project.support.ant.AntProjectHelper;
 import org.netbeans.spi.project.support.ant.AntProjectListener;
@@ -66,6 +67,7 @@
 import org.netbeans.spi.project.ui.PrivilegedTemplates;
 import org.netbeans.spi.project.ui.ProjectOpenedHook;
 import org.netbeans.spi.project.ui.RecommendedTemplates;
+import org.netbeans.spi.project.ui.support.UILookupMergerSupport;
 import org.openide.ErrorManager;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
@@ -196,7 +198,7 @@
     private Lookup createLookup(AuxiliaryConfiguration aux) {
         SubprojectProvider spp = refHelper.createSubprojectProvider();
         final J2SEProjectClassPathModifier cpMod = new J2SEProjectClassPathModifier(this, this.updateHelper, eval, refHelper);
-        return Lookups.fixed(new Object[] {
+        Lookup base = Lookups.fixed(new Object[] {
             new Info(),
             aux,
             helper.createCacheDirectoryProvider(),
@@ -222,8 +224,12 @@
             this, // never cast an externally obtained Project to J2SEProject - use lookup instead
             new J2SEProjectOperations(this),
             new J2SEConfigurationProvider(this),
-            new J2SEProjectWebServicesSupportProvider()
+            new J2SEProjectWebServicesSupportProvider(),
+            UILookupMergerSupport.createPrivilegedTemplatesMerger(),
+            UILookupMergerSupport.createRecommendedTemplatesMerger(),
+            LookupProviderSupport.createSourcesMerger()
         });
+        return LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-java-j2seproject/Lookup"); //NOI18N
     }
 
     public void configurationXmlChanged(AntProjectEvent ev) {
Index: j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml,v
retrieving revision 1.19
diff -u -r1.19 layer.xml
--- j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml	18 Sep 2006 11:28:11 -0000	1.19
+++ j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml	18 Sep 2006 14:00:24 -0000
@@ -108,6 +108,7 @@
                     </file>
                 </folder>
             </folder>
+            
             <folder name="Nodes">
                 <file name="org.netbeans.modules.java.j2seproject.ui.SourceNodeFactory.instance"/>
                 <attr name="org.netbeans.modules.java.j2seproject.ui.SourceNodeFactory.instance/org.netbeans.modules.java.j2seproject.ui.LibrariesNodeFactory.instance" boolvalue="true"/>
@@ -116,6 +117,9 @@
                 <file name="org.netbeans.modules.java.j2seproject.wsclient.WebServicesNodeFactory.instance"/>
                 
             </folder>
+            
+            <folder name="Lookup"/>
+            
         </folder>
     </folder>
 </filesystem>