Attachment #94849 for bug #136595

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




import org.openide.util.Mutex;
import org.openide.util.Utilities;
import org.openide.util.WeakListeners;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        if (java == null) {
            return null;
        }
        List<Element> compilationUnits = XMLUtil.findSubElements(java);
        it = compilationUnits.iterator();
        while (it.hasNext()) {
            Element compilationUnitEl = (Element)it.next();

            if (java == null) {
                return;
            }
            for (Element compilationUnitEl : XMLUtil.findSubElements(java)) {
                assert compilationUnitEl.getLocalName().equals("compilation-unit") : compilationUnitEl;
                // For each compilation unit, find the package roots first.
                List<FileObject> packageRoots = findPackageRoots(helper, evaluator, compilationUnitEl);

    
    static List<String> findPackageRootNames(Element compilationUnitEl) {
        List<String> names = new ArrayList<String>();
        Iterator it = XMLUtil.findSubElements(compilationUnitEl).iterator();
        while (it.hasNext()) {
            Element e = (Element) it.next();
            if (!e.getLocalName().equals("package-root")) { // NOI18N
                continue;
            }
            String location = XMLUtil.findText(e);
            names.add(location);
        }
        return names;

    }
    
    private List<URL> createCompileClasspath(Element compilationUnitEl) {
        for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
            if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("compile")) { // NOI18N
                return createClasspath(e);
            }

     * Create a classpath from a &lt;classpath&gt; element.
     */
    private List<URL> createClasspath(Element classpathEl) {
        String cp = XMLUtil.findText(classpathEl);
        if (cp == null) {
            cp = "";
        }

    }
    
    private List<URL> createExecuteClasspath(List<String> packageRoots, Element compilationUnitEl) {
        for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
            if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("execute")) { // NOI18N
                return createClasspath(e);
            }

        List<URL> urls = new ArrayList<URL>();
        urls.addAll(createCompileClasspath(compilationUnitEl));
        boolean foundBuiltTos = false;
        for (Element builtTo : XMLUtil.findSubElements(compilationUnitEl)) {
            if (!builtTo.getLocalName().equals("built-to")) { // NOI18N
                continue;
            }
            foundBuiltTos = true;
            String rawtext = XMLUtil.findText(builtTo);
            assert rawtext != null : "Must have nonempty text inside <built-to>";
            String text = evaluator.evaluate(rawtext);
            if (text == null) {

    }
    
    private List<URL> createBootClasspath(Element compilationUnitEl) {
        for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
            if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("boot")) { // NOI18N
                return createClasspath(e);
            }

            if (java == null) {
                return null;
            }
            List<Element> compilationUnits = XMLUtil.findSubElements(java);
            Iterator it = compilationUnits.iterator();
            while (it.hasNext()) {
                Element compilationUnitEl = (Element)it.next();

                rootFolder = null;
            }
            Element genldata = Util.getPrimaryConfigurationData(helper);
            Element foldersE = XMLUtil.findElement(genldata, "folders", Util.NAMESPACE); // NOI18N
            if (foldersE != null) {
                for (Element folderE : XMLUtil.findSubElements(foldersE)) {
                    if (folderE.getLocalName().equals("source-folder")) {
                        Element typeE = XMLUtil.findElement(folderE, "type", Util.NAMESPACE); // NOI18N
                        if (typeE != null) {
                            String type = XMLUtil.findText(typeE);
                            if (type.equals(JavaProjectConstants.SOURCES_TYPE_JAVA)) {
                                Element locationE = XMLUtil.findElement(folderE, "location", Util.NAMESPACE); // NOI18N
                                String location = evaluator.evaluate(XMLUtil.findText(locationE));
                                if (location != null && helper.resolveFile(location).equals(rootFolder)) {
                                    Element includesE = XMLUtil.findElement(folderE, "includes", Util.NAMESPACE); // NOI18N
                                    if (includesE != null) {
                                        incl = evaluator.evaluate(XMLUtil.findText(includesE));
                                        if (incl != null && incl.matches("\\$\\{[^}]+\\}")) { // NOI18N
                                            // Clearly intended to mean "include everything".
                                            incl = null;
                                        }
                                    }
                                    Element excludesE = XMLUtil.findElement(folderE, "excludes", Util.NAMESPACE); // NOI18N
                                    if (excludesE != null) {
                                        excl = evaluator.evaluate(XMLUtil.findText(excludesE));
                                    }
                                }
                            }




        antProject.setAttribute("basedir", /* ".." times count('/', FILE_SCRIPT_PATH) */".."); // NOI18N
        // Look for <properties> in project.xml and make corresponding definitions in the Ant script.
        Element data = Util.getPrimaryConfigurationData(helper);
        Element properties = XMLUtil.findElement(data, "properties", Util.NAMESPACE);
        if (properties != null) {
            for (Element el : XMLUtil.findSubElements(properties)) {
                Element nue = antProject.getOwnerDocument().createElement("property"); // NOI18N
                if (el.getLocalName().equals("property")) { // NOI18N
                    String name = el.getAttribute("name"); // NOI18N
                    assert name != null;
                    String text = XMLUtil.findText(el);
                    assert text != null;
                    nue.setAttribute("name", name);
                    nue.setAttribute("value", text);
                } else if (el.getLocalName().equals("property-file")) { // NOI18N
                    String text = XMLUtil.findText(el);
                    assert text != null;
                    nue.setAttribute("file", text);
                } else {

        if (java == null) {
            return Collections.emptyList();
        }
        return XMLUtil.findSubElements(java);
    }
    
    /**

     */
    private Element findCompilationUnit(String sources) {
        for (Element compilationUnitEl : compilationUnits()) {
            for (Element packageRoot : XMLUtil.findSubElements(compilationUnitEl)) {
                if (packageRoot.getLocalName().equals("package-root")) { // NOI18N
                    if (XMLUtil.findText(packageRoot).equals(sources)) {
                        return compilationUnitEl;
                    }
                }

     */
    private String findClassesOutputDir(Element compilationUnitEl) {
        // Look for an appropriate <built-to>.
        for (Element builtTo : XMLUtil.findSubElements(compilationUnitEl)) {
            if (builtTo.getLocalName().equals("built-to")) { // NOI18N
                String rawtext = XMLUtil.findText(builtTo);
                // Check that it is not an archive.
                String evaltext = evaluator.evaluate(rawtext);
                if (evaltext != null) {

    String findSourceLevel(String sources) {
        Element compilationUnitEl = findCompilationUnit(sources);
        if (compilationUnitEl != null) {
            Element sourceLevel = XMLUtil.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_2);
            if (sourceLevel != null) {
                return XMLUtil.findText(sourceLevel);
            }
        }
        return null;

    String findCUClasspath(String sources, String moud) {
        Element compilationUnitEl = findCompilationUnit(sources);
        if (compilationUnitEl != null) {
            for (Element classpath : XMLUtil.findSubElements(compilationUnitEl)) {
                if (classpath.getLocalName().equals("classpath")) { // NOI18N
                    String mode = classpath.getAttribute("mode"); // NOI18N
                    if (mode.equals(moud)) {
                        return XMLUtil.findText(classpath);
                    }
                }
            }

        // XXX cannot use FreeformProjectGenerator since that is currently not a public support SPI from ant/freeform
        // XXX should this try to find an existing binding? probably not, since it is assumed that if there was one, we would never get here to begin with
        Element data = Util.getPrimaryConfigurationData(helper);
        Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N
        if (ideActions == null) {
            //fix for #58442:
            ideActions = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "ide-actions"); // NOI18N
            XMLUtil.appendChildElement(data, ideActions, rootElementsOrder);
        }
        Document doc = data.getOwnerDocument();
        Element action = doc.createElementNS(Util.NAMESPACE, "action"); // NOI18N

        } else {
            // Add a context menu item, since it applies to the project as a whole.
            // Assume there is already a <context-menu> defined, which is quite likely.
            Element view = XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N
            if (view != null) {
                Element contextMenu = XMLUtil.findElement(view, "context-menu", Util.NAMESPACE); // NOI18N
                if (contextMenu != null) {
                    Element ideAction = doc.createElementNS(Util.NAMESPACE, "ide-action"); // NOI18N
                    ideAction.setAttribute("name", command); // NOI18N

                return null;
            }
        }
        for (Element target : XMLUtil.findSubElements(doc.getDocumentElement())) {
            if (target.getLocalName().equals("target") && targetName.equals(target.getAttribute("name"))) { // NOI18N
                return target;
            }

     */
    String[] findCommandBinding(String command) {
        Element data = Util.getPrimaryConfigurationData(helper);
        Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N
        if (ideActions == null) {
            return null;
        }
        String scriptName = "build.xml"; // NOI18N
        for (Element action : XMLUtil.findSubElements(ideActions)) {
            assert action.getLocalName().equals("action");
            if (action.getAttribute("name").equals(command)) {
                Element script = XMLUtil.findElement(action, "script", Util.NAMESPACE); // NOI18N
                if (script != null) {
                    scriptName = XMLUtil.findText(script);
                }
                List<String> scriptPlusTargetNames = new ArrayList<String>();
                scriptPlusTargetNames.add(scriptName);
                for (Element target : XMLUtil.findSubElements(action)) {
                    if (target.getLocalName().equals("target")) { // NOI18N
                        scriptPlusTargetNames.add(XMLUtil.findText(target));
                    }
                }
                if (scriptName.equals(JdkConfiguration.NBJDK_XML) && scriptPlusTargetNames.size() > 1) {

    Element targetUsesTaskExactlyOnce(Element target, String taskName) {
        // XXX should maybe also look for any other usage of the task in the same script in case there is none in the mentioned target
        Element foundTask = null;
        for (Element task : XMLUtil.findSubElements(target)) {
            if (task.getLocalName().equals(taskName)) {
                if (foundTask != null) {
                    // Duplicate.




import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.queries.FileBuiltQuery.Status;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectEvent;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Mutex;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        List<String> to   = new ArrayList<String>();
        
        if (java != null) {
            List<Element> compilationUnits = XMLUtil.findSubElements(java);
            Iterator it = compilationUnits.iterator();
            while (it.hasNext()) {
                Element compilationUnitEl = (Element)it.next();

    
    static List<String> findBuiltToNames(Element compilationUnitEl) {
        List<String> names = new ArrayList<String>();
        for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
            if (!e.getLocalName().equals("built-to")) { // NOI18N
                continue;
            }
            String location = XMLUtil.findText(e);
            names.add(location);
        }
        return names;




import org.netbeans.spi.project.support.ant.PropertyUtils;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;


        //assert ProjectManager.mutex().isReadAccess() || ProjectManager.mutex().isWriteAccess();
        List<SourceFolder> list = new ArrayList<SourceFolder>();
        Element data = Util.getPrimaryConfigurationData(helper);
        Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N
        if (foldersEl == null) {
            return list;
        }
        for (Element sourceFolderEl : XMLUtil.findSubElements(foldersEl)) {
            if (!sourceFolderEl.getLocalName().equals("source-folder")) { // NOI18N
                continue;
            }
            SourceFolder sf = new SourceFolder();
            Element el = XMLUtil.findElement(sourceFolderEl, "label", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.label = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "type", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.type = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "location", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.location = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "includes", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.includes = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "excludes", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.excludes = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "encoding", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.encoding = XMLUtil.findText(el);
            }
            if (type == null || type.equals(sf.type)) {
                if (sf.label == null || sf.label.length() == 0) {

        //assert ProjectManager.mutex().isWriteAccess();
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N
        if (foldersEl == null) {
            foldersEl = doc.createElementNS(Util.NAMESPACE, "folders"); // NOI18N
            XMLUtil.appendChildElement(data, foldersEl, rootElementsOrder);
        } else {
            for (Element sourceFolderEl : XMLUtil.findSubElements(foldersEl)) {
                if (!sourceFolderEl.getLocalName().equals("source-folder")) { // NOI18N
                    continue;
                }
                if (type == null) {
                    foldersEl.removeChild(sourceFolderEl);
                } else {
                    Element typeEl = XMLUtil.findElement(sourceFolderEl, "type", Util.NAMESPACE); // NOI18N
                    if (typeEl != null) {
                        String typeElValue = XMLUtil.findText(typeEl);
                        if (type.equals(typeElValue)) {
                            foldersEl.removeChild(sourceFolderEl);
                        }

                el.appendChild(doc.createTextNode(sf.encoding)); // NOI18N
                sourceFolderEl.appendChild(el);
            }
            XMLUtil.appendChildElement(foldersEl, sourceFolderEl, folderElementsOrder);
        }
        Util.putPrimaryConfigurationData(helper, data);
    }

        //assert ProjectManager.mutex().isReadAccess() || ProjectManager.mutex().isWriteAccess();
        List<SourceFolder> list = new ArrayList<SourceFolder>();
        Element data = Util.getPrimaryConfigurationData(helper);
        Element viewEl =XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N
        if (viewEl == null) {
            return list;
        }
        Element itemsEl = XMLUtil.findElement(viewEl, "items", Util.NAMESPACE); // NOI18N
        if (itemsEl == null) {
            return list;
        }
        for (Element sourceFolderEl : XMLUtil.findSubElements(itemsEl)) {
            if (!sourceFolderEl.getLocalName().equals("source-folder")) { // NOI18N
                continue;
            }
            SourceFolder sf = new SourceFolder();
            sf.style = sourceFolderEl.getAttribute("style"); // NOI18N
            assert sf.style != null && sf.style.length() > 0 : "Bad style attr on <source-folder> in " + helper; // NOI18N
            Element el = XMLUtil.findElement(sourceFolderEl, "label", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.label = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "location", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.location = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "includes", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.includes = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "excludes", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.excludes = XMLUtil.findText(el);
            }
            if (style == null || style.equals(sf.style)) {
                list.add(sf);

     */
    public static void putSourceViews(AntProjectHelper helper, List<SourceFolder> sources, String style) {
        //assert ProjectManager.mutex().isWriteAccess();
        //ArrayList list = new ArrayList();
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element viewEl = XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N
        if (viewEl == null) {
            viewEl = doc.createElementNS(Util.NAMESPACE, "view"); // NOI18N
            XMLUtil.appendChildElement(data, viewEl, rootElementsOrder);
        }
        Element itemsEl = XMLUtil.findElement(viewEl, "items", Util.NAMESPACE); // NOI18N
        if (itemsEl == null) {
            itemsEl = doc.createElementNS(Util.NAMESPACE, "items"); // NOI18N
            XMLUtil.appendChildElement(viewEl, itemsEl, viewElementsOrder);
        }
        List<Element> sourceViews = XMLUtil.findSubElements(itemsEl);
        Iterator it = sourceViews.iterator();
        while (it.hasNext()) {
            Element sourceViewEl = (Element)it.next();

                el.appendChild(doc.createTextNode(sf.excludes)); // NOI18N
                sourceFolderEl.appendChild(el);
            }
            XMLUtil.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder);
        }
        Util.putPrimaryConfigurationData(helper, data);
    }

        if (data == null) {
            return list;
        }
        for (Element cuEl : XMLUtil.findSubElements(data)) {
            JavaCompilationUnit cu = new JavaCompilationUnit();
            List<String> outputs = new ArrayList<String>();
            List<String> javadoc = new ArrayList<String>();
            List<JavaCompilationUnit.CP> cps = new ArrayList<JavaCompilationUnit.CP>();
            List<String> packageRoots = new ArrayList<String>();
            for (Element el : XMLUtil.findSubElements(cuEl)) {
                if (el.getLocalName().equals("package-root")) { // NOI18N
                    packageRoots.add(XMLUtil.findText(el));
                    continue;
                }
                if (el.getLocalName().equals("classpath")) { // NOI18N
                    JavaCompilationUnit.CP cp = new JavaCompilationUnit.CP();
                    cp.classpath = XMLUtil.findText(el);
                    cp.mode = el.getAttribute("mode"); // NOI18N
                    if (cp.mode != null && cp.classpath != null) {
                        cps.add(cp);

                    continue;
                }
                if (el.getLocalName().equals("built-to")) { // NOI18N
                    outputs.add(XMLUtil.findText(el));
                    continue;
                }
                if (el.getLocalName().equals("javadoc-built-to")) { // NOI18N
                    javadoc.add(XMLUtil.findText(el));
                    continue;
                }
                if (el.getLocalName().equals("source-level")) { // NOI18N
                    cu.sourceLevel = XMLUtil.findText(el);
                }
                if (el.getLocalName().equals("unit-tests")) { // NOI18N
                    cu.isTests = true;

            }
        }
        Document doc = data.getOwnerDocument();
        for (Element cuEl : XMLUtil.findSubElements(data)) {
            data.removeChild(cuEl);
        }
        for (JavaCompilationUnit cu : compUnits) {

     */
    public static void putExports(AntProjectHelper helper, List<Export> exports) {
        //assert ProjectManager.mutex().isWriteAccess();
        //ArrayList list = new ArrayList();
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Iterator it = XMLUtil.findSubElements(data).iterator();
        while (it.hasNext()) {
            Element exportEl = (Element)it.next();
            if (!exportEl.getLocalName().equals("export")) { // NOI18N

                el.appendChild(doc.createTextNode(export.cleanTarget)); // NOI18N
                exportEl.appendChild(el);
            }
            XMLUtil.appendChildElement(data, exportEl, rootElementsOrder);
        }
        Util.putPrimaryConfigurationData(helper, data);
    }

     */
    public static void putSubprojects(AntProjectHelper helper, List<String> subprojects) {
        //assert ProjectManager.mutex().isWriteAccess();
        //ArrayList list = new ArrayList();
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element subproject = XMLUtil.findElement(data, "subprojects", Util.NAMESPACE); // NOI18N
        if (subproject != null) {
            data.removeChild(subproject);
        }
        subproject = doc.createElementNS(Util.NAMESPACE, "subprojects"); // NOI18N
        XMLUtil.appendChildElement(data, subproject, rootElementsOrder);
        
        Iterator it = subprojects.iterator();
        while (it.hasNext()) {

    private static void putBuildElement(AntProjectHelper helper, List<String> buildFolders, String elemName) {
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N
        if (foldersEl == null) {
            foldersEl = doc.createElementNS(Util.NAMESPACE, "folders"); // NOI18N
            XMLUtil.appendChildElement(data, foldersEl, rootElementsOrder);
        } else {
            List<Element> folders = XMLUtil.findSubElements(foldersEl);
            Iterator it = folders.iterator();
            while (it.hasNext()) {
                Element buildFolderEl = (Element)it.next();

            Element locationEl = doc.createElementNS(Util.NAMESPACE, "location"); // NOI18N
            locationEl.appendChild(doc.createTextNode(location));
            buildFolderEl.appendChild(locationEl);
            XMLUtil.appendChildElement(foldersEl, buildFolderEl, folderElementsOrder);
        }
        Util.putPrimaryConfigurationData(helper, data);
    }

        //assert ProjectManager.mutex().isReadAccess() || ProjectManager.mutex().isWriteAccess();
        List<TargetMapping> list = new ArrayList<TargetMapping>();
        Element genldata = Util.getPrimaryConfigurationData(helper);
        Element actionsEl = XMLUtil.findElement(genldata, "ide-actions", Util.NAMESPACE); // NOI18N
        if (actionsEl == null) {
            return list;
        }
        for (Element actionEl : XMLUtil.findSubElements(actionsEl)) {
            TargetMapping tm = new TargetMapping();
            tm.name = actionEl.getAttribute("name"); // NOI18N
            List<String> targetNames = new ArrayList<String>();
            EditableProperties props = new EditableProperties(false);
            for (Element subEl : XMLUtil.findSubElements(actionEl)) {
                if (subEl.getLocalName().equals("target")) { // NOI18N
                    targetNames.add(XMLUtil.findText(subEl));
                    continue;
                }
                if (subEl.getLocalName().equals("script")) { // NOI18N
                    tm.script = XMLUtil.findText(subEl);
                    continue;
                }
                if (subEl.getLocalName().equals("context")) { // NOI18N
                    TargetMapping.Context ctx = new TargetMapping.Context();
                    for (Element contextSubEl : XMLUtil.findSubElements(subEl)) {
                        if (contextSubEl.getLocalName().equals("property")) { // NOI18N
                            ctx.property = XMLUtil.findText(contextSubEl);
                            continue;
                        }
                        if (contextSubEl.getLocalName().equals("format")) { // NOI18N
                            ctx.format = XMLUtil.findText(contextSubEl);
                            continue;
                        }
                        if (contextSubEl.getLocalName().equals("folder")) { // NOI18N
                            ctx.folder = XMLUtil.findText(contextSubEl);
                            continue;
                        }
                        if (contextSubEl.getLocalName().equals("pattern")) { // NOI18N
                            ctx.pattern = XMLUtil.findText(contextSubEl);
                            continue;
                        }
                        if (contextSubEl.getLocalName().equals("arity")) { // NOI18N
                            Element sepFilesEl = XMLUtil.findElement(contextSubEl, "separated-files", Util.NAMESPACE); // NOI18N
                            if (sepFilesEl != null) {
                                ctx.separator = XMLUtil.findText(sepFilesEl);
                            }
                            continue;
                        }

    
    private static void readProperty(Element propertyElement, EditableProperties props) {
        String key = propertyElement.getAttribute("name"); // NOI18N
        String value = XMLUtil.findText(propertyElement);
        props.setProperty(key, value);
    }





import java.util.List;
import javax.swing.event.ChangeListener;
import org.netbeans.api.java.queries.JavadocForBinaryQuery;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.java.queries.JavadocForBinaryQueryImplementation;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.openide.filesystems.FileUtil;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

    public JavadocForBinaryQuery.Result findJavadoc(URL binaryRoot) {
        Element data = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true);
        if (data != null) {
            for (Element cu : XMLUtil.findSubElements(data)) {
                assert cu.getLocalName().equals("compilation-unit") : cu;
                boolean rightCU = false;
                for (Element builtTo : XMLUtil.findSubElements(cu)) {
                    if (builtTo.getLocalName().equals("built-to")) { // NOI18N
                        String rawtext = XMLUtil.findText(builtTo);
                        assert rawtext != null;
                        String evaltext = eval.evaluate(rawtext);
                        if (evaltext != null) {

                }
                if (rightCU) {
                    List<URL> resultURLs = new ArrayList<URL>();
                    for (Element javadocTo : XMLUtil.findSubElements(cu)) {
                        if (javadocTo.getLocalName().equals("javadoc-built-to")) { // NOI18N
                            String rawtext = XMLUtil.findText(javadocTo);
                            assert rawtext != null;
                            String evaltext = eval.evaluate(rawtext);
                            if (evaltext != null) {




import javax.swing.event.ChangeListener;
import org.netbeans.api.java.queries.SourceForBinaryQuery;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectEvent;

import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Mutex;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

            if (java == null) {
                return null;
            }
            for (Element compilationUnit : XMLUtil.findSubElements(java)) {
                assert compilationUnit.getLocalName().equals("compilation-unit") : compilationUnit;
                List<URL> binaries = findBinaries(compilationUnit);
                if (!binaries.isEmpty()) {

     */
    private List<URL> findBinaries(Element compilationUnitEl) {
        List<URL> binaries = new ArrayList<URL>();
        for (Element builtToEl : XMLUtil.findSubElements(compilationUnitEl)) {
            if (!builtToEl.getLocalName().equals("built-to")) { // NOI18N
                continue;
            }
            String text = XMLUtil.findText(builtToEl);
            String textEval = evaluator.evaluate(text);
            if (textEval == null) {
                continue;




import java.util.Map;
import java.util.WeakHashMap;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.java.queries.SourceLevelQueryImplementation;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Mutex;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        if (java == null) {
            return null;
        }
        for (Element compilationUnitEl : XMLUtil.findSubElements(java)) {
            assert compilationUnitEl.getLocalName().equals("compilation-unit") : compilationUnitEl;
            List<FileObject> packageRoots = Classpaths.findPackageRoots(helper, evaluator, compilationUnitEl);
            for (FileObject root : packageRoots) {

     * Get the source level indicated in a compilation unit (or null if none is indicated).
     */
    private String getLevel(Element compilationUnitEl) {
        Element sourceLevelEl = XMLUtil.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_2);
        if (sourceLevelEl != null) {
            return XMLUtil.findText(sourceLevelEl);
        } else {
            return null;
        }




import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.java.queries.MultipleRootsUnitTestForSourceQueryImplementation;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
import org.openide.filesystems.FileUtil;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        List<URL> tests = new ArrayList<URL>();
        Element data = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true);
        if (data != null) {
            for (Element cu : XMLUtil.findSubElements(data)) {
                assert cu.getLocalName().equals("compilation-unit") : cu;
                boolean isTests = XMLUtil.findElement(cu, "unit-tests", JavaProjectNature.NS_JAVA_2) != null; // NOI18N
                for (Element pr : XMLUtil.findSubElements(cu)) {
                    if (pr.getLocalName().equals("package-root")) { // NOI18N
                        String rawtext = XMLUtil.findText(pr);
                        assert rawtext != null;
                        String evaltext = eval.evaluate(rawtext);
                        if (evaltext != null) {




import org.netbeans.api.project.ProjectUtils;
import org.netbeans.modules.ant.freeform.spi.ProjectAccessor;
import org.netbeans.modules.ant.freeform.spi.ProjectConstants;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;

import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

            java = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_1, true);
        }
        if (java != null) {
            for (Element compilationUnitEl : XMLUtil.findSubElements(java)) {
                compilationUnits++;
                int builtTos = 0;
                int roots = 0;
                for (Element other : XMLUtil.findSubElements(compilationUnitEl)) {
                    String name = other.getLocalName();
                    if (name.equals("package-root")) { // NOI18N
                        roots++;
                    } else if (name.equals("built-to")) { // NOI18N
                        builtTos++;
                    } else if (name.equals("classpath")) { // NOI18N
                        String text = XMLUtil.findText(other);
                        if (text != null) {
                            String textEval = eval.evaluate(text);
                            if (textEval != null) {




import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.modules.java.freeform.JavaProjectGenerator;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.EditableProperties;
import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;

        Element projectE = nbjdkDoc.getDocumentElement();
        Set<String> targetsCreated = new HashSet<String>();
        // XXX remove any definition of ${ant.script}, which will by now be obsolete
        Element ideActionsE = XMLUtil.findElement(generalDataE, "ide-actions", Util.NAMESPACE);
        if (ideActionsE != null) {
            for (Element actionE : XMLUtil.findSubElements(ideActionsE)) {
                rebindAction(actionE, projectE, targetsCreated);
            }
        }
        Element viewE = XMLUtil.findElement(generalDataE, "ide-actions", Util.NAMESPACE);
        if (viewE != null) {
            Element contextMenuE = XMLUtil.findElement(viewE, "context-menu", Util.NAMESPACE);
            if (contextMenuE != null) {
                for (Element actionE : XMLUtil.findSubElements(contextMenuE)) {
                    if (!actionE.getLocalName().equals("action")) {
                        continue; // ignore <ide-action> here
                    }

    }

    private void rebindAction(Element actionE, Element projectE, Set<String> targetsCreated) {
        Element scriptE = XMLUtil.findElement(actionE, "script", Util.NAMESPACE); // NOI18N
        String script;
        if (scriptE != null) {
            script = XMLUtil.findText(scriptE);
            actionE.removeChild(scriptE);
        } else {
            script = "build.xml"; // NOI18N

        scriptE.appendChild(actionE.getOwnerDocument().createTextNode(NBJDK_XML));
        actionE.insertBefore(scriptE, actionE.getFirstChild());
        List<String> targetNames = new ArrayList<String>();
        for (Element targetE : XMLUtil.findSubElements(actionE)) {
            if (!targetE.getLocalName().equals("target")) { // NOI18N
                continue;
            }
            targetNames.add(XMLUtil.findText(targetE));
        }
        if (targetNames.isEmpty()) {
            targetNames.add(null);




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Mutex;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;


        FileUtil.createData(new File(d, "s/ignored/file"));
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element sf = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), XMLUtil.findElement(data, "view", Util.NAMESPACE)).
                appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));
        sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources"));
        sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode(JavaProjectConstants.SOURCES_TYPE_JAVA));

        data.getElementsByTagName("properties").item(0).
                appendChild(doc.createElementNS(Util.NAMESPACE, "property-file")).
                appendChild(doc.createTextNode("config.properties"));
        Element folders = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), XMLUtil.findElement(data, "view", Util.NAMESPACE));
        Element sf = (Element) folders.appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));
        sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources #1"));
        sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode(JavaProjectConstants.SOURCES_TYPE_JAVA));




import java.util.Locale;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.ant.freeform.FreeformProject;
import org.netbeans.modules.ant.freeform.FreeformProjectType;
import org.netbeans.modules.ant.freeform.TestBase;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.project.ActionProvider;

        prj = copyProject(simple);
        // Remove existing context-sensitive bindings to make a clean slate.
        Element data = prj.getPrimaryConfigurationData();
        Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
        assertNotNull(ideActions);
        Iterator<Element> actionsIt = XMLUtil.findSubElements(ideActions).iterator();
        while (actionsIt.hasNext()) {
            Element action = actionsIt.next();
            assertEquals("action", action.getLocalName());
            if (XMLUtil.findElement(action, "context", Util.NAMESPACE) != null) {
                ideActions.removeChild(action);
            }
        }

        ja.addBinding("some.action", "special.xml", "special-target", "selection", "${some.src.dir}", "\\.java$", "relative-path", ",");
        Element data = prj.getPrimaryConfigurationData();
        assertNotNull(data);
        Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
        assertNotNull(ideActions);
        List<Element> actions = XMLUtil.findSubElements(ideActions);
        Element lastAction = actions.get(actions.size() - 1);
        String expectedXml =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +

        assertEquals(expectedXml, xmlToString(lastAction));
        ja.addBinding("some.other.action", "special.xml", "special-target", "selection", "${some.src.dir}", null, "relative-path", null);
        data = prj.getPrimaryConfigurationData();
        ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
        actions = XMLUtil.findSubElements(ideActions);
        lastAction = actions.get(actions.size() - 1);
        expectedXml =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +

        // Non-context-sensitive bindings have no <context> but need to add a view item.
        ja.addBinding("general.action", "special.xml", "special-target", null, null, null, null, null);
        data = prj.getPrimaryConfigurationData();
        ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
        actions = XMLUtil.findSubElements(ideActions);
        lastAction = actions.get(actions.size() - 1);
        expectedXml =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +

            "    <target>special-target</target>\n" +
            "</action>\n";
        assertEquals(expectedXml, xmlToString(lastAction));
        Element view = XMLUtil.findElement(data, "view", Util.NAMESPACE);
        assertNotNull(view);
        Element contextMenu = XMLUtil.findElement(view, "context-menu", Util.NAMESPACE);
        assertNotNull(contextMenu);
        // Currently (no FPG to help) it is always added as the last item.
        List<Element> contextMenuActions = XMLUtil.findSubElements(contextMenu);
        Element lastContextMenuAction = contextMenuActions.get(contextMenuActions.size() - 1);
        expectedXml =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +

        
        //test #58442:
        data = prj.getPrimaryConfigurationData();
        ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
        data.removeChild(ideActions);
        
        ja.addBinding("some.other.action", "special.xml", "special-target", "selection", "${some.src.dir}", null, "relative-path", null);
        data = prj.getPrimaryConfigurationData();
        ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
        actions = XMLUtil.findSubElements(ideActions);
        lastAction = actions.get(actions.size() - 1);
        expectedXml =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +

        assertEquals("Correct code generated for external script", expectedXml, xmlToString(root));
        // And also with locations defined as special properties in various ways...
        Element data = prj.getPrimaryConfigurationData();
        Element properties = XMLUtil.findElement(data, "properties", Util.NAMESPACE);
        assertNotNull(properties);
        Element property = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "property");
        property.setAttribute("name", "external.xml");




import org.netbeans.spi.project.support.ant.PropertyUtils;
import org.openide.modules.ModuleInfo;
import org.openide.util.Lookup;
import org.openide.xml.XMLUtil;

/**
 * Tests for JavaProjectGenerator.

        // check that all elements are written in expected order
        
        Element el = Util.getPrimaryConfigurationData(helper);
        List subElements = XMLUtil.findSubElements(el);
        assertEquals(7, subElements.size());
        assertElementArray(subElements, 
            new String[]{"name", "properties", "folders", "ide-actions", "export", "view", "subprojects"}, 
            new String[]{null, null, null, null, null, null, null});
        Element el2 = (Element)subElements.get(5);
        subElements = XMLUtil.findSubElements(el2);
        assertEquals(2, subElements.size());
        assertElementArray(subElements, 
            new String[]{"items", "context-menu"}, 
            new String[]{null, null});
        Element el3 = (Element)subElements.get(0);
        List subEls = XMLUtil.findSubElements(el3);
        assertEquals(2, subEls.size());
        assertElementArray(subEls, 
            new String[]{"source-folder", "source-file"}, 
            new String[]{null, null});
        el3 = (Element)subElements.get(1);
        subEls = XMLUtil.findSubElements(el3);
        assertEquals(2, subEls.size());
        assertElementArray(subEls, 
            new String[]{"ide-action", "action"}, 

        FreeformProjectGenerator.putTargetMappings(helper, mappings);
//        ProjectManager.getDefault().saveAllProjects();
        el = Util.getPrimaryConfigurationData(helper);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(7, subElements.size());
        assertElementArray(subElements, 
            new String[]{"name", "properties", "folders", "ide-actions", "export", "view", "subprojects"}, 
            new String[]{null, null, null, null, null, null, null});
        el2 = (Element)subElements.get(5);
        subElements = XMLUtil.findSubElements(el2);
        assertEquals(2, subElements.size());
        assertElementArray(subElements, 
            new String[]{"items", "context-menu"}, 
            new String[]{null, null});
        el3 = (Element)subElements.get(0);
        subEls = XMLUtil.findSubElements(el3);
        assertEquals(2, subEls.size());
        assertElementArray(subEls, 
            new String[]{"source-folder", "source-file"}, 
            new String[]{null, null});
        el3 = (Element)subElements.get(1);
        subEls = XMLUtil.findSubElements(el3);
        assertEquals(2, subEls.size());
        assertElementArray(subEls, 
            new String[]{"ide-action", "action"}, 

        String message = "Element "+element+" does not match [name="+expectedName+",value="+expectedValue+"]"; // NOI18N
        assertEquals(message, expectedName, element.getLocalName());
        if (expectedValue != null) {
            assertEquals(message, expectedValue, XMLUtil.findText(element));
        }
    }


            expectedValue+", attr="+expectedAttrName+", attrvalue="+expectedAttrValue+"]"; // NOI18N
        assertEquals(message, expectedName, element.getLocalName());
        if (expectedValue != null) {
            assertEquals(message, expectedValue, XMLUtil.findText(element));
        }
        String val = element.getAttribute(expectedAttrName);
        assertEquals(expectedAttrValue, val);

        JavaProjectGenerator.putSourceFolders(helper, folders, null);
//        ProjectManager.getDefault().saveAllProjects();
        Element el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        assertNotNull("Source folders were not saved correctly",  el);
        List subElements = XMLUtil.findSubElements(el);
        assertEquals(2, subElements.size());
        // compare first source folder
        Element el2 = (Element)subElements.get(0);
        assertElement(el2, "source-folder", null);
        List l1 = XMLUtil.findSubElements(el2);
        assertEquals(3, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "type", "location"}, 

        // compare second source folder
        el2 = (Element)subElements.get(1);
        assertElement(el2, "source-folder", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(3, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "type", "location"}, 

        JavaProjectGenerator.putSourceFolders(helper, folders, "type2");
        ProjectManager.getDefault().saveAllProjects();
        el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        assertNotNull("Source folders were not saved correctly",  el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(2, subElements.size());
        // compare first source folder
        el2 = (Element)subElements.get(0);
        assertElement(el2, "source-folder", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(3, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "type", "location"}, 

        // compare second source folder
        el2 = (Element)subElements.get(1);
        assertElement(el2, "source-folder", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(3, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "type", "location"}, 

        JavaProjectGenerator.putSourceViews(helper, folders, null);
        ProjectManager.getDefault().saveAllProjects();
        Element el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "view", Util.NAMESPACE);
        assertNotNull("View folders were not saved correctly",  el);
        el = XMLUtil.findElement(el, "items", Util.NAMESPACE);
        assertNotNull("View folders were not saved correctly",  el);
        List subElements = XMLUtil.findSubElements(el);
        // there will be three sublements: <source-file> is added for build.xml during project.creation
        assertEquals(3, subElements.size());
        // compare first source view
        Element el2 = (Element)subElements.get(0);
        assertElement(el2, "source-folder", null, "style", "tree");
        List l1 = XMLUtil.findSubElements(el2);
        assertEquals(2, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "location"}, 

        // compare second source view
        el2 = (Element)subElements.get(1);
        assertElement(el2, "source-folder", null, "style", "packages");
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(2, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "location"}, 

        JavaProjectGenerator.putSourceViews(helper, folders, "packages");
        ProjectManager.getDefault().saveAllProjects();
        el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "view", Util.NAMESPACE);
        assertNotNull("Source views were not saved correctly",  el);
        el = XMLUtil.findElement(el, "items", Util.NAMESPACE);
        assertNotNull("View folders were not saved correctly",  el);
        subElements = XMLUtil.findSubElements(el);
        // there will be three sublements: <source-file> is added for build.xml during project.creation
        assertEquals("3 elements in " + subElements, 3, subElements.size());
        // compare first source view
        el2 = (Element)subElements.get(0);
        assertElement(el2, "source-folder", null, "style", "tree");
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(2, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "location"}, 

        // compare second source view
        el2 = (Element)subElements.get(1);
        assertElement(el2, "source-folder", null, "style", "packages");
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(2, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "location"}, 

//        ProjectManager.getDefault().saveAllProjects();
        Element el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_1, true);
        assertNotNull("Java compilation units were not saved correctly",  el);
        List subElements = XMLUtil.findSubElements(el);
        assertEquals(2, subElements.size());
        // compare first compilation unit
        Element el2 = (Element)subElements.get(0);
        assertElement(el2, "compilation-unit", null);
        List l1 = XMLUtil.findSubElements(el2);
        assertEquals(7, l1.size());
        assertElementArray(l1, 
            new String[]{"package-root", "package-root", "classpath", "classpath", "built-to", "built-to", "source-level"}, 

        // compare second compilation unit
        el2 = (Element)subElements.get(1);
        assertElement(el2, "compilation-unit", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(7, l1.size());
        assertElementArray(l1, 
            new String[]{"package-root", "package-root", "classpath", "classpath", "built-to", "built-to", "source-level"}, 

//        ProjectManager.getDefault().saveAllProjects();
        el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_1, true);
        assertNotNull("Java compilation units were not saved correctly",  el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        // compare first compilation unit
        el2 = (Element)subElements.get(0);
        assertElement(el2, "compilation-unit", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(1, l1.size());
        assertElementArray(l1, 
            new String[]{"package-root"}, 

        // Check that the correct /1 data was saved.
        Element el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_1, true);
        assertNotNull("Java compilation units were saved in /1",  el);
        List<Element> subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        // compare the compilation unit
        Element el2 = (Element) subElements.get(0);
        assertElement(el2, "compilation-unit", null);
        assertElementArray(XMLUtil.findSubElements(el2),
            new String[] {"package-root"},
            new String[] {"pkgroot1"});
        ProjectManager.getDefault().saveAllProjects();

        assertNull("No /1 data", el);
        el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true);
        assertNotNull("Have /2 data", el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        // compare the compilation unit
        el2 = (Element) subElements.get(0);
        assertElement(el2, "compilation-unit", null);
        assertElementArray(XMLUtil.findSubElements(el2),
            new String[] {"package-root", "unit-tests"},
            new String[] {"pkgroot1", null});
        ProjectManager.getDefault().saveAllProjects();

        assertNull("No /1 data", el);
        el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true);
        assertNotNull("Have /2 data", el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        // compare the compilation unit
        el2 = (Element) subElements.get(0);
        assertElement(el2, "compilation-unit", null);
        assertElementArray(XMLUtil.findSubElements(el2),
            new String[] {"package-root", "javadoc-built-to", "javadoc-built-to"},
            new String[] {"pkgroot1", "javadoc1", "javadoc2"});
        ProjectManager.getDefault().saveAllProjects();

        
        JavaProjectGenerator.putExports(helper, exports);
        Element el = Util.getPrimaryConfigurationData(helper);
        List subElements = XMLUtil.findSubElements(el);
        // 4, i.e. name, two exports and one view of build.xml file
        assertEquals(5, subElements.size());
        // compare first compilation unit

        assertElement(el2, "properties", null);
        el2 = (Element)subElements.get(2);
        assertElement(el2, "export", null);
        List l1 = XMLUtil.findSubElements(el2);
        assertEquals(5, l1.size());
        assertElementArray(l1, 
            new String[]{"type", "location", "script", "build-target", "clean-target"}, 

        // compare second compilation unit
        el2 = (Element)subElements.get(3);
        assertElement(el2, "export", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(3, l1.size());
        assertElementArray(l1, 
            new String[]{"type", "location", "build-target"}, 

        
        JavaProjectGenerator.putExports(helper, exports);
        el = Util.getPrimaryConfigurationData(helper);
        subElements = XMLUtil.findSubElements(el);
        // 3, i.e. name, export and one view of build.xml file
        assertEquals(4, subElements.size());
        // compare first compilation unit

        assertElement(el2, "properties", null);
        el2 = (Element)subElements.get(2);
        assertElement(el2, "export", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(3, l1.size());
        assertElementArray(l1, 
            new String[]{"type", "location", "build-target"}, 

        
        JavaProjectGenerator.putSubprojects(helper, subprojects);
        Element el = Util.getPrimaryConfigurationData(helper);
        Element subprojectsEl = XMLUtil.findElement(el, "subprojects", Util.NAMESPACE);
        assertNotNull("<subprojects> element exists", subprojectsEl);
        List subElements = XMLUtil.findSubElements(subprojectsEl);
        assertEquals("project depends on two subprojects", 2, subElements.size());
        Element el2 = (Element)subElements.get(0);
        assertElement(el2, "project", "/some/path/projA");

        subprojects.add("/projC");
        JavaProjectGenerator.putSubprojects(helper, subprojects);
        el = Util.getPrimaryConfigurationData(helper);
        subprojectsEl = XMLUtil.findElement(el, "subprojects", Util.NAMESPACE);
        subElements = XMLUtil.findSubElements(subprojectsEl);
        assertEquals("project depends on one subproject", 1, subElements.size());
        el2 = (Element)subElements.get(0);
        assertElement(el2, "project", "/projC");
        subprojects = new ArrayList();
        JavaProjectGenerator.putSubprojects(helper, subprojects);
        el = Util.getPrimaryConfigurationData(helper);
        subprojectsEl = XMLUtil.findElement(el, "subprojects", Util.NAMESPACE);
        subElements = XMLUtil.findSubElements(subprojectsEl);
        assertEquals("project depends on one subproject", 0, subElements.size());
        
        ProjectManager.getDefault().saveAllProjects();

        
        JavaProjectGenerator.putBuildFolders(helper, buildFolders);
        Element el = Util.getPrimaryConfigurationData(helper);
        Element foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        assertNotNull("<folders> element exists", foldersEl);
        List subElements = XMLUtil.findSubElements(foldersEl);
        assertEquals("project has two build-folders", 2, subElements.size());
        Element el2 = (Element)subElements.get(0);
        assertElement(el2, "build-folder", null);
        assertEquals("build-folder has one subelement", 1, XMLUtil.findSubElements(el2).size());
        assertElement((Element)XMLUtil.findSubElements(el2).get(0), "location", "/some/path/projA");
        el2 = (Element)subElements.get(1);
        assertElement(el2, "build-folder", null);
        assertEquals("build-folder has one subelement", 1, XMLUtil.findSubElements(el2).size());
        assertElement((Element)XMLUtil.findSubElements(el2).get(0), "location", "C:\\dev\\projB");
        
        ProjectManager.getDefault().saveAllProjects();
        

        buildFolders.add("/projC");
        JavaProjectGenerator.putBuildFolders(helper, buildFolders);
        el = Util.getPrimaryConfigurationData(helper);
        foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        subElements = XMLUtil.findSubElements(foldersEl);
        assertEquals("project has one build-folder", 1, subElements.size());
        el2 = (Element)subElements.get(0);
        assertElement(el2, "build-folder", null);
        assertEquals("build-folder has one subelement", 1, XMLUtil.findSubElements(el2).size());
        assertElement((Element)XMLUtil.findSubElements(el2).get(0), "location", "/projC");
        buildFolders = new ArrayList();
        JavaProjectGenerator.putBuildFolders(helper, buildFolders);
        el = Util.getPrimaryConfigurationData(helper);
        foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        subElements = XMLUtil.findSubElements(foldersEl);
        assertEquals("project has no build-folder", 0, subElements.size());
        
        ProjectManager.getDefault().saveAllProjects();

        
        JavaProjectGenerator.putBuildFiles(helper, buildFiles);
        Element el = Util.getPrimaryConfigurationData(helper);
        Element foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        assertNotNull("<folders> element exists", foldersEl);
        List subElements = XMLUtil.findSubElements(foldersEl);
        assertEquals("project has two build-files", 2, subElements.size());
        Element el2 = (Element)subElements.get(0);
        assertElement(el2, "build-file", null);
        assertEquals("build-file has one subelement", 1, XMLUtil.findSubElements(el2).size());
        assertElement((Element)XMLUtil.findSubElements(el2).get(0), "location", "/some/path/projA/archive.jar");
        el2 = (Element)subElements.get(1);
        assertElement(el2, "build-file", null);
        assertEquals("build-file has one subelement", 1, XMLUtil.findSubElements(el2).size());
        assertElement((Element)XMLUtil.findSubElements(el2).get(0), "location", "C:\\dev\\projB\\library.jar");
        
        ProjectManager.getDefault().saveAllProjects();
        

        buildFiles.add("/projC/dist/projC.jar");
        JavaProjectGenerator.putBuildFiles(helper, buildFiles);
        el = Util.getPrimaryConfigurationData(helper);
        foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        subElements = XMLUtil.findSubElements(foldersEl);
        assertEquals("project has one build-file", 1, subElements.size());
        el2 = (Element)subElements.get(0);
        assertElement(el2, "build-file", null);
        assertEquals("build-file has one subelement", 1, XMLUtil.findSubElements(el2).size());
        assertElement((Element)XMLUtil.findSubElements(el2).get(0), "location", "/projC/dist/projC.jar");
        
        buildFiles = new ArrayList();
        JavaProjectGenerator.putBuildFiles(helper, buildFiles);
        el = Util.getPrimaryConfigurationData(helper);
        foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        subElements = XMLUtil.findSubElements(foldersEl);
        assertEquals("project has no build-file", 0, subElements.size());
        
        ProjectManager.getDefault().saveAllProjects();

Return to bug 136595

Lines 88-93 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/Classpaths.java (-21 / +22 lines)
88	import org.openide.util.Mutex;	88	import org.openide.util.Mutex;
89	import org.openide.util.Utilities;	89	import org.openide.util.Utilities;
90	import org.openide.util.WeakListeners;	90	import org.openide.util.WeakListeners;
		91	import org.openide.xml.XMLUtil;
91	import org.w3c.dom.Element;	92	import org.w3c.dom.Element;
92		93
93	/**	94	/**
Lines 192-198 Link Here
192	if (java == null) {	193	if (java == null) {
193	return null;	194	return null;
194	}	195	}
195	List<Element> compilationUnits = Util.findSubElements(java);	196	List<Element> compilationUnits = XMLUtil.findSubElements(java);
196	it = compilationUnits.iterator();	197	it = compilationUnits.iterator();
197	while (it.hasNext()) {	198	while (it.hasNext()) {
198	Element compilationUnitEl = (Element)it.next();	199	Element compilationUnitEl = (Element)it.next();
Lines 256-262 Link Here
256	if (java == null) {	257	if (java == null) {
257	return;	258	return;
258	}	259	}
259	for (Element compilationUnitEl : Util.findSubElements(java)) {	260	for (Element compilationUnitEl : XMLUtil.findSubElements(java)) {
260	assert compilationUnitEl.getLocalName().equals("compilation-unit") : compilationUnitEl;	261	assert compilationUnitEl.getLocalName().equals("compilation-unit") : compilationUnitEl;
261	// For each compilation unit, find the package roots first.	262	// For each compilation unit, find the package roots first.
262	List<FileObject> packageRoots = findPackageRoots(helper, evaluator, compilationUnitEl);	263	List<FileObject> packageRoots = findPackageRoots(helper, evaluator, compilationUnitEl);
Lines 335-347 Link Here
335		336
336	static List<String> findPackageRootNames(Element compilationUnitEl) {	337	static List<String> findPackageRootNames(Element compilationUnitEl) {
337	List<String> names = new ArrayList<String>();	338	List<String> names = new ArrayList<String>();
338	Iterator it = Util.findSubElements(compilationUnitEl).iterator();	339	Iterator it = XMLUtil.findSubElements(compilationUnitEl).iterator();
339	while (it.hasNext()) {	340	while (it.hasNext()) {
340	Element e = (Element) it.next();	341	Element e = (Element) it.next();
341	if (!e.getLocalName().equals("package-root")) { // NOI18N	342	if (!e.getLocalName().equals("package-root")) { // NOI18N
342	continue;	343	continue;
343	}	344	}
344	String location = Util.findText(e);	345	String location = XMLUtil.findText(e);
345	names.add(location);	346	names.add(location);
346	}	347	}
347	return names;	348	return names;
Lines 418-424 Link Here
418	}	419	}
419		420
420	private List<URL> createCompileClasspath(Element compilationUnitEl) {	421	private List<URL> createCompileClasspath(Element compilationUnitEl) {
421	for (Element e : Util.findSubElements(compilationUnitEl)) {	422	for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
422	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("compile")) { // NOI18N	423	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("compile")) { // NOI18N
423	return createClasspath(e);	424	return createClasspath(e);
424	}	425	}
Lines 431-437 Link Here
431	* Create a classpath from a <classpath> element.	432	* Create a classpath from a <classpath> element.
432	*/	433	*/
433	private List<URL> createClasspath(Element classpathEl) {	434	private List<URL> createClasspath(Element classpathEl) {
434	String cp = Util.findText(classpathEl);	435	String cp = XMLUtil.findText(classpathEl);
435	if (cp == null) {	436	if (cp == null) {
436	cp = "";	437	cp = "";
437	}	438	}
Lines 453-459 Link Here
453	}	454	}
454		455
455	private List<URL> createExecuteClasspath(List<String> packageRoots, Element compilationUnitEl) {	456	private List<URL> createExecuteClasspath(List<String> packageRoots, Element compilationUnitEl) {
456	for (Element e : Util.findSubElements(compilationUnitEl)) {	457	for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
457	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("execute")) { // NOI18N	458	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("execute")) { // NOI18N
458	return createClasspath(e);	459	return createClasspath(e);
459	}	460	}
Lines 463-474 Link Here
463	List<URL> urls = new ArrayList<URL>();	464	List<URL> urls = new ArrayList<URL>();
464	urls.addAll(createCompileClasspath(compilationUnitEl));	465	urls.addAll(createCompileClasspath(compilationUnitEl));
465	boolean foundBuiltTos = false;	466	boolean foundBuiltTos = false;
466	for (Element builtTo : Util.findSubElements(compilationUnitEl)) {	467	for (Element builtTo : XMLUtil.findSubElements(compilationUnitEl)) {
467	if (!builtTo.getLocalName().equals("built-to")) { // NOI18N	468	if (!builtTo.getLocalName().equals("built-to")) { // NOI18N
468	continue;	469	continue;
469	}	470	}
470	foundBuiltTos = true;	471	foundBuiltTos = true;
471	String rawtext = Util.findText(builtTo);	472	String rawtext = XMLUtil.findText(builtTo);
472	assert rawtext != null : "Must have nonempty text inside <built-to>";	473	assert rawtext != null : "Must have nonempty text inside <built-to>";
473	String text = evaluator.evaluate(rawtext);	474	String text = evaluator.evaluate(rawtext);
474	if (text == null) {	475	if (text == null) {
Lines 483-489 Link Here
483	}	484	}
484		485
485	private List<URL> createBootClasspath(Element compilationUnitEl) {	486	private List<URL> createBootClasspath(Element compilationUnitEl) {
486	for (Element e : Util.findSubElements(compilationUnitEl)) {	487	for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
487	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("boot")) { // NOI18N	488	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("boot")) { // NOI18N
488	return createClasspath(e);	489	return createClasspath(e);
489	}	490	}
Lines 558-564 Link Here
558	if (java == null) {	559	if (java == null) {
559	return null;	560	return null;
560	}	561	}
561	List<Element> compilationUnits = Util.findSubElements(java);	562	List<Element> compilationUnits = XMLUtil.findSubElements(java);
562	Iterator it = compilationUnits.iterator();	563	Iterator it = compilationUnits.iterator();
563	while (it.hasNext()) {	564	while (it.hasNext()) {
564	Element compilationUnitEl = (Element)it.next();	565	Element compilationUnitEl = (Element)it.next();
Lines 665-692 Link Here
665	rootFolder = null;	666	rootFolder = null;
666	}	667	}
667	Element genldata = Util.getPrimaryConfigurationData(helper);	668	Element genldata = Util.getPrimaryConfigurationData(helper);
668	Element foldersE = Util.findElement(genldata, "folders", Util.NAMESPACE); // NOI18N	669	Element foldersE = XMLUtil.findElement(genldata, "folders", Util.NAMESPACE); // NOI18N
669	if (foldersE != null) {	670	if (foldersE != null) {
670	for (Element folderE : Util.findSubElements(foldersE)) {	671	for (Element folderE : XMLUtil.findSubElements(foldersE)) {
671	if (folderE.getLocalName().equals("source-folder")) {	672	if (folderE.getLocalName().equals("source-folder")) {
672	Element typeE = Util.findElement(folderE, "type", Util.NAMESPACE); // NOI18N	673	Element typeE = XMLUtil.findElement(folderE, "type", Util.NAMESPACE); // NOI18N
673	if (typeE != null) {	674	if (typeE != null) {
674	String type = Util.findText(typeE);	675	String type = XMLUtil.findText(typeE);
675	if (type.equals(JavaProjectConstants.SOURCES_TYPE_JAVA)) {	676	if (type.equals(JavaProjectConstants.SOURCES_TYPE_JAVA)) {
676	Element locationE = Util.findElement(folderE, "location", Util.NAMESPACE); // NOI18N	677	Element locationE = XMLUtil.findElement(folderE, "location", Util.NAMESPACE); // NOI18N
677	String location = evaluator.evaluate(Util.findText(locationE));	678	String location = evaluator.evaluate(XMLUtil.findText(locationE));
678	if (location != null && helper.resolveFile(location).equals(rootFolder)) {	679	if (location != null && helper.resolveFile(location).equals(rootFolder)) {
679	Element includesE = Util.findElement(folderE, "includes", Util.NAMESPACE); // NOI18N	680	Element includesE = XMLUtil.findElement(folderE, "includes", Util.NAMESPACE); // NOI18N
680	if (includesE != null) {	681	if (includesE != null) {
681	incl = evaluator.evaluate(Util.findText(includesE));	682	incl = evaluator.evaluate(XMLUtil.findText(includesE));
682	if (incl != null && incl.matches("\\$\\{[^}]+\\}")) { // NOI18N	683	if (incl != null && incl.matches("\\$\\{[^}]+\\}")) { // NOI18N
683	// Clearly intended to mean "include everything".	684	// Clearly intended to mean "include everything".
684	incl = null;	685	incl = null;
685	}	686	}
686	}	687	}
687	Element excludesE = Util.findElement(folderE, "excludes", Util.NAMESPACE); // NOI18N	688	Element excludesE = XMLUtil.findElement(folderE, "excludes", Util.NAMESPACE); // NOI18N
688	if (excludesE != null) {	689	if (excludesE != null) {
689	excl = evaluator.evaluate(Util.findText(excludesE));	690	excl = evaluator.evaluate(XMLUtil.findText(excludesE));
690	}	691	}
691	}	692	}
692	}	693	}

Lines 506-524 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/JavaActions.java (-25 / +25 lines)
506	antProject.setAttribute("basedir", /* ".." times count('/', FILE_SCRIPT_PATH) */".."); // NOI18N	506	antProject.setAttribute("basedir", /* ".." times count('/', FILE_SCRIPT_PATH) */".."); // NOI18N
507	// Look for <properties> in project.xml and make corresponding definitions in the Ant script.	507	// Look for <properties> in project.xml and make corresponding definitions in the Ant script.
508	Element data = Util.getPrimaryConfigurationData(helper);	508	Element data = Util.getPrimaryConfigurationData(helper);
509	Element properties = Util.findElement(data, "properties", Util.NAMESPACE);	509	Element properties = XMLUtil.findElement(data, "properties", Util.NAMESPACE);
510	if (properties != null) {	510	if (properties != null) {
511	for (Element el : Util.findSubElements(properties)) {	511	for (Element el : XMLUtil.findSubElements(properties)) {
512	Element nue = antProject.getOwnerDocument().createElement("property"); // NOI18N	512	Element nue = antProject.getOwnerDocument().createElement("property"); // NOI18N
513	if (el.getLocalName().equals("property")) { // NOI18N	513	if (el.getLocalName().equals("property")) { // NOI18N
514	String name = el.getAttribute("name"); // NOI18N	514	String name = el.getAttribute("name"); // NOI18N
515	assert name != null;	515	assert name != null;
516	String text = Util.findText(el);	516	String text = XMLUtil.findText(el);
517	assert text != null;	517	assert text != null;
518	nue.setAttribute("name", name);	518	nue.setAttribute("name", name);
519	nue.setAttribute("value", text);	519	nue.setAttribute("value", text);
520	} else if (el.getLocalName().equals("property-file")) { // NOI18N	520	} else if (el.getLocalName().equals("property-file")) { // NOI18N
521	String text = Util.findText(el);	521	String text = XMLUtil.findText(el);
522	assert text != null;	522	assert text != null;
523	nue.setAttribute("file", text);	523	nue.setAttribute("file", text);
524	} else {	524	} else {
Lines 615-621 Link Here
615	if (java == null) {	615	if (java == null) {
616	return Collections.emptyList();	616	return Collections.emptyList();
617	}	617	}
618	return Util.findSubElements(java);	618	return XMLUtil.findSubElements(java);
619	}	619	}
620		620
621	/**	621	/**
Lines 684-692 Link Here
684	*/	684	*/
685	private Element findCompilationUnit(String sources) {	685	private Element findCompilationUnit(String sources) {
686	for (Element compilationUnitEl : compilationUnits()) {	686	for (Element compilationUnitEl : compilationUnits()) {
687	for (Element packageRoot : Util.findSubElements(compilationUnitEl)) {	687	for (Element packageRoot : XMLUtil.findSubElements(compilationUnitEl)) {
688	if (packageRoot.getLocalName().equals("package-root")) { // NOI18N	688	if (packageRoot.getLocalName().equals("package-root")) { // NOI18N
689	if (Util.findText(packageRoot).equals(sources)) {	689	if (XMLUtil.findText(packageRoot).equals(sources)) {
690	return compilationUnitEl;	690	return compilationUnitEl;
691	}	691	}
692	}	692	}
Lines 714-722 Link Here
714	*/	714	*/
715	private String findClassesOutputDir(Element compilationUnitEl) {	715	private String findClassesOutputDir(Element compilationUnitEl) {
716	// Look for an appropriate <built-to>.	716	// Look for an appropriate <built-to>.
717	for (Element builtTo : Util.findSubElements(compilationUnitEl)) {	717	for (Element builtTo : XMLUtil.findSubElements(compilationUnitEl)) {
718	if (builtTo.getLocalName().equals("built-to")) { // NOI18N	718	if (builtTo.getLocalName().equals("built-to")) { // NOI18N
719	String rawtext = Util.findText(builtTo);	719	String rawtext = XMLUtil.findText(builtTo);
720	// Check that it is not an archive.	720	// Check that it is not an archive.
721	String evaltext = evaluator.evaluate(rawtext);	721	String evaltext = evaluator.evaluate(rawtext);
722	if (evaltext != null) {	722	if (evaltext != null) {
Lines 745-753 Link Here
745	String findSourceLevel(String sources) {	745	String findSourceLevel(String sources) {
746	Element compilationUnitEl = findCompilationUnit(sources);	746	Element compilationUnitEl = findCompilationUnit(sources);
747	if (compilationUnitEl != null) {	747	if (compilationUnitEl != null) {
748	Element sourceLevel = Util.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_2);	748	Element sourceLevel = XMLUtil.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_2);
749	if (sourceLevel != null) {	749	if (sourceLevel != null) {
750	return Util.findText(sourceLevel);	750	return XMLUtil.findText(sourceLevel);
751	}	751	}
752	}	752	}
753	return null;	753	return null;
Lines 761-771 Link Here
761	String findCUClasspath(String sources, String moud) {	761	String findCUClasspath(String sources, String moud) {
762	Element compilationUnitEl = findCompilationUnit(sources);	762	Element compilationUnitEl = findCompilationUnit(sources);
763	if (compilationUnitEl != null) {	763	if (compilationUnitEl != null) {
764	for (Element classpath : Util.findSubElements(compilationUnitEl)) {	764	for (Element classpath : XMLUtil.findSubElements(compilationUnitEl)) {
765	if (classpath.getLocalName().equals("classpath")) { // NOI18N	765	if (classpath.getLocalName().equals("classpath")) { // NOI18N
766	String mode = classpath.getAttribute("mode"); // NOI18N	766	String mode = classpath.getAttribute("mode"); // NOI18N
767	if (mode.equals(moud)) {	767	if (mode.equals(moud)) {
768	return Util.findText(classpath);	768	return XMLUtil.findText(classpath);
769	}	769	}
770	}	770	}
771	}	771	}
Lines 810-820 Link Here
810	// XXX cannot use FreeformProjectGenerator since that is currently not a public support SPI from ant/freeform	810	// XXX cannot use FreeformProjectGenerator since that is currently not a public support SPI from ant/freeform
811	// XXX should this try to find an existing binding? probably not, since it is assumed that if there was one, we would never get here to begin with	811	// XXX should this try to find an existing binding? probably not, since it is assumed that if there was one, we would never get here to begin with
812	Element data = Util.getPrimaryConfigurationData(helper);	812	Element data = Util.getPrimaryConfigurationData(helper);
813	Element ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N	813	Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N
814	if (ideActions == null) {	814	if (ideActions == null) {
815	//fix for #58442:	815	//fix for #58442:
816	ideActions = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "ide-actions"); // NOI18N	816	ideActions = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "ide-actions"); // NOI18N
817	Util.appendChildElement(data, ideActions, rootElementsOrder);	817	XMLUtil.appendChildElement(data, ideActions, rootElementsOrder);
818	}	818	}
819	Document doc = data.getOwnerDocument();	819	Document doc = data.getOwnerDocument();
820	Element action = doc.createElementNS(Util.NAMESPACE, "action"); // NOI18N	820	Element action = doc.createElementNS(Util.NAMESPACE, "action"); // NOI18N
Lines 854-862 Link Here
854	} else {	854	} else {
855	// Add a context menu item, since it applies to the project as a whole.	855	// Add a context menu item, since it applies to the project as a whole.
856	// Assume there is already a <context-menu> defined, which is quite likely.	856	// Assume there is already a <context-menu> defined, which is quite likely.
857	Element view = Util.findElement(data, "view", Util.NAMESPACE); // NOI18N	857	Element view = XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N
858	if (view != null) {	858	if (view != null) {
859	Element contextMenu = Util.findElement(view, "context-menu", Util.NAMESPACE); // NOI18N	859	Element contextMenu = XMLUtil.findElement(view, "context-menu", Util.NAMESPACE); // NOI18N
860	if (contextMenu != null) {	860	if (contextMenu != null) {
861	Element ideAction = doc.createElementNS(Util.NAMESPACE, "ide-action"); // NOI18N	861	Element ideAction = doc.createElementNS(Util.NAMESPACE, "ide-action"); // NOI18N
862	ideAction.setAttribute("name", command); // NOI18N	862	ideAction.setAttribute("name", command); // NOI18N
Lines 994-1000 Link Here
994	return null;	994	return null;
995	}	995	}
996	}	996	}
997	for (Element target : Util.findSubElements(doc.getDocumentElement())) {	997	for (Element target : XMLUtil.findSubElements(doc.getDocumentElement())) {
998	if (target.getLocalName().equals("target") && targetName.equals(target.getAttribute("name"))) { // NOI18N	998	if (target.getLocalName().equals("target") && targetName.equals(target.getAttribute("name"))) { // NOI18N
999	return target;	999	return target;
1000	}	1000	}
Lines 1010-1032 Link Here
1010	*/	1010	*/
1011	String[] findCommandBinding(String command) {	1011	String[] findCommandBinding(String command) {
1012	Element data = Util.getPrimaryConfigurationData(helper);	1012	Element data = Util.getPrimaryConfigurationData(helper);
1013	Element ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N	1013	Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N
1014	if (ideActions == null) {	1014	if (ideActions == null) {
1015	return null;	1015	return null;
1016	}	1016	}
1017	String scriptName = "build.xml"; // NOI18N	1017	String scriptName = "build.xml"; // NOI18N
1018	for (Element action : Util.findSubElements(ideActions)) {	1018	for (Element action : XMLUtil.findSubElements(ideActions)) {
1019	assert action.getLocalName().equals("action");	1019	assert action.getLocalName().equals("action");
1020	if (action.getAttribute("name").equals(command)) {	1020	if (action.getAttribute("name").equals(command)) {
1021	Element script = Util.findElement(action, "script", Util.NAMESPACE); // NOI18N	1021	Element script = XMLUtil.findElement(action, "script", Util.NAMESPACE); // NOI18N
1022	if (script != null) {	1022	if (script != null) {
1023	scriptName = Util.findText(script);	1023	scriptName = XMLUtil.findText(script);
1024	}	1024	}
1025	List<String> scriptPlusTargetNames = new ArrayList<String>();	1025	List<String> scriptPlusTargetNames = new ArrayList<String>();
1026	scriptPlusTargetNames.add(scriptName);	1026	scriptPlusTargetNames.add(scriptName);
1027	for (Element target : Util.findSubElements(action)) {	1027	for (Element target : XMLUtil.findSubElements(action)) {
1028	if (target.getLocalName().equals("target")) { // NOI18N	1028	if (target.getLocalName().equals("target")) { // NOI18N
1029	scriptPlusTargetNames.add(Util.findText(target));	1029	scriptPlusTargetNames.add(XMLUtil.findText(target));
1030	}	1030	}
1031	}	1031	}
1032	if (scriptName.equals(JdkConfiguration.NBJDK_XML) && scriptPlusTargetNames.size() > 1) {	1032	if (scriptName.equals(JdkConfiguration.NBJDK_XML) && scriptPlusTargetNames.size() > 1) {
Lines 1069-1075 Link Here
1069	Element targetUsesTaskExactlyOnce(Element target, String taskName) {	1069	Element targetUsesTaskExactlyOnce(Element target, String taskName) {
1070	// XXX should maybe also look for any other usage of the task in the same script in case there is none in the mentioned target	1070	// XXX should maybe also look for any other usage of the task in the same script in case there is none in the mentioned target
1071	Element foundTask = null;	1071	Element foundTask = null;
1072	for (Element task : Util.findSubElements(target)) {	1072	for (Element task : XMLUtil.findSubElements(target)) {
1073	if (task.getLocalName().equals(taskName)) {	1073	if (task.getLocalName().equals(taskName)) {
1074	if (foundTask != null) {	1074	if (foundTask != null) {
1075	// Duplicate.	1075	// Duplicate.

Lines 47-53 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/JavaFreeformFileBuiltQuery.java (-4 / +4 lines)
47	import org.netbeans.api.project.Project;	47	import org.netbeans.api.project.Project;
48	import org.netbeans.api.project.ProjectManager;	48	import org.netbeans.api.project.ProjectManager;
49	import org.netbeans.api.queries.FileBuiltQuery.Status;	49	import org.netbeans.api.queries.FileBuiltQuery.Status;
50	import org.netbeans.modules.ant.freeform.spi.support.Util;
51	import org.netbeans.spi.project.AuxiliaryConfiguration;	50	import org.netbeans.spi.project.AuxiliaryConfiguration;
52	import org.netbeans.spi.project.support.ant.AntProjectEvent;	51	import org.netbeans.spi.project.support.ant.AntProjectEvent;
53	import org.netbeans.spi.project.support.ant.AntProjectHelper;	52	import org.netbeans.spi.project.support.ant.AntProjectHelper;
Lines 58-63 Link Here
58	import org.openide.filesystems.FileObject;	57	import org.openide.filesystems.FileObject;
59	import org.openide.filesystems.FileUtil;	58	import org.openide.filesystems.FileUtil;
60	import org.openide.util.Mutex;	59	import org.openide.util.Mutex;
		60	import org.openide.xml.XMLUtil;
61	import org.w3c.dom.Element;	61	import org.w3c.dom.Element;
62		62
63	/**	63	/**
Lines 99-105 Link Here
99	List<String> to = new ArrayList<String>();	99	List<String> to = new ArrayList<String>();
100		100
101	if (java != null) {	101	if (java != null) {
102	List<Element> compilationUnits = Util.findSubElements(java);	102	List<Element> compilationUnits = XMLUtil.findSubElements(java);
103	Iterator it = compilationUnits.iterator();	103	Iterator it = compilationUnits.iterator();
104	while (it.hasNext()) {	104	while (it.hasNext()) {
105	Element compilationUnitEl = (Element)it.next();	105	Element compilationUnitEl = (Element)it.next();
Lines 188-198 Link Here
188		188
189	static List<String> findBuiltToNames(Element compilationUnitEl) {	189	static List<String> findBuiltToNames(Element compilationUnitEl) {
190	List<String> names = new ArrayList<String>();	190	List<String> names = new ArrayList<String>();
191	for (Element e : Util.findSubElements(compilationUnitEl)) {	191	for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
192	if (!e.getLocalName().equals("built-to")) { // NOI18N	192	if (!e.getLocalName().equals("built-to")) { // NOI18N
193	continue;	193	continue;
194	}	194	}
195	String location = Util.findText(e);	195	String location = XMLUtil.findText(e);
196	names.add(location);	196	names.add(location);
197	}	197	}
198	return names;	198	return names;

Lines 50-56 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/SourceForBinaryQueryImpl.java (-4 / +4 lines)
50	import javax.swing.event.ChangeListener;	50	import javax.swing.event.ChangeListener;
51	import org.netbeans.api.java.queries.SourceForBinaryQuery;	51	import org.netbeans.api.java.queries.SourceForBinaryQuery;
52	import org.netbeans.api.project.ProjectManager;	52	import org.netbeans.api.project.ProjectManager;
53	import org.netbeans.modules.ant.freeform.spi.support.Util;
54	import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation;	53	import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation;
55	import org.netbeans.spi.project.AuxiliaryConfiguration;	54	import org.netbeans.spi.project.AuxiliaryConfiguration;
56	import org.netbeans.spi.project.support.ant.AntProjectEvent;	55	import org.netbeans.spi.project.support.ant.AntProjectEvent;
Lines 60-65 Link Here
60	import org.openide.filesystems.FileObject;	59	import org.openide.filesystems.FileObject;
61	import org.openide.filesystems.FileUtil;	60	import org.openide.filesystems.FileUtil;
62	import org.openide.util.Mutex;	61	import org.openide.util.Mutex;
		62	import org.openide.xml.XMLUtil;
63	import org.w3c.dom.Element;	63	import org.w3c.dom.Element;
64		64
65	/**	65	/**
Lines 100-106 Link Here
100	if (java == null) {	100	if (java == null) {
101	return null;	101	return null;
102	}	102	}
103	for (Element compilationUnit : Util.findSubElements(java)) {	103	for (Element compilationUnit : XMLUtil.findSubElements(java)) {
104	assert compilationUnit.getLocalName().equals("compilation-unit") : compilationUnit;	104	assert compilationUnit.getLocalName().equals("compilation-unit") : compilationUnit;
105	List<URL> binaries = findBinaries(compilationUnit);	105	List<URL> binaries = findBinaries(compilationUnit);
106	if (!binaries.isEmpty()) {	106	if (!binaries.isEmpty()) {
Lines 137-147 Link Here
137	*/	137	*/
138	private List<URL> findBinaries(Element compilationUnitEl) {	138	private List<URL> findBinaries(Element compilationUnitEl) {
139	List<URL> binaries = new ArrayList<URL>();	139	List<URL> binaries = new ArrayList<URL>();
140	for (Element builtToEl : Util.findSubElements(compilationUnitEl)) {	140	for (Element builtToEl : XMLUtil.findSubElements(compilationUnitEl)) {
141	if (!builtToEl.getLocalName().equals("built-to")) { // NOI18N	141	if (!builtToEl.getLocalName().equals("built-to")) { // NOI18N
142	continue;	142	continue;
143	}	143	}
144	String text = Util.findText(builtToEl);	144	String text = XMLUtil.findText(builtToEl);
145	String textEval = evaluator.evaluate(text);	145	String textEval = evaluator.evaluate(text);
146	if (textEval == null) {	146	if (textEval == null) {
147	continue;	147	continue;

Lines 50-56 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/UsageLogger.java (-4 / +4 lines)
50	import org.netbeans.api.project.ProjectUtils;	50	import org.netbeans.api.project.ProjectUtils;
51	import org.netbeans.modules.ant.freeform.spi.ProjectAccessor;	51	import org.netbeans.modules.ant.freeform.spi.ProjectAccessor;
52	import org.netbeans.modules.ant.freeform.spi.ProjectConstants;	52	import org.netbeans.modules.ant.freeform.spi.ProjectConstants;
53	import org.netbeans.modules.ant.freeform.spi.support.Util;
54	import org.netbeans.spi.project.AuxiliaryConfiguration;	53	import org.netbeans.spi.project.AuxiliaryConfiguration;
55	import org.netbeans.spi.project.support.ant.AntProjectHelper;	54	import org.netbeans.spi.project.support.ant.AntProjectHelper;
56	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	55	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
Lines 60-65 Link Here
60	import org.openide.util.Exceptions;	59	import org.openide.util.Exceptions;
61	import org.openide.util.NbBundle;	60	import org.openide.util.NbBundle;
62	import org.openide.util.RequestProcessor;	61	import org.openide.util.RequestProcessor;
		62	import org.openide.xml.XMLUtil;
63	import org.w3c.dom.Element;	63	import org.w3c.dom.Element;
64		64
65	/**	65	/**
Lines 110-127 Link Here
110	java = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_1, true);	110	java = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_1, true);
111	}	111	}
112	if (java != null) {	112	if (java != null) {
113	for (Element compilationUnitEl : Util.findSubElements(java)) {	113	for (Element compilationUnitEl : XMLUtil.findSubElements(java)) {
114	compilationUnits++;	114	compilationUnits++;
115	int builtTos = 0;	115	int builtTos = 0;
116	int roots = 0;	116	int roots = 0;
117	for (Element other : Util.findSubElements(compilationUnitEl)) {	117	for (Element other : XMLUtil.findSubElements(compilationUnitEl)) {
118	String name = other.getLocalName();	118	String name = other.getLocalName();
119	if (name.equals("package-root")) { // NOI18N	119	if (name.equals("package-root")) { // NOI18N
120	roots++;	120	roots++;
121	} else if (name.equals("built-to")) { // NOI18N	121	} else if (name.equals("built-to")) { // NOI18N
122	builtTos++;	122	builtTos++;
123	} else if (name.equals("classpath")) { // NOI18N	123	} else if (name.equals("classpath")) { // NOI18N
124	String text = Util.findText(other);	124	String text = XMLUtil.findText(other);
125	if (text != null) {	125	if (text != null) {
126	String textEval = eval.evaluate(text);	126	String textEval = eval.evaluate(text);
127	if (textEval != null) {	127	if (textEval != null) {

Lines 47-58 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/JavadocQuery.java (-6 / +6 lines)
47	import java.util.List;	47	import java.util.List;
48	import javax.swing.event.ChangeListener;	48	import javax.swing.event.ChangeListener;
49	import org.netbeans.api.java.queries.JavadocForBinaryQuery;	49	import org.netbeans.api.java.queries.JavadocForBinaryQuery;
50	import org.netbeans.modules.ant.freeform.spi.support.Util;
51	import org.netbeans.spi.java.queries.JavadocForBinaryQueryImplementation;	50	import org.netbeans.spi.java.queries.JavadocForBinaryQueryImplementation;
52	import org.netbeans.spi.project.AuxiliaryConfiguration;	51	import org.netbeans.spi.project.AuxiliaryConfiguration;
53	import org.netbeans.spi.project.support.ant.AntProjectHelper;	52	import org.netbeans.spi.project.support.ant.AntProjectHelper;
54	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	53	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
55	import org.openide.filesystems.FileUtil;	54	import org.openide.filesystems.FileUtil;
		55	import org.openide.xml.XMLUtil;
56	import org.w3c.dom.Element;	56	import org.w3c.dom.Element;
57		57
58	/**	58	/**
Lines 74-85 Link Here
74	public JavadocForBinaryQuery.Result findJavadoc(URL binaryRoot) {	74	public JavadocForBinaryQuery.Result findJavadoc(URL binaryRoot) {
75	Element data = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true);	75	Element data = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true);
76	if (data != null) {	76	if (data != null) {
77	for (Element cu : Util.findSubElements(data)) {	77	for (Element cu : XMLUtil.findSubElements(data)) {
78	assert cu.getLocalName().equals("compilation-unit") : cu;	78	assert cu.getLocalName().equals("compilation-unit") : cu;
79	boolean rightCU = false;	79	boolean rightCU = false;
80	for (Element builtTo : Util.findSubElements(cu)) {	80	for (Element builtTo : XMLUtil.findSubElements(cu)) {
81	if (builtTo.getLocalName().equals("built-to")) { // NOI18N	81	if (builtTo.getLocalName().equals("built-to")) { // NOI18N
82	String rawtext = Util.findText(builtTo);	82	String rawtext = XMLUtil.findText(builtTo);
83	assert rawtext != null;	83	assert rawtext != null;
84	String evaltext = eval.evaluate(rawtext);	84	String evaltext = eval.evaluate(rawtext);
85	if (evaltext != null) {	85	if (evaltext != null) {
Lines 95-103 Link Here
95	}	95	}
96	if (rightCU) {	96	if (rightCU) {
97	List<URL> resultURLs = new ArrayList<URL>();	97	List<URL> resultURLs = new ArrayList<URL>();
98	for (Element javadocTo : Util.findSubElements(cu)) {	98	for (Element javadocTo : XMLUtil.findSubElements(cu)) {
99	if (javadocTo.getLocalName().equals("javadoc-built-to")) { // NOI18N	99	if (javadocTo.getLocalName().equals("javadoc-built-to")) { // NOI18N
100	String rawtext = Util.findText(javadocTo);	100	String rawtext = XMLUtil.findText(javadocTo);
101	assert rawtext != null;	101	assert rawtext != null;
102	String evaltext = eval.evaluate(rawtext);	102	String evaltext = eval.evaluate(rawtext);
103	if (evaltext != null) {	103	if (evaltext != null) {

Lines 45-51 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/SourceLevelQueryImpl.java (-4 / +4 lines)
45	import java.util.Map;	45	import java.util.Map;
46	import java.util.WeakHashMap;	46	import java.util.WeakHashMap;
47	import org.netbeans.api.project.ProjectManager;	47	import org.netbeans.api.project.ProjectManager;
48	import org.netbeans.modules.ant.freeform.spi.support.Util;
49	import org.netbeans.spi.java.queries.SourceLevelQueryImplementation;	48	import org.netbeans.spi.java.queries.SourceLevelQueryImplementation;
50	import org.netbeans.spi.project.AuxiliaryConfiguration;	49	import org.netbeans.spi.project.AuxiliaryConfiguration;
51	import org.netbeans.spi.project.support.ant.AntProjectHelper;	50	import org.netbeans.spi.project.support.ant.AntProjectHelper;
Lines 54-59 Link Here
54	import org.openide.filesystems.FileObject;	53	import org.openide.filesystems.FileObject;
55	import org.openide.filesystems.FileUtil;	54	import org.openide.filesystems.FileUtil;
56	import org.openide.util.Mutex;	55	import org.openide.util.Mutex;
		56	import org.openide.xml.XMLUtil;
57	import org.w3c.dom.Element;	57	import org.w3c.dom.Element;
58		58
59	/**	59	/**
Lines 102-108 Link Here
102	if (java == null) {	102	if (java == null) {
103	return null;	103	return null;
104	}	104	}
105	for (Element compilationUnitEl : Util.findSubElements(java)) {	105	for (Element compilationUnitEl : XMLUtil.findSubElements(java)) {
106	assert compilationUnitEl.getLocalName().equals("compilation-unit") : compilationUnitEl;	106	assert compilationUnitEl.getLocalName().equals("compilation-unit") : compilationUnitEl;
107	List<FileObject> packageRoots = Classpaths.findPackageRoots(helper, evaluator, compilationUnitEl);	107	List<FileObject> packageRoots = Classpaths.findPackageRoots(helper, evaluator, compilationUnitEl);
108	for (FileObject root : packageRoots) {	108	for (FileObject root : packageRoots) {
Lines 133-141 Link Here
133	* Get the source level indicated in a compilation unit (or null if none is indicated).	133	* Get the source level indicated in a compilation unit (or null if none is indicated).
134	*/	134	*/
135	private String getLevel(Element compilationUnitEl) {	135	private String getLevel(Element compilationUnitEl) {
136	Element sourceLevelEl = Util.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_2);	136	Element sourceLevelEl = XMLUtil.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_2);
137	if (sourceLevelEl != null) {	137	if (sourceLevelEl != null) {
138	return Util.findText(sourceLevelEl);	138	return XMLUtil.findText(sourceLevelEl);
139	} else {	139	} else {
140	return null;	140	return null;
141	}	141	}

Lines 46-52 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/TestQuery.java (-5 / +5 lines)
46	import java.util.ArrayList;	46	import java.util.ArrayList;
47	import java.util.Arrays;	47	import java.util.Arrays;
48	import java.util.List;	48	import java.util.List;
49	import org.netbeans.modules.ant.freeform.spi.support.Util;
50	import org.netbeans.spi.java.queries.MultipleRootsUnitTestForSourceQueryImplementation;	49	import org.netbeans.spi.java.queries.MultipleRootsUnitTestForSourceQueryImplementation;
51	import org.netbeans.spi.project.AuxiliaryConfiguration;	50	import org.netbeans.spi.project.AuxiliaryConfiguration;
52	import org.netbeans.spi.project.support.ant.AntProjectHelper;	51	import org.netbeans.spi.project.support.ant.AntProjectHelper;
Lines 54-59 Link Here
54	import org.openide.filesystems.FileObject;	53	import org.openide.filesystems.FileObject;
55	import org.openide.filesystems.FileStateInvalidException;	54	import org.openide.filesystems.FileStateInvalidException;
56	import org.openide.filesystems.FileUtil;	55	import org.openide.filesystems.FileUtil;
		56	import org.openide.xml.XMLUtil;
57	import org.w3c.dom.Element;	57	import org.w3c.dom.Element;
58		58
59	/**	59	/**
Lines 117-128 Link Here
117	List<URL> tests = new ArrayList<URL>();	117	List<URL> tests = new ArrayList<URL>();
118	Element data = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true);	118	Element data = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true);
119	if (data != null) {	119	if (data != null) {
120	for (Element cu : Util.findSubElements(data)) {	120	for (Element cu : XMLUtil.findSubElements(data)) {
121	assert cu.getLocalName().equals("compilation-unit") : cu;	121	assert cu.getLocalName().equals("compilation-unit") : cu;
122	boolean isTests = Util.findElement(cu, "unit-tests", JavaProjectNature.NS_JAVA_2) != null; // NOI18N	122	boolean isTests = XMLUtil.findElement(cu, "unit-tests", JavaProjectNature.NS_JAVA_2) != null; // NOI18N
123	for (Element pr : Util.findSubElements(cu)) {	123	for (Element pr : XMLUtil.findSubElements(cu)) {
124	if (pr.getLocalName().equals("package-root")) { // NOI18N	124	if (pr.getLocalName().equals("package-root")) { // NOI18N
125	String rawtext = Util.findText(pr);	125	String rawtext = XMLUtil.findText(pr);
126	assert rawtext != null;	126	assert rawtext != null;
127	String evaltext = eval.evaluate(rawtext);	127	String evaltext = eval.evaluate(rawtext);
128	if (evaltext != null) {	128	if (evaltext != null) {

Lines 77-82 Link Here

(-)a/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/ClasspathsTest.java (-2 / +3 lines)
77	import org.openide.filesystems.FileObject;	77	import org.openide.filesystems.FileObject;
78	import org.openide.filesystems.FileUtil;	78	import org.openide.filesystems.FileUtil;
79	import org.openide.util.Mutex;	79	import org.openide.util.Mutex;
		80	import org.openide.xml.XMLUtil;
80	import org.w3c.dom.Document;	81	import org.w3c.dom.Document;
81	import org.w3c.dom.Element;	82	import org.w3c.dom.Element;
82		83
Lines 456-462 Link Here
456	FileUtil.createData(new File(d, "s/ignored/file"));	457	FileUtil.createData(new File(d, "s/ignored/file"));
457	Element data = Util.getPrimaryConfigurationData(helper);	458	Element data = Util.getPrimaryConfigurationData(helper);
458	Document doc = data.getOwnerDocument();	459	Document doc = data.getOwnerDocument();
459	Element sf = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), Util.findElement(data, "view", Util.NAMESPACE)).	460	Element sf = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), XMLUtil.findElement(data, "view", Util.NAMESPACE)).
460	appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));	461	appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));
461	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources"));	462	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources"));
462	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode(JavaProjectConstants.SOURCES_TYPE_JAVA));	463	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode(JavaProjectConstants.SOURCES_TYPE_JAVA));
Lines 547-553 Link Here
547	data.getElementsByTagName("properties").item(0).	548	data.getElementsByTagName("properties").item(0).
548	appendChild(doc.createElementNS(Util.NAMESPACE, "property-file")).	549	appendChild(doc.createElementNS(Util.NAMESPACE, "property-file")).
549	appendChild(doc.createTextNode("config.properties"));	550	appendChild(doc.createTextNode("config.properties"));
550	Element folders = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), Util.findElement(data, "view", Util.NAMESPACE));	551	Element folders = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), XMLUtil.findElement(data, "view", Util.NAMESPACE));
551	Element sf = (Element) folders.appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));	552	Element sf = (Element) folders.appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));
552	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources #1"));	553	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources #1"));
553	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode(JavaProjectConstants.SOURCES_TYPE_JAVA));	554	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode(JavaProjectConstants.SOURCES_TYPE_JAVA));

Lines 51-57 Link Here

(-)a/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/JavaActionsTest.java (-17 / +16 lines)
51	import java.util.Locale;	51	import java.util.Locale;
52	import org.netbeans.api.project.ProjectManager;	52	import org.netbeans.api.project.ProjectManager;
53	import org.netbeans.modules.ant.freeform.FreeformProject;	53	import org.netbeans.modules.ant.freeform.FreeformProject;
54	import org.netbeans.modules.ant.freeform.FreeformProjectType;
55	import org.netbeans.modules.ant.freeform.TestBase;	54	import org.netbeans.modules.ant.freeform.TestBase;
56	import org.netbeans.modules.ant.freeform.spi.support.Util;	55	import org.netbeans.modules.ant.freeform.spi.support.Util;
57	import org.netbeans.spi.project.ActionProvider;	56	import org.netbeans.spi.project.ActionProvider;
Lines 88-100 Link Here
88	prj = copyProject(simple);	87	prj = copyProject(simple);
89	// Remove existing context-sensitive bindings to make a clean slate.	88	// Remove existing context-sensitive bindings to make a clean slate.
90	Element data = prj.getPrimaryConfigurationData();	89	Element data = prj.getPrimaryConfigurationData();
91	Element ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE);	90	Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
92	assertNotNull(ideActions);	91	assertNotNull(ideActions);
93	Iterator<Element> actionsIt = Util.findSubElements(ideActions).iterator();	92	Iterator<Element> actionsIt = XMLUtil.findSubElements(ideActions).iterator();
94	while (actionsIt.hasNext()) {	93	while (actionsIt.hasNext()) {
95	Element action = actionsIt.next();	94	Element action = actionsIt.next();
96	assertEquals("action", action.getLocalName());	95	assertEquals("action", action.getLocalName());
97	if (Util.findElement(action, "context", Util.NAMESPACE) != null) {	96	if (XMLUtil.findElement(action, "context", Util.NAMESPACE) != null) {
98	ideActions.removeChild(action);	97	ideActions.removeChild(action);
99	}	98	}
100	}	99	}
Lines 209-217 Link Here
209	ja.addBinding("some.action", "special.xml", "special-target", "selection", "${some.src.dir}", "\\.java$", "relative-path", ",");	208	ja.addBinding("some.action", "special.xml", "special-target", "selection", "${some.src.dir}", "\\.java$", "relative-path", ",");
210	Element data = prj.getPrimaryConfigurationData();	209	Element data = prj.getPrimaryConfigurationData();
211	assertNotNull(data);	210	assertNotNull(data);
212	Element ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE);	211	Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
213	assertNotNull(ideActions);	212	assertNotNull(ideActions);
214	List<Element> actions = Util.findSubElements(ideActions);	213	List<Element> actions = XMLUtil.findSubElements(ideActions);
215	Element lastAction = actions.get(actions.size() - 1);	214	Element lastAction = actions.get(actions.size() - 1);
216	String expectedXml =	215	String expectedXml =
217	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +	216	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
Lines 231-238 Link Here
231	assertEquals(expectedXml, xmlToString(lastAction));	230	assertEquals(expectedXml, xmlToString(lastAction));
232	ja.addBinding("some.other.action", "special.xml", "special-target", "selection", "${some.src.dir}", null, "relative-path", null);	231	ja.addBinding("some.other.action", "special.xml", "special-target", "selection", "${some.src.dir}", null, "relative-path", null);
233	data = prj.getPrimaryConfigurationData();	232	data = prj.getPrimaryConfigurationData();
234	ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE);	233	ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
235	actions = Util.findSubElements(ideActions);	234	actions = XMLUtil.findSubElements(ideActions);
236	lastAction = actions.get(actions.size() - 1);	235	lastAction = actions.get(actions.size() - 1);
237	expectedXml =	236	expectedXml =
238	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +	237	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
Lines 252-259 Link Here
252	// Non-context-sensitive bindings have no <context> but need to add a view item.	251	// Non-context-sensitive bindings have no <context> but need to add a view item.
253	ja.addBinding("general.action", "special.xml", "special-target", null, null, null, null, null);	252	ja.addBinding("general.action", "special.xml", "special-target", null, null, null, null, null);
254	data = prj.getPrimaryConfigurationData();	253	data = prj.getPrimaryConfigurationData();
255	ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE);	254	ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
256	actions = Util.findSubElements(ideActions);	255	actions = XMLUtil.findSubElements(ideActions);
257	lastAction = actions.get(actions.size() - 1);	256	lastAction = actions.get(actions.size() - 1);
258	expectedXml =	257	expectedXml =
259	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +	258	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
Lines 262-273 Link Here
262	" <target>special-target</target>\n" +	261	" <target>special-target</target>\n" +
263	"</action>\n";	262	"</action>\n";
264	assertEquals(expectedXml, xmlToString(lastAction));	263	assertEquals(expectedXml, xmlToString(lastAction));
265	Element view = Util.findElement(data, "view", Util.NAMESPACE);	264	Element view = XMLUtil.findElement(data, "view", Util.NAMESPACE);
266	assertNotNull(view);	265	assertNotNull(view);
267	Element contextMenu = Util.findElement(view, "context-menu", Util.NAMESPACE);	266	Element contextMenu = XMLUtil.findElement(view, "context-menu", Util.NAMESPACE);
268	assertNotNull(contextMenu);	267	assertNotNull(contextMenu);
269	// Currently (no FPG to help) it is always added as the last item.	268	// Currently (no FPG to help) it is always added as the last item.
270	List<Element> contextMenuActions = Util.findSubElements(contextMenu);	269	List<Element> contextMenuActions = XMLUtil.findSubElements(contextMenu);
271	Element lastContextMenuAction = contextMenuActions.get(contextMenuActions.size() - 1);	270	Element lastContextMenuAction = contextMenuActions.get(contextMenuActions.size() - 1);
272	expectedXml =	271	expectedXml =
273	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +	272	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
Lines 276-288 Link Here
276		275
277	//test #58442:	276	//test #58442:
278	data = prj.getPrimaryConfigurationData();	277	data = prj.getPrimaryConfigurationData();
279	ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE);	278	ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
280	data.removeChild(ideActions);	279	data.removeChild(ideActions);
281		280
282	ja.addBinding("some.other.action", "special.xml", "special-target", "selection", "${some.src.dir}", null, "relative-path", null);	281	ja.addBinding("some.other.action", "special.xml", "special-target", "selection", "${some.src.dir}", null, "relative-path", null);
283	data = prj.getPrimaryConfigurationData();	282	data = prj.getPrimaryConfigurationData();
284	ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE);	283	ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
285	actions = Util.findSubElements(ideActions);	284	actions = XMLUtil.findSubElements(ideActions);
286	lastAction = actions.get(actions.size() - 1);	285	lastAction = actions.get(actions.size() - 1);
287	expectedXml =	286	expectedXml =
288	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +	287	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
Lines 460-466 Link Here
460	assertEquals("Correct code generated for external script", expectedXml, xmlToString(root));	459	assertEquals("Correct code generated for external script", expectedXml, xmlToString(root));
461	// And also with locations defined as special properties in various ways...	460	// And also with locations defined as special properties in various ways...
462	Element data = prj.getPrimaryConfigurationData();	461	Element data = prj.getPrimaryConfigurationData();
463	Element properties = Util.findElement(data, "properties", Util.NAMESPACE);	462	Element properties = XMLUtil.findElement(data, "properties", Util.NAMESPACE);
464	assertNotNull(properties);	463	assertNotNull(properties);
465	Element property = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "property");	464	Element property = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "property");
466	property.setAttribute("name", "external.xml");	465	property.setAttribute("name", "external.xml");