Lines 141-147
Link Here
|
141 |
// Parse jobs and return them |
141 |
// Parse jobs and return them |
142 |
Collection<ViewData> viewsData = getViewData(docInstance, instanceUrl); |
142 |
Collection<ViewData> viewsData = getViewData(docInstance, instanceUrl); |
143 |
Collection<FolderData> foldersData = new ArrayList<FolderData>(); |
143 |
Collection<FolderData> foldersData = new ArrayList<FolderData>(); |
144 |
Collection<JobData> jobsData = getJobsData(docInstance, instanceUrl, viewsData, foldersData); |
144 |
Collection<JobData> jobsData = getJobsData(docInstance, instanceUrl, viewsData, foldersData, null); |
145 |
return new InstanceData(jobsData, viewsData, foldersData); |
145 |
return new InstanceData(jobsData, viewsData, foldersData); |
146 |
} |
146 |
} |
147 |
|
147 |
|
Lines 160-166
Link Here
|
160 |
// Clear cache |
160 |
// Clear cache |
161 |
cache.clear(); |
161 |
cache.clear(); |
162 |
Collection<FolderData> foldersData = new ArrayList<FolderData>(); |
162 |
Collection<FolderData> foldersData = new ArrayList<FolderData>(); |
163 |
Collection<JobData> jobsData = getJobsData(docInstance, parentFolder.getUrl(), Collections.<ViewData>emptySet(), foldersData); |
163 |
Collection<JobData> jobsData = getJobsData(docInstance, parentFolder.getUrl(), Collections.<ViewData>emptySet(), foldersData, parentFolder); |
164 |
return new InstanceData(jobsData, Collections.<ViewData>emptySet(), foldersData); |
164 |
return new InstanceData(jobsData, Collections.<ViewData>emptySet(), foldersData); |
165 |
} |
165 |
} |
166 |
|
166 |
|
Lines 324-330
Link Here
|
324 |
} |
324 |
} |
325 |
|
325 |
|
326 |
private Collection<JobData> getJobsData(Document doc, String baseUrl, |
326 |
private Collection<JobData> getJobsData(Document doc, String baseUrl, |
327 |
Collection<ViewData> viewsData, Collection<FolderData> foldersData) { |
327 |
Collection<ViewData> viewsData, Collection<FolderData> foldersData, |
|
|
328 |
HudsonFolder parentFolder) { |
328 |
Collection<JobData> jobs = new ArrayList<JobData>(); |
329 |
Collection<JobData> jobs = new ArrayList<JobData>(); |
329 |
|
330 |
|
330 |
NodeList nodes = doc.getDocumentElement().getChildNodes(); |
331 |
NodeList nodes = doc.getDocumentElement().getChildNodes(); |
Lines 348-355
Link Here
|
348 |
} |
349 |
} |
349 |
String nodeName = d.getNodeName(); |
350 |
String nodeName = d.getNodeName(); |
350 |
if (nodeName.equals(XML_API_NAME_ELEMENT)) { |
351 |
if (nodeName.equals(XML_API_NAME_ELEMENT)) { |
351 |
jd.setJobName(d.getFirstChild().getTextContent()); |
352 |
String folder = parentFolder == null |
352 |
fd.setName(d.getFirstChild().getTextContent()); |
353 |
? "" : parentFolder.getName() + "/"; //NOI18N |
|
|
354 |
String name = folder + d.getFirstChild().getTextContent(); |
355 |
jd.setJobName(name); |
356 |
fd.setName(name); |
353 |
} else if (nodeName.equals(XML_API_URL_ELEMENT)) { |
357 |
} else if (nodeName.equals(XML_API_URL_ELEMENT)) { |
354 |
String u = normalizeUrl(baseUrl, d.getFirstChild().getTextContent(), "job/[^/]+/"); // NOI18N |
358 |
String u = normalizeUrl(baseUrl, d.getFirstChild().getTextContent(), "job/[^/]+/"); // NOI18N |
355 |
jd.setJobUrl(u); |
359 |
jd.setJobUrl(u); |