Skip to content

Commit eee01ec

Browse files
LPS-135470 Use StringBundler.concat
1 parent f9d6c9b commit eee01ec

File tree

1 file changed

+19
-38
lines changed

1 file changed

+19
-38
lines changed

portal-impl/src/com/liferay/portal/events/ServicePreAction.java

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -835,22 +835,16 @@ private ThemeDisplay _initThemeDisplay(
835835

836836
// Company logo
837837

838-
StringBundler sb = new StringBundler(6);
839-
840-
sb.append(imagePath);
841-
sb.append("/company_logo");
838+
String companyLogo = imagePath + "/company_logo";
842839

843840
long companyLogoId = company.getLogoId();
844841

845842
if (companyLogoId > 0) {
846-
sb.append("?img_id=");
847-
sb.append(company.getLogoId());
848-
sb.append("&t=");
849-
sb.append(WebServerServletTokenUtil.getToken(company.getLogoId()));
843+
companyLogo = StringBundler.concat(
844+
"?img_id=", company.getLogoId(), "&t=",
845+
WebServerServletTokenUtil.getToken(company.getLogoId()));
850846
}
851847

852-
String companyLogo = sb.toString();
853-
854848
int companyLogoHeight = 0;
855849
int companyLogoWidth = 0;
856850

@@ -1020,19 +1014,16 @@ private ThemeDisplay _initThemeDisplay(
10201014
!GroupPermissionUtil.contains(
10211015
permissionChecker, sourceGroup, ActionKeys.VIEW)) {
10221016

1023-
sb = new StringBundler(6);
1024-
1025-
sb.append("User ");
1026-
sb.append(user.getUserId());
1027-
sb.append(" is not allowed to access the private ");
1028-
sb.append("pages of user ");
1029-
sb.append(sourceGroup.getClassPK());
1017+
String message = StringBundler.concat(
1018+
"User ", user.getUserId(),
1019+
" is not allowed to access the private pages of ",
1020+
"user ", sourceGroup.getClassPK());
10301021

10311022
if (_log.isWarnEnabled()) {
1032-
_log.warn(sb.toString());
1023+
_log.warn(message);
10331024
}
10341025

1035-
throw new NoSuchLayoutException(sb.toString());
1026+
throw new NoSuchLayoutException(message);
10361027
}
10371028

10381029
layout = new VirtualLayout(layout, sourceGroup);
@@ -1109,20 +1100,16 @@ else if (!loginRequest &&
11091100
user.getUserId());
11101101
}
11111102

1112-
sb = new StringBundler(6);
1113-
1114-
sb.append("User ");
1115-
sb.append(user.getUserId());
1116-
sb.append(" is not allowed to access the ");
1117-
sb.append(layout.isPrivateLayout() ? "private" : "public");
1118-
sb.append(" pages of group ");
1119-
sb.append(layout.getGroupId());
1103+
String message = StringBundler.concat(
1104+
"User ", user.getUserId(), " is not allowed to access the ",
1105+
layout.isPrivateLayout() ? "private" : "public",
1106+
" pages of group ", layout.getGroupId());
11201107

11211108
if (_log.isWarnEnabled()) {
1122-
_log.warn(sb.toString());
1109+
_log.warn(message);
11231110
}
11241111

1125-
throw new NoSuchLayoutException(sb.toString());
1112+
throw new NoSuchLayoutException(message);
11261113
}
11271114
else if (loginRequest && !viewableGroup) {
11281115
layout = null;
@@ -1231,15 +1218,9 @@ else if (group.isLayoutPrototype()) {
12311218
}
12321219

12331220
if (logoId > 0) {
1234-
sb = new StringBundler(5);
1235-
1236-
sb.append(imagePath);
1237-
sb.append("/layout_set_logo?img_id=");
1238-
sb.append(logoId);
1239-
sb.append("&t=");
1240-
sb.append(WebServerServletTokenUtil.getToken(logoId));
1241-
1242-
layoutSetLogo = sb.toString();
1221+
layoutSetLogo = StringBundler.concat(
1222+
imagePath, "/layout_set_logo?img_id=", logoId, "&t=",
1223+
WebServerServletTokenUtil.getToken(logoId));
12431224

12441225
Image layoutSetLogoImage =
12451226
ImageLocalServiceUtil.getCompanyLogo(logoId);

0 commit comments

Comments
 (0)