diff -r 27608c292512 java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java Wed Jun 08 04:02:06 2016 +0000 +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java Fri Jun 10 11:08:07 2016 +0200 @@ -340,9 +340,9 @@ } + static final String COS_UPDATED = "$cos.update"; //NOI18N private static final class CosAction implements BuildArtifactMapper.ArtifactsUpdated, PropertyChangeListener { - private static final String COS_UPDATED = "$cos.update"; //NOI18N private static final Object NONE = new Object(); private final J2SEActionProvider owner; private final PropertyEvaluator eval; diff -r 27608c292512 java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEEnableCosQuery.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEEnableCosQuery.java Fri Jun 10 11:08:07 2016 +0200 @@ -0,0 +1,57 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2016 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2016 Sun Microsystems, Inc. + */ +package org.netbeans.modules.java.j2seproject; + +import java.net.URI; +import org.netbeans.api.java.source.UpdateSourceRootQuery; +import org.netbeans.api.project.FileOwnerQuery; +import org.netbeans.api.project.Project; +import org.openide.util.lookup.ServiceProvider; + +@ServiceProvider(service = UpdateSourceRootQuery.class) +public class J2SEEnableCosQuery extends UpdateSourceRootQuery { + @Override + protected boolean updateRoot(URI sourceRoot) { + Project p = FileOwnerQuery.getOwner(sourceRoot); + return J2SEProjectUtil.getEvaluatedProperty(p, J2SEActionProvider.COS_UPDATED) != null; + } +} diff -r 27608c292512 java.source.base/src/org/netbeans/api/java/source/UpdateSourceRootQuery.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java.source.base/src/org/netbeans/api/java/source/UpdateSourceRootQuery.java Fri Jun 10 11:08:07 2016 +0200 @@ -0,0 +1,58 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2016 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2016 Sun Microsystems, Inc. + */ +package org.netbeans.api.java.source; + +import java.net.URI; +import org.openide.util.Lookup; + +public abstract class UpdateSourceRootQuery { + protected abstract boolean updateRoot(URI sourceRoot); + + public static boolean shouldUpdateRoot(URI sourceRoot) { + for (UpdateSourceRootQuery q : Lookup.getDefault().lookupAll(UpdateSourceRootQuery.class)) { + if (q.updateRoot(sourceRoot)) { + return true; + } + } + return false; + } +} diff -r 27608c292512 java.source.base/src/org/netbeans/modules/java/source/usages/BuildArtifactMapperImpl.java --- a/java.source.base/src/org/netbeans/modules/java/source/usages/BuildArtifactMapperImpl.java Wed Jun 08 04:02:06 2016 +0000 +++ b/java.source.base/src/org/netbeans/modules/java/source/usages/BuildArtifactMapperImpl.java Fri Jun 10 11:08:07 2016 +0200 @@ -76,6 +76,7 @@ import org.netbeans.api.java.queries.SourceForBinaryQuery; import org.netbeans.api.java.source.BuildArtifactMapper.ArtifactsUpdated; import org.netbeans.api.java.source.SourceUtils; +import org.netbeans.api.java.source.UpdateSourceRootQuery; import org.netbeans.api.queries.FileBuiltQuery; import org.netbeans.api.queries.FileBuiltQuery.Status; import org.netbeans.api.queries.VisibilityQuery; @@ -326,14 +327,22 @@ } if (!new File(targetFolder, TAG_FILE_NAME).exists()) { - return null; + if (!UpdateSourceRootQuery.shouldUpdateRoot(targetFolder.toURI())) { + return null; + } } return targetFolder; } public static boolean isUpdateResources(File targetFolder) { - return targetFolder != null && new File(targetFolder, TAG_UPDATE_RESOURCES).exists(); + if (targetFolder == null) { + return false; + } + if (new File(targetFolder, TAG_UPDATE_RESOURCES).exists()) { + return true; + } + return UpdateSourceRootQuery.shouldUpdateRoot(targetFolder.toURI()); } public static void classCacheUpdated(URL sourceRoot, File cacheRoot, Iterable deleted, Iterable updated, boolean resource) {