Lines 48-55
Link Here
|
48 |
import org.netbeans.modules.web.api.webmodule.WebProjectConstants; |
48 |
import org.netbeans.modules.web.api.webmodule.WebProjectConstants; |
49 |
import org.netbeans.spi.project.AuxiliaryConfiguration; |
49 |
import org.netbeans.spi.project.AuxiliaryConfiguration; |
50 |
import org.netbeans.spi.project.support.ant.AntProjectHelper; |
50 |
import org.netbeans.spi.project.support.ant.AntProjectHelper; |
51 |
import org.openide.filesystems.FileObject; |
|
|
52 |
import org.openide.util.NbBundle; |
51 |
import org.openide.util.NbBundle; |
|
|
52 |
import org.openide.xml.XMLUtil; |
53 |
import org.w3c.dom.Document; |
53 |
import org.w3c.dom.Document; |
54 |
import org.w3c.dom.Element; |
54 |
import org.w3c.dom.Element; |
55 |
import org.w3c.dom.Node; |
55 |
import org.w3c.dom.Node; |
Lines 102-141
Link Here
|
102 |
|
102 |
|
103 |
Element data = Util.getPrimaryConfigurationData(helper); |
103 |
Element data = Util.getPrimaryConfigurationData(helper); |
104 |
Document doc = data.getOwnerDocument(); |
104 |
Document doc = data.getOwnerDocument(); |
105 |
Element foldersEl = Util.findElement(data, "folders", Util.NAMESPACE); // NOI18N |
105 |
Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N |
106 |
if (foldersEl == null) { |
106 |
if (foldersEl == null) { |
107 |
foldersEl = doc.createElementNS(Util.NAMESPACE, "folders"); // NOI18N |
107 |
foldersEl = doc.createElementNS(Util.NAMESPACE, "folders"); // NOI18N |
108 |
Util.appendChildElement(data, foldersEl, rootElementsOrder); |
108 |
XMLUtil.appendChildElement(data, foldersEl, rootElementsOrder); |
109 |
} else { |
109 |
} else { |
110 |
List l = Util.findSubElements(foldersEl); |
110 |
List l = XMLUtil.findSubElements(foldersEl); |
111 |
for (int i = 0; i < l.size(); i++) { |
111 |
for (int i = 0; i < l.size(); i++) { |
112 |
Element e = (Element) l.get(i); |
112 |
Element e = (Element) l.get(i); |
113 |
Element te = Util.findElement(e, "type", Util.NAMESPACE); |
113 |
Element te = XMLUtil.findElement(e, "type", Util.NAMESPACE); |
114 |
if (te != null && Util.findText(te).equals(folderType)) { |
114 |
if (te != null && XMLUtil.findText(te).equals(folderType)) { |
115 |
foldersEl.removeChild(e); |
115 |
foldersEl.removeChild(e); |
116 |
break; |
116 |
break; |
117 |
} |
117 |
} |
118 |
} |
118 |
} |
119 |
} |
119 |
} |
120 |
|
120 |
|
121 |
Element viewEl = Util.findElement(data, "view", Util.NAMESPACE); // NOI18N |
121 |
Element viewEl = XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N |
122 |
if (viewEl == null) { |
122 |
if (viewEl == null) { |
123 |
viewEl = doc.createElementNS(Util.NAMESPACE, "view"); // NOI18N |
123 |
viewEl = doc.createElementNS(Util.NAMESPACE, "view"); // NOI18N |
124 |
Util.appendChildElement(data, viewEl, rootElementsOrder); |
124 |
XMLUtil.appendChildElement(data, viewEl, rootElementsOrder); |
125 |
} |
125 |
} |
126 |
Element itemsEl = Util.findElement(viewEl, "items", Util.NAMESPACE); // NOI18N |
126 |
Element itemsEl = XMLUtil.findElement(viewEl, "items", Util.NAMESPACE); // NOI18N |
127 |
if (itemsEl == null) { |
127 |
if (itemsEl == null) { |
128 |
itemsEl = doc.createElementNS(Util.NAMESPACE, "items"); // NOI18N |
128 |
itemsEl = doc.createElementNS(Util.NAMESPACE, "items"); // NOI18N |
129 |
Util.appendChildElement(viewEl, itemsEl, viewElementsOrder); |
129 |
XMLUtil.appendChildElement(viewEl, itemsEl, viewElementsOrder); |
130 |
} else { |
130 |
} else { |
131 |
List l = Util.findSubElements(itemsEl); |
131 |
List l = XMLUtil.findSubElements(itemsEl); |
132 |
for (int i = 0; i < l.size(); i++) { |
132 |
for (int i = 0; i < l.size(); i++) { |
133 |
Element e = (Element) l.get(i); |
133 |
Element e = (Element) l.get(i); |
134 |
if (e.hasAttribute("style")) { |
134 |
if (e.hasAttribute("style")) { |
135 |
if (e.getAttribute("style").equals("tree")) { |
135 |
if (e.getAttribute("style").equals("tree")) { |
136 |
// #110173 |
136 |
// #110173 |
137 |
Element labelElement = Util.findElement(e, "label", Util.NAMESPACE); |
137 |
Element labelElement = XMLUtil.findElement(e, "label", Util.NAMESPACE); |
138 |
if (labelElement != null && label.equals(Util.findText(labelElement))) { |
138 |
if (labelElement != null && label.equals(XMLUtil.findText(labelElement))) { |
139 |
itemsEl.removeChild(e); |
139 |
itemsEl.removeChild(e); |
140 |
break; |
140 |
break; |
141 |
} |
141 |
} |
Lines 159-165
Link Here
|
159 |
el = doc.createElementNS(Util.NAMESPACE, "location"); // NOI18N |
159 |
el = doc.createElementNS(Util.NAMESPACE, "location"); // NOI18N |
160 |
el.appendChild(doc.createTextNode(path)); |
160 |
el.appendChild(doc.createTextNode(path)); |
161 |
sourceFolderEl.appendChild(el); |
161 |
sourceFolderEl.appendChild(el); |
162 |
Util.appendChildElement(foldersEl, sourceFolderEl, folderElementsOrder); |
162 |
XMLUtil.appendChildElement(foldersEl, sourceFolderEl, folderElementsOrder); |
163 |
|
163 |
|
164 |
sourceFolderEl = doc.createElementNS(Util.NAMESPACE, "source-folder"); // NOI18N |
164 |
sourceFolderEl = doc.createElementNS(Util.NAMESPACE, "source-folder"); // NOI18N |
165 |
sourceFolderEl.setAttribute("style", "tree"); // NOI18N |
165 |
sourceFolderEl.setAttribute("style", "tree"); // NOI18N |
Lines 177-183
Link Here
|
177 |
insertWebInfElement(itemsEl, firstNode, sourceFolderEl); |
177 |
insertWebInfElement(itemsEl, firstNode, sourceFolderEl); |
178 |
} |
178 |
} |
179 |
} else { |
179 |
} else { |
180 |
Util.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder); |
180 |
XMLUtil.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder); |
181 |
} |
181 |
} |
182 |
} |
182 |
} |
183 |
Util.putPrimaryConfigurationData(helper, data); |
183 |
Util.putPrimaryConfigurationData(helper, data); |
Lines 192-198
Link Here
|
192 |
if (secondNode != null) { |
192 |
if (secondNode != null) { |
193 |
itemsEl.insertBefore(sourceFolderEl, secondNode); |
193 |
itemsEl.insertBefore(sourceFolderEl, secondNode); |
194 |
} else { |
194 |
} else { |
195 |
Util.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder); |
195 |
XMLUtil.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder); |
196 |
} |
196 |
} |
197 |
} |
197 |
} |
198 |
|
198 |
|
Lines 213-244
Link Here
|
213 |
return list; |
213 |
return list; |
214 |
} |
214 |
} |
215 |
} |
215 |
} |
216 |
List<Element> wms = Util.findSubElements(data); |
216 |
List<Element> wms = XMLUtil.findSubElements(data); |
217 |
Iterator<Element> it = wms.iterator(); |
217 |
Iterator<Element> it = wms.iterator(); |
218 |
while (it.hasNext()) { |
218 |
while (it.hasNext()) { |
219 |
Element wmEl = it.next(); |
219 |
Element wmEl = it.next(); |
220 |
WebModule wm = new WebModule(); |
220 |
WebModule wm = new WebModule(); |
221 |
Iterator it2 = Util.findSubElements(wmEl).iterator(); |
221 |
Iterator it2 = XMLUtil.findSubElements(wmEl).iterator(); |
222 |
while (it2.hasNext()) { |
222 |
while (it2.hasNext()) { |
223 |
Element el = (Element)it2.next(); |
223 |
Element el = (Element)it2.next(); |
224 |
if (el.getLocalName().equals("doc-root")) { // NOI18N |
224 |
if (el.getLocalName().equals("doc-root")) { // NOI18N |
225 |
wm.docRoot = Util.findText(el); |
225 |
wm.docRoot = XMLUtil.findText(el); |
226 |
continue; |
226 |
continue; |
227 |
} |
227 |
} |
228 |
if (el.getLocalName().equals("classpath")) { // NOI18N |
228 |
if (el.getLocalName().equals("classpath")) { // NOI18N |
229 |
wm.classpath = Util.findText(el); |
229 |
wm.classpath = XMLUtil.findText(el); |
230 |
continue; |
230 |
continue; |
231 |
} |
231 |
} |
232 |
if (el.getLocalName().equals("context-path")) { // NOI18N |
232 |
if (el.getLocalName().equals("context-path")) { // NOI18N |
233 |
wm.contextPath = Util.findText(el); |
233 |
wm.contextPath = XMLUtil.findText(el); |
234 |
continue; |
234 |
continue; |
235 |
} |
235 |
} |
236 |
if (el.getLocalName().equals("j2ee-spec-level")) { // NOI18N |
236 |
if (el.getLocalName().equals("j2ee-spec-level")) { // NOI18N |
237 |
wm.j2eeSpecLevel = Util.findText(el); |
237 |
wm.j2eeSpecLevel = XMLUtil.findText(el); |
238 |
continue; |
238 |
continue; |
239 |
} |
239 |
} |
240 |
if (el.getLocalName().equals("web-inf")) { // NOI18N |
240 |
if (el.getLocalName().equals("web-inf")) { // NOI18N |
241 |
wm.webInf = Util.findText(el); |
241 |
wm.webInf = XMLUtil.findText(el); |
242 |
} |
242 |
} |
243 |
} |
243 |
} |
244 |
list.add(wm); |
244 |
list.add(wm); |
Lines 295-301
Link Here
|
295 |
} |
295 |
} |
296 |
|
296 |
|
297 |
Document doc = data.getOwnerDocument(); |
297 |
Document doc = data.getOwnerDocument(); |
298 |
List<Element> wms = Util.findSubElements(data); |
298 |
List<Element> wms = XMLUtil.findSubElements(data); |
299 |
Iterator<Element> it = wms.iterator(); |
299 |
Iterator<Element> it = wms.iterator(); |
300 |
while (it.hasNext()) { |
300 |
while (it.hasNext()) { |
301 |
Element wmEl = it.next(); |
301 |
Element wmEl = it.next(); |