diff --git a/java.freeform/src/org/netbeans/modules/java/freeform/Classpaths.java b/java.freeform/src/org/netbeans/modules/java/freeform/Classpaths.java --- a/java.freeform/src/org/netbeans/modules/java/freeform/Classpaths.java +++ b/java.freeform/src/org/netbeans/modules/java/freeform/Classpaths.java @@ -88,6 +88,7 @@ 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; /** @@ -192,7 +193,7 @@ if (java == null) { return null; } - List compilationUnits = Util.findSubElements(java); + List compilationUnits = XMLUtil.findSubElements(java); it = compilationUnits.iterator(); while (it.hasNext()) { Element compilationUnitEl = (Element)it.next(); @@ -256,7 +257,7 @@ if (java == null) { return; } - for (Element compilationUnitEl : Util.findSubElements(java)) { + for (Element compilationUnitEl : XMLUtil.findSubElements(java)) { assert compilationUnitEl.getLocalName().equals("compilation-unit") : compilationUnitEl; // For each compilation unit, find the package roots first. List packageRoots = findPackageRoots(helper, evaluator, compilationUnitEl); @@ -335,13 +336,13 @@ static List findPackageRootNames(Element compilationUnitEl) { List names = new ArrayList(); - Iterator it = Util.findSubElements(compilationUnitEl).iterator(); + Iterator it = XMLUtil.findSubElements(compilationUnitEl).iterator(); while (it.hasNext()) { Element e = (Element) it.next(); if (!e.getLocalName().equals("package-root")) { // NOI18N continue; } - String location = Util.findText(e); + String location = XMLUtil.findText(e); names.add(location); } return names; @@ -418,7 +419,7 @@ } private List createCompileClasspath(Element compilationUnitEl) { - for (Element e : Util.findSubElements(compilationUnitEl)) { + for (Element e : XMLUtil.findSubElements(compilationUnitEl)) { if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("compile")) { // NOI18N return createClasspath(e); } @@ -431,7 +432,7 @@ * Create a classpath from a <classpath> element. */ private List createClasspath(Element classpathEl) { - String cp = Util.findText(classpathEl); + String cp = XMLUtil.findText(classpathEl); if (cp == null) { cp = ""; } @@ -453,7 +454,7 @@ } private List createExecuteClasspath(List packageRoots, Element compilationUnitEl) { - for (Element e : Util.findSubElements(compilationUnitEl)) { + for (Element e : XMLUtil.findSubElements(compilationUnitEl)) { if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("execute")) { // NOI18N return createClasspath(e); } @@ -463,12 +464,12 @@ List urls = new ArrayList(); urls.addAll(createCompileClasspath(compilationUnitEl)); boolean foundBuiltTos = false; - for (Element builtTo : Util.findSubElements(compilationUnitEl)) { + for (Element builtTo : XMLUtil.findSubElements(compilationUnitEl)) { if (!builtTo.getLocalName().equals("built-to")) { // NOI18N continue; } foundBuiltTos = true; - String rawtext = Util.findText(builtTo); + String rawtext = XMLUtil.findText(builtTo); assert rawtext != null : "Must have nonempty text inside "; String text = evaluator.evaluate(rawtext); if (text == null) { @@ -483,7 +484,7 @@ } private List createBootClasspath(Element compilationUnitEl) { - for (Element e : Util.findSubElements(compilationUnitEl)) { + for (Element e : XMLUtil.findSubElements(compilationUnitEl)) { if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("boot")) { // NOI18N return createClasspath(e); } @@ -558,7 +559,7 @@ if (java == null) { return null; } - List compilationUnits = Util.findSubElements(java); + List compilationUnits = XMLUtil.findSubElements(java); Iterator it = compilationUnits.iterator(); while (it.hasNext()) { Element compilationUnitEl = (Element)it.next(); @@ -665,28 +666,28 @@ rootFolder = null; } Element genldata = Util.getPrimaryConfigurationData(helper); - Element foldersE = Util.findElement(genldata, "folders", Util.NAMESPACE); // NOI18N + Element foldersE = XMLUtil.findElement(genldata, "folders", Util.NAMESPACE); // NOI18N if (foldersE != null) { - for (Element folderE : Util.findSubElements(foldersE)) { + for (Element folderE : XMLUtil.findSubElements(foldersE)) { if (folderE.getLocalName().equals("source-folder")) { - Element typeE = Util.findElement(folderE, "type", Util.NAMESPACE); // NOI18N + Element typeE = XMLUtil.findElement(folderE, "type", Util.NAMESPACE); // NOI18N if (typeE != null) { - String type = Util.findText(typeE); + String type = XMLUtil.findText(typeE); if (type.equals(JavaProjectConstants.SOURCES_TYPE_JAVA)) { - Element locationE = Util.findElement(folderE, "location", Util.NAMESPACE); // NOI18N - String location = evaluator.evaluate(Util.findText(locationE)); + 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 = Util.findElement(folderE, "includes", Util.NAMESPACE); // NOI18N + Element includesE = XMLUtil.findElement(folderE, "includes", Util.NAMESPACE); // NOI18N if (includesE != null) { - incl = evaluator.evaluate(Util.findText(includesE)); + incl = evaluator.evaluate(XMLUtil.findText(includesE)); if (incl != null && incl.matches("\\$\\{[^}]+\\}")) { // NOI18N // Clearly intended to mean "include everything". incl = null; } } - Element excludesE = Util.findElement(folderE, "excludes", Util.NAMESPACE); // NOI18N + Element excludesE = XMLUtil.findElement(folderE, "excludes", Util.NAMESPACE); // NOI18N if (excludesE != null) { - excl = evaluator.evaluate(Util.findText(excludesE)); + excl = evaluator.evaluate(XMLUtil.findText(excludesE)); } } } diff --git a/java.freeform/src/org/netbeans/modules/java/freeform/JavaActions.java b/java.freeform/src/org/netbeans/modules/java/freeform/JavaActions.java --- a/java.freeform/src/org/netbeans/modules/java/freeform/JavaActions.java +++ b/java.freeform/src/org/netbeans/modules/java/freeform/JavaActions.java @@ -506,19 +506,19 @@ antProject.setAttribute("basedir", /* ".." times count('/', FILE_SCRIPT_PATH) */".."); // NOI18N // Look for in project.xml and make corresponding definitions in the Ant script. Element data = Util.getPrimaryConfigurationData(helper); - Element properties = Util.findElement(data, "properties", Util.NAMESPACE); + Element properties = XMLUtil.findElement(data, "properties", Util.NAMESPACE); if (properties != null) { - for (Element el : Util.findSubElements(properties)) { + 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 = Util.findText(el); + 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 = Util.findText(el); + String text = XMLUtil.findText(el); assert text != null; nue.setAttribute("file", text); } else { @@ -615,7 +615,7 @@ if (java == null) { return Collections.emptyList(); } - return Util.findSubElements(java); + return XMLUtil.findSubElements(java); } /** @@ -684,9 +684,9 @@ */ private Element findCompilationUnit(String sources) { for (Element compilationUnitEl : compilationUnits()) { - for (Element packageRoot : Util.findSubElements(compilationUnitEl)) { + for (Element packageRoot : XMLUtil.findSubElements(compilationUnitEl)) { if (packageRoot.getLocalName().equals("package-root")) { // NOI18N - if (Util.findText(packageRoot).equals(sources)) { + if (XMLUtil.findText(packageRoot).equals(sources)) { return compilationUnitEl; } } @@ -714,9 +714,9 @@ */ private String findClassesOutputDir(Element compilationUnitEl) { // Look for an appropriate . - for (Element builtTo : Util.findSubElements(compilationUnitEl)) { + for (Element builtTo : XMLUtil.findSubElements(compilationUnitEl)) { if (builtTo.getLocalName().equals("built-to")) { // NOI18N - String rawtext = Util.findText(builtTo); + String rawtext = XMLUtil.findText(builtTo); // Check that it is not an archive. String evaltext = evaluator.evaluate(rawtext); if (evaltext != null) { @@ -745,9 +745,9 @@ String findSourceLevel(String sources) { Element compilationUnitEl = findCompilationUnit(sources); if (compilationUnitEl != null) { - Element sourceLevel = Util.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_2); + Element sourceLevel = XMLUtil.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_2); if (sourceLevel != null) { - return Util.findText(sourceLevel); + return XMLUtil.findText(sourceLevel); } } return null; @@ -761,11 +761,11 @@ String findCUClasspath(String sources, String moud) { Element compilationUnitEl = findCompilationUnit(sources); if (compilationUnitEl != null) { - for (Element classpath : Util.findSubElements(compilationUnitEl)) { + for (Element classpath : XMLUtil.findSubElements(compilationUnitEl)) { if (classpath.getLocalName().equals("classpath")) { // NOI18N String mode = classpath.getAttribute("mode"); // NOI18N if (mode.equals(moud)) { - return Util.findText(classpath); + return XMLUtil.findText(classpath); } } } @@ -810,11 +810,11 @@ // 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 = Util.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N + 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 - Util.appendChildElement(data, ideActions, rootElementsOrder); + XMLUtil.appendChildElement(data, ideActions, rootElementsOrder); } Document doc = data.getOwnerDocument(); Element action = doc.createElementNS(Util.NAMESPACE, "action"); // NOI18N @@ -854,9 +854,9 @@ } else { // Add a context menu item, since it applies to the project as a whole. // Assume there is already a defined, which is quite likely. - Element view = Util.findElement(data, "view", Util.NAMESPACE); // NOI18N + Element view = XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N if (view != null) { - Element contextMenu = Util.findElement(view, "context-menu", Util.NAMESPACE); // NOI18N + 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 @@ -994,7 +994,7 @@ return null; } } - for (Element target : Util.findSubElements(doc.getDocumentElement())) { + for (Element target : XMLUtil.findSubElements(doc.getDocumentElement())) { if (target.getLocalName().equals("target") && targetName.equals(target.getAttribute("name"))) { // NOI18N return target; } @@ -1010,23 +1010,23 @@ */ String[] findCommandBinding(String command) { Element data = Util.getPrimaryConfigurationData(helper); - Element ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N + Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N if (ideActions == null) { return null; } String scriptName = "build.xml"; // NOI18N - for (Element action : Util.findSubElements(ideActions)) { + for (Element action : XMLUtil.findSubElements(ideActions)) { assert action.getLocalName().equals("action"); if (action.getAttribute("name").equals(command)) { - Element script = Util.findElement(action, "script", Util.NAMESPACE); // NOI18N + Element script = XMLUtil.findElement(action, "script", Util.NAMESPACE); // NOI18N if (script != null) { - scriptName = Util.findText(script); + scriptName = XMLUtil.findText(script); } List scriptPlusTargetNames = new ArrayList(); scriptPlusTargetNames.add(scriptName); - for (Element target : Util.findSubElements(action)) { + for (Element target : XMLUtil.findSubElements(action)) { if (target.getLocalName().equals("target")) { // NOI18N - scriptPlusTargetNames.add(Util.findText(target)); + scriptPlusTargetNames.add(XMLUtil.findText(target)); } } if (scriptName.equals(JdkConfiguration.NBJDK_XML) && scriptPlusTargetNames.size() > 1) { @@ -1069,7 +1069,7 @@ 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 : Util.findSubElements(target)) { + for (Element task : XMLUtil.findSubElements(target)) { if (task.getLocalName().equals(taskName)) { if (foundTask != null) { // Duplicate. diff --git a/java.freeform/src/org/netbeans/modules/java/freeform/JavaFreeformFileBuiltQuery.java b/java.freeform/src/org/netbeans/modules/java/freeform/JavaFreeformFileBuiltQuery.java --- a/java.freeform/src/org/netbeans/modules/java/freeform/JavaFreeformFileBuiltQuery.java +++ b/java.freeform/src/org/netbeans/modules/java/freeform/JavaFreeformFileBuiltQuery.java @@ -47,7 +47,6 @@ 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; @@ -58,6 +57,7 @@ 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; /** @@ -99,7 +99,7 @@ List to = new ArrayList(); if (java != null) { - List compilationUnits = Util.findSubElements(java); + List compilationUnits = XMLUtil.findSubElements(java); Iterator it = compilationUnits.iterator(); while (it.hasNext()) { Element compilationUnitEl = (Element)it.next(); @@ -188,11 +188,11 @@ static List findBuiltToNames(Element compilationUnitEl) { List names = new ArrayList(); - for (Element e : Util.findSubElements(compilationUnitEl)) { + for (Element e : XMLUtil.findSubElements(compilationUnitEl)) { if (!e.getLocalName().equals("built-to")) { // NOI18N continue; } - String location = Util.findText(e); + String location = XMLUtil.findText(e); names.add(location); } return names; diff --git a/java.freeform/src/org/netbeans/modules/java/freeform/JavaProjectGenerator.java b/java.freeform/src/org/netbeans/modules/java/freeform/JavaProjectGenerator.java --- a/java.freeform/src/org/netbeans/modules/java/freeform/JavaProjectGenerator.java +++ b/java.freeform/src/org/netbeans/modules/java/freeform/JavaProjectGenerator.java @@ -59,6 +59,7 @@ 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; @@ -112,38 +113,38 @@ //assert ProjectManager.mutex().isReadAccess() || ProjectManager.mutex().isWriteAccess(); List list = new ArrayList(); Element data = Util.getPrimaryConfigurationData(helper); - Element foldersEl = Util.findElement(data, "folders", Util.NAMESPACE); // NOI18N + Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N if (foldersEl == null) { return list; } - for (Element sourceFolderEl : Util.findSubElements(foldersEl)) { + for (Element sourceFolderEl : XMLUtil.findSubElements(foldersEl)) { if (!sourceFolderEl.getLocalName().equals("source-folder")) { // NOI18N continue; } SourceFolder sf = new SourceFolder(); - Element el = Util.findElement(sourceFolderEl, "label", Util.NAMESPACE); // NOI18N + Element el = XMLUtil.findElement(sourceFolderEl, "label", Util.NAMESPACE); // NOI18N if (el != null) { - sf.label = Util.findText(el); + sf.label = XMLUtil.findText(el); } - el = Util.findElement(sourceFolderEl, "type", Util.NAMESPACE); // NOI18N + el = XMLUtil.findElement(sourceFolderEl, "type", Util.NAMESPACE); // NOI18N if (el != null) { - sf.type = Util.findText(el); + sf.type = XMLUtil.findText(el); } - el = Util.findElement(sourceFolderEl, "location", Util.NAMESPACE); // NOI18N + el = XMLUtil.findElement(sourceFolderEl, "location", Util.NAMESPACE); // NOI18N if (el != null) { - sf.location = Util.findText(el); + sf.location = XMLUtil.findText(el); } - el = Util.findElement(sourceFolderEl, "includes", Util.NAMESPACE); // NOI18N + el = XMLUtil.findElement(sourceFolderEl, "includes", Util.NAMESPACE); // NOI18N if (el != null) { - sf.includes = Util.findText(el); + sf.includes = XMLUtil.findText(el); } - el = Util.findElement(sourceFolderEl, "excludes", Util.NAMESPACE); // NOI18N + el = XMLUtil.findElement(sourceFolderEl, "excludes", Util.NAMESPACE); // NOI18N if (el != null) { - sf.excludes = Util.findText(el); + sf.excludes = XMLUtil.findText(el); } - el = Util.findElement(sourceFolderEl, "encoding", Util.NAMESPACE); // NOI18N + el = XMLUtil.findElement(sourceFolderEl, "encoding", Util.NAMESPACE); // NOI18N if (el != null) { - sf.encoding = Util.findText(el); + sf.encoding = XMLUtil.findText(el); } if (type == null || type.equals(sf.type)) { if (sf.label == null || sf.label.length() == 0) { @@ -172,21 +173,21 @@ //assert ProjectManager.mutex().isWriteAccess(); Element data = Util.getPrimaryConfigurationData(helper); Document doc = data.getOwnerDocument(); - Element foldersEl = Util.findElement(data, "folders", Util.NAMESPACE); // NOI18N + Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N if (foldersEl == null) { foldersEl = doc.createElementNS(Util.NAMESPACE, "folders"); // NOI18N - Util.appendChildElement(data, foldersEl, rootElementsOrder); + XMLUtil.appendChildElement(data, foldersEl, rootElementsOrder); } else { - for (Element sourceFolderEl : Util.findSubElements(foldersEl)) { + for (Element sourceFolderEl : XMLUtil.findSubElements(foldersEl)) { if (!sourceFolderEl.getLocalName().equals("source-folder")) { // NOI18N continue; } if (type == null) { foldersEl.removeChild(sourceFolderEl); } else { - Element typeEl = Util.findElement(sourceFolderEl, "type", Util.NAMESPACE); // NOI18N + Element typeEl = XMLUtil.findElement(sourceFolderEl, "type", Util.NAMESPACE); // NOI18N if (typeEl != null) { - String typeElValue = Util.findText(typeEl); + String typeElValue = XMLUtil.findText(typeEl); if (type.equals(typeElValue)) { foldersEl.removeChild(sourceFolderEl); } @@ -231,7 +232,7 @@ el.appendChild(doc.createTextNode(sf.encoding)); // NOI18N sourceFolderEl.appendChild(el); } - Util.appendChildElement(foldersEl, sourceFolderEl, folderElementsOrder); + XMLUtil.appendChildElement(foldersEl, sourceFolderEl, folderElementsOrder); } Util.putPrimaryConfigurationData(helper, data); } @@ -248,36 +249,36 @@ //assert ProjectManager.mutex().isReadAccess() || ProjectManager.mutex().isWriteAccess(); List list = new ArrayList(); Element data = Util.getPrimaryConfigurationData(helper); - Element viewEl = Util.findElement(data, "view", Util.NAMESPACE); // NOI18N + Element viewEl =XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N if (viewEl == null) { return list; } - Element itemsEl = Util.findElement(viewEl, "items", Util.NAMESPACE); // NOI18N + Element itemsEl = XMLUtil.findElement(viewEl, "items", Util.NAMESPACE); // NOI18N if (itemsEl == null) { return list; } - for (Element sourceFolderEl : Util.findSubElements(itemsEl)) { + 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 in " + helper; // NOI18N - Element el = Util.findElement(sourceFolderEl, "label", Util.NAMESPACE); // NOI18N + Element el = XMLUtil.findElement(sourceFolderEl, "label", Util.NAMESPACE); // NOI18N if (el != null) { - sf.label = Util.findText(el); + sf.label = XMLUtil.findText(el); } - el = Util.findElement(sourceFolderEl, "location", Util.NAMESPACE); // NOI18N + el = XMLUtil.findElement(sourceFolderEl, "location", Util.NAMESPACE); // NOI18N if (el != null) { - sf.location = Util.findText(el); + sf.location = XMLUtil.findText(el); } - el = Util.findElement(sourceFolderEl, "includes", Util.NAMESPACE); // NOI18N + el = XMLUtil.findElement(sourceFolderEl, "includes", Util.NAMESPACE); // NOI18N if (el != null) { - sf.includes = Util.findText(el); + sf.includes = XMLUtil.findText(el); } - el = Util.findElement(sourceFolderEl, "excludes", Util.NAMESPACE); // NOI18N + el = XMLUtil.findElement(sourceFolderEl, "excludes", Util.NAMESPACE); // NOI18N if (el != null) { - sf.excludes = Util.findText(el); + sf.excludes = XMLUtil.findText(el); } if (style == null || style.equals(sf.style)) { list.add(sf); @@ -299,20 +300,20 @@ */ public static void putSourceViews(AntProjectHelper helper, List sources, String style) { //assert ProjectManager.mutex().isWriteAccess(); - ArrayList list = new ArrayList(); + //ArrayList list = new ArrayList(); Element data = Util.getPrimaryConfigurationData(helper); Document doc = data.getOwnerDocument(); - Element viewEl = Util.findElement(data, "view", Util.NAMESPACE); // NOI18N + Element viewEl = XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N if (viewEl == null) { viewEl = doc.createElementNS(Util.NAMESPACE, "view"); // NOI18N - Util.appendChildElement(data, viewEl, rootElementsOrder); + XMLUtil.appendChildElement(data, viewEl, rootElementsOrder); } - Element itemsEl = Util.findElement(viewEl, "items", Util.NAMESPACE); // NOI18N + Element itemsEl = XMLUtil.findElement(viewEl, "items", Util.NAMESPACE); // NOI18N if (itemsEl == null) { itemsEl = doc.createElementNS(Util.NAMESPACE, "items"); // NOI18N - Util.appendChildElement(viewEl, itemsEl, viewElementsOrder); + XMLUtil.appendChildElement(viewEl, itemsEl, viewElementsOrder); } - List sourceViews = Util.findSubElements(itemsEl); + List sourceViews = XMLUtil.findSubElements(itemsEl); Iterator it = sourceViews.iterator(); while (it.hasNext()) { Element sourceViewEl = (Element)it.next(); @@ -354,7 +355,7 @@ el.appendChild(doc.createTextNode(sf.excludes)); // NOI18N sourceFolderEl.appendChild(el); } - Util.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder); + XMLUtil.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder); } Util.putPrimaryConfigurationData(helper, data); } @@ -377,20 +378,20 @@ if (data == null) { return list; } - for (Element cuEl : Util.findSubElements(data)) { + for (Element cuEl : XMLUtil.findSubElements(data)) { JavaCompilationUnit cu = new JavaCompilationUnit(); List outputs = new ArrayList(); List javadoc = new ArrayList(); List cps = new ArrayList(); List packageRoots = new ArrayList(); - for (Element el : Util.findSubElements(cuEl)) { + for (Element el : XMLUtil.findSubElements(cuEl)) { if (el.getLocalName().equals("package-root")) { // NOI18N - packageRoots.add(Util.findText(el)); + packageRoots.add(XMLUtil.findText(el)); continue; } if (el.getLocalName().equals("classpath")) { // NOI18N JavaCompilationUnit.CP cp = new JavaCompilationUnit.CP(); - cp.classpath = Util.findText(el); + cp.classpath = XMLUtil.findText(el); cp.mode = el.getAttribute("mode"); // NOI18N if (cp.mode != null && cp.classpath != null) { cps.add(cp); @@ -398,15 +399,15 @@ continue; } if (el.getLocalName().equals("built-to")) { // NOI18N - outputs.add(Util.findText(el)); + outputs.add(XMLUtil.findText(el)); continue; } if (el.getLocalName().equals("javadoc-built-to")) { // NOI18N - javadoc.add(Util.findText(el)); + javadoc.add(XMLUtil.findText(el)); continue; } if (el.getLocalName().equals("source-level")) { // NOI18N - cu.sourceLevel = Util.findText(el); + cu.sourceLevel = XMLUtil.findText(el); } if (el.getLocalName().equals("unit-tests")) { // NOI18N cu.isTests = true; @@ -463,7 +464,7 @@ } } Document doc = data.getOwnerDocument(); - for (Element cuEl : Util.findSubElements(data)) { + for (Element cuEl : XMLUtil.findSubElements(data)) { data.removeChild(cuEl); } for (JavaCompilationUnit cu : compUnits) { @@ -614,10 +615,10 @@ */ public static void putExports(AntProjectHelper helper, List exports) { //assert ProjectManager.mutex().isWriteAccess(); - ArrayList list = new ArrayList(); + //ArrayList list = new ArrayList(); Element data = Util.getPrimaryConfigurationData(helper); Document doc = data.getOwnerDocument(); - Iterator it = Util.findSubElements(data).iterator(); + Iterator it = XMLUtil.findSubElements(data).iterator(); while (it.hasNext()) { Element exportEl = (Element)it.next(); if (!exportEl.getLocalName().equals("export")) { // NOI18N @@ -649,7 +650,7 @@ el.appendChild(doc.createTextNode(export.cleanTarget)); // NOI18N exportEl.appendChild(el); } - Util.appendChildElement(data, exportEl, rootElementsOrder); + XMLUtil.appendChildElement(data, exportEl, rootElementsOrder); } Util.putPrimaryConfigurationData(helper, data); } @@ -694,15 +695,15 @@ */ public static void putSubprojects(AntProjectHelper helper, List subprojects) { //assert ProjectManager.mutex().isWriteAccess(); - ArrayList list = new ArrayList(); + //ArrayList list = new ArrayList(); Element data = Util.getPrimaryConfigurationData(helper); Document doc = data.getOwnerDocument(); - Element subproject = Util.findElement(data, "subprojects", Util.NAMESPACE); // NOI18N + Element subproject = XMLUtil.findElement(data, "subprojects", Util.NAMESPACE); // NOI18N if (subproject != null) { data.removeChild(subproject); } subproject = doc.createElementNS(Util.NAMESPACE, "subprojects"); // NOI18N - Util.appendChildElement(data, subproject, rootElementsOrder); + XMLUtil.appendChildElement(data, subproject, rootElementsOrder); Iterator it = subprojects.iterator(); while (it.hasNext()) { @@ -780,12 +781,12 @@ private static void putBuildElement(AntProjectHelper helper, List buildFolders, String elemName) { Element data = Util.getPrimaryConfigurationData(helper); Document doc = data.getOwnerDocument(); - Element foldersEl = Util.findElement(data, "folders", Util.NAMESPACE); // NOI18N + Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N if (foldersEl == null) { foldersEl = doc.createElementNS(Util.NAMESPACE, "folders"); // NOI18N - Util.appendChildElement(data, foldersEl, rootElementsOrder); + XMLUtil.appendChildElement(data, foldersEl, rootElementsOrder); } else { - List folders = Util.findSubElements(foldersEl); + List folders = XMLUtil.findSubElements(foldersEl); Iterator it = folders.iterator(); while (it.hasNext()) { Element buildFolderEl = (Element)it.next(); @@ -802,7 +803,7 @@ Element locationEl = doc.createElementNS(Util.NAMESPACE, "location"); // NOI18N locationEl.appendChild(doc.createTextNode(location)); buildFolderEl.appendChild(locationEl); - Util.appendChildElement(foldersEl, buildFolderEl, folderElementsOrder); + XMLUtil.appendChildElement(foldersEl, buildFolderEl, folderElementsOrder); } Util.putPrimaryConfigurationData(helper, data); } @@ -861,47 +862,47 @@ //assert ProjectManager.mutex().isReadAccess() || ProjectManager.mutex().isWriteAccess(); List list = new ArrayList(); Element genldata = Util.getPrimaryConfigurationData(helper); - Element actionsEl = Util.findElement(genldata, "ide-actions", Util.NAMESPACE); // NOI18N + Element actionsEl = XMLUtil.findElement(genldata, "ide-actions", Util.NAMESPACE); // NOI18N if (actionsEl == null) { return list; } - for (Element actionEl : Util.findSubElements(actionsEl)) { + for (Element actionEl : XMLUtil.findSubElements(actionsEl)) { TargetMapping tm = new TargetMapping(); tm.name = actionEl.getAttribute("name"); // NOI18N List targetNames = new ArrayList(); EditableProperties props = new EditableProperties(false); - for (Element subEl : Util.findSubElements(actionEl)) { + for (Element subEl : XMLUtil.findSubElements(actionEl)) { if (subEl.getLocalName().equals("target")) { // NOI18N - targetNames.add(Util.findText(subEl)); + targetNames.add(XMLUtil.findText(subEl)); continue; } if (subEl.getLocalName().equals("script")) { // NOI18N - tm.script = Util.findText(subEl); + tm.script = XMLUtil.findText(subEl); continue; } if (subEl.getLocalName().equals("context")) { // NOI18N TargetMapping.Context ctx = new TargetMapping.Context(); - for (Element contextSubEl : Util.findSubElements(subEl)) { + for (Element contextSubEl : XMLUtil.findSubElements(subEl)) { if (contextSubEl.getLocalName().equals("property")) { // NOI18N - ctx.property = Util.findText(contextSubEl); + ctx.property = XMLUtil.findText(contextSubEl); continue; } if (contextSubEl.getLocalName().equals("format")) { // NOI18N - ctx.format = Util.findText(contextSubEl); + ctx.format = XMLUtil.findText(contextSubEl); continue; } if (contextSubEl.getLocalName().equals("folder")) { // NOI18N - ctx.folder = Util.findText(contextSubEl); + ctx.folder = XMLUtil.findText(contextSubEl); continue; } if (contextSubEl.getLocalName().equals("pattern")) { // NOI18N - ctx.pattern = Util.findText(contextSubEl); + ctx.pattern = XMLUtil.findText(contextSubEl); continue; } if (contextSubEl.getLocalName().equals("arity")) { // NOI18N - Element sepFilesEl = Util.findElement(contextSubEl, "separated-files", Util.NAMESPACE); // NOI18N + Element sepFilesEl = XMLUtil.findElement(contextSubEl, "separated-files", Util.NAMESPACE); // NOI18N if (sepFilesEl != null) { - ctx.separator = Util.findText(sepFilesEl); + ctx.separator = XMLUtil.findText(sepFilesEl); } continue; } @@ -955,7 +956,7 @@ private static void readProperty(Element propertyElement, EditableProperties props) { String key = propertyElement.getAttribute("name"); // NOI18N - String value = Util.findText(propertyElement); + String value = XMLUtil.findText(propertyElement); props.setProperty(key, value); } diff --git a/java.freeform/src/org/netbeans/modules/java/freeform/JavadocQuery.java b/java.freeform/src/org/netbeans/modules/java/freeform/JavadocQuery.java --- a/java.freeform/src/org/netbeans/modules/java/freeform/JavadocQuery.java +++ b/java.freeform/src/org/netbeans/modules/java/freeform/JavadocQuery.java @@ -47,12 +47,12 @@ 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; /** @@ -74,12 +74,12 @@ public JavadocForBinaryQuery.Result findJavadoc(URL binaryRoot) { Element data = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true); if (data != null) { - for (Element cu : Util.findSubElements(data)) { + for (Element cu : XMLUtil.findSubElements(data)) { assert cu.getLocalName().equals("compilation-unit") : cu; boolean rightCU = false; - for (Element builtTo : Util.findSubElements(cu)) { + for (Element builtTo : XMLUtil.findSubElements(cu)) { if (builtTo.getLocalName().equals("built-to")) { // NOI18N - String rawtext = Util.findText(builtTo); + String rawtext = XMLUtil.findText(builtTo); assert rawtext != null; String evaltext = eval.evaluate(rawtext); if (evaltext != null) { @@ -95,9 +95,9 @@ } if (rightCU) { List resultURLs = new ArrayList(); - for (Element javadocTo : Util.findSubElements(cu)) { + for (Element javadocTo : XMLUtil.findSubElements(cu)) { if (javadocTo.getLocalName().equals("javadoc-built-to")) { // NOI18N - String rawtext = Util.findText(javadocTo); + String rawtext = XMLUtil.findText(javadocTo); assert rawtext != null; String evaltext = eval.evaluate(rawtext); if (evaltext != null) { diff --git a/java.freeform/src/org/netbeans/modules/java/freeform/SourceForBinaryQueryImpl.java b/java.freeform/src/org/netbeans/modules/java/freeform/SourceForBinaryQueryImpl.java --- a/java.freeform/src/org/netbeans/modules/java/freeform/SourceForBinaryQueryImpl.java +++ b/java.freeform/src/org/netbeans/modules/java/freeform/SourceForBinaryQueryImpl.java @@ -50,7 +50,6 @@ 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; @@ -60,6 +59,7 @@ 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; /** @@ -100,7 +100,7 @@ if (java == null) { return null; } - for (Element compilationUnit : Util.findSubElements(java)) { + for (Element compilationUnit : XMLUtil.findSubElements(java)) { assert compilationUnit.getLocalName().equals("compilation-unit") : compilationUnit; List binaries = findBinaries(compilationUnit); if (!binaries.isEmpty()) { @@ -137,11 +137,11 @@ */ private List findBinaries(Element compilationUnitEl) { List binaries = new ArrayList(); - for (Element builtToEl : Util.findSubElements(compilationUnitEl)) { + for (Element builtToEl : XMLUtil.findSubElements(compilationUnitEl)) { if (!builtToEl.getLocalName().equals("built-to")) { // NOI18N continue; } - String text = Util.findText(builtToEl); + String text = XMLUtil.findText(builtToEl); String textEval = evaluator.evaluate(text); if (textEval == null) { continue; diff --git a/java.freeform/src/org/netbeans/modules/java/freeform/SourceLevelQueryImpl.java b/java.freeform/src/org/netbeans/modules/java/freeform/SourceLevelQueryImpl.java --- a/java.freeform/src/org/netbeans/modules/java/freeform/SourceLevelQueryImpl.java +++ b/java.freeform/src/org/netbeans/modules/java/freeform/SourceLevelQueryImpl.java @@ -45,7 +45,6 @@ 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; @@ -54,6 +53,7 @@ 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; /** @@ -102,7 +102,7 @@ if (java == null) { return null; } - for (Element compilationUnitEl : Util.findSubElements(java)) { + for (Element compilationUnitEl : XMLUtil.findSubElements(java)) { assert compilationUnitEl.getLocalName().equals("compilation-unit") : compilationUnitEl; List packageRoots = Classpaths.findPackageRoots(helper, evaluator, compilationUnitEl); for (FileObject root : packageRoots) { @@ -133,9 +133,9 @@ * Get the source level indicated in a compilation unit (or null if none is indicated). */ private String getLevel(Element compilationUnitEl) { - Element sourceLevelEl = Util.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_2); + Element sourceLevelEl = XMLUtil.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_2); if (sourceLevelEl != null) { - return Util.findText(sourceLevelEl); + return XMLUtil.findText(sourceLevelEl); } else { return null; } diff --git a/java.freeform/src/org/netbeans/modules/java/freeform/TestQuery.java b/java.freeform/src/org/netbeans/modules/java/freeform/TestQuery.java --- a/java.freeform/src/org/netbeans/modules/java/freeform/TestQuery.java +++ b/java.freeform/src/org/netbeans/modules/java/freeform/TestQuery.java @@ -46,7 +46,6 @@ 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; @@ -54,6 +53,7 @@ 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; /** @@ -117,12 +117,12 @@ List tests = new ArrayList(); Element data = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true); if (data != null) { - for (Element cu : Util.findSubElements(data)) { + for (Element cu : XMLUtil.findSubElements(data)) { assert cu.getLocalName().equals("compilation-unit") : cu; - boolean isTests = Util.findElement(cu, "unit-tests", JavaProjectNature.NS_JAVA_2) != null; // NOI18N - for (Element pr : Util.findSubElements(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 = Util.findText(pr); + String rawtext = XMLUtil.findText(pr); assert rawtext != null; String evaltext = eval.evaluate(rawtext); if (evaltext != null) { diff --git a/java.freeform/src/org/netbeans/modules/java/freeform/UsageLogger.java b/java.freeform/src/org/netbeans/modules/java/freeform/UsageLogger.java --- a/java.freeform/src/org/netbeans/modules/java/freeform/UsageLogger.java +++ b/java.freeform/src/org/netbeans/modules/java/freeform/UsageLogger.java @@ -50,7 +50,6 @@ 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; @@ -60,6 +59,7 @@ 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; /** @@ -110,18 +110,18 @@ java = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_1, true); } if (java != null) { - for (Element compilationUnitEl : Util.findSubElements(java)) { + for (Element compilationUnitEl : XMLUtil.findSubElements(java)) { compilationUnits++; int builtTos = 0; int roots = 0; - for (Element other : Util.findSubElements(compilationUnitEl)) { + 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 = Util.findText(other); + String text = XMLUtil.findText(other); if (text != null) { String textEval = eval.evaluate(text); if (textEval != null) { diff --git a/java.freeform/src/org/netbeans/modules/java/freeform/jdkselection/JdkConfiguration.java b/java.freeform/src/org/netbeans/modules/java/freeform/jdkselection/JdkConfiguration.java --- a/java.freeform/src/org/netbeans/modules/java/freeform/jdkselection/JdkConfiguration.java +++ b/java.freeform/src/org/netbeans/modules/java/freeform/jdkselection/JdkConfiguration.java @@ -53,7 +53,6 @@ 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; @@ -163,17 +162,17 @@ Element projectE = nbjdkDoc.getDocumentElement(); Set targetsCreated = new HashSet(); // XXX remove any definition of ${ant.script}, which will by now be obsolete - Element ideActionsE = Util.findElement(generalDataE, "ide-actions", Util.NAMESPACE); + Element ideActionsE = XMLUtil.findElement(generalDataE, "ide-actions", Util.NAMESPACE); if (ideActionsE != null) { - for (Element actionE : Util.findSubElements(ideActionsE)) { + for (Element actionE : XMLUtil.findSubElements(ideActionsE)) { rebindAction(actionE, projectE, targetsCreated); } } - Element viewE = Util.findElement(generalDataE, "ide-actions", Util.NAMESPACE); + Element viewE = XMLUtil.findElement(generalDataE, "ide-actions", Util.NAMESPACE); if (viewE != null) { - Element contextMenuE = Util.findElement(viewE, "context-menu", Util.NAMESPACE); + Element contextMenuE = XMLUtil.findElement(viewE, "context-menu", Util.NAMESPACE); if (contextMenuE != null) { - for (Element actionE : Util.findSubElements(contextMenuE)) { + for (Element actionE : XMLUtil.findSubElements(contextMenuE)) { if (!actionE.getLocalName().equals("action")) { continue; // ignore here } @@ -187,10 +186,10 @@ } private void rebindAction(Element actionE, Element projectE, Set targetsCreated) { - Element scriptE = Util.findElement(actionE, "script", Util.NAMESPACE); // NOI18N + Element scriptE = XMLUtil.findElement(actionE, "script", Util.NAMESPACE); // NOI18N String script; if (scriptE != null) { - script = Util.findText(scriptE); + script = XMLUtil.findText(scriptE); actionE.removeChild(scriptE); } else { script = "build.xml"; // NOI18N @@ -199,11 +198,11 @@ scriptE.appendChild(actionE.getOwnerDocument().createTextNode(NBJDK_XML)); actionE.insertBefore(scriptE, actionE.getFirstChild()); List targetNames = new ArrayList(); - for (Element targetE : Util.findSubElements(actionE)) { + for (Element targetE : XMLUtil.findSubElements(actionE)) { if (!targetE.getLocalName().equals("target")) { // NOI18N continue; } - targetNames.add(Util.findText(targetE)); + targetNames.add(XMLUtil.findText(targetE)); } if (targetNames.isEmpty()) { targetNames.add(null); diff --git a/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/ClasspathsTest.java b/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/ClasspathsTest.java --- a/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/ClasspathsTest.java +++ b/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/ClasspathsTest.java @@ -77,6 +77,7 @@ 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; @@ -456,7 +457,7 @@ 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"), Util.findElement(data, "view", Util.NAMESPACE)). + 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)); @@ -547,7 +548,7 @@ 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"), Util.findElement(data, "view", Util.NAMESPACE)); + 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)); diff --git a/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/JavaActionsTest.java b/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/JavaActionsTest.java --- a/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/JavaActionsTest.java +++ b/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/JavaActionsTest.java @@ -51,7 +51,6 @@ 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; @@ -88,13 +87,13 @@ prj = copyProject(simple); // Remove existing context-sensitive bindings to make a clean slate. Element data = prj.getPrimaryConfigurationData(); - Element ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE); + Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); assertNotNull(ideActions); - Iterator actionsIt = Util.findSubElements(ideActions).iterator(); + Iterator actionsIt = XMLUtil.findSubElements(ideActions).iterator(); while (actionsIt.hasNext()) { Element action = actionsIt.next(); assertEquals("action", action.getLocalName()); - if (Util.findElement(action, "context", Util.NAMESPACE) != null) { + if (XMLUtil.findElement(action, "context", Util.NAMESPACE) != null) { ideActions.removeChild(action); } } @@ -209,9 +208,9 @@ ja.addBinding("some.action", "special.xml", "special-target", "selection", "${some.src.dir}", "\\.java$", "relative-path", ","); Element data = prj.getPrimaryConfigurationData(); assertNotNull(data); - Element ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE); + Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); assertNotNull(ideActions); - List actions = Util.findSubElements(ideActions); + List actions = XMLUtil.findSubElements(ideActions); Element lastAction = actions.get(actions.size() - 1); String expectedXml = "\n" + @@ -231,8 +230,8 @@ 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 = Util.findElement(data, "ide-actions", Util.NAMESPACE); - actions = Util.findSubElements(ideActions); + ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); + actions = XMLUtil.findSubElements(ideActions); lastAction = actions.get(actions.size() - 1); expectedXml = "\n" + @@ -252,8 +251,8 @@ // Non-context-sensitive bindings have no but need to add a view item. ja.addBinding("general.action", "special.xml", "special-target", null, null, null, null, null); data = prj.getPrimaryConfigurationData(); - ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE); - actions = Util.findSubElements(ideActions); + ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); + actions = XMLUtil.findSubElements(ideActions); lastAction = actions.get(actions.size() - 1); expectedXml = "\n" + @@ -262,12 +261,12 @@ " special-target\n" + "\n"; assertEquals(expectedXml, xmlToString(lastAction)); - Element view = Util.findElement(data, "view", Util.NAMESPACE); + Element view = XMLUtil.findElement(data, "view", Util.NAMESPACE); assertNotNull(view); - Element contextMenu = Util.findElement(view, "context-menu", Util.NAMESPACE); + 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 contextMenuActions = Util.findSubElements(contextMenu); + List contextMenuActions = XMLUtil.findSubElements(contextMenu); Element lastContextMenuAction = contextMenuActions.get(contextMenuActions.size() - 1); expectedXml = "\n" + @@ -276,13 +275,13 @@ //test #58442: data = prj.getPrimaryConfigurationData(); - ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE); + 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 = Util.findElement(data, "ide-actions", Util.NAMESPACE); - actions = Util.findSubElements(ideActions); + ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); + actions = XMLUtil.findSubElements(ideActions); lastAction = actions.get(actions.size() - 1); expectedXml = "\n" + @@ -460,7 +459,7 @@ 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 = Util.findElement(data, "properties", Util.NAMESPACE); + Element properties = XMLUtil.findElement(data, "properties", Util.NAMESPACE); assertNotNull(properties); Element property = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "property"); property.setAttribute("name", "external.xml"); diff --git a/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/JavaProjectGeneratorTest.java b/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/JavaProjectGeneratorTest.java --- a/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/JavaProjectGeneratorTest.java +++ b/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/JavaProjectGeneratorTest.java @@ -77,6 +77,7 @@ 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. @@ -212,25 +213,25 @@ // check that all elements are written in expected order Element el = Util.getPrimaryConfigurationData(helper); - List subElements = Util.findSubElements(el); + 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 = Util.findSubElements(el2); + 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 = Util.findSubElements(el3); + 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 = Util.findSubElements(el3); + subEls = XMLUtil.findSubElements(el3); assertEquals(2, subEls.size()); assertElementArray(subEls, new String[]{"ide-action", "action"}, @@ -259,25 +260,25 @@ FreeformProjectGenerator.putTargetMappings(helper, mappings); // ProjectManager.getDefault().saveAllProjects(); el = Util.getPrimaryConfigurationData(helper); - subElements = Util.findSubElements(el); + 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 = Util.findSubElements(el2); + 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 = Util.findSubElements(el3); + 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 = Util.findSubElements(el3); + subEls = XMLUtil.findSubElements(el3); assertEquals(2, subEls.size()); assertElementArray(subEls, new String[]{"ide-action", "action"}, @@ -296,7 +297,7 @@ String message = "Element "+element+" does not match [name="+expectedName+",value="+expectedValue+"]"; // NOI18N assertEquals(message, expectedName, element.getLocalName()); if (expectedValue != null) { - assertEquals(message, expectedValue, Util.findText(element)); + assertEquals(message, expectedValue, XMLUtil.findText(element)); } } @@ -324,7 +325,7 @@ expectedValue+", attr="+expectedAttrName+", attrvalue="+expectedAttrValue+"]"; // NOI18N assertEquals(message, expectedName, element.getLocalName()); if (expectedValue != null) { - assertEquals(message, expectedValue, Util.findText(element)); + assertEquals(message, expectedValue, XMLUtil.findText(element)); } String val = element.getAttribute(expectedAttrName); assertEquals(expectedAttrValue, val); @@ -434,14 +435,14 @@ JavaProjectGenerator.putSourceFolders(helper, folders, null); // ProjectManager.getDefault().saveAllProjects(); Element el = Util.getPrimaryConfigurationData(helper); - el = Util.findElement(el, "folders", Util.NAMESPACE); + el = XMLUtil.findElement(el, "folders", Util.NAMESPACE); assertNotNull("Source folders were not saved correctly", el); - List subElements = Util.findSubElements(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 = Util.findSubElements(el2); + List l1 = XMLUtil.findSubElements(el2); assertEquals(3, l1.size()); assertElementArray(l1, new String[]{"label", "type", "location"}, @@ -449,7 +450,7 @@ // compare second source folder el2 = (Element)subElements.get(1); assertElement(el2, "source-folder", null); - l1 = Util.findSubElements(el2); + l1 = XMLUtil.findSubElements(el2); assertEquals(3, l1.size()); assertElementArray(l1, new String[]{"label", "type", "location"}, @@ -467,14 +468,14 @@ JavaProjectGenerator.putSourceFolders(helper, folders, "type2"); ProjectManager.getDefault().saveAllProjects(); el = Util.getPrimaryConfigurationData(helper); - el = Util.findElement(el, "folders", Util.NAMESPACE); + el = XMLUtil.findElement(el, "folders", Util.NAMESPACE); assertNotNull("Source folders were not saved correctly", el); - subElements = Util.findSubElements(el); + subElements = XMLUtil.findSubElements(el); assertEquals(2, subElements.size()); // compare first source folder el2 = (Element)subElements.get(0); assertElement(el2, "source-folder", null); - l1 = Util.findSubElements(el2); + l1 = XMLUtil.findSubElements(el2); assertEquals(3, l1.size()); assertElementArray(l1, new String[]{"label", "type", "location"}, @@ -482,7 +483,7 @@ // compare second source folder el2 = (Element)subElements.get(1); assertElement(el2, "source-folder", null); - l1 = Util.findSubElements(el2); + l1 = XMLUtil.findSubElements(el2); assertEquals(3, l1.size()); assertElementArray(l1, new String[]{"label", "type", "location"}, @@ -582,17 +583,17 @@ JavaProjectGenerator.putSourceViews(helper, folders, null); ProjectManager.getDefault().saveAllProjects(); Element el = Util.getPrimaryConfigurationData(helper); - el = Util.findElement(el, "view", Util.NAMESPACE); + el = XMLUtil.findElement(el, "view", Util.NAMESPACE); assertNotNull("View folders were not saved correctly", el); - el = Util.findElement(el, "items", Util.NAMESPACE); + el = XMLUtil.findElement(el, "items", Util.NAMESPACE); assertNotNull("View folders were not saved correctly", el); - List subElements = Util.findSubElements(el); + List subElements = XMLUtil.findSubElements(el); // there will be three sublements: 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 = Util.findSubElements(el2); + List l1 = XMLUtil.findSubElements(el2); assertEquals(2, l1.size()); assertElementArray(l1, new String[]{"label", "location"}, @@ -600,7 +601,7 @@ // compare second source view el2 = (Element)subElements.get(1); assertElement(el2, "source-folder", null, "style", "packages"); - l1 = Util.findSubElements(el2); + l1 = XMLUtil.findSubElements(el2); assertEquals(2, l1.size()); assertElementArray(l1, new String[]{"label", "location"}, @@ -618,17 +619,17 @@ JavaProjectGenerator.putSourceViews(helper, folders, "packages"); ProjectManager.getDefault().saveAllProjects(); el = Util.getPrimaryConfigurationData(helper); - el = Util.findElement(el, "view", Util.NAMESPACE); + el = XMLUtil.findElement(el, "view", Util.NAMESPACE); assertNotNull("Source views were not saved correctly", el); - el = Util.findElement(el, "items", Util.NAMESPACE); + el = XMLUtil.findElement(el, "items", Util.NAMESPACE); assertNotNull("View folders were not saved correctly", el); - subElements = Util.findSubElements(el); + subElements = XMLUtil.findSubElements(el); // there will be three sublements: 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 = Util.findSubElements(el2); + l1 = XMLUtil.findSubElements(el2); assertEquals(2, l1.size()); assertElementArray(l1, new String[]{"label", "location"}, @@ -636,7 +637,7 @@ // compare second source view el2 = (Element)subElements.get(1); assertElement(el2, "source-folder", null, "style", "packages"); - l1 = Util.findSubElements(el2); + l1 = XMLUtil.findSubElements(el2); assertEquals(2, l1.size()); assertElementArray(l1, new String[]{"label", "location"}, @@ -758,12 +759,12 @@ // 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 = Util.findSubElements(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 = Util.findSubElements(el2); + 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"}, @@ -775,7 +776,7 @@ // compare second compilation unit el2 = (Element)subElements.get(1); assertElement(el2, "compilation-unit", null); - l1 = Util.findSubElements(el2); + l1 = XMLUtil.findSubElements(el2); assertEquals(7, l1.size()); assertElementArray(l1, new String[]{"package-root", "package-root", "classpath", "classpath", "built-to", "built-to", "source-level"}, @@ -797,12 +798,12 @@ // ProjectManager.getDefault().saveAllProjects(); el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_1, true); assertNotNull("Java compilation units were not saved correctly", el); - subElements = Util.findSubElements(el); + subElements = XMLUtil.findSubElements(el); assertEquals(1, subElements.size()); // compare first compilation unit el2 = (Element)subElements.get(0); assertElement(el2, "compilation-unit", null); - l1 = Util.findSubElements(el2); + l1 = XMLUtil.findSubElements(el2); assertEquals(1, l1.size()); assertElementArray(l1, new String[]{"package-root"}, @@ -827,12 +828,12 @@ // 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 subElements = Util.findSubElements(el); + List subElements = XMLUtil.findSubElements(el); assertEquals(1, subElements.size()); // compare the compilation unit Element el2 = (Element) subElements.get(0); assertElement(el2, "compilation-unit", null); - assertElementArray(Util.findSubElements(el2), + assertElementArray(XMLUtil.findSubElements(el2), new String[] {"package-root"}, new String[] {"pkgroot1"}); ProjectManager.getDefault().saveAllProjects(); @@ -849,12 +850,12 @@ assertNull("No /1 data", el); el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true); assertNotNull("Have /2 data", el); - subElements = Util.findSubElements(el); + subElements = XMLUtil.findSubElements(el); assertEquals(1, subElements.size()); // compare the compilation unit el2 = (Element) subElements.get(0); assertElement(el2, "compilation-unit", null); - assertElementArray(Util.findSubElements(el2), + assertElementArray(XMLUtil.findSubElements(el2), new String[] {"package-root", "unit-tests"}, new String[] {"pkgroot1", null}); ProjectManager.getDefault().saveAllProjects(); @@ -874,12 +875,12 @@ assertNull("No /1 data", el); el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true); assertNotNull("Have /2 data", el); - subElements = Util.findSubElements(el); + subElements = XMLUtil.findSubElements(el); assertEquals(1, subElements.size()); // compare the compilation unit el2 = (Element) subElements.get(0); assertElement(el2, "compilation-unit", null); - assertElementArray(Util.findSubElements(el2), + assertElementArray(XMLUtil.findSubElements(el2), new String[] {"package-root", "javadoc-built-to", "javadoc-built-to"}, new String[] {"pkgroot1", "javadoc1", "javadoc2"}); ProjectManager.getDefault().saveAllProjects(); @@ -1000,7 +1001,7 @@ JavaProjectGenerator.putExports(helper, exports); Element el = Util.getPrimaryConfigurationData(helper); - List subElements = Util.findSubElements(el); + 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 @@ -1010,7 +1011,7 @@ assertElement(el2, "properties", null); el2 = (Element)subElements.get(2); assertElement(el2, "export", null); - List l1 = Util.findSubElements(el2); + List l1 = XMLUtil.findSubElements(el2); assertEquals(5, l1.size()); assertElementArray(l1, new String[]{"type", "location", "script", "build-target", "clean-target"}, @@ -1018,7 +1019,7 @@ // compare second compilation unit el2 = (Element)subElements.get(3); assertElement(el2, "export", null); - l1 = Util.findSubElements(el2); + l1 = XMLUtil.findSubElements(el2); assertEquals(3, l1.size()); assertElementArray(l1, new String[]{"type", "location", "build-target"}, @@ -1038,7 +1039,7 @@ JavaProjectGenerator.putExports(helper, exports); el = Util.getPrimaryConfigurationData(helper); - subElements = Util.findSubElements(el); + subElements = XMLUtil.findSubElements(el); // 3, i.e. name, export and one view of build.xml file assertEquals(4, subElements.size()); // compare first compilation unit @@ -1048,7 +1049,7 @@ assertElement(el2, "properties", null); el2 = (Element)subElements.get(2); assertElement(el2, "export", null); - l1 = Util.findSubElements(el2); + l1 = XMLUtil.findSubElements(el2); assertEquals(3, l1.size()); assertElementArray(l1, new String[]{"type", "location", "build-target"}, @@ -1123,9 +1124,9 @@ JavaProjectGenerator.putSubprojects(helper, subprojects); Element el = Util.getPrimaryConfigurationData(helper); - Element subprojectsEl = Util.findElement(el, "subprojects", Util.NAMESPACE); + Element subprojectsEl = XMLUtil.findElement(el, "subprojects", Util.NAMESPACE); assertNotNull(" element exists", subprojectsEl); - List subElements = Util.findSubElements(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"); @@ -1140,16 +1141,16 @@ subprojects.add("/projC"); JavaProjectGenerator.putSubprojects(helper, subprojects); el = Util.getPrimaryConfigurationData(helper); - subprojectsEl = Util.findElement(el, "subprojects", Util.NAMESPACE); - subElements = Util.findSubElements(subprojectsEl); + 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 = Util.findElement(el, "subprojects", Util.NAMESPACE); - subElements = Util.findSubElements(subprojectsEl); + subprojectsEl = XMLUtil.findElement(el, "subprojects", Util.NAMESPACE); + subElements = XMLUtil.findSubElements(subprojectsEl); assertEquals("project depends on one subproject", 0, subElements.size()); ProjectManager.getDefault().saveAllProjects(); @@ -1212,18 +1213,18 @@ JavaProjectGenerator.putBuildFolders(helper, buildFolders); Element el = Util.getPrimaryConfigurationData(helper); - Element foldersEl = Util.findElement(el, "folders", Util.NAMESPACE); + Element foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE); assertNotNull(" element exists", foldersEl); - List subElements = Util.findSubElements(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, Util.findSubElements(el2).size()); - assertElement((Element)Util.findSubElements(el2).get(0), "location", "/some/path/projA"); + 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, Util.findSubElements(el2).size()); - assertElement((Element)Util.findSubElements(el2).get(0), "location", "C:\\dev\\projB"); + 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(); @@ -1233,18 +1234,18 @@ buildFolders.add("/projC"); JavaProjectGenerator.putBuildFolders(helper, buildFolders); el = Util.getPrimaryConfigurationData(helper); - foldersEl = Util.findElement(el, "folders", Util.NAMESPACE); - subElements = Util.findSubElements(foldersEl); + 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, Util.findSubElements(el2).size()); - assertElement((Element)Util.findSubElements(el2).get(0), "location", "/projC"); + 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 = Util.findElement(el, "folders", Util.NAMESPACE); - subElements = Util.findSubElements(foldersEl); + foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE); + subElements = XMLUtil.findSubElements(foldersEl); assertEquals("project has no build-folder", 0, subElements.size()); ProjectManager.getDefault().saveAllProjects(); @@ -1264,18 +1265,18 @@ JavaProjectGenerator.putBuildFiles(helper, buildFiles); Element el = Util.getPrimaryConfigurationData(helper); - Element foldersEl = Util.findElement(el, "folders", Util.NAMESPACE); + Element foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE); assertNotNull(" element exists", foldersEl); - List subElements = Util.findSubElements(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, Util.findSubElements(el2).size()); - assertElement((Element)Util.findSubElements(el2).get(0), "location", "/some/path/projA/archive.jar"); + 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, Util.findSubElements(el2).size()); - assertElement((Element)Util.findSubElements(el2).get(0), "location", "C:\\dev\\projB\\library.jar"); + 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(); @@ -1284,19 +1285,19 @@ buildFiles.add("/projC/dist/projC.jar"); JavaProjectGenerator.putBuildFiles(helper, buildFiles); el = Util.getPrimaryConfigurationData(helper); - foldersEl = Util.findElement(el, "folders", Util.NAMESPACE); - subElements = Util.findSubElements(foldersEl); + 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, Util.findSubElements(el2).size()); - assertElement((Element)Util.findSubElements(el2).get(0), "location", "/projC/dist/projC.jar"); + 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 = Util.findElement(el, "folders", Util.NAMESPACE); - subElements = Util.findSubElements(foldersEl); + foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE); + subElements = XMLUtil.findSubElements(foldersEl); assertEquals("project has no build-file", 0, subElements.size()); ProjectManager.getDefault().saveAllProjects();