Skip to content

The Unified and Autonomous Development Platform

chore: The link to user activity page when hover mouse over user avatar is broken (OD-2846)

Robin Shena8b936528e3b
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java
index 8443eea491..0c6e1e30c8 100755
--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java
@@ -30,7 +30,7 @@ public class TextInput {
buffer.append(" @NotEmpty\n");
if (multiline)
buffer.append(" @Multiline\n");
- buffer.append(MessageFormat.format("@Size(max={0}, message=\"Text is too long. Max {0} characters\")", MAX_LEN));
+ buffer.append(MessageFormat.format("@Size(max={0}, message=\"Text is too long. Max {0} characters\")", String.valueOf(MAX_LEN)));
if (pattern != null)
buffer.append(" @Pattern(regexp=\"" + pattern + "\", message=\"Should match regular expression: " + pattern + "\")\n");
inputSpec.appendMethods(buffer, index, "String", null, defaultValueProvider);
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java
index c0ee2f2f78..6fa2dae50f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java
@@ -171,13 +171,13 @@ public class TimeTrackingSetting implements Serializable {
StringBuilder builder = new StringBuilder();
if (hours != 0)
- builder.append(MessageFormat.format(translate? _T("{0}h"): "{0}h", hours)).append(" ");
+ builder.append(MessageFormat.format(translate? _T("{0}h"): "{0}h", String.valueOf(hours))).append(" ");
if (minutes != 0)
- builder.append(MessageFormat.format(translate? _T("{0}m"): "{0}m", minutes));
+ builder.append(MessageFormat.format(translate? _T("{0}m"): "{0}m", String.valueOf(minutes)));
String formatted = builder.toString().trim();
if (formatted.length() == 0)
- formatted = MessageFormat.format(translate? _T("{0}h"): "{0}h", 0);
+ formatted = MessageFormat.format(translate? _T("{0}h"): "{0}h", String.valueOf(0));
return formatted;
} else {
int weeks = minutes / (60 * hoursPerDay * daysPerWeek);
@@ -189,17 +189,17 @@ public class TimeTrackingSetting implements Serializable {
StringBuilder builder = new StringBuilder();
if (weeks != 0)
- builder.append(MessageFormat.format(translate? _T("{0}w"): "{0}w", weeks)).append(" ");
+ builder.append(MessageFormat.format(translate? _T("{0}w"): "{0}w", String.valueOf(weeks))).append(" ");
if (days != 0)
- builder.append(MessageFormat.format(translate? _T("{0}d"): "{0}d", days)).append(" ");
+ builder.append(MessageFormat.format(translate? _T("{0}d"): "{0}d", String.valueOf(days))).append(" ");
if (hours != 0)
- builder.append(MessageFormat.format(translate? _T("{0}h"): "{0}h", hours)).append(" ");
+ builder.append(MessageFormat.format(translate? _T("{0}h"): "{0}h", String.valueOf(hours))).append(" ");
if (minutes != 0)
- builder.append(MessageFormat.format(translate? _T("{0}m"): "{0}m", minutes));
+ builder.append(MessageFormat.format(translate? _T("{0}m"): "{0}m", String.valueOf(minutes)));
String formatted = builder.toString().trim();
if (formatted.length() == 0)
- formatted = MessageFormat.format(translate? _T("{0}h"): "{0}h", 0);
+ formatted = MessageFormat.format(translate? _T("{0}h"): "{0}h", String.valueOf(0));
return formatted;
}
}
@@ -209,7 +209,7 @@ public class TimeTrackingSetting implements Serializable {
return _T("Expects one or more <tt>&lt;number&gt;(h|m)</tt>. For instance <tt>1h 1m</tt> represents 1 hour and 1 minute");
} else {
return MessageFormat.format(_T("Expects one or more <tt>&lt;number&gt;(w|d|h|m)</tt>. For instance <tt>1w 1d 1h 1m</tt> represents 1 week ({0} days), 1 day ({1} hours), 1 hour, and 1 minute"),
- daysPerWeek, hoursPerDay);
+ String.valueOf(daysPerWeek), String.valueOf(hoursPerDay));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/NoActivitySpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/NoActivitySpec.java
index 39eb6c7ae2..cc8bd88e46 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/NoActivitySpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/NoActivitySpec.java
@@ -27,7 +27,7 @@ public class NoActivitySpec extends AutoSpec {
@Override
public String getTriggerDescription() {
- return MessageFormat.format(_T("no activity for {0} days"), days);
+ return MessageFormat.format(_T("no activity for {0} days"), String.valueOf(days));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.java b/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.java
index 0f948f3f89..83de550042 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.java
@@ -352,7 +352,7 @@ public class ChatPanel extends Panel {
@Override
public void setObject(String object) {
if (object != null && object.length() > ChatMessage.MAX_CONTENT_LEN)
- getSession().error(MessageFormat.format(_T("Message is too long. Max {0} characters"), ChatMessage.MAX_CONTENT_LEN));
+ getSession().error(MessageFormat.format(_T("Message is too long. Max {0} characters"), String.valueOf(ChatMessage.MAX_CONTENT_LEN)));
else
WebSession.get().setChatInput(object);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index ae3b08ec65..ab9ae64859 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -314,7 +314,7 @@ public abstract class BuildListPanel extends Panel {
for (IModel<Build> each: selectionColumn.getSelections()) {
Build build = each.getObject();
if (build.isFinished()) {
- errorMessage = MessageFormat.format(_T("Build #{0} already finished"), build.getNumber());
+ errorMessage = MessageFormat.format(_T("Build #{0} already finished"), String.valueOf(build.getNumber()));
break;
}
}
@@ -386,7 +386,7 @@ public abstract class BuildListPanel extends Panel {
for (IModel<Build> each: selectionColumn.getSelections()) {
Build build = each.getObject();
if (!build.isFinished()) {
- errorMessage = MessageFormat.format(_T("Build #{0} not finished yet"), build.getNumber());
+ errorMessage = MessageFormat.format(_T("Build #{0} not finished yet"), String.valueOf(build.getNumber()));
break;
}
}
@@ -532,7 +532,7 @@ public abstract class BuildListPanel extends Panel {
for (Iterator<Build> it = (Iterator<Build>) dataProvider.iterator(0, buildsTable.getItemCount()); it.hasNext();) {
Build build = it.next();
if (build.isFinished()) {
- errorMessage = MessageFormat.format(_T("Build #{0} already finished"), build.getNumber());
+ errorMessage = MessageFormat.format(_T("Build #{0} already finished"), String.valueOf(build.getNumber()));
break;
}
}
@@ -605,7 +605,7 @@ public abstract class BuildListPanel extends Panel {
for (Iterator<Build> it = (Iterator<Build>) dataProvider.iterator(0, buildsTable.getItemCount()); it.hasNext();) {
Build build = it.next();
if (!build.isFinished()) {
- errorMessage = MessageFormat.format(_T("Build #{0} not finished yet"), build.getNumber());
+ errorMessage = MessageFormat.format(_T("Build #{0} not finished yet"), String.valueOf(build.getNumber()));
break;
}
}
@@ -1029,7 +1029,7 @@ public abstract class BuildListPanel extends Panel {
@Override
public String getObject() {
if (dataProvider.size() > 1)
- return MessageFormat.format(_T("found {0} builds"), dataProvider.size());
+ return MessageFormat.format(_T("found {0} builds"), String.valueOf(dataProvider.size()));
else
return _T("found 1 build");
}
@@ -1169,7 +1169,7 @@ public abstract class BuildListPanel extends Panel {
Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);
PageParameters params = PullRequestActivitiesPage.paramsOf(build.getRequest());
Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class, params);
- link.add(new Label("label", MessageFormat.format(_T("pull request #{0}"), build.getRequest().getNumber())));
+ link.add(new Label("label", MessageFormat.format(_T("pull request #{0}"), String.valueOf(build.getRequest().getNumber()))));
fragment.add(link);
cellItem.add(fragment);
} else if (build.getBranch() != null) {
@@ -1201,7 +1201,7 @@ public abstract class BuildListPanel extends Panel {
}
} else {
if (build.getRequest() != null)
- cellItem.add(new Label(componentId, MessageFormat.format(_T("pull request #{0}"), build.getRequest().getNumber())));
+ cellItem.add(new Label(componentId, MessageFormat.format(_T("pull request #{0}"), String.valueOf(build.getRequest().getNumber()))));
else if (build.getBranch() != null)
cellItem.add(new Label(componentId, MessageFormat.format(_T("branch {0}"), build.getBranch())));
else if (build.getTag() != null)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index 4994a97de2..2d63e80ede 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -428,7 +428,7 @@ public abstract class BuildSidePanel extends Panel {
Link<Void> dependentsLink = new BookmarkablePageLink<Void>("dependents", BuildListPage.class,
BuildListPage.paramsOf(query, 0));
dependentsLink.setVisible(!getBuild().getDependents().isEmpty());
- dependentsLink.add(new Label("label", MessageFormat.format(_T("{0} build(s)"), getBuild().getDependents().size())));
+ dependentsLink.add(new Label("label", MessageFormat.format(_T("{0} build(s)"), String.valueOf(getBuild().getDependents().size()))));
dependencesContainer.add(dependentsLink);
@@ -436,7 +436,7 @@ public abstract class BuildSidePanel extends Panel {
Link<Void> dependenciesLink = new BookmarkablePageLink<Void>("dependencies", BuildListPage.class,
BuildListPage.paramsOf(query, 0));
dependenciesLink.setVisible(!getBuild().getDependencies().isEmpty());
- dependenciesLink.add(new Label("label", MessageFormat.format(_T("{0} build(s)"), getBuild().getDependencies().size())));
+ dependenciesLink.add(new Label("label", MessageFormat.format(_T("{0} build(s)"), String.valueOf(getBuild().getDependencies().size()))));
dependencesContainer.add(dependenciesLink);
WebMarkupContainer comma = new WebMarkupContainer("comma");
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index e82b6b6d41..84c98d23d2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -739,7 +739,7 @@ public abstract class CodeCommentListPanel extends Panel {
@Override
public String getObject() {
if (dataProvider.size() > 1)
- return MessageFormat.format(_T("found {0} comments"), dataProvider.size());
+ return MessageFormat.format(_T("found {0} comments"), String.valueOf(dataProvider.size()));
else
return _T("found 1 comment");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
index 732f444d49..52bc3ffbd3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
@@ -952,7 +952,7 @@ public class BlobTextDiffPanel extends Panel implements ChatToolAware {
SpriteImage.getVersionedHref(IconScope.class, "ellipsis"));
String script = String.format("javascript:$('#%s').data('callback')('expand', %d);", getMarkupId(), blockIndex);
- var skippedMessage = MessageFormat.format(_T("skipped {0} lines"), skippedLines);
+ var skippedMessage = MessageFormat.format(_T("skipped {0} lines"), String.valueOf(skippedLines));
if (diffMode == DiffViewMode.UNIFIED) {
if (blameInfo != null) {
builder.append("<td colspan='3' class='expander noselect'><a data-tippy-content='" + _T("Show more lines") + "' href=\"")
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 432820f8ff..511f37d0fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -764,7 +764,7 @@ public abstract class RevisionDiffPanel extends Panel {
@Override
public String getObject() {
- return MessageFormat.format(_T("Showing first {0} files as there are too many"), getDisplayChanges().size());
+ return MessageFormat.format(_T("Showing first {0} files as there are too many"), String.valueOf(getDisplayChanges().size()));
}
}) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.java b/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.java
index 7e9c8ce2f0..bf108d1c20 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.java
@@ -65,7 +65,7 @@ public class DiffStatBar extends Panel {
}
}).setEscapeModelStrings(false));
- add(AttributeAppender.append("data-tippy-content", MessageFormat.format(_T("{0} additions & {1} deletions"), additions, deletions)));
+ add(AttributeAppender.append("data-tippy-content", MessageFormat.format(_T("{0} additions & {1} deletions"), String.valueOf(additions), String.valueOf(deletions))));
}
private int getAdditionBlocks() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java
index b61aa64c12..f3ee5b94f8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java
@@ -195,7 +195,7 @@ public class PlainTextDiffPanel extends Panel {
SpriteImage.getVersionedHref(IconScope.class, "ellipsis"));
String script = String.format("javascript:$('#%s').data('callback')('expand', %d);", getMarkupId(), blockIndex);
- var skippedMessage = MessageFormat.format(_T("skipped {0} lines"), skippedLines);
+ var skippedMessage = MessageFormat.format(_T("skipped {0} lines"), String.valueOf(skippedLines));
if (showLineNumbers) {
builder.append("<td colspan='2' class='expander noselect'><a data-tippy-content='").append(_T("Show more lines")).append("' href=\"")
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 6de7e4e00d..7733a558e6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -1839,7 +1839,7 @@ public abstract class IssueListPanel extends Panel {
@Override
public String getObject() {
if (dataProvider.size() > 1)
- return MessageFormat.format(_T("found {0} issues"), dataProvider.size());
+ return MessageFormat.format(_T("found {0} issues"), String.valueOf(dataProvider.size()));
else
return _T("found 1 issue");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
index c223046dd2..5d1dad2bd2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
@@ -550,7 +550,7 @@ public abstract class PackListPanel extends Panel {
@Override
public String getObject() {
if (dataProvider.size() > 1)
- return MessageFormat.format(_T("found {0} packages"), dataProvider.size());
+ return MessageFormat.format(_T("found {0} packages"), String.valueOf(dataProvider.size()));
else
return _T("found 1 package");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
index 2d1790a45c..d9ba4102c0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
@@ -101,7 +101,7 @@ public abstract class ProjectInfoPanel extends Panel {
+ Criteria.quote(getProject().getPath());
PageParameters params = ProjectListPage.paramsOf(query, 0, getProject().getForks().size());
Link<Void> forksLink = new BookmarkablePageLink<Void>("forks", ProjectListPage.class, params);
- forksLink.add(new Label("label", MessageFormat.format(_T("{0} forks"), getProject().getForks().size())));
+ forksLink.add(new Label("label", MessageFormat.format(_T("{0} forks"), String.valueOf(getProject().getForks().size()))));
forkInfo.add(forksLink);
ModalLink forkNow = new ModalLink("forkNow") {
@@ -218,7 +218,7 @@ public abstract class ProjectInfoPanel extends Panel {
try {
getProjectService().requestToSyncReplica(projectId, activeServer);
} catch (Throwable e) {
- logger.error(MessageFormat.format("Error requestig to sync replica of project with id \"{0}\"", projectId), e);
+ logger.error(MessageFormat.format("Error requestig to sync replica of project with id \"{0}\"", String.valueOf(projectId)), e);
}
return null;
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index 1210fac950..73a41d8e42 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -1134,7 +1134,7 @@ public class ProjectListPanel extends Panel {
@Override
public String getObject() {
if (dataProvider.size() > 1)
- return MessageFormat.format(_T("found {0} projects"), dataProvider.size());
+ return MessageFormat.format(_T("found {0} projects"), String.valueOf(dataProvider.size()));
else
return _T("found 1 project");
}
@@ -1351,7 +1351,7 @@ public class ProjectListPanel extends Panel {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Label("label", MessageFormat.format(_T("{0} child projects"), children.size())));
+ add(new Label("label", MessageFormat.format(_T("{0} child projects"), String.valueOf(children.size()))));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.java
index abb3eb93f1..992b23b511 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.java
@@ -63,7 +63,7 @@ public class CodeStatsPanel extends GenericPanel<Project> {
@Override
protected String load() {
- return MessageFormat.format(_T("{0} files"), getCommitInfoManager().getFileCount(getProject().getId()));
+ return MessageFormat.format(_T("{0} files"), String.valueOf(getCommitInfoManager().getFileCount(getProject().getId())));
}
}));
@@ -75,7 +75,7 @@ public class CodeStatsPanel extends GenericPanel<Project> {
@Override
protected String load() {
- return MessageFormat.format(_T("{0} commits"), commitCountModel.getObject());
+ return MessageFormat.format(_T("{0} commits"), String.valueOf(commitCountModel.getObject()));
}
}));
@@ -89,7 +89,7 @@ public class CodeStatsPanel extends GenericPanel<Project> {
protected String load() {
int branchCount = OneDev.getInstance(GitService.class)
.countRefs(getProject().getId(), Constants.R_HEADS);
- return MessageFormat.format(_T("{0} branches"), branchCount);
+ return MessageFormat.format(_T("{0} branches"), String.valueOf(branchCount));
}
}));
@@ -103,7 +103,7 @@ public class CodeStatsPanel extends GenericPanel<Project> {
protected String load() {
int tagCount = OneDev.getInstance(GitService.class)
.countRefs(getProject().getId(), Constants.R_TAGS);
- return MessageFormat.format(_T("{0} tags"), tagCount);
+ return MessageFormat.format(_T("{0} tags"), String.valueOf(tagCount));
}
}));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 237ade1cec..901f8f79bc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -1089,7 +1089,7 @@ public abstract class PullRequestListPanel extends Panel {
@Override
public String getObject() {
if (dataProvider.size() > 1)
- return MessageFormat.format(_T("found {0} pull requests"), dataProvider.size());
+ return MessageFormat.format(_T("found {0} pull requests"), String.valueOf(dataProvider.size()));
else
return _T("found 1 pull request");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java
index fad877d3b7..6bc0994b73 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java
@@ -53,7 +53,7 @@ public class PersonCardPanel extends Panel {
if (personIdent.getName().equals(User.SYSTEM_NAME))
builder.append("<i>System Account</i>");
else if (emailAddress != null && emailAddress.isVerified())
- builder.append(MessageFormat.format("<a href=\"/~users/{0}\">@{1}</a>", emailAddress.getOwner().getId(), escapeHtml5(emailAddress.getOwner().getName())));
+ builder.append(MessageFormat.format("<a href=\"/~users/{0}\">@{1}</a>", String.valueOf(emailAddress.getOwner().getId()), escapeHtml5(emailAddress.getOwner().getName())));
else
builder.append("<i>No OneDev Account</i>");
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/card/UserCardPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/card/UserCardPanel.java
index 947e1418e3..6254898557 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/card/UserCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/card/UserCardPanel.java
@@ -53,7 +53,7 @@ public class UserCardPanel extends GenericPanel<User> {
else if (getUser().isSystem())
builder.append("<i>System Account</i>");
else
- builder.append(MessageFormat.format("<a href=\"/~users/{0}\">@{1}</a>", getUser().getId(), escapeHtml5(getUser().getName())));
+ builder.append(MessageFormat.format("<a href=\"/~users/{0}\">@{1}</a>", String.valueOf(getUser().getId()), escapeHtml5(getUser().getName())));
container.add(new Label("info", builder.toString()).setEscapeModelStrings(false));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/wizard/WizardPanel.java b/server-core/src/main/java/io/onedev/server/web/component/wizard/WizardPanel.java
index bd0ba8ee36..b28a780f04 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/wizard/WizardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/wizard/WizardPanel.java
@@ -54,7 +54,7 @@ public abstract class WizardPanel extends Panel {
@Override
public String getObject() {
- return format(_T("Step {0} of {1}: "), activeStepIndex+1, steps.size()) + _T(getActiveStep().getTitle());
+ return format(_T("Step {0} of {1}: "), String.valueOf(activeStepIndex+1), String.valueOf(steps.size())) + _T(getActiveStep().getTitle());
}
}));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java
index bce945875e..558511a471 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java
@@ -559,7 +559,7 @@ public abstract class WorkspaceListPanel extends Panel {
@Override
public String getObject() {
if (dataProvider.size() > 1)
- return MessageFormat.format(_T("found {0} workspaces"), dataProvider.size());
+ return MessageFormat.format(_T("found {0} workspaces"), String.valueOf(dataProvider.size()));
else
return _T("found 1 workspace");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
index 1cced26966..e33c86849a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
@@ -844,7 +844,7 @@ class AgentListPanel extends Panel {
@Override
public String getObject() {
if (dataProvider.size() > 1)
- return MessageFormat.format(_T("found {0} agents"), dataProvider.size());
+ return MessageFormat.format(_T("found {0} agents"), String.valueOf(dataProvider.size()));
else
return _T("found 1 agent");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.java
index 201354d49f..98a68f5755 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.java
@@ -41,7 +41,7 @@ public class AgentLogPage extends AgentDetailPage {
List<String> lines = OneDev.getInstance(AgentService.class).getAgentLog(getAgent());
String content;
if (lines.size() > MAX_DISPLAY_LINES) {
- fragment.add(new Label("warning", MessageFormat.format(_T("Too many log entries, displaying recent {0}"), MAX_DISPLAY_LINES)));
+ fragment.add(new Label("warning", MessageFormat.format(_T("Too many log entries, displaying recent {0}"), String.valueOf(MAX_DISPLAY_LINES))));
content = Joiner.on("\n").join(toZoneId(lines.subList(lines.size()-MAX_DISPLAY_LINES, lines.size()), getZoneId()));
} else {
fragment.add(new WebMarkupContainer("warning").setVisible(false));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java
index de94d5a95b..f65ea6de99 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java
@@ -36,7 +36,7 @@ public class ServerLogPage extends ServerDetailPage {
List<String> lines = ServerLogResource.readServerLog(server);
String content;
if (lines.size() > MAX_DISPLAY_LINES) {
- add(new Label("warning", MessageFormat.format(_T("Too many log entries, displaying recent {0}"), MAX_DISPLAY_LINES)));
+ add(new Label("warning", MessageFormat.format(_T("Too many log entries, displaying recent {0}"), String.valueOf(MAX_DISPLAY_LINES))));
content = Joiner.on("\n").join(toZoneId(lines.subList(lines.size()-MAX_DISPLAY_LINES, lines.size()), getZoneId()));
} else {
add(new WebMarkupContainer("warning").setVisible(false));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java
index f37719a4cd..226fdc2ecb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java
@@ -960,7 +960,7 @@ public class UserListPage extends AdministrationPage {
@Override
public String getObject() {
if (dataProvider.size() > 1)
- return MessageFormat.format(_T("found {0} users"), dataProvider.size());
+ return MessageFormat.format(_T("found {0} users"), String.valueOf(dataProvider.size()));
else
return _T("found 1 user");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index 1757846965..429ded14c4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -784,7 +784,7 @@ public class ProjectBranchesPage extends ProjectPage {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Label("label", MessageFormat.format(ahead? _T("{0} ahead") : _T("{0} behind"), count)));
+ add(new Label("label", MessageFormat.format(ahead? _T("{0} ahead") : _T("{0} behind"), String.valueOf(count))));
}
@Override
@@ -792,9 +792,9 @@ public class ProjectBranchesPage extends ProjectPage {
super.onComponentTag(tag);
if (ahead)
- tag.put("data-tippy-content", MessageFormat.format(_T("{0} commits ahead of base branch"), count));
+ tag.put("data-tippy-content", MessageFormat.format(_T("{0} commits ahead of base branch"), String.valueOf(count)));
else
- tag.put("data-tippy-content", MessageFormat.format(_T("{0} commits behind of base branch"), count));
+ tag.put("data-tippy-content", MessageFormat.format(_T("{0} commits behind of base branch"), String.valueOf(count)));
if (count == 0)
tag.setName("span");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index 936133e5bf..f3fe424103 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -156,7 +156,7 @@ public abstract class BuildDetailPage extends ProjectPage
Long buildNumber = params.get(PARAM_BUILD).toLong();
Build build = buildService.find(getProject(), buildNumber);
if (build == null)
- throw new EntityNotFoundException(MessageFormat.format(_T("Unable to find build #{0} in project {1}"), buildNumber, getProject()));
+ throw new EntityNotFoundException(MessageFormat.format(_T("Unable to find build #{0} in project {1}"), String.valueOf(buildNumber), getProject()));
else if (!build.getProject().equals(getProject()))
throw new RestartResponseException(getPageClass(), paramsOf(build));
else
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java
index 8f22a53b9c..c7ebb91832 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java
@@ -47,7 +47,7 @@ public class InvalidBuildPage extends ProjectPage {
Long buildNumber = params.get(PARAM_BUILD).toLong();
Build build = OneDev.getInstance(BuildService.class).find(getProject(), buildNumber);
if (build == null)
- throw new EntityNotFoundException(MessageFormat.format(_T("Unable to find build #{0} in project {1}"), buildNumber, getProject()));
+ throw new EntityNotFoundException(MessageFormat.format(_T("Unable to find build #{0} in project {1}"), String.valueOf(buildNumber), getProject()));
Preconditions.checkState(!build.isValid());
return build;
}
@@ -84,7 +84,7 @@ public class InvalidBuildPage extends ProjectPage {
setVisible(SecurityUtils.canManageBuild(getBuild()));
}
- }.add(new ConfirmClickModifier(MessageFormat.format(_T("Do you really want to delete build #{0}?"), getBuild().getNumber()))));
+ }.add(new ConfirmClickModifier(MessageFormat.format(_T("Do you really want to delete build #{0}?"), String.valueOf(getBuild().getNumber())))));
}
public static PageParameters paramsOf(Build build) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java
index f4c0720653..30ac11fb3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java
@@ -76,7 +76,7 @@ public class InvalidCodeCommentPage extends ProjectPage {
public void onClick() {
OneDev.getInstance(CodeCommentService.class).delete(getCodeComment());
- Session.get().success(MessageFormat.format(_T("Code comment #{0} deleted"), getCodeComment().getId()));
+ Session.get().success(MessageFormat.format(_T("Code comment #{0} deleted"), String.valueOf(getCodeComment().getId())));
String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(CodeComment.class);
if (redirectUrlAfterDelete != null)
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java
index 0367e550d0..bdfbba33a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java
@@ -110,7 +110,7 @@ public class InvalidPullRequestPage extends ProjectPage {
}
}
- }.add(new ConfirmClickModifier(MessageFormat.format(_T("Do you really want to delete pull request #{0}?"), getPullRequest().getNumber()))));
+ }.add(new ConfirmClickModifier(MessageFormat.format(_T("Do you really want to delete pull request #{0}?"), String.valueOf(getPullRequest().getNumber())))));
}
public static PageParameters paramsOf(PullRequest request) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java
index d386f06e0e..bb14a120a1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java
@@ -46,7 +46,7 @@ class PullRequestUpdatePanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- String tooManyMessage = MessageFormat.format(_T("Too many commits, displaying recent {0}"), WebConstants.MAX_DISPLAY_COMMITS);
+ String tooManyMessage = MessageFormat.format(_T("Too many commits, displaying recent {0}"), String.valueOf(WebConstants.MAX_DISPLAY_COMMITS));
add(new Label("tooManyCommits", tooManyMessage) {
@Override
diff --git a/server-ee b/server-ee
index 933ac2a2ce..9d918bfb1d 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 933ac2a2cebdba10b3d391f1d60e952338365713
+Subproject commit 9d918bfb1d931e7fb108156b6a4f49298d82b565
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
index f480a9b4c1..655f830834 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
@@ -262,7 +262,7 @@ public class ProblemReportPage extends BuildReportPage {
.setVisible(groupKey instanceof BlobTarget.GroupKey));
item.add(new Label("tooManyProblems",
- MessageFormat.format(_T("Too many problems, displaying first {0}"), MAX_PROBLEMS_TO_DISPLAY)) {
+ MessageFormat.format(_T("Too many problems, displaying first {0}"), String.valueOf(MAX_PROBLEMS_TO_DISPLAY))) {
@Override
protected void onConfigure() {