提交 398fb100 编写于 作者: S Seiji Sogabe

mistake. rollback.

上级 8e85eab6
......@@ -44,7 +44,7 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import java.io.File;
import java.io.IOException;
import java.util.AbstractList;
import java.util.LinkedHashMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
......@@ -105,7 +105,7 @@ public final class ComputerSet extends AbstractModelObject {
* Returns a subset pf {@link #getMonitors()} that are {@linkplain NodeMonitor#isIgnored() not ignored}.
*/
public static Map<Descriptor<NodeMonitor>,NodeMonitor> getNonIgnoredMonitors() {
Map<Descriptor<NodeMonitor>,NodeMonitor> r = new LinkedHashMap<Descriptor<NodeMonitor>, NodeMonitor>();
Map<Descriptor<NodeMonitor>,NodeMonitor> r = new HashMap<Descriptor<NodeMonitor>, NodeMonitor>();
for (NodeMonitor m : monitors) {
if(!m.isIgnored())
r.put(m.getDescriptor(),m);
......
......@@ -37,14 +37,13 @@ THE SOFTWARE.
</style>
</l:header>
<l:main-panel>
<j:set var="monitors" value="${it.nonIgnoredMonitors}"/>
<j:set var="monitors" value="${it._monitors}"/>
<j:set var="tableWidth" value="${3}"/>
<table id="computers" class="sortable pane bigtable">
<tr>
<th width="32">S</th>
<th initialSortDir="down">${%Name}</th>
<j:forEach var="entry" items="${monitors}">
<j:set var="m" value="${entry.value}" />
<j:forEach var="m" items="${monitors}">
<j:if test="${m.columnCaption!=null}">
<j:set var="tableWidth" value="${tableWidth+1}"/>
<th>${m.columnCaption}</th>
......@@ -58,8 +57,7 @@ THE SOFTWARE.
<img src="${imagesURL}/32x32/${c.icon}" width="32" height="32" alt="${c.iconAltText}"/>
</td>
<td><a href="${rootURL}/${c.url}">${c.displayName}</a></td>
<j:forEach var="entry" items="${monitors}">
<j:set var="m" value="${entry.value}" />
<j:forEach var="m" items="${monitors}">
<j:if test="${m.columnCaption!=null}">
<j:set var="data" value="${m.data(c)}"/>
<st:include page="column.jelly" from="${m}" />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册