提交 e50d115f 编写于 作者: J Jesse Glick

Merge branch 'master' of github.com:jenkinsci/jenkins

...@@ -1082,10 +1082,11 @@ public class Functions { ...@@ -1082,10 +1082,11 @@ public class Functions {
Integer d = parents.get(gr); Integer d = parents.get(gr);
if (d!=null) { if (d!=null) {
String s=""; for (int j=d; j>0; j--) {
for (int j=d; j>0; j--) buf.insert(0,separationString);
s+=".." + separationString; buf.insert(0,"..");
return s+buf; }
return buf.toString();
} }
if (gr instanceof Item) if (gr instanceof Item)
...@@ -1227,21 +1228,21 @@ public class Functions { ...@@ -1227,21 +1228,21 @@ public class Functions {
StackTraceElement[] stackTrace = ti.getStackTrace(); StackTraceElement[] stackTrace = ti.getStackTrace();
for (int i=0; i < stackTrace.length; i++) { for (int i=0; i < stackTrace.length; i++) {
StackTraceElement ste = stackTrace[i]; StackTraceElement ste = stackTrace[i];
sb.append("\tat " + ste.toString()); sb.append("\tat ").append(ste);
sb.append('\n'); sb.append('\n');
if (i == 0 && ti.getLockInfo() != null) { if (i == 0 && ti.getLockInfo() != null) {
Thread.State ts = ti.getThreadState(); Thread.State ts = ti.getThreadState();
switch (ts) { switch (ts) {
case BLOCKED: case BLOCKED:
sb.append("\t- blocked on " + ti.getLockInfo()); sb.append("\t- blocked on ").append(ti.getLockInfo());
sb.append('\n'); sb.append('\n');
break; break;
case WAITING: case WAITING:
sb.append("\t- waiting on " + ti.getLockInfo()); sb.append("\t- waiting on ").append(ti.getLockInfo());
sb.append('\n'); sb.append('\n');
break; break;
case TIMED_WAITING: case TIMED_WAITING:
sb.append("\t- waiting on " + ti.getLockInfo()); sb.append("\t- waiting on ").append(ti.getLockInfo());
sb.append('\n'); sb.append('\n');
break; break;
default: default:
...@@ -1250,7 +1251,7 @@ public class Functions { ...@@ -1250,7 +1251,7 @@ public class Functions {
for (MonitorInfo mi : ti.getLockedMonitors()) { for (MonitorInfo mi : ti.getLockedMonitors()) {
if (mi.getLockedStackDepth() == i) { if (mi.getLockedStackDepth() == i) {
sb.append("\t- locked " + mi); sb.append("\t- locked ").append(mi);
sb.append('\n'); sb.append('\n');
} }
} }
...@@ -1261,7 +1262,7 @@ public class Functions { ...@@ -1261,7 +1262,7 @@ public class Functions {
sb.append("\n\tNumber of locked synchronizers = " + locks.length); sb.append("\n\tNumber of locked synchronizers = " + locks.length);
sb.append('\n'); sb.append('\n');
for (LockInfo li : locks) { for (LockInfo li : locks) {
sb.append("\t- " + li); sb.append("\t- ").append(li);
sb.append('\n'); sb.append('\n');
} }
} }
...@@ -1644,16 +1645,16 @@ public class Functions { ...@@ -1644,16 +1645,16 @@ public class Functions {
for (ConsoleAnnotatorFactory f : ConsoleAnnotatorFactory.all()) { for (ConsoleAnnotatorFactory f : ConsoleAnnotatorFactory.all()) {
String path = cp + "/extensionList/" + ConsoleAnnotatorFactory.class.getName() + "/" + f.getClass().getName(); String path = cp + "/extensionList/" + ConsoleAnnotatorFactory.class.getName() + "/" + f.getClass().getName();
if (f.hasScript()) if (f.hasScript())
buf.append("<script src='"+path+"/script.js'></script>"); buf.append("<script src='").append(path).append("/script.js'></script>");
if (f.hasStylesheet()) if (f.hasStylesheet())
buf.append("<link rel='stylesheet' type='text/css' href='"+path+"/style.css' />"); buf.append("<link rel='stylesheet' type='text/css' href='").append(path).append("/style.css' />");
} }
for (ConsoleAnnotationDescriptor d : ConsoleAnnotationDescriptor.all()) { for (ConsoleAnnotationDescriptor d : ConsoleAnnotationDescriptor.all()) {
String path = cp+"/descriptor/"+d.clazz.getName(); String path = cp+"/descriptor/"+d.clazz.getName();
if (d.hasScript()) if (d.hasScript())
buf.append("<script src='"+path+"/script.js'></script>"); buf.append("<script src='").append(path).append("/script.js'></script>");
if (d.hasStylesheet()) if (d.hasStylesheet())
buf.append("<link rel='stylesheet' type='text/css' href='"+path+"/style.css' />"); buf.append("<link rel='stylesheet' type='text/css' href='").append(path).append("/style.css' />");
} }
return buf.toString(); return buf.toString();
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册