();
@@ -312,11 +314,29 @@
/**
* Create the helper object, initially configured to recognize only sources
* contained inside the project directory.
- * @param project an Ant project helper
+ * @param aph an Ant project helper
* @param evaluator a way to evaluate Ant properties used to define source locations
+ * @deprecated Rather use {@link #SourcesHelper(Project, AntProjectHelper, PropertyEvaluator)}.
*/
- public SourcesHelper(AntProjectHelper project, PropertyEvaluator evaluator) {
+ @Deprecated
+ public SourcesHelper(AntProjectHelper aph, PropertyEvaluator evaluator) {
+ this.project = null;
+ this.aph = aph;
+ this.evaluator = evaluator;
+ }
+
+ /**
+ * Create the helper object, initially configured to recognize only sources
+ * contained inside the project directory.
+ * @param project the project object (need not yet be registered in {@link ProjectManager})
+ * @param aph an Ant project helper
+ * @param evaluator a way to evaluate Ant properties used to define source locations
+ * @since org.netbeans.modules.project.ant/1 1.31
+ */
+ public SourcesHelper(Project project, AntProjectHelper aph, PropertyEvaluator evaluator) {
+ Parameters.notNull("project", project);
this.project = project;
+ this.aph = aph;
this.evaluator = evaluator;
}
@@ -470,7 +490,7 @@
}
private Project getProject() {
- return AntBasedProjectFactorySingleton.getProjectFor(project);
+ return project != null ? project : AntBasedProjectFactorySingleton.getProjectFor(aph);
}
/**
@@ -504,11 +524,14 @@
* {@link FileOwnerQuery#EXTERNAL_ALGORITHM_TRANSIENT}.
*
*
- * You may not call this method inside the project's constructor, as
- * it requires the actual project to exist and be registered in {@link ProjectManager}.
- * Typically you would use {@link org.openide.util.Mutex#postWriteRequest} to run it
+ * If you used the old constructor form
+ * {@link #SourcesHelper(AntProjectHelper, PropertyEvaluator)}
+ * then you may not call this method inside the project's constructor, as
+ * it requires the actual project to exist and be registered in {@link ProjectManager};
+ * in this case you could still use {@link org.openide.util.Mutex#postWriteRequest} to run it
* later, if you were creating the helper in your constructor, since the project construction
* normally occurs in read access.
+ * Better to use {@link #SourcesHelper(Project, AntProjectHelper, PropertyEvaluator)}.
*
* @param algorithm an external root registration algorithm as per
* {@link FileOwnerQuery#markExternalOwner}
@@ -584,7 +607,7 @@
allRoots.addAll(nonSourceRoots);
allRoots.addAll(ownedFiles);
Project p = getProject();
- FileObject pdir = project.getProjectDirectory();
+ FileObject pdir = aph.getProjectDirectory();
// First time: register roots and add to lastRegisteredRoots.
// Subsequent times: add to newRootsToRegister and maybe add them later.
if (lastRegisteredRoots == null) {
diff --git a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/SourcesHelperTest.java b/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/SourcesHelperTest.java
--- a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/SourcesHelperTest.java
+++ b/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/SourcesHelperTest.java
@@ -85,7 +85,7 @@
private Project project2;
private SourcesHelper sh2;
- protected void setUp() throws Exception {
+ protected @Override void setUp() throws Exception {
super.setUp();
MockLookup.setInstances(AntBasedTestUtil.testAntBasedProjectType());
scratch = TestUtil.makeScratchDir(this);
@@ -120,7 +120,7 @@
p.setProperty("ext.file", "../../external/extFile");
h.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, p);
ProjectManager.getDefault().saveProject(project);
- sh = new SourcesHelper(h, h.getStandardPropertyEvaluator());
+ sh = new SourcesHelper(project, h, h.getStandardPropertyEvaluator());
sh.addPrincipalSourceRoot("${src1.dir}", "Sources #1", null, null); // inside proj dir
sh.addPrincipalSourceRoot("${src2.dir}", "Sources #2", null, null); // outside (rel path)
sh.addPrincipalSourceRoot("${src2a.dir}", "Sources #2a", null, null); // redundant
@@ -147,7 +147,7 @@
h2 = ProjectGenerator.createProject(proj2dir, "test");
project2 = ProjectManager.getDefault().findProject(proj2dir);
assertNotNull("have a project2", project2);
- sh2 = new SourcesHelper(h2, h2.getStandardPropertyEvaluator());
+ sh2 = new SourcesHelper(project2, h2, h2.getStandardPropertyEvaluator());
sh2.addPrincipalSourceRoot("src1", "Sources #1", null, null);
sh2.addPrincipalSourceRoot("src2", "Sources #2", null, null);
sh2.addNonSourceRoot("build");
@@ -420,7 +420,7 @@
//
h.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, p);
ProjectManager.getDefault().saveProject(project);
- sh = new SourcesHelper(h, h.getStandardPropertyEvaluator());
+ sh = new SourcesHelper(project, h, h.getStandardPropertyEvaluator());
sh.addPrincipalSourceRoot("${src1.dir}", "${src1.includes}", "${src1.excludes}", "Sources #1", null, null);
sh.addPrincipalSourceRoot("${src2.dir}", "${src2.includes}", "${src2.excludes}", "Sources #2", null, null);
sh.addPrincipalSourceRoot("${src3.dir}", "${src3.includes}", null, "Sources #3", null, null);
@@ -594,7 +594,7 @@
h.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, p);
ProjectManager.getDefault().saveProject(project);
//minimalSubfolders = true
- sh = new SourcesHelper(h, h.getStandardPropertyEvaluator());
+ sh = new SourcesHelper(project, h, h.getStandardPropertyEvaluator());
sh.addPrincipalSourceRoot("${src1.dir}", "${src1.includes}", "${src1.excludes}", "Sources #1", null, null);
sh.addTypedSourceRoot("${src1.dir}", "${src1.includes}", "${src1.excludes}", "java", "Packages #1", null, null);
sh.registerExternalRoots(FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT, true);
@@ -604,7 +604,7 @@
assertEquals("Packages #1", g1.getDisplayName());
assertNull(FileOwnerQuery.getOwner(src1dir));
//minimalSubfolders = false
- sh = new SourcesHelper(h, h.getStandardPropertyEvaluator());
+ sh = new SourcesHelper(project, h, h.getStandardPropertyEvaluator());
sh.addPrincipalSourceRoot("${src1.dir}", "${src1.includes}", "${src1.excludes}", "Sources #1", null, null);
sh.addTypedSourceRoot("${src1.dir}", "${src1.includes}", "${src1.excludes}", "java", "Packages #1", null, null);
sh.registerExternalRoots(FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT, false);
diff --git a/projectapi/src/org/netbeans/modules/projectapi/AuxiliaryConfigBasedPreferencesProvider.java b/projectapi/src/org/netbeans/modules/projectapi/AuxiliaryConfigBasedPreferencesProvider.java
--- a/projectapi/src/org/netbeans/modules/projectapi/AuxiliaryConfigBasedPreferencesProvider.java
+++ b/projectapi/src/org/netbeans/modules/projectapi/AuxiliaryConfigBasedPreferencesProvider.java
@@ -95,6 +95,7 @@
}
AuxiliaryConfiguration ac = ProjectUtils.getAuxiliaryConfiguration(p);
+ assert p.getLookup() != null : p;
AuxiliaryProperties ap = p.getLookup().lookup(AuxiliaryProperties.class);
target.put(p, new WeakReference(prov = new AuxiliaryConfigBasedPreferencesProvider(p, ac, ap, shared)));
diff --git a/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/ProjectOpenHookImpl.java b/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/ProjectOpenHookImpl.java
--- a/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/ProjectOpenHookImpl.java
+++ b/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/ProjectOpenHookImpl.java
@@ -40,31 +40,17 @@
package org.netbeans.modules.projectimport.eclipse.core;
import java.util.concurrent.ExecutionException;
-import java.util.logging.Logger;
-import org.netbeans.api.project.Project;
import org.netbeans.api.project.ui.OpenProjects;
import org.netbeans.spi.project.ui.ProjectOpenedHook;
import org.openide.util.Exceptions;
import org.openide.util.RequestProcessor;
-/**
- *
- */
public class ProjectOpenHookImpl extends ProjectOpenedHook{
private static final RequestProcessor PROJ_OPEN_HOOK_RESYNCHRONIZER = new RequestProcessor("Eclipse.Resynchronizer"); // NOI18N
private static RequestProcessor.Task currentTask;
- private UpgradableProject upgradable;
- private Project project;
-
- private static final Logger LOG =
- Logger.getLogger(ProjectOpenHookImpl.class.getName());
-
- public ProjectOpenHookImpl(Project project, UpgradableProject upgradable) {
- this.upgradable = upgradable;
- this.project = project;
- }
+ public ProjectOpenHookImpl() {}
@Override
protected synchronized void projectOpened() {
diff --git a/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/spi/UpgradableProjectLookupProvider.java b/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/spi/UpgradableProjectLookupProvider.java
--- a/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/spi/UpgradableProjectLookupProvider.java
+++ b/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/spi/UpgradableProjectLookupProvider.java
@@ -40,22 +40,33 @@
package org.netbeans.modules.projectimport.eclipse.core.spi;
import org.netbeans.api.project.Project;
+import org.netbeans.api.project.ProjectUtils;
import org.netbeans.modules.projectimport.eclipse.core.ProjectOpenHookImpl;
import org.netbeans.modules.projectimport.eclipse.core.UpgradableProject;
import org.netbeans.spi.project.LookupProvider;
import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;
-// registered separately in j2se and web modules, but could use @LookupProvider.Registration
+// registered separately in j2se and web modules, otherwise could use @LookupProvider.Registration
final public class UpgradableProjectLookupProvider implements LookupProvider {
public Lookup createAdditionalLookup(Lookup baseContext) {
Project p = baseContext.lookup(Project.class);
assert p != null;
- UpgradableProject up = new UpgradableProject(p);
+ if (ProjectUtils.getPreferences(p, UpgradableProjectLookupProvider.class, true).
+ get("project", null) == null) { // NOI18N
+ // Shortcut, the normal case:
+ return Lookup.EMPTY;
+ } else {
+ // Keep as separate method to try to delay class initialization:
+ return upgradeLookup(p);
+ }
+ }
+
+ private static Lookup upgradeLookup(Project p) {
return Lookups.fixed(
- up,
- new ProjectOpenHookImpl(p, up));
+ new UpgradableProject(p),
+ new ProjectOpenHookImpl());
}
}
diff --git a/projectimport.eclipse.core/test/unit/src/org/netbeans/modules/projectimport/eclipse/core/spi/ProjectFactorySupportTest.java b/projectimport.eclipse.core/test/unit/src/org/netbeans/modules/projectimport/eclipse/core/spi/ProjectFactorySupportTest.java
--- a/projectimport.eclipse.core/test/unit/src/org/netbeans/modules/projectimport/eclipse/core/spi/ProjectFactorySupportTest.java
+++ b/projectimport.eclipse.core/test/unit/src/org/netbeans/modules/projectimport/eclipse/core/spi/ProjectFactorySupportTest.java
@@ -46,7 +46,6 @@
import java.util.Collections;
import java.util.List;
import org.netbeans.api.java.platform.JavaPlatform;
-import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ProjectUtils;
@@ -225,14 +224,6 @@
model.getEclipseTestSourceRootsAsFileArray(), null, null, null);
J2SEProject p = (J2SEProject)ProjectManager.getDefault().findProject(helper.getProjectDirectory());
List importProblems = new ArrayList();
-
- //
- // NB-Core-Build #1293: "No project found to correspond to .../spcp/eclipse/src" from ProjectClassPathModifier.findExtensible
- //
- // Looks like J2SEProject registers its external source roots asynchronously and sometimes
- // it is too late and above problem happens. Mark external source roots explicitly here:
- FileOwnerQuery.markExternalOwner(model.getEclipseSourceRootsAsFileArray()[0].toURI(), p, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT);
-
ProjectFactorySupport.updateProjectClassPath(helper, p.getReferenceHelper(), model, importProblems);
EditableProperties ep = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
assertEquals(
@@ -262,14 +253,6 @@
model.getEclipseTestSourceRootsAsFileArray(), null, null, null);
J2SEProject p = (J2SEProject)ProjectManager.getDefault().findProject(helper.getProjectDirectory());
List importProblems = new ArrayList();
-
- //
- // NB-Core-Build #1293: "No project found to correspond to .../spcp/eclipse/src" from ProjectClassPathModifier.findExtensible
- //
- // Looks like J2SEProject registers its external source roots asynchronously and sometimes
- // it is too late and above problem happens. Mark external source roots explicitly here:
- FileOwnerQuery.markExternalOwner(model.getEclipseSourceRootsAsFileArray()[0].toURI(), p, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT);
-
ProjectFactorySupport.updateProjectClassPath(helper, p.getReferenceHelper(), model, importProblems);
EditableProperties ep = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
assertEquals(
@@ -355,14 +338,6 @@
model.getEclipseTestSourceRootsAsFileArray(), null, null, null);
J2SEProject p = (J2SEProject)ProjectManager.getDefault().findProject(helper.getProjectDirectory());
List importProblems = new ArrayList();
-
- //
- // NB-Core-Build #1293: "No project found to correspond to .../spcp/eclipse/src" from ProjectClassPathModifier.findExtensible
- //
- // Looks like J2SEProject registers its external source roots asynchronously and sometimes
- // it is too late and above problem happens. Mark external source roots explicitly here:
- FileOwnerQuery.markExternalOwner(model.getEclipseSourceRootsAsFileArray()[0].toURI(), p, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT);
-
ProjectFactorySupport.updateProjectClassPath(helper, p.getReferenceHelper(), model, importProblems);
EditableProperties ep = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
// required project "JavaLibrary1" is not available and therefore should not be
@@ -411,14 +386,6 @@
mdl_d.getEclipseTestSourceRootsAsFileArray(), null, null, null);
List problems = new ArrayList();
J2SEProject j2seprj_d = (J2SEProject) ProjectManager.getDefault().findProject(aph_d.getProjectDirectory());
-
- //
- // NB-Core-Build #1293: "No project found to correspond to .../spcp/eclipse/src" from ProjectClassPathModifier.findExtensible
- //
- // Looks like J2SEProject registers its external source roots asynchronously and sometimes
- // it is too late and above problem happens. Mark external source roots explicitly here:
- FileOwnerQuery.markExternalOwner(mdl_d.getEclipseSourceRootsAsFileArray()[0].toURI(), j2seprj_d, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT);
-
ProjectFactorySupport.updateProjectClassPath(aph_d, j2seprj_d.getReferenceHelper(), mdl_d, problems);
assertEquals(Collections.emptyList(), problems);
assertEquals("${reference.c.jar}:${reference.b.jar}", aph_d.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH).get("javac.classpath"));
diff --git a/web.project/src/org/netbeans/modules/web/project/WebProject.java b/web.project/src/org/netbeans/modules/web/project/WebProject.java
--- a/web.project/src/org/netbeans/modules/web/project/WebProject.java
+++ b/web.project/src/org/netbeans/modules/web/project/WebProject.java
@@ -185,7 +185,7 @@
private final PropertyEvaluator eval;
private final ReferenceHelper refHelper;
private final GeneratedFilesHelper genFilesHelper;
- private final Lookup lookup;
+ private Lookup lookup;
private final ProjectWebModule webModule;
private final CopyOnSaveSupport css;
private final ArtifactCopyOnSaveSupport artifactSupport;
@@ -528,6 +528,7 @@
LookupMergerSupport.createJFBLookupMerger(),
QuerySupport.createBinaryForSourceQueryImplementation(sourceRoots, testRoots, helper, eval),
});
+ lookup = base;
return LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-web-project/Lookup"); //NOI18N
}