This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 83343
Collapse All | Expand All

(-)j2seproject/arch.xml (+8 lines)
Lines 1079-1084 Link Here
1079
       It's content is expected to be <code>NodeFactory</code> instances.
1079
       It's content is expected to be <code>NodeFactory</code> instances.
1080
     </p>
1080
     </p>
1081
    </api>
1081
    </api>
1082
    <api group="layer" name="J2SELookup" type="export" category="official">
1083
     <p>
1084
       "Projects/org-netbeans-modules-java-j2seproject/Lookup" folder's content is used to construct the project's additional lookup.
1085
       It's content is expected to be <code>LookupProvider</code> instances. J2SE project provides <code>LookupMerger</code>s 
1086
       for <code>Sources</code>, <code>PrivilegedTemplates</code> and <code>RecommendedTemplates</code>. Implementations added by 3rd parties 
1087
       will be merged into a single instance in the project's lookup.
1088
     </p>
1089
    </api>
1082
1090
1083
 </answer>
1091
 </answer>
1084
1092
(-)j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java (-2 / +8 lines)
Lines 52-57 Link Here
52
import org.netbeans.spi.project.AuxiliaryConfiguration;
52
import org.netbeans.spi.project.AuxiliaryConfiguration;
53
import org.netbeans.spi.project.SubprojectProvider;
53
import org.netbeans.spi.project.SubprojectProvider;
54
import org.netbeans.spi.project.ant.AntArtifactProvider;
54
import org.netbeans.spi.project.ant.AntArtifactProvider;
55
import org.netbeans.spi.project.support.LookupProviderSupport;
55
import org.netbeans.spi.project.support.ant.AntProjectEvent;
56
import org.netbeans.spi.project.support.ant.AntProjectEvent;
56
import org.netbeans.spi.project.support.ant.AntProjectHelper;
57
import org.netbeans.spi.project.support.ant.AntProjectHelper;
57
import org.netbeans.spi.project.support.ant.AntProjectListener;
58
import org.netbeans.spi.project.support.ant.AntProjectListener;
Lines 66-71 Link Here
66
import org.netbeans.spi.project.ui.PrivilegedTemplates;
67
import org.netbeans.spi.project.ui.PrivilegedTemplates;
67
import org.netbeans.spi.project.ui.ProjectOpenedHook;
68
import org.netbeans.spi.project.ui.ProjectOpenedHook;
68
import org.netbeans.spi.project.ui.RecommendedTemplates;
69
import org.netbeans.spi.project.ui.RecommendedTemplates;
70
import org.netbeans.spi.project.ui.support.UILookupMergerSupport;
69
import org.openide.ErrorManager;
71
import org.openide.ErrorManager;
70
import org.openide.filesystems.FileObject;
72
import org.openide.filesystems.FileObject;
71
import org.openide.filesystems.FileUtil;
73
import org.openide.filesystems.FileUtil;
Lines 196-202 Link Here
196
    private Lookup createLookup(AuxiliaryConfiguration aux) {
198
    private Lookup createLookup(AuxiliaryConfiguration aux) {
197
        SubprojectProvider spp = refHelper.createSubprojectProvider();
199
        SubprojectProvider spp = refHelper.createSubprojectProvider();
198
        final J2SEProjectClassPathModifier cpMod = new J2SEProjectClassPathModifier(this, this.updateHelper, eval, refHelper);
200
        final J2SEProjectClassPathModifier cpMod = new J2SEProjectClassPathModifier(this, this.updateHelper, eval, refHelper);
199
        return Lookups.fixed(new Object[] {
201
        Lookup base = Lookups.fixed(new Object[] {
200
            new Info(),
202
            new Info(),
201
            aux,
203
            aux,
202
            helper.createCacheDirectoryProvider(),
204
            helper.createCacheDirectoryProvider(),
Lines 222-229 Link Here
222
            this, // never cast an externally obtained Project to J2SEProject - use lookup instead
224
            this, // never cast an externally obtained Project to J2SEProject - use lookup instead
223
            new J2SEProjectOperations(this),
225
            new J2SEProjectOperations(this),
224
            new J2SEConfigurationProvider(this),
226
            new J2SEConfigurationProvider(this),
225
            new J2SEProjectWebServicesSupportProvider()
227
            new J2SEProjectWebServicesSupportProvider(),
228
            UILookupMergerSupport.createPrivilegedTemplatesMerger(),
229
            UILookupMergerSupport.createRecommendedTemplatesMerger(),
230
            LookupProviderSupport.createSourcesMerger()
226
        });
231
        });
232
        return LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-java-j2seproject/Lookup"); //NOI18N
227
    }
233
    }
228
234
229
    public void configurationXmlChanged(AntProjectEvent ev) {
235
    public void configurationXmlChanged(AntProjectEvent ev) {
(-)j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml (+4 lines)
Lines 108-113 Link Here
108
                    </file>
108
                    </file>
109
                </folder>
109
                </folder>
110
            </folder>
110
            </folder>
111
            
111
            <folder name="Nodes">
112
            <folder name="Nodes">
112
                <file name="org.netbeans.modules.java.j2seproject.ui.SourceNodeFactory.instance"/>
113
                <file name="org.netbeans.modules.java.j2seproject.ui.SourceNodeFactory.instance"/>
113
                <attr name="org.netbeans.modules.java.j2seproject.ui.SourceNodeFactory.instance/org.netbeans.modules.java.j2seproject.ui.LibrariesNodeFactory.instance" boolvalue="true"/>
114
                <attr name="org.netbeans.modules.java.j2seproject.ui.SourceNodeFactory.instance/org.netbeans.modules.java.j2seproject.ui.LibrariesNodeFactory.instance" boolvalue="true"/>
Lines 116-121 Link Here
116
                <file name="org.netbeans.modules.java.j2seproject.wsclient.WebServicesNodeFactory.instance"/>
117
                <file name="org.netbeans.modules.java.j2seproject.wsclient.WebServicesNodeFactory.instance"/>
117
                
118
                
118
            </folder>
119
            </folder>
120
            
121
            <folder name="Lookup"/>
122
            
119
        </folder>
123
        </folder>
120
    </folder>
124
    </folder>
121
</filesystem>
125
</filesystem>

Return to bug 83343