提交 8e85eab6 编写于 作者: S Seiji Sogabe
上级 cd48b4eb
......@@ -44,9 +44,9 @@ 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.List;
import java.util.Map;
import java.util.HashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
......@@ -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 HashMap<Descriptor<NodeMonitor>, NodeMonitor>();
Map<Descriptor<NodeMonitor>,NodeMonitor> r = new LinkedHashMap<Descriptor<NodeMonitor>, NodeMonitor>();
for (NodeMonitor m : monitors) {
if(!m.isIgnored())
r.put(m.getDescriptor(),m);
......
# The MIT License
#
# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman
# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Changes=\u5909\u66f4
\ No newline at end of file
Changes=\u5909\u66f4\u5c65\u6b74
\ No newline at end of file
......@@ -22,7 +22,7 @@
Back\ to\ Project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3078\u623b\u308b
Status=\u72b6\u614b
Changes=\u5909\u66f4
Changes=\u5909\u66f4\u5c65\u6b74
Console\ Output=\u30b3\u30f3\u30bd\u30fc\u30eb\u51fa\u529b
raw=\u672a\u52a0\u5de5
Configure=\u8a2d\u5b9a
......
# The MIT License
#
# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman. Seiji Sogabe
# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman. Seiji Sogabe
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
......@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
changes.title={0}\u306E\u5909\u66F4
Changes=\u5909\u66F4
from.label=#{0} \u304B\u3089
to.label=#{0} \u307E\u3067
\ No newline at end of file
changes.title={0}\u306e\u5909\u66f4
Changes=\u5909\u66f4\u5c65\u6b74
from.label=#{0} \u304b\u3089
to.label=#{0} \u307e\u3067
\ No newline at end of file
......@@ -21,7 +21,7 @@
# THE SOFTWARE.
Workspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9
Recent\ Changes=\u6700\u65b0\u306e\u5909\u66f4
Recent\ Changes=\u5909\u66f4\u5c65\u6b74s
Last\ Successful\ Artifacts=\u6700\u65b0\u6210\u529f\u30d3\u30eb\u30c9\u306e\u6210\u679c\u7269
Latest\ Test\ Result=\u6700\u65b0\u306e\u30c6\u30b9\u30c8\u7d50\u679c
Latest\ Aggregated\ Test\ Result=\u6700\u65b0\u306e\u96c6\u7d04\u3055\u308c\u305f\u30c6\u30b9\u30c8\u7d50\u679c
# The MIT License
#
# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman
# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
......@@ -22,7 +22,7 @@
Back\ to\ Dashboard=\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u3078\u623b\u308b
Status=\u72b6\u614b
Changes=\u5909\u66f4
Changes=\u5909\u66f4\u5c65\u6b74
Workspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9
Wipe\ Out\ Workspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u306e\u30af\u30ea\u30a2
delete={0}\u306e\u524a\u9664
......
......@@ -37,13 +37,14 @@ THE SOFTWARE.
</style>
</l:header>
<l:main-panel>
<j:set var="monitors" value="${it._monitors}"/>
<j:set var="monitors" value="${it.nonIgnoredMonitors}"/>
<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="m" items="${monitors}">
<j:forEach var="entry" items="${monitors}">
<j:set var="m" value="${entry.value}" />
<j:if test="${m.columnCaption!=null}">
<j:set var="tableWidth" value="${tableWidth+1}"/>
<th>${m.columnCaption}</th>
......@@ -57,7 +58,8 @@ 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="m" items="${monitors}">
<j:forEach var="entry" items="${monitors}">
<j:set var="m" value="${entry.value}" />
<j:if test="${m.columnCaption!=null}">
<j:set var="data" value="${m.data(c)}"/>
<st:include page="column.jelly" from="${m}" />
......
......@@ -20,11 +20,11 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
BuildButtonColumn.DisplayName=\u30D3\u30EB\u30C9\u30DC\u30BF\u30F3
JobColumn.DisplayName=\u540D\u524D
LastDurationColumn.DisplayName=\u30D3\u30EB\u30C9\u6240\u8981\u6642\u9593
LastFailureColumn.DisplayName=\u6700\u65B0\u306E\u5931\u6557\u30D3\u30EB\u30C9
LastStableColumn.DisplayName=\u6700\u65B0\u306E\u5B89\u5B9A\u30D3\u30EB\u30C9
LastSuccessColumn.DisplayName=\u6700\u65B0\u306E\u6210\u529F\u30D3\u30EB\u30C9
StatusColumn.DisplayName=\u30B9\u30C6\u30FC\u30BF\u30B9
WeatherColumn.DisplayName=\u5929\u6C17\u4E88\u5831
BuildButtonColumn.DisplayName=\u30d3\u30eb\u30c9\u30dc\u30bf\u30f3
JobColumn.DisplayName=\u540d\u524d
LastDurationColumn.DisplayName=\u30d3\u30eb\u30c9\u6240\u8981\u6642\u9593
LastFailureColumn.DisplayName=\u6700\u65b0\u306e\u5931\u6557\u30d3\u30eb\u30c9
LastStableColumn.DisplayName=\u6700\u65b0\u306e\u5b89\u5b9a\u30d3\u30eb\u30c9
LastSuccessColumn.DisplayName=\u6700\u65b0\u306e\u6210\u529f\u30d3\u30eb\u30c9
StatusColumn.DisplayName=\u30b9\u30c6\u30fc\u30bf\u30b9
WeatherColumn.DisplayName=\u7a7a\u6a21\u69d8
# The MIT License
#
# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman, Martin Eigenbrodt
# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman, Martin Eigenbrodt
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
......@@ -21,4 +21,4 @@
# THE SOFTWARE.
Weather\ report\ showing\ aggregated\ status\ of\ recent\ builds=\
\u6700\u8FD1\u306E\u30D3\u30EB\u30C9\u306E\u30B9\u30C6\u30FC\u30BF\u30B9\u3092\u96C6\u7D04\u3057\u305F\u5929\u6C17\u4E88\u5831
\u6700\u8fd1\u306e\u30d3\u30eb\u30c9\u306e\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u96c6\u7d04\u3057\u305f\u7a7a\u6a21\u69d8
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册