Attachment #114885 for bug #207288

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 207288
Collapse All | Expand All

Lines 1-4 Link Here

(-)a/java.api.common/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.java.api.common/0	2	OpenIDE-Module: org.netbeans.modules.java.api.common/0
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties
4	OpenIDE-Module-Specification-Version: 1.34	4	OpenIDE-Module-Specification-Version: 1.35

Lines 99-105 Link Here

(-)a/java.api.common/nbproject/project.xml (-1 / +1 lines)
99	<compile-dependency/>	99	<compile-dependency/>
100	<run-dependency>	100	<run-dependency>
101	<release-version>1</release-version>	101	<release-version>1</release-version>
102	<specification-version>1.41</specification-version>	102	<specification-version>1.47</specification-version>
103	</run-dependency>	103	</run-dependency>
104	</dependency>	104	</dependency>
105	<dependency>	105	<dependency>





package org.netbeans.modules.java.api.common.queries;

import java.io.File;
import javax.swing.Icon;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.api.project.Sources;
import org.netbeans.modules.java.api.common.SourceRoots;
import org.netbeans.api.java.queries.AnnotationProcessingQuery.Result;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectInformation;
import org.netbeans.modules.java.api.common.Roots;

import org.netbeans.spi.java.queries.MultipleRootsUnitTestForSourceQueryImplementation;
import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation;
import org.netbeans.spi.java.queries.SourceLevelQueryImplementation2;
import org.netbeans.spi.project.SourceGroupModifierImplementation;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.AntProjectListener;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.netbeans.spi.queries.FileBuiltQueryImplementation;
import org.netbeans.spi.queries.FileEncodingQueryImplementation;
import org.netbeans.spi.queries.SharabilityQueryImplementation;
import org.netbeans.spi.queries.SharabilityQueryImplementation2;
import org.openide.loaders.CreateFromTemplateAttributesProvider;
import org.openide.util.Parameters;
import org.openide.util.WeakListeners;

     * @param testRoots a list of test roots to treat as sharable, may be null if the project does not support tests
     * @param additionalSourceRoots additional paths to treat as sharable (just pure property names, do not
     *          use <i>${</i> and <i>}</i> characters). Can be <code>null</code>.
     * @return a query to provide information about files sharability.
     * @since 1.35
     */
    public static SharabilityQueryImplementation2 createSharabilityQuery2(
            final @NonNull AntProjectHelper helper,
            final @NonNull PropertyEvaluator evaluator,
            final @NonNull SourceRoots srcRoots,


        return new SharabilityQueryImpl(helper, evaluator, srcRoots, testRoots, additionalSourceRoots);
    }

    /**
     * @deprecated since 1.35 use {@link #createSharabilityQuery2} instead
     * {@link #createSharabilityQuery(AntProjectHelper, PropertyEvaluator, SourceRoots, SourceRoots, String...)
     * createSharabilityQuery()}
     * for more information.
     */
    @Deprecated
    public static SharabilityQueryImplementation createSharabilityQuery(
            final @NonNull AntProjectHelper helper,
            final @NonNull PropertyEvaluator evaluator,
            final @NonNull SourceRoots srcRoots,
            final @NullAllowed SourceRoots testRoots,
            final @NullAllowed String... additionalSourceRoots) {
        final SharabilityQueryImplementation2 sq2 = createSharabilityQuery2(helper, evaluator, srcRoots, testRoots, additionalSourceRoots);
        return new SharabilityQueryImplementation() {
            @Override public int getSharability(File file) {
                return sq2.getSharability(file.toURI()).ordinal();
            }
        };
    }
    /**
     * @deprecated since 1.35 use {@link #createSharabilityQuery2} instead
     */
    @Deprecated
    public static SharabilityQueryImplementation createSharabilityQuery(AntProjectHelper helper,
            PropertyEvaluator evaluator, SourceRoots srcRoots, SourceRoots testRoots) {





package org.netbeans.modules.java.api.common.queries;

import org.netbeans.modules.java.api.common.SourceRoots;
import java.io.File;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.openide.util.Mutex;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.queries.SharabilityQuery;
import org.netbeans.spi.queries.SharabilityQueryImplementation;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.netbeans.spi.queries.SharabilityQueryImplementation2;

/**
 * Default implementation of {@link SharabilityQueryImplementation} which is capable to take more sources.
 * It listens to the changes in particular property values.
 * @author Tomas Zezula, Tomas Mysik
 */
class SharabilityQueryImpl implements SharabilityQueryImplementation2, PropertyChangeListener {

    private final AntProjectHelper helper;
    private final PropertyEvaluator evaluator;
    private final SourceRoots srcRoots;
    private final SourceRoots testRoots;
    private final List<String> additionalSourceRoots;
    private SharabilityQueryImplementation2 delegate;

    @SuppressWarnings("LeakingThisInConstructor")
    public SharabilityQueryImpl(AntProjectHelper helper, PropertyEvaluator evaluator, SourceRoots srcRoots,

        }
    }

    @Override public SharabilityQuery.Sharability getSharability(final URI file) {
        return ProjectManager.mutex().readAccess(new Mutex.Action<SharabilityQuery.Sharability>() {
            @Override public SharabilityQuery.Sharability run() {
            @Override
            public Integer run() {
                synchronized (SharabilityQueryImpl.this) {
                    if (delegate == null) {
                        delegate = createDelegate();

        }
    }

    private SharabilityQueryImplementation2 createDelegate() {
        String[] srcProps = srcRoots.getRootProperties();
        String[] testProps = testRoots == null ? new String[0] : testRoots.getRootProperties();
        String[] buildDirectories = new String[] {"${dist.dir}", "${build.dir}"}; // NOI18N

        }
        props.addAll(additionalSourceRoots);

        return helper.createSharabilityQuery2(evaluator, props.toArray(new String[props.size()]), buildDirectories);
    }
}

Lines 141-148 Link Here

(-)a/java.j2seproject/nbproject/project.xml (-2 / +2 lines)
141	<build-prerequisite/>	141	<build-prerequisite/>
142	<compile-dependency/>	142	<compile-dependency/>
143	<run-dependency>	143	<run-dependency>
144	<release-version>0-1</release-version>	144	<release-version>1</release-version>
145	<specification-version>1.26</specification-version>	145	<specification-version>1.35</specification-version>
146	</run-dependency>	146	</run-dependency>
147	</dependency>	147	</dependency>
148	<dependency>	148	<dependency>





    <changes>

        <change id="createSharabilityQuery2">
            <api name="general"/>
            <summary>Added <code>AntProjectHelper.createSharabilityQuery2</code></summary>
            <version major="1" minor="47"/>
            <date year="2012" month="1" day="20"/>
            <author login="jglick"/>
            <compatibility addition="yes" deprecation="yes">
                <p>
                    Project types using <code>AntProjectHelper.createSharabilityQuery</code> should switch to the new method.
                </p>
            </compatibility>
            <description>
                <p>
                   <code>AntProjectHelper.createSharabilityQuery2</code> was introduced
                   to avoid the deprecated <code>SharabilityQueryImplementation</code>.
                </p>
            </description>
            <class package="org.netbeans.spi.project.support.ant" name="AntProjectHelper"/>
            <issue number="207288"/>
        </change>

        <change id="ReferenceHelper-getLibraryChooserImportHandler-url">
            <api name="general"/>
            <summary>Added <code>getLibraryChooserImportHandler</code> method into <code>ReferenceHelper</code> accepting <code>URL</code></summary>

Lines 1-6 Link Here

(-)a/project.ant/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.project.ant/1	2	OpenIDE-Module: org.netbeans.modules.project.ant/1
3	OpenIDE-Module-Specification-Version: 1.46	3	OpenIDE-Module-Specification-Version: 1.47
4	OpenIDE-Module-Layer: org/netbeans/modules/project/ant/resources/mf-layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/project/ant/resources/mf-layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/ant/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/ant/Bundle.properties
6	OpenIDE-Module-Install: org/netbeans/modules/project/ant/AntProjectModule.class	6	OpenIDE-Module-Install: org/netbeans/modules/project/ant/AntProjectModule.class




import org.netbeans.spi.project.ProjectState;
import org.netbeans.spi.queries.FileBuiltQueryImplementation;
import org.netbeans.spi.queries.SharabilityQueryImplementation;
import org.netbeans.spi.queries.SharabilityQueryImplementation2;
import org.openide.ErrorManager;
import org.openide.filesystems.FileAlreadyLockedException;
import org.openide.filesystems.FileAttributeEvent;

     * Typical usage would be:
     * </p>
     * <pre>
     * helper.createSharabilityQuery2(helper.getStandardPropertyEvaluator(),
     *                                new String[] {"${src.dir}", "${test.src.dir}"},
     *                                new String[] {"${build.dir}", "${dist.dir}"})
     * </pre>
     * <p>
     * A quick rule of thumb is that the include list should contain any

     * @param buildDirectories a list of paths to treat as not sharable
     * @return a sharability query implementation suitable for the project lookup
     * @see Project#getLookup
     * @since 1.47
     */
    public SharabilityQueryImplementation2 createSharabilityQuery2(PropertyEvaluator eval, String[] sourceRoots, String[] buildDirectories) {
        String[] includes = new String[sourceRoots.length + 1];
        System.arraycopy(sourceRoots, 0, includes, 0, sourceRoots.length);
        includes[sourceRoots.length] = ""; // NOI18N

        excludes[buildDirectories.length] = "nbproject/private"; // NOI18N
        return new SharabilityQueryImpl(this, eval, includes, excludes);
    }
    /**
     * @deprecated since 1.47 use {@link #createSharabilityQuery2} instead
     */
    @Deprecated
    public SharabilityQueryImplementation createSharabilityQuery(PropertyEvaluator eval, String[] sourceRoots, String[] buildDirectories) {
        final SharabilityQueryImplementation2 sq2 = createSharabilityQuery2(eval, sourceRoots, buildDirectories);
        return new SharabilityQueryImplementation() {
            @Override public int getSharability(File file) {
                return sq2.getSharability(file.toURI()).ordinal();
            }
        };
    }
    
    /**
     * Get a property provider which defines <code>basedir</code> according to




import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import org.netbeans.api.queries.SharabilityQuery;
import org.netbeans.modules.project.ant.ProjectLibraryProvider;
import org.netbeans.spi.queries.SharabilityQueryImplementation2;
import org.openide.util.WeakListeners;

/**
 * Standard impl of {@link SharabilityQueryImplementation2}.
 * @author Jesse Glick
 */
final class SharabilityQueryImpl implements SharabilityQueryImplementation2, PropertyChangeListener, AntProjectListener {

    private final AntProjectHelper h;
    private final PropertyEvaluator eval;

        // XXX should remove overlaps somehow
        return result.toArray(new String[result.size()]);
    }

    @Override public SharabilityQuery.Sharability getSharability(URI uri) {
        // XXX might be more efficient to precompute URIs for includePaths and excludePaths
        String path = new File(uri).getAbsolutePath();
        if (contains(path, excludePaths, false)) {
            return SharabilityQuery.Sharability.NOT_SHARABLE;
        }
        return contains(path, includePaths, false) ?
            (contains(path, excludePaths, true) ? SharabilityQuery.Sharability.MIXED : SharabilityQuery.Sharability.SHARABLE) :
            SharabilityQuery.Sharability.UNKNOWN;
    }
    
    /**

Lines 189-195 Link Here

(-)a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/AntBasedTestUtil.java (-1 / +1 lines)
189	genFilesHelper,	189	genFilesHelper,
190	aux,	190	aux,
191	helper.createCacheDirectoryProvider(),	191	helper.createCacheDirectoryProvider(),
192	helper.createSharabilityQuery(helper.getStandardPropertyEvaluator(), new String[0], new String[0]),	192	helper.createSharabilityQuery2(helper.getStandardPropertyEvaluator(), new String[0], new String[0]),
193	refHelper.createSubprojectProvider(),	193	refHelper.createSubprojectProvider(),
194	new TestAntArtifactProvider(),	194	new TestAntArtifactProvider(),
195	new ProjectXmlSavedHook() {	195	new ProjectXmlSavedHook() {




package org.netbeans.spi.project.support.ant;

import java.io.File;
import java.net.URI;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.TestUtil;
import org.netbeans.api.queries.SharabilityQuery;
import org.netbeans.junit.NbTestCase;
import org.netbeans.spi.queries.SharabilityQueryImplementation2;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.test.MockLookup;

    /** Location of top of testing dir (contains projdir and external). */
    private File scratchF;
    /** Tested impl. */
    private SharabilityQueryImplementation2 sqi;
    
    protected void setUp() throws Exception {
        super.setUp();

        props.setProperty("build3.dir", new File(externalF, "build").getAbsolutePath());
        h.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
        ProjectManager.getDefault().saveProject(ProjectManager.getDefault().findProject(projdir));
        sqi = h.createSharabilityQuery2(h.getStandardPropertyEvaluator(), new String[] {"${src.dir}", "${src2.dir}"},
                                       new String[] {"${build.dir}", "${build2.dir}", "${build3.dir}", "${dist.dir}"});
    }
    
    private URI file(String path) {
        return new File(scratchF, path.replace('/', File.separatorChar)).toURI();
    }
    
    public void testBasicIncludesExcludes() throws Exception {
        assertEquals("project directory is mixed", SharabilityQuery.Sharability.MIXED, sqi.getSharability(file("projdir")));
        assertEquals("build.xml is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/build.xml")));
        assertEquals("src/ is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/src")));
        assertEquals("src/org/foo/ is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/src/org/foo")));
        assertEquals("src/org/foo/Foo.java is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/src/org/foo/Foo.java")));
        assertEquals("nbproject/ is mixed", SharabilityQuery.Sharability.MIXED, sqi.getSharability(file("projdir/nbproject")));
        assertEquals("nbproject/project.xml is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/nbproject/project.xml")));
        assertEquals("nbproject/private/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/nbproject/private")));
        assertEquals("nbproject/private/private.properties is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/nbproject/private/private.properties")));
        assertEquals("build/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/build")));
        assertEquals("build/classes/org/foo/Foo.class is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/build/classes/org/foo/Foo.class")));
        assertEquals("dist/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/dist")));
    }
    
    public void testOverlaps() throws Exception {
        assertEquals("build/2/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/build/2")));
        assertEquals("build/2/whatever is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/build/2/whatever")));
        // overlaps in includePaths tested in basicIncludesExcludes: src is inside projdir
    }
    
    public void testExternalFiles() throws Exception {
        assertEquals("external/src is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("external/src")));
        assertEquals("external/src/org/foo/Foo.java is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("external/src/org/foo/Foo.java")));
        assertEquals("external/build is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("external/build")));
        assertEquals("external/build/classes/org/foo/Foo.class is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("external/build/classes/org/foo/Foo.class")));
    }
    
    public void testUnknownFiles() throws Exception {
        assertEquals("some other dir is unknown", SharabilityQuery.Sharability.UNKNOWN, sqi.getSharability(file("something")));
        assertEquals("some other file is unknown", SharabilityQuery.Sharability.UNKNOWN, sqi.getSharability(file("something/else")));
        assertEquals("external itself is unknown", SharabilityQuery.Sharability.UNKNOWN, sqi.getSharability(file("external")));
    }
    
    public void testDirNamesEndingInSlash() throws Exception {
        assertEquals("project directory is mixed", SharabilityQuery.Sharability.MIXED, sqi.getSharability(file("projdir/")));
        assertEquals("src/ is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/src/")));
        assertEquals("src/org/foo/ is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/src/org/foo/")));
        assertEquals("nbproject/ is mixed", SharabilityQuery.Sharability.MIXED, sqi.getSharability(file("projdir/nbproject/")));
        assertEquals("nbproject/private/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/nbproject/private/")));
        assertEquals("build/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/build/")));
        assertEquals("dist/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/dist/")));
        assertEquals("build/2/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/build/2/")));
        assertEquals("some other dir is unknown", SharabilityQuery.Sharability.UNKNOWN, sqi.getSharability(file("something/")));
        assertEquals("external itself is unknown", SharabilityQuery.Sharability.UNKNOWN, sqi.getSharability(file("external/")));
        assertEquals("external/src is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("external/src/")));
        assertEquals("external/build is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("external/build/")));
    }
    
    public void testSubprojectFiles() throws Exception {
        assertEquals("nbproject/private from a subproject is sharable as far as this impl is concerned", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/subproj/nbproject/private")));
    }
    
    // XXX testChangedProperties

Return to bug 207288

Lines 108-113 Link Here

(-)a/project.ant/apichanges.xml (+21 lines)
108		108
109	<changes>	109	<changes>
110		110
		111	<change id="createSharabilityQuery2">
		112	<api name="general"/>
		113	<summary>Added <code>AntProjectHelper.createSharabilityQuery2</code></summary>
		114	<version major="1" minor="47"/>
		115	<date year="2012" month="1" day="20"/>
		116	<author login="jglick"/>
		117	<compatibility addition="yes" deprecation="yes">
		118	<p>
		119	Project types using <code>AntProjectHelper.createSharabilityQuery</code> should switch to the new method.
		120	</p>
		121	</compatibility>
		122	<description>
		123	<p>
		124	<code>AntProjectHelper.createSharabilityQuery2</code> was introduced
		125	to avoid the deprecated <code>SharabilityQueryImplementation</code>.
		126	</p>
		127	</description>
		128	<class package="org.netbeans.spi.project.support.ant" name="AntProjectHelper"/>
		129	<issue number="207288"/>
		130	</change>
		131
111	<change id="ReferenceHelper-getLibraryChooserImportHandler-url">	132	<change id="ReferenceHelper-getLibraryChooserImportHandler-url">
112	<api name="general"/>	133	<api name="general"/>
113	<summary>Added <code>getLibraryChooserImportHandler</code> method into <code>ReferenceHelper</code> accepting <code>URL</code></summary>	134	<summary>Added <code>getLibraryChooserImportHandler</code> method into <code>ReferenceHelper</code> accepting <code>URL</code></summary>

Lines 47-64 Link Here

(-)a/project.ant/src/org/netbeans/spi/project/support/ant/SharabilityQueryImpl.java (-9 / +11 lines)
47	import java.beans.PropertyChangeEvent;	47	import java.beans.PropertyChangeEvent;
48	import java.beans.PropertyChangeListener;	48	import java.beans.PropertyChangeListener;
49	import java.io.File;	49	import java.io.File;
		50	import java.net.URI;
50	import java.util.ArrayList;	51	import java.util.ArrayList;
51	import java.util.List;	52	import java.util.List;
52	import org.netbeans.api.queries.SharabilityQuery;	53	import org.netbeans.api.queries.SharabilityQuery;
53	import org.netbeans.modules.project.ant.ProjectLibraryProvider;	54	import org.netbeans.modules.project.ant.ProjectLibraryProvider;
54	import org.netbeans.spi.queries.SharabilityQueryImplementation;	55	import org.netbeans.spi.queries.SharabilityQueryImplementation2;
55	import org.openide.util.WeakListeners;	56	import org.openide.util.WeakListeners;
56		57
57	/**	58	/**
58	* Standard impl of {@link SharabilityQueryImplementation}.	59	* Standard impl of {@link SharabilityQueryImplementation2}.
59	* @author Jesse Glick	60	* @author Jesse Glick
60	*/	61	*/
61	final class SharabilityQueryImpl implements SharabilityQueryImplementation, PropertyChangeListener, AntProjectListener {	62	final class SharabilityQueryImpl implements SharabilityQueryImplementation2, PropertyChangeListener, AntProjectListener {
62		63
63	private final AntProjectHelper h;	64	private final AntProjectHelper h;
64	private final PropertyEvaluator eval;	65	private final PropertyEvaluator eval;
Lines 105-119 Link Here
105	// XXX should remove overlaps somehow	106	// XXX should remove overlaps somehow
106	return result.toArray(new String[result.size()]);	107	return result.toArray(new String[result.size()]);
107	}	108	}
108		109
109	public synchronized int getSharability(File file) {	110	@Override public SharabilityQuery.Sharability getSharability(URI uri) {
110	String path = file.getAbsolutePath();	111	// XXX might be more efficient to precompute URIs for includePaths and excludePaths
		112	String path = new File(uri).getAbsolutePath();
111	if (contains(path, excludePaths, false)) {	113	if (contains(path, excludePaths, false)) {
112	return SharabilityQuery.NOT_SHARABLE;	114	return SharabilityQuery.Sharability.NOT_SHARABLE;
113	}	115	}
114	return contains(path, includePaths, false) ?	116	return contains(path, includePaths, false) ?
115	(contains(path, excludePaths, true) ? SharabilityQuery.MIXED : SharabilityQuery.SHARABLE) :	117	(contains(path, excludePaths, true) ? SharabilityQuery.Sharability.MIXED : SharabilityQuery.Sharability.SHARABLE) :
116	SharabilityQuery.UNKNOWN;	118	SharabilityQuery.Sharability.UNKNOWN;
117	}	119	}
118		120
119	/**	121	/**

Lines 42-53 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/queries/QuerySupport.java (-9 / +24 lines)
42		42
43	package org.netbeans.modules.java.api.common.queries;	43	package org.netbeans.modules.java.api.common.queries;
44		44
		45	import java.io.File;
45	import javax.swing.Icon;	46	import javax.swing.Icon;
46	import org.netbeans.api.annotations.common.NonNull;	47	import org.netbeans.api.annotations.common.NonNull;
47	import org.netbeans.api.annotations.common.NullAllowed;	48	import org.netbeans.api.annotations.common.NullAllowed;
48	import org.netbeans.api.project.Sources;	49	import org.netbeans.api.project.Sources;
49	import org.netbeans.modules.java.api.common.SourceRoots;	50	import org.netbeans.modules.java.api.common.SourceRoots;
50	import org.netbeans.api.java.queries.AnnotationProcessingQuery.Result;
51	import org.netbeans.api.project.Project;	51	import org.netbeans.api.project.Project;
52	import org.netbeans.api.project.ProjectInformation;	52	import org.netbeans.api.project.ProjectInformation;
53	import org.netbeans.modules.java.api.common.Roots;	53	import org.netbeans.modules.java.api.common.Roots;
Lines 58-70 Link Here
58	import org.netbeans.spi.java.queries.MultipleRootsUnitTestForSourceQueryImplementation;	58	import org.netbeans.spi.java.queries.MultipleRootsUnitTestForSourceQueryImplementation;
59	import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation;	59	import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation;
60	import org.netbeans.spi.java.queries.SourceLevelQueryImplementation2;	60	import org.netbeans.spi.java.queries.SourceLevelQueryImplementation2;
61	import org.netbeans.spi.project.SourceGroupModifierImplementation;
62	import org.netbeans.spi.project.support.ant.AntProjectHelper;	61	import org.netbeans.spi.project.support.ant.AntProjectHelper;
63	import org.netbeans.spi.project.support.ant.AntProjectListener;	62	import org.netbeans.spi.project.support.ant.AntProjectListener;
64	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	63	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
65	import org.netbeans.spi.queries.FileBuiltQueryImplementation;	64	import org.netbeans.spi.queries.FileBuiltQueryImplementation;
66	import org.netbeans.spi.queries.FileEncodingQueryImplementation;	65	import org.netbeans.spi.queries.FileEncodingQueryImplementation;
67	import org.netbeans.spi.queries.SharabilityQueryImplementation;	66	import org.netbeans.spi.queries.SharabilityQueryImplementation;
		67	import org.netbeans.spi.queries.SharabilityQueryImplementation2;
68	import org.openide.loaders.CreateFromTemplateAttributesProvider;	68	import org.openide.loaders.CreateFromTemplateAttributesProvider;
69	import org.openide.util.Parameters;	69	import org.openide.util.Parameters;
70	import org.openide.util.WeakListeners;	70	import org.openide.util.WeakListeners;
Lines 180-188 Link Here
180	* @param testRoots a list of test roots to treat as sharable, may be null if the project does not support tests	180	* @param testRoots a list of test roots to treat as sharable, may be null if the project does not support tests
181	* @param additionalSourceRoots additional paths to treat as sharable (just pure property names, do not	181	* @param additionalSourceRoots additional paths to treat as sharable (just pure property names, do not
182	* use <i>${</i> and <i>}</i> characters). Can be <code>null</code>.	182	* use <i>${</i> and <i>}</i> characters). Can be <code>null</code>.
183	* @return a {@link SharabilityQueryImplementation} to provide information about files sharability.	183	* @return a query to provide information about files sharability.
		184	* @since 1.35
184	*/	185	*/
185	public static SharabilityQueryImplementation createSharabilityQuery(	186	public static SharabilityQueryImplementation2 createSharabilityQuery2(
186	final @NonNull AntProjectHelper helper,	187	final @NonNull AntProjectHelper helper,
187	final @NonNull PropertyEvaluator evaluator,	188	final @NonNull PropertyEvaluator evaluator,
188	final @NonNull SourceRoots srcRoots,	189	final @NonNull SourceRoots srcRoots,
Lines 194-206 Link Here
194		195
195	return new SharabilityQueryImpl(helper, evaluator, srcRoots, testRoots, additionalSourceRoots);	196	return new SharabilityQueryImpl(helper, evaluator, srcRoots, testRoots, additionalSourceRoots);
196	}	197	}
197
198	/**	198	/**
199	* Create a new query to provide information about files sharability without any additional source roots. See	199	* @deprecated since 1.35 use {@link #createSharabilityQuery2} instead
200	* {@link #createSharabilityQuery(AntProjectHelper, PropertyEvaluator, SourceRoots, SourceRoots, String...)
201	* createSharabilityQuery()}
202	* for more information.
203	*/	200	*/
		201	@Deprecated
		202	public static SharabilityQueryImplementation createSharabilityQuery(
		203	final @NonNull AntProjectHelper helper,
		204	final @NonNull PropertyEvaluator evaluator,
		205	final @NonNull SourceRoots srcRoots,
		206	final @NullAllowed SourceRoots testRoots,
		207	final @NullAllowed String... additionalSourceRoots) {
		208	final SharabilityQueryImplementation2 sq2 = createSharabilityQuery2(helper, evaluator, srcRoots, testRoots, additionalSourceRoots);
		209	return new SharabilityQueryImplementation() {
		210	@Override public int getSharability(File file) {
		211	return sq2.getSharability(file.toURI()).ordinal();
		212	}
		213	};
		214	}
		215	/**
		216	* @deprecated since 1.35 use {@link #createSharabilityQuery2} instead
		217	*/
		218	@Deprecated
204	public static SharabilityQueryImplementation createSharabilityQuery(AntProjectHelper helper,	219	public static SharabilityQueryImplementation createSharabilityQuery(AntProjectHelper helper,
205	PropertyEvaluator evaluator, SourceRoots srcRoots, SourceRoots testRoots) {	220	PropertyEvaluator evaluator, SourceRoots srcRoots, SourceRoots testRoots) {
206		221

Lines 72-78 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java (-2 / +1 lines)
72	import javax.xml.parsers.DocumentBuilder;	72	import javax.xml.parsers.DocumentBuilder;
73	import javax.xml.parsers.DocumentBuilderFactory;	73	import javax.xml.parsers.DocumentBuilderFactory;
74	import javax.xml.parsers.ParserConfigurationException;	74	import javax.xml.parsers.ParserConfigurationException;
75	import org.netbeans.api.annotations.common.NonNull;
76	import org.netbeans.api.java.classpath.ClassPath;	75	import org.netbeans.api.java.classpath.ClassPath;
77	import org.netbeans.api.java.classpath.GlobalPathRegistry;	76	import org.netbeans.api.java.classpath.GlobalPathRegistry;
78	import org.netbeans.api.java.project.JavaProjectConstants;	77	import org.netbeans.api.java.project.JavaProjectConstants;
Lines 373-379 Link Here
373	QuerySupport.createUnitTestForSourceQuery(getSourceRoots(), getTestSourceRoots()),	372	QuerySupport.createUnitTestForSourceQuery(getSourceRoots(), getTestSourceRoots()),
374	QuerySupport.createSourceLevelQuery2(evaluator()),	373	QuerySupport.createSourceLevelQuery2(evaluator()),
375	QuerySupport.createSources(this, helper, evaluator(), getSourceRoots(), getTestSourceRoots(), Roots.nonSourceRoots(ProjectProperties.BUILD_DIR, J2SEProjectProperties.DIST_DIR)),	374	QuerySupport.createSources(this, helper, evaluator(), getSourceRoots(), getTestSourceRoots(), Roots.nonSourceRoots(ProjectProperties.BUILD_DIR, J2SEProjectProperties.DIST_DIR)),
376	QuerySupport.createSharabilityQuery(helper, evaluator(), getSourceRoots(), getTestSourceRoots()),	375	QuerySupport.createSharabilityQuery2(helper, evaluator(), getSourceRoots(), getTestSourceRoots()),
377	new CoSAwareFileBuiltQueryImpl(QuerySupport.createFileBuiltQuery(helper, evaluator(), getSourceRoots(), getTestSourceRoots()), this),	376	new CoSAwareFileBuiltQueryImpl(QuerySupport.createFileBuiltQuery(helper, evaluator(), getSourceRoots(), getTestSourceRoots()), this),
378	new RecommendedTemplatesImpl (this.updateHelper),	377	new RecommendedTemplatesImpl (this.updateHelper),
379	ProjectClassPathModifier.extenderForModifier(cpMod),	378	ProjectClassPathModifier.extenderForModifier(cpMod),

Lines 74-79 Link Here

(-)a/project.ant/src/org/netbeans/spi/project/support/ant/AntProjectHelper.java (-4 / +18 lines)
74	import org.netbeans.spi.project.ProjectState;	74	import org.netbeans.spi.project.ProjectState;
75	import org.netbeans.spi.queries.FileBuiltQueryImplementation;	75	import org.netbeans.spi.queries.FileBuiltQueryImplementation;
76	import org.netbeans.spi.queries.SharabilityQueryImplementation;	76	import org.netbeans.spi.queries.SharabilityQueryImplementation;
		77	import org.netbeans.spi.queries.SharabilityQueryImplementation2;
77	import org.openide.ErrorManager;	78	import org.openide.ErrorManager;
78	import org.openide.filesystems.FileAlreadyLockedException;	79	import org.openide.filesystems.FileAlreadyLockedException;
79	import org.openide.filesystems.FileAttributeEvent;	80	import org.openide.filesystems.FileAttributeEvent;
Lines 1153-1161 Link Here
1153	* Typical usage would be:	1154	* Typical usage would be:
1154	* </p>	1155	* </p>
1155	* <pre>	1156	* <pre>
1156	* helper.createSharabilityQuery(helper.getStandardPropertyEvaluator(),	1157	* helper.createSharabilityQuery2(helper.getStandardPropertyEvaluator(),
1157	* new String[] {"${src.dir}", "${test.src.dir}"},	1158	* new String[] {"${src.dir}", "${test.src.dir}"},
1158	* new String[] {"${build.dir}", "${dist.dir}"})	1159	* new String[] {"${build.dir}", "${dist.dir}"})
1159	* </pre>	1160	* </pre>
1160	* <p>	1161	* <p>
1161	* A quick rule of thumb is that the include list should contain any	1162	* A quick rule of thumb is that the include list should contain any
Lines 1180-1187 Link Here
1180	* @param buildDirectories a list of paths to treat as not sharable	1181	* @param buildDirectories a list of paths to treat as not sharable
1181	* @return a sharability query implementation suitable for the project lookup	1182	* @return a sharability query implementation suitable for the project lookup
1182	* @see Project#getLookup	1183	* @see Project#getLookup
		1184	* @since 1.47
1183	*/	1185	*/
1184	public SharabilityQueryImplementation createSharabilityQuery(PropertyEvaluator eval, String[] sourceRoots, String[] buildDirectories) {	1186	public SharabilityQueryImplementation2 createSharabilityQuery2(PropertyEvaluator eval, String[] sourceRoots, String[] buildDirectories) {
1185	String[] includes = new String[sourceRoots.length + 1];	1187	String[] includes = new String[sourceRoots.length + 1];
1186	System.arraycopy(sourceRoots, 0, includes, 0, sourceRoots.length);	1188	System.arraycopy(sourceRoots, 0, includes, 0, sourceRoots.length);
1187	includes[sourceRoots.length] = ""; // NOI18N	1189	includes[sourceRoots.length] = ""; // NOI18N
Lines 1190-1195 Link Here
1190	excludes[buildDirectories.length] = "nbproject/private"; // NOI18N	1192	excludes[buildDirectories.length] = "nbproject/private"; // NOI18N
1191	return new SharabilityQueryImpl(this, eval, includes, excludes);	1193	return new SharabilityQueryImpl(this, eval, includes, excludes);
1192	}	1194	}
		1195	/**
		1196	* @deprecated since 1.47 use {@link #createSharabilityQuery2} instead
		1197	*/
		1198	@Deprecated
		1199	public SharabilityQueryImplementation createSharabilityQuery(PropertyEvaluator eval, String[] sourceRoots, String[] buildDirectories) {
		1200	final SharabilityQueryImplementation2 sq2 = createSharabilityQuery2(eval, sourceRoots, buildDirectories);
		1201	return new SharabilityQueryImplementation() {
		1202	@Override public int getSharability(File file) {
		1203	return sq2.getSharability(file.toURI()).ordinal();
		1204	}
		1205	};
		1206	}
1193		1207
1194	/**	1208	/**
1195	* Get a property provider which defines <code>basedir</code> according to	1209	* Get a property provider which defines <code>basedir</code> according to

Lines 45-55 Link Here

(-)a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/SharabilityQueryImplTest.java (-39 / +40 lines)
45	package org.netbeans.spi.project.support.ant;	45	package org.netbeans.spi.project.support.ant;
46		46
47	import java.io.File;	47	import java.io.File;
		48	import java.net.URI;
48	import org.netbeans.api.project.ProjectManager;	49	import org.netbeans.api.project.ProjectManager;
49	import org.netbeans.api.project.TestUtil;	50	import org.netbeans.api.project.TestUtil;
50	import org.netbeans.api.queries.SharabilityQuery;	51	import org.netbeans.api.queries.SharabilityQuery;
51	import org.netbeans.junit.NbTestCase;	52	import org.netbeans.junit.NbTestCase;
52	import org.netbeans.spi.queries.SharabilityQueryImplementation;	53	import org.netbeans.spi.queries.SharabilityQueryImplementation2;
53	import org.openide.filesystems.FileObject;	54	import org.openide.filesystems.FileObject;
54	import org.openide.filesystems.FileUtil;	55	import org.openide.filesystems.FileUtil;
55	import org.openide.util.test.MockLookup;	56	import org.openide.util.test.MockLookup;
Lines 67-73 Link Here
67	/** Location of top of testing dir (contains projdir and external). */	68	/** Location of top of testing dir (contains projdir and external). */
68	private File scratchF;	69	private File scratchF;
69	/** Tested impl. */	70	/** Tested impl. */
70	private SharabilityQueryImplementation sqi;	71	private SharabilityQueryImplementation2 sqi;
71		72
72	protected void setUp() throws Exception {	73	protected void setUp() throws Exception {
73	super.setUp();	74	super.setUp();
Lines 88-152 Link Here
88	props.setProperty("build3.dir", new File(externalF, "build").getAbsolutePath());	89	props.setProperty("build3.dir", new File(externalF, "build").getAbsolutePath());
89	h.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);	90	h.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
90	ProjectManager.getDefault().saveProject(ProjectManager.getDefault().findProject(projdir));	91	ProjectManager.getDefault().saveProject(ProjectManager.getDefault().findProject(projdir));
91	sqi = h.createSharabilityQuery(h.getStandardPropertyEvaluator(), new String[] {"${src.dir}", "${src2.dir}"},	92	sqi = h.createSharabilityQuery2(h.getStandardPropertyEvaluator(), new String[] {"${src.dir}", "${src2.dir}"},
92	new String[] {"${build.dir}", "${build2.dir}", "${build3.dir}", "${dist.dir}"});	93	new String[] {"${build.dir}", "${build2.dir}", "${build3.dir}", "${dist.dir}"});
93	}	94	}
94		95
95	private File file(String path) {	96	private URI file(String path) {
96	return new File(scratchF, path.replace('/', File.separatorChar));	97	return new File(scratchF, path.replace('/', File.separatorChar)).toURI();
97	}	98	}
98		99
99	public void testBasicIncludesExcludes() throws Exception {	100	public void testBasicIncludesExcludes() throws Exception {
100	assertEquals("project directory is mixed", SharabilityQuery.MIXED, sqi.getSharability(file("projdir")));	101	assertEquals("project directory is mixed", SharabilityQuery.Sharability.MIXED, sqi.getSharability(file("projdir")));
101	assertEquals("build.xml is sharable", SharabilityQuery.SHARABLE, sqi.getSharability(file("projdir/build.xml")));	102	assertEquals("build.xml is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/build.xml")));
102	assertEquals("src/ is sharable", SharabilityQuery.SHARABLE, sqi.getSharability(file("projdir/src")));	103	assertEquals("src/ is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/src")));
103	assertEquals("src/org/foo/ is sharable", SharabilityQuery.SHARABLE, sqi.getSharability(file("projdir/src/org/foo")));	104	assertEquals("src/org/foo/ is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/src/org/foo")));
104	assertEquals("src/org/foo/Foo.java is sharable", SharabilityQuery.SHARABLE, sqi.getSharability(file("projdir/src/org/foo/Foo.java")));	105	assertEquals("src/org/foo/Foo.java is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/src/org/foo/Foo.java")));
105	assertEquals("nbproject/ is mixed", SharabilityQuery.MIXED, sqi.getSharability(file("projdir/nbproject")));	106	assertEquals("nbproject/ is mixed", SharabilityQuery.Sharability.MIXED, sqi.getSharability(file("projdir/nbproject")));
106	assertEquals("nbproject/project.xml is sharable", SharabilityQuery.SHARABLE, sqi.getSharability(file("projdir/nbproject/project.xml")));	107	assertEquals("nbproject/project.xml is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/nbproject/project.xml")));
107	assertEquals("nbproject/private/ is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("projdir/nbproject/private")));	108	assertEquals("nbproject/private/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/nbproject/private")));
108	assertEquals("nbproject/private/private.properties is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("projdir/nbproject/private/private.properties")));	109	assertEquals("nbproject/private/private.properties is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/nbproject/private/private.properties")));
109	assertEquals("build/ is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("projdir/build")));	110	assertEquals("build/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/build")));
110	assertEquals("build/classes/org/foo/Foo.class is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("projdir/build/classes/org/foo/Foo.class")));	111	assertEquals("build/classes/org/foo/Foo.class is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/build/classes/org/foo/Foo.class")));
111	assertEquals("dist/ is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("projdir/dist")));	112	assertEquals("dist/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/dist")));
112	}	113	}
113		114
114	public void testOverlaps() throws Exception {	115	public void testOverlaps() throws Exception {
115	assertEquals("build/2/ is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("projdir/build/2")));	116	assertEquals("build/2/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/build/2")));
116	assertEquals("build/2/whatever is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("projdir/build/2/whatever")));	117	assertEquals("build/2/whatever is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/build/2/whatever")));
117	// overlaps in includePaths tested in basicIncludesExcludes: src is inside projdir	118	// overlaps in includePaths tested in basicIncludesExcludes: src is inside projdir
118	}	119	}
119		120
120	public void testExternalFiles() throws Exception {	121	public void testExternalFiles() throws Exception {
121	assertEquals("external/src is sharable", SharabilityQuery.SHARABLE, sqi.getSharability(file("external/src")));	122	assertEquals("external/src is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("external/src")));
122	assertEquals("external/src/org/foo/Foo.java is sharable", SharabilityQuery.SHARABLE, sqi.getSharability(file("external/src/org/foo/Foo.java")));	123	assertEquals("external/src/org/foo/Foo.java is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("external/src/org/foo/Foo.java")));
123	assertEquals("external/build is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("external/build")));	124	assertEquals("external/build is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("external/build")));
124	assertEquals("external/build/classes/org/foo/Foo.class is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("external/build/classes/org/foo/Foo.class")));	125	assertEquals("external/build/classes/org/foo/Foo.class is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("external/build/classes/org/foo/Foo.class")));
125	}	126	}
126		127
127	public void testUnknownFiles() throws Exception {	128	public void testUnknownFiles() throws Exception {
128	assertEquals("some other dir is unknown", SharabilityQuery.UNKNOWN, sqi.getSharability(file("something")));	129	assertEquals("some other dir is unknown", SharabilityQuery.Sharability.UNKNOWN, sqi.getSharability(file("something")));
129	assertEquals("some other file is unknown", SharabilityQuery.UNKNOWN, sqi.getSharability(file("something/else")));	130	assertEquals("some other file is unknown", SharabilityQuery.Sharability.UNKNOWN, sqi.getSharability(file("something/else")));
130	assertEquals("external itself is unknown", SharabilityQuery.UNKNOWN, sqi.getSharability(file("external")));	131	assertEquals("external itself is unknown", SharabilityQuery.Sharability.UNKNOWN, sqi.getSharability(file("external")));
131	}	132	}
132		133
133	public void testDirNamesEndingInSlash() throws Exception {	134	public void testDirNamesEndingInSlash() throws Exception {
134	assertEquals("project directory is mixed", SharabilityQuery.MIXED, sqi.getSharability(file("projdir/")));	135	assertEquals("project directory is mixed", SharabilityQuery.Sharability.MIXED, sqi.getSharability(file("projdir/")));
135	assertEquals("src/ is sharable", SharabilityQuery.SHARABLE, sqi.getSharability(file("projdir/src/")));	136	assertEquals("src/ is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/src/")));
136	assertEquals("src/org/foo/ is sharable", SharabilityQuery.SHARABLE, sqi.getSharability(file("projdir/src/org/foo/")));	137	assertEquals("src/org/foo/ is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/src/org/foo/")));
137	assertEquals("nbproject/ is mixed", SharabilityQuery.MIXED, sqi.getSharability(file("projdir/nbproject/")));	138	assertEquals("nbproject/ is mixed", SharabilityQuery.Sharability.MIXED, sqi.getSharability(file("projdir/nbproject/")));
138	assertEquals("nbproject/private/ is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("projdir/nbproject/private/")));	139	assertEquals("nbproject/private/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/nbproject/private/")));
139	assertEquals("build/ is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("projdir/build/")));	140	assertEquals("build/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/build/")));
140	assertEquals("dist/ is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("projdir/dist/")));	141	assertEquals("dist/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/dist/")));
141	assertEquals("build/2/ is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("projdir/build/2/")));	142	assertEquals("build/2/ is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("projdir/build/2/")));
142	assertEquals("some other dir is unknown", SharabilityQuery.UNKNOWN, sqi.getSharability(file("something/")));	143	assertEquals("some other dir is unknown", SharabilityQuery.Sharability.UNKNOWN, sqi.getSharability(file("something/")));
143	assertEquals("external itself is unknown", SharabilityQuery.UNKNOWN, sqi.getSharability(file("external/")));	144	assertEquals("external itself is unknown", SharabilityQuery.Sharability.UNKNOWN, sqi.getSharability(file("external/")));
144	assertEquals("external/src is sharable", SharabilityQuery.SHARABLE, sqi.getSharability(file("external/src/")));	145	assertEquals("external/src is sharable", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("external/src/")));
145	assertEquals("external/build is not sharable", SharabilityQuery.NOT_SHARABLE, sqi.getSharability(file("external/build/")));	146	assertEquals("external/build is not sharable", SharabilityQuery.Sharability.NOT_SHARABLE, sqi.getSharability(file("external/build/")));
146	}	147	}
147		148
148	public void testSubprojectFiles() throws Exception {	149	public void testSubprojectFiles() throws Exception {
149	assertEquals("nbproject/private from a subproject is sharable as far as this impl is concerned", SharabilityQuery.SHARABLE, sqi.getSharability(file("projdir/subproj/nbproject/private")));	150	assertEquals("nbproject/private from a subproject is sharable as far as this impl is concerned", SharabilityQuery.Sharability.SHARABLE, sqi.getSharability(file("projdir/subproj/nbproject/private")));
150	}	151	}
151		152
152	// XXX testChangedProperties	153	// XXX testChangedProperties