
Fix java accessor method called as empty-paren
Methods that follow JavaBean naming contract for accessor (e.g. getXXX, setXXX, isXXX, ..) are expected to have no side effects. So you don't need to call them as empty-paren.
@33ab80d35d57ffa64b3d7fa5d4c3e3613c9a92f9
--- app/views/board/list.scala.html
+++ app/views/board/list.scala.html
... | ... | @@ -64,7 +64,7 @@ |
64 | 64 |
} |
65 | 65 |
|
66 | 66 |
<ul class="post-list-wrap"> |
67 |
- @for(post <- page.getList()){ |
|
67 |
+ @for(post <- page.getList){ |
|
68 | 68 |
@partial_list(post, project) |
69 | 69 |
} |
70 | 70 |
</ul> |
--- app/views/board/view.scala.html
+++ app/views/board/view.scala.html
... | ... | @@ -153,7 +153,7 @@ |
153 | 153 |
// yobi.Mention |
154 | 154 |
yobi.Mention({ |
155 | 155 |
"target": "comment-editor", |
156 |
- "url" : "@Html(routes.ProjectApp.mentionList(project.owner, project.name, post.getNumber, post.asResource().getType().resource()).toString())" |
|
156 |
+ "url" : "@Html(routes.ProjectApp.mentionList(project.owner, project.name, post.getNumber, post.asResource().getType.resource()).toString())" |
|
157 | 157 |
}); |
158 | 158 |
}); |
159 | 159 |
</script> |
--- app/views/code/branches.scala.html
+++ app/views/code/branches.scala.html
... | ... | @@ -35,7 +35,7 @@ |
35 | 35 |
<li> |
36 | 36 |
<a href="@routes.CodeHistoryApp.historyUntilHead(project.owner, project.name)">@Messages("code.commits")</a> |
37 | 37 |
</li> |
38 |
- @if(project.isGit()) { |
|
38 |
+ @if(project.isGit) { |
|
39 | 39 |
<li class="active"> |
40 | 40 |
<a href="@routes.BranchApp.branches(project.owner, project.name)">@Messages("title.branches")</a> |
41 | 41 |
</li> |
--- app/views/code/partial_branchrow.scala.html
+++ app/views/code/partial_branchrow.scala.html
... | ... | @@ -58,7 +58,7 @@ |
58 | 58 |
</td> |
59 | 59 |
<td class="commitMessage"> |
60 | 60 |
@getCommiterAvatar(branch) |
61 |
- @common.commitMsg(branch.getHeadCommit.getShortMessage(), |
|
61 |
+ @common.commitMsg(branch.getHeadCommit.getShortMessage, |
|
62 | 62 |
branch.getHeadCommit.getMessage, |
63 | 63 |
getShowCommitURL(branch)) |
64 | 64 |
</td> |
... | ... | @@ -68,7 +68,7 @@ |
68 | 68 |
<td class="pullRequest"> |
69 | 69 |
@if(branch.getPullRequest != null) { |
70 | 70 |
<a href="@routes.PullRequestApp.pullRequest(branch.getPullRequest.toProject.owner, branch.getPullRequest.toProject.name, branch.getPullRequest.number)" |
71 |
- class="blue-txt pullrequest-state @branch.getPullRequest.state.toString().toLowerCase()"> |
|
71 |
+ class="blue-txt pullrequest-state @branch.getPullRequest.state.toString().toLowerCase"> |
|
72 | 72 |
pullRequest-@branch.getPullRequest.number |
73 | 73 |
</a> |
74 | 74 |
} else { |
... | ... | @@ -80,11 +80,11 @@ |
80 | 80 |
isAllowed(UserApp.currentUser(), project.asResource(), Operation.UPDATE)) { |
81 | 81 |
<td class="actions"> |
82 | 82 |
@if(isAllowed(UserApp.currentUser(), project.asResource(), Operation.UPDATE)){ |
83 |
- @if(branch.getName() != project.defaultBranch()){ |
|
83 |
+ @if(branch.getName != project.defaultBranch()){ |
|
84 | 84 |
<button type="button" |
85 | 85 |
class="ybtn ybtn-default" |
86 | 86 |
data-request-method="post" |
87 |
- data-request-uri="@routes.BranchApp.setAsDefault(project.owner, project.name, URLEncoder.encode(branch.getName(), "UTF-8"))"> |
|
87 |
+ data-request-uri="@routes.BranchApp.setAsDefault(project.owner, project.name, URLEncoder.encode(branch.getName, "UTF-8"))"> |
|
88 | 88 |
@Messages("code.branches.setAsDefault") |
89 | 89 |
</button> |
90 | 90 |
} |
--- app/views/code/view.scala.html
+++ app/views/code/view.scala.html
... | ... | @@ -46,7 +46,7 @@ |
46 | 46 |
} else { |
47 | 47 |
<li><a href="@routes.CodeHistoryApp.history(project.owner, project.name, URLEncoder.encode(branch, "UTF-8"), null)">@Messages("code.commits")</a></li> |
48 | 48 |
} |
49 |
- @if(project.isGit()) { |
|
49 |
+ @if(project.isGit) { |
|
50 | 50 |
<li> |
51 | 51 |
<a href="@routes.BranchApp.branches(project.owner, project.name)">@Messages("title.branches")</a> |
52 | 52 |
</li> |
--- app/views/git/partial_diff.scala.html
+++ app/views/git/partial_diff.scala.html
... | ... | @@ -51,11 +51,11 @@ |
51 | 51 |
|
52 | 52 |
<div id="diff"> |
53 | 53 |
@if(result != null) { |
54 |
- @if(result.getGitCommits().isEmpty()) { |
|
54 |
+ @if(result.getGitCommits().isEmpty) { |
|
55 | 55 |
<h4>@Messages("pullRequest.diff.noChanges")</h4> |
56 | 56 |
} else { |
57 | 57 |
<div style="margin-top:20px;"> |
58 |
- @if(result.getGitConflicts() == null){ |
|
58 |
+ @if(result.getGitConflicts == null){ |
|
59 | 59 |
<div class="alert alert-success"> |
60 | 60 |
<h5>@Messages("pullRequest.is.safe")</h5> |
61 | 61 |
</div> |
... | ... | @@ -82,11 +82,11 @@ |
82 | 82 |
</tr> |
83 | 83 |
</thead> |
84 | 84 |
<tbody class="tbody"> |
85 |
- @for(commit <- result.getGitCommits()) { |
|
85 |
+ @for(commit <- result.getGitCommits) { |
|
86 | 86 |
<tr> |
87 | 87 |
<td class="commit-id"> |
88 |
- <a href="@routes.CodeHistoryApp.show(pullRequest.fromProject.owner, pullRequest.fromProject.name, commit.getId())"> |
|
89 |
- @commit.getShortId() |
|
88 |
+ <a href="@routes.CodeHistoryApp.show(pullRequest.fromProject.owner, pullRequest.fromProject.name, commit.getId)"> |
|
89 |
+ @commit.getShortId |
|
90 | 90 |
<i class="yobicon-right"></i> |
91 | 91 |
</a> |
92 | 92 |
</td> |
... | ... | @@ -96,14 +96,14 @@ |
96 | 96 |
<span class="number-of-comments"><i class="yobicon-comments"></i> @numOfComment</span> |
97 | 97 |
} |
98 | 98 |
} |
99 |
- @defining(commit.getMessage()){ commitMsg => |
|
99 |
+ @defining(commit.getMessage){ commitMsg => |
|
100 | 100 |
@common.commitMsg(commitMsg.split("\n")(0), |
101 | 101 |
commitMsg, |
102 |
- routes.CodeHistoryApp.show(pullRequest.fromProject.owner, pullRequest.fromProject.name, commit.getId()).toString()) |
|
102 |
+ routes.CodeHistoryApp.show(pullRequest.fromProject.owner, pullRequest.fromProject.name, commit.getId).toString()) |
|
103 | 103 |
} |
104 | 104 |
</td> |
105 | 105 |
<td class="date" title="@JodaDateUtil.getDateString(commit.getAuthorDate)"> |
106 |
- @agoString(JodaDateUtil.ago(commit.getAuthorDate())) |
|
106 |
+ @agoString(JodaDateUtil.ago(commit.getAuthorDate)) |
|
107 | 107 |
</td> |
108 | 108 |
<td class="author @commit.getAuthorEmail"> |
109 | 109 |
@defining(User.find.where.eq("email", commit.getAuthorEmail).findUnique) { user => |
... | ... | @@ -113,7 +113,7 @@ |
113 | 113 |
</a> |
114 | 114 |
} else { |
115 | 115 |
<div class="avatar-wrap"> |
116 |
- <img src="@urlToPicture(commit.getAuthorEmail(), 32)" width="32" height="32"/> |
|
116 |
+ <img src="@urlToPicture(commit.getAuthorEmail, 32)" width="32" height="32"/> |
|
117 | 117 |
</div> |
118 | 118 |
} |
119 | 119 |
} |
--- app/views/git/partial_forklist.scala.html
+++ app/views/git/partial_forklist.scala.html
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 |
@import utils.TemplateHelper._ |
3 | 3 |
|
4 | 4 |
|
5 |
-@if(project.hasForks()) { |
|
5 |
+@if(project.hasForks) { |
|
6 | 6 |
<div id="forks" class="tab-pane"> |
7 | 7 |
<ul class="all-projects"> |
8 | 8 |
@for(fork <- project.forkingProjects) { |
... | ... | @@ -14,7 +14,7 @@ |
14 | 14 |
</a> |
15 | 15 |
@if(!fork.isPublic){ <i class="yobicon-lock yobicon-small"></i> } |
16 | 16 |
@for(label <- fork.labels) { |
17 |
- <span class="project-label @label.category.toLowerCase()">@label.name</span> |
|
17 |
+ <span class="project-label @label.category.toLowerCase">@label.name</span> |
|
18 | 18 |
} |
19 | 19 |
</div> |
20 | 20 |
<div style="float:left"> |
... | ... | @@ -22,7 +22,7 @@ |
22 | 22 |
<a href="@routes.ProjectApp.project(fork.owner, fork.name)" class="black">@fork.name</a> |
23 | 23 |
@if(!fork.isPublic){ <i class="yobicon-lock yobicon-small"></i> } |
24 | 24 |
@for(label <- fork.labels) { |
25 |
- <span class="project-label @label.category.toLowerCase()">@label.name</span> |
|
25 |
+ <span class="project-label @label.category.toLowerCase">@label.name</span> |
|
26 | 26 |
} |
27 | 27 |
</div> |
28 | 28 |
<div class="desc"> |
--- app/views/git/partial_list.scala.html
+++ app/views/git/partial_list.scala.html
... | ... | @@ -7,8 +7,8 @@ |
7 | 7 |
branch.replace("refs/heads/", "") |
8 | 8 |
} |
9 | 9 |
<ul class="post-list-wrap"> |
10 |
-@if(page.getList().size()> 0){ |
|
11 |
- @for(req <- page.getList().iterator()) { |
|
10 |
+@if(page.getList.size()> 0){ |
|
11 |
+ @for(req <- page.getList.iterator()) { |
|
12 | 12 |
@defining(User.findByLoginId(req.contributor.loginId)){ user => |
13 | 13 |
<li class="post-item"> |
14 | 14 |
<div class="span10"> |
... | ... | @@ -74,6 +74,6 @@ |
74 | 74 |
$(function(){ |
75 | 75 |
$('[data-toggle="tooltip"]').tooltip(); |
76 | 76 |
var welPagination = $("#pagination"); |
77 |
- yobi.Pagination.update(welPagination, @page.getTotalPageCount()); |
|
77 |
+ yobi.Pagination.update(welPagination, @page.getTotalPageCount); |
|
78 | 78 |
}); |
79 | 79 |
</script> |
--- app/views/git/partial_pull_request_comment.scala.html
+++ app/views/git/partial_pull_request_comment.scala.html
... | ... | @@ -52,7 +52,7 @@ |
52 | 52 |
<strong>@comment.authorLoginId</strong> |
53 | 53 |
</a> |
54 | 54 |
</span> |
55 |
- <a href="#comment-@comment.id" class="ago">@momentFromNow(comment.getDate(), lang.language)</a> |
|
55 |
+ <a href="#comment-@comment.id" class="ago">@momentFromNow(comment.getDate, lang.language)</a> |
|
56 | 56 |
|
57 | 57 |
@if(isLineComment(comment) && comment.isOutdated) { |
58 | 58 |
<span class="outdated-message" style="color: red">@Messages("code.outdatedDiff")</span> |
--- app/views/git/partial_state.scala.html
+++ app/views/git/partial_state.scala.html
... | ... | @@ -88,7 +88,7 @@ |
88 | 88 |
</div> |
89 | 89 |
} |
90 | 90 |
|
91 |
-@if(pull.isMerged()){ |
|
91 |
+@if(pull.isMerged){ |
|
92 | 92 |
<div class="alert alert-info"> |
93 | 93 |
<a href="@routes.UserApp.userInfo(pull.receiver.loginId)" class="avatar-wrap small"> |
94 | 94 |
<img src="@pull.receiver.avatarUrl" width="25" height="25"> |
--- app/views/git/view.scala.html
+++ app/views/git/view.scala.html
... | ... | @@ -51,7 +51,7 @@ |
51 | 51 |
} |
52 | 52 |
</button> |
53 | 53 |
} |
54 |
- <div id="actOnOpen" class="mr5 pull-right" style="@if(pull.isMerging == false && pull.isOpen()){display:block;}else{display:none;}"> |
|
54 |
+ <div id="actOnOpen" class="mr5 pull-right" style="@if(pull.isMerging == false && pull.isOpen){display:block;}else{display:none;}"> |
|
55 | 55 |
@if(project.isUsingReviewerCount && isAllowed(UserApp.currentUser(), pull.asResource(), Operation.ACCEPT)) { |
56 | 56 |
@if(pull.isReviewedBy(UserApp.currentUser())) { |
57 | 57 |
<a data-request-method="post" class="ybtn" href="@routes.ReviewApp.unreview(project.owner, project.name, pull.number)"> |
... | ... | @@ -67,7 +67,7 @@ |
67 | 67 |
@if(pull.isReviewed || !project.isUsingReviewerCount) { |
68 | 68 |
<a data-request-method="post" id="btnAccept" href="@routes.PullRequestApp.accept(project.owner, project.name, pull.number)" class="ybtn ybtn-success" @if(pull.isConflict == true){style="display:none;"}>@Messages("pullRequest.accept")</a> |
69 | 69 |
} else { |
70 |
- <button class="ybtn ybtn-disabled" data-toggle="tooltip" data-placement="top" title="@Messages("pullRequest.not.enough.review.point", pull.getLackingReviewerCount())">@Messages("pullRequest.accept")</button> |
|
70 |
+ <button class="ybtn ybtn-disabled" data-toggle="tooltip" data-placement="top" title="@Messages("pullRequest.not.enough.review.point", pull.getLackingReviewerCount)">@Messages("pullRequest.accept")</button> |
|
71 | 71 |
} |
72 | 72 |
|
73 | 73 |
} |
... | ... | @@ -79,7 +79,7 @@ |
79 | 79 |
} |
80 | 80 |
</div> |
81 | 81 |
|
82 |
- <div id="actOnClosed" class="mr5 pull-right" style="@if(pull.isMerging == false && pull.isClosed()) {display:block;}else{display:none;}"> |
|
82 |
+ <div id="actOnClosed" class="mr5 pull-right" style="@if(pull.isMerging == false && pull.isClosed) {display:block;}else{display:none;}"> |
|
83 | 83 |
@if(isAllowed(UserApp.currentUser(), pull.asResource(), Operation.REOPEN)) { |
84 | 84 |
<a data-request-method="post" href="@routes.PullRequestApp.open(project.owner, project.name, pull.number)" class="ybtn">@Messages("pullRequest.reopen")</a> |
85 | 85 |
} |
... | ... | @@ -121,7 +121,7 @@ |
121 | 121 |
|
122 | 122 |
yobi.Mention({ |
123 | 123 |
target:'comment-editor', |
124 |
- @if(pull.getCurrentCommits.isEmpty()) { |
|
124 |
+ @if(pull.getCurrentCommits.isEmpty) { |
|
125 | 125 |
url : "@Html(routes.ProjectApp.mentionListAtPullRequest(pull.toProject.owner, pull.toProject.name, "", pull.id).toString())" |
126 | 126 |
} else { |
127 | 127 |
url : "@Html(routes.ProjectApp.mentionListAtPullRequest(pull.toProject.owner, pull.toProject.name, pull.getCurrentCommits.get(0).getCommitId, pull.id).toString())" |
--- app/views/git/viewChanges.scala.html
+++ app/views/git/viewChanges.scala.html
... | ... | @@ -50,7 +50,7 @@ |
50 | 50 |
$(document).ready(function() { |
51 | 51 |
yobi.Mention({ |
52 | 52 |
target:'comment-editor', |
53 |
- @if(pull.getCurrentCommits.isEmpty()) { |
|
53 |
+ @if(pull.getCurrentCommits.isEmpty) { |
|
54 | 54 |
url : "@Html(routes.ProjectApp.mentionListAtPullRequest(pull.toProject.owner, pull.toProject.name, "", pull.id).toString())" |
55 | 55 |
} else { |
56 | 56 |
url : "@Html(routes.ProjectApp.mentionListAtPullRequest(pull.toProject.owner, pull.toProject.name, pull.getCurrentCommits.get(0).getCommitId, pull.id).toString())" |
--- app/views/git/viewCommits.scala.html
+++ app/views/git/viewCommits.scala.html
... | ... | @@ -33,8 +33,8 @@ |
33 | 33 |
@for(commit <- pull.getCurrentCommits) { |
34 | 34 |
<tr> |
35 | 35 |
<td class="commit-id"> |
36 |
- <a href="@routes.PullRequestApp.commitView(pull.toProject.owner, pull.toProject.name, pull.number, commit.getCommitId())"> |
|
37 |
- @commit.getCommitShortId() |
|
36 |
+ <a href="@routes.PullRequestApp.commitView(pull.toProject.owner, pull.toProject.name, pull.number, commit.getCommitId)"> |
|
37 |
+ @commit.getCommitShortId |
|
38 | 38 |
</a> |
39 | 39 |
</td> |
40 | 40 |
|
... | ... | @@ -46,14 +46,14 @@ |
46 | 46 |
} |
47 | 47 |
} |
48 | 48 |
|
49 |
- @defining(commit.getCommitMessage()){ commitMsg => |
|
49 |
+ @defining(commit.getCommitMessage){ commitMsg => |
|
50 | 50 |
@common.commitMsg(commitMsg.split("\n")(0), |
51 | 51 |
commitMsg, |
52 |
- routes.PullRequestApp.commitView(pull.toProject.owner, pull.toProject.name, pull.number, commit.getCommitId()).toString()) |
|
52 |
+ routes.PullRequestApp.commitView(pull.toProject.owner, pull.toProject.name, pull.number, commit.getCommitId).toString()) |
|
53 | 53 |
} |
54 | 54 |
</td> |
55 | 55 |
<td class="date" title="@JodaDateUtil.getDateString(commit.getAuthorDate)"> |
56 |
- @agoString(JodaDateUtil.ago(commit.getAuthorDate())) |
|
56 |
+ @agoString(JodaDateUtil.ago(commit.getAuthorDate)) |
|
57 | 57 |
</td> |
58 | 58 |
<td class="author @commit.getAuthorEmail"> |
59 | 59 |
@defining(User.find.where.eq("email", commit.getAuthorEmail).findUnique) { user => |
... | ... | @@ -63,7 +63,7 @@ |
63 | 63 |
</a> |
64 | 64 |
} else { |
65 | 65 |
<div class="avatar-wrap"> |
66 |
- <img src="@urlToPicture(commit.getAuthorEmail(), 32)" width="32" height="32"/> |
|
66 |
+ <img src="@urlToPicture(commit.getAuthorEmail, 32)" width="32" height="32"/> |
|
67 | 67 |
</div> |
68 | 68 |
} |
69 | 69 |
} |
--- app/views/issue/my_partial_search.scala.html
+++ app/views/issue/my_partial_search.scala.html
... | ... | @@ -77,7 +77,7 @@ |
77 | 77 |
@for(state <- Array(State.OPEN, State.CLOSED)) { |
78 | 78 |
<li @if(param.state == state.state) { class="active" } data-pjax> |
79 | 79 |
<a href="#" state="@state.state"> |
80 |
- @Messages("issue.state." + state.name.toLowerCase()) |
|
80 |
+ @Messages("issue.state." + state.name.toLowerCase) |
|
81 | 81 |
<span class="num-badge">@Issue.countIssuesBy(param.clone.setState(state))</span> |
82 | 82 |
</a> |
83 | 83 |
</li> |
... | ... | @@ -85,9 +85,9 @@ |
85 | 85 |
</ul> |
86 | 86 |
|
87 | 87 |
|
88 |
- @if(currentPage.getList().size() > 0){ |
|
88 |
+ @if(currentPage.getList.size() > 0){ |
|
89 | 89 |
<div class="filter-wrap small-heights"> |
90 |
- @if(currentPage.getList().size() > 1){ |
|
90 |
+ @if(currentPage.getList.size() > 1){ |
|
91 | 91 |
<div class="filters pull-right"> |
92 | 92 |
@makeFilterLink("updatedDate", param.orderBy, param.orderDir, Messages("common.order.updatedDate")) |
93 | 93 |
@makeFilterLink("createdDate", param.orderBy, param.orderDir, Messages("common.order.date")) |
... | ... | @@ -124,7 +124,7 @@ |
124 | 124 |
"welSearchForm":$("form[name='search']"), |
125 | 125 |
"welFilter": $("a[pjax-filter]"), |
126 | 126 |
"elPagination": $("#pagination"), |
127 |
- "nTotalPages" : @currentPage.getTotalPageCount() |
|
127 |
+ "nTotalPages" : @currentPage.getTotalPageCount |
|
128 | 128 |
}); |
129 | 129 |
}); |
130 | 130 |
</script> |
--- app/views/issue/partial_search.scala.html
+++ app/views/issue/partial_search.scala.html
... | ... | @@ -38,7 +38,7 @@ |
38 | 38 |
<span class="num-badge pull-right">@Issue.countIssuesBy(project.id, paramForEveryone)</span> |
39 | 39 |
</a> |
40 | 40 |
</li> |
41 |
- @if(!UserApp.currentUser().isSiteManager()){ |
|
41 |
+ @if(!UserApp.currentUser().isSiteManager){ |
|
42 | 42 |
<li @if(param.assigneeId == UserApp.currentUser().id){ class="active"}> |
43 | 43 |
<a pjax-filter href="#" authorId="" assigneeId="@User.findByLoginId(session.get("loginId")).id" milestoneId="@param.milestoneId">@Messages("issue.list.assignedToMe") |
44 | 44 |
<span class="num-badge pull-right">@Issue.countIssuesBy(project.id, paramForIssuesAssignedToMe)</span> |
... | ... | @@ -167,20 +167,20 @@ |
167 | 167 |
@for(state <- Array(State.OPEN, State.CLOSED)) { |
168 | 168 |
<li @if(param.state == state.state) { class="active" } data-pjax> |
169 | 169 |
<a href="#" state="@state.state"> |
170 |
- @Messages("issue.state." + state.name.toLowerCase()) |
|
170 |
+ @Messages("issue.state." + state.name.toLowerCase) |
|
171 | 171 |
<span class="num-badge">@Issue.countIssuesBy(project.id, param.clone.setState(state))</span> |
172 | 172 |
</a> |
173 | 173 |
</li> |
174 | 174 |
} |
175 | 175 |
</ul> |
176 | 176 |
|
177 |
- @if(currentPage.getList().size() > 0){ |
|
177 |
+ @if(currentPage.getList.size() > 0){ |
|
178 | 178 |
<div class="filter-wrap board"> |
179 | 179 |
@if(ProjectUser.isMember(UserApp.currentUser().id, project.id)){ |
180 | 180 |
@partial_massupdate(project, param) |
181 | 181 |
} |
182 | 182 |
|
183 |
- @if(currentPage.getList().size() > 1){ |
|
183 |
+ @if(currentPage.getList.size() > 1){ |
|
184 | 184 |
<div class="filters pull-right"> |
185 | 185 |
@makeFilterLink("updatedDate", param.orderBy, param.orderDir, Messages("common.order.updatedDate")) |
186 | 186 |
@makeFilterLink("createdDate", param.orderBy, param.orderDir, Messages("common.order.date")) |
... | ... | @@ -223,7 +223,7 @@ |
223 | 223 |
"welSearchForm" : $("form[name='search']"), |
224 | 224 |
"welFilter" : $("a[pjax-filter]"), |
225 | 225 |
"elPagination" : $("#pagination"), |
226 |
- "nTotalPages" : @currentPage.getTotalPageCount() |
|
226 |
+ "nTotalPages" : @currentPage.getTotalPageCount |
|
227 | 227 |
}); |
228 | 228 |
|
229 | 229 |
// ShortcutKey |
--- app/views/issue/view.scala.html
+++ app/views/issue/view.scala.html
... | ... | @@ -322,7 +322,7 @@ |
322 | 322 |
|
323 | 323 |
yobi.Mention({ |
324 | 324 |
target:'comment-editor', |
325 |
- url : "@Html(routes.ProjectApp.mentionList(project.owner, project.name, issue.getNumber, issue.asResource().getType().resource()).toString())" |
|
325 |
+ url : "@Html(routes.ProjectApp.mentionList(project.owner, project.name, issue.getNumber, issue.asResource().getType.resource()).toString())" |
|
326 | 326 |
}); |
327 | 327 |
}); |
328 | 328 |
</script> |
--- app/views/milestone/list.scala.html
+++ app/views/milestone/list.scala.html
... | ... | @@ -51,7 +51,7 @@ |
51 | 51 |
</ul> |
52 | 52 |
</div> |
53 | 53 |
|
54 |
- @if(milestones == null || milestones.isEmpty()){ |
|
54 |
+ @if(milestones == null || milestones.isEmpty){ |
|
55 | 55 |
|
56 | 56 |
<div class="error-wrap"> |
57 | 57 |
<i class="ico ico-err1"></i> |
... | ... | @@ -85,7 +85,7 @@ |
85 | 85 |
@if(milestone.state != State.CLOSED) { |
86 | 86 |
@if(milestone.dueDate != null) { |
87 | 87 |
<span class="sp">|</span> |
88 |
- <span class="due-date @if(milestone.isOverDueDate()){over}"> |
|
88 |
+ <span class="due-date @if(milestone.isOverDueDate){over}"> |
|
89 | 89 |
@Messages("label.dueDate") |
90 | 90 |
<strong>@milestone.getDueDateString</strong> |
91 | 91 |
<span class="date"> |
--- app/views/project/header.scala.html
+++ app/views/project/header.scala.html
... | ... | @@ -13,7 +13,7 @@ |
13 | 13 |
<div class="project-header-avatar"> |
14 | 14 |
<img src="@urlToProjectLogo(project)" /> |
15 | 15 |
</div> |
16 |
- <div class="project-breadcrumb-wrap @if(project.isForkedFromOrigin()){fork}"> |
|
16 |
+ <div class="project-breadcrumb-wrap @if(project.isForkedFromOrigin){fork}"> |
|
17 | 17 |
<div class="project-breadcrumb"> |
18 | 18 |
<span class="project-author"><a href="@routes.UserApp.userInfo(project.owner)">@project.owner</a></span> |
19 | 19 |
<span class="project-separator">/</span> |
... | ... | @@ -24,7 +24,7 @@ |
24 | 24 |
</span> |
25 | 25 |
} |
26 | 26 |
</div> |
27 |
- @if(project.isForkedFromOrigin()){ |
|
27 |
+ @if(project.isForkedFromOrigin){ |
|
28 | 28 |
<div class="project-origin"> |
29 | 29 |
<span class="project-origin-title">@Messages("fork.original")</span> |
30 | 30 |
<a href="@routes.ProjectApp.project(project.originalProject.owner, project.originalProject.name)" class="project-origin-name"> |
--- app/views/project/list.scala.html
+++ app/views/project/list.scala.html
... | ... | @@ -32,7 +32,7 @@ |
32 | 32 |
<div style="float:left"> |
33 | 33 |
<div class="header"> |
34 | 34 |
<a href="@routes.ProjectApp.project(project.owner, project.name)" class="black">@project.name</a> |
35 |
- @if(project.isForkedFromOrigin()){ |
|
35 |
+ @if(project.isForkedFromOrigin){ |
|
36 | 36 |
<span class="small-font blue-txt"> |
37 | 37 |
<a class="origin-title" href='@routes.ProjectApp.project(project.originalProject.owner, project.originalProject.name)'> |
38 | 38 |
<i class="yobicon-split"></i> |
... | ... | @@ -43,7 +43,7 @@ |
43 | 43 |
|
44 | 44 |
@if(!project.isPublic){ <i class="yobicon-lock yobicon-small"></i> } |
45 | 45 |
@for(label <- project.labels) { |
46 |
- <a class="project-label @label.category.toLowerCase()" href="@routes.ProjectApp.projects()?labelIds=@label.id">@label.name</a> |
|
46 |
+ <a class="project-label @label.category.toLowerCase" href="@routes.ProjectApp.projects()?labelIds=@label.id">@label.name</a> |
|
47 | 47 |
} |
48 | 48 |
</div> |
49 | 49 |
<div class="desc"> |
--- app/views/project/overview.scala.html
+++ app/views/project/overview.scala.html
... | ... | @@ -7,22 +7,22 @@ |
7 | 7 |
@import models.enumeration._ |
8 | 8 |
|
9 | 9 |
@userPageUrlOnHistory(history:History) = @{ |
10 |
- if(history.getUserPageUrl() != null) { |
|
11 |
- history.getUserPageUrl() |
|
10 |
+ if(history.getUserPageUrl != null) { |
|
11 |
+ history.getUserPageUrl |
|
12 | 12 |
} else { |
13 | 13 |
"#" |
14 | 14 |
} |
15 | 15 |
} |
16 | 16 |
@userAvatarUrlOnHistory(history:History) = @{ |
17 |
- if(history.getUserAvatarUrl() != null){ |
|
18 |
- history.getUserAvatarUrl() |
|
17 |
+ if(history.getUserAvatarUrl != null){ |
|
18 |
+ history.getUserAvatarUrl |
|
19 | 19 |
} else { |
20 | 20 |
routes.Assets.at("images/default-avatar-64.png") |
21 | 21 |
} |
22 | 22 |
} |
23 |
-@makeHistoryWho(history:History) = {<a href="@userPageUrlOnHistory(history)" class="actor">@history.getWho()</a>} |
|
24 |
-@makeHistoryHow(history:History) = {<span class="whereis"><a href="@history.getUrl()" class="where">@history.getShortTitle()</a> <a href="@history.getUrl()" class="title">@history.getHow()</a></span> } |
|
25 |
-@makeHistoryWhat(history:History) = {@Messages("project.history.type." + history.getWhat())} |
|
23 |
+@makeHistoryWho(history:History) = {<a href="@userPageUrlOnHistory(history)" class="actor">@history.getWho</a>} |
|
24 |
+@makeHistoryHow(history:History) = {<span class="whereis"><a href="@history.getUrl" class="where">@history.getShortTitle</a> <a href="@history.getUrl" class="title">@history.getHow</a></span> } |
|
25 |
+@makeHistoryWhat(history:History) = {@Messages("project.history.type." + history.getWhat)} |
|
26 | 26 |
|
27 | 27 |
@projectLayout(message, project, utils.MenuType.PROJECT_HOME) { |
28 | 28 |
@projectMenu(project, utils.MenuType.PROJECT_HOME, "") |
... | ... | @@ -99,8 +99,8 @@ |
99 | 99 |
)) |
100 | 100 |
</p> |
101 | 101 |
<p class="others" style="padding-left:0;"> |
102 |
- <span class="date" style="margin-left:0;" title="@JodaDateUtil.getDateString(history.getWhen())"> |
|
103 |
- @agoString(JodaDateUtil.ago(history.getWhen())) |
|
102 |
+ <span class="date" style="margin-left:0;" title="@JodaDateUtil.getDateString(history.getWhen)"> |
|
103 |
+ @agoString(JodaDateUtil.ago(history.getWhen)) |
|
104 | 104 |
</span> |
105 | 105 |
</p> |
106 | 106 |
</div> |
--- app/views/projectMenu.scala.html
+++ app/views/projectMenu.scala.html
... | ... | @@ -10,7 +10,7 @@ |
10 | 10 |
} |
11 | 11 |
|
12 | 12 |
@getPullRequestURL(project:Project) = @{ |
13 |
- if(project.isForkedFromOrigin()){ |
|
13 |
+ if(project.isForkedFromOrigin){ |
|
14 | 14 |
routes.PullRequestApp.sentPullRequests(project.owner, project.name) |
15 | 15 |
} else { |
16 | 16 |
routes.PullRequestApp.pullRequests(project.owner, project.name) |
--- app/views/site/issueList.scala.html
+++ app/views/site/issueList.scala.html
... | ... | @@ -16,7 +16,7 @@ |
16 | 16 |
<li class="@isActiveTabMenu(State.CLOSED)"><a href="@routes.SiteApp.issueList()?state=@State.CLOSED.name.toLowerCase()">@Messages("issue.state." + State.CLOSED.name.toLowerCase())</a></li> |
17 | 17 |
</ul> |
18 | 18 |
<ul class="post-list-wrap"> |
19 |
- @for(issue <- currentPage.getList()) { |
|
19 |
+ @for(issue <- currentPage.getList) { |
|
20 | 20 |
@defining(User.findByLoginId(issue.authorLoginId)){ user => |
21 | 21 |
<li class="row-fluid listitem"> |
22 | 22 |
<a href="@routes.ProjectApp.project(issue.project.owner, issue.project.name)" class="avatar-wrap list-avatar"> |
... | ... | @@ -61,7 +61,7 @@ |
61 | 61 |
|
62 | 62 |
<script type="text/javascript"> |
63 | 63 |
$(function(){ |
64 |
- yobi.Pagination.update($("#pagination"), @currentPage.getTotalPageCount()); |
|
64 |
+ yobi.Pagination.update($("#pagination"), @currentPage.getTotalPageCount); |
|
65 | 65 |
}); |
66 | 66 |
</script> |
67 | 67 |
} |
--- app/views/site/postList.scala.html
+++ app/views/site/postList.scala.html
... | ... | @@ -8,7 +8,7 @@ |
8 | 8 |
<h2 class="pull-left">@Messages("site.sidebar.postList")</h2> |
9 | 9 |
</div> |
10 | 10 |
<ul class="post-list-wrap"> |
11 |
- @for(post <- currentPage.getList()) { |
|
11 |
+ @for(post <- currentPage.getList) { |
|
12 | 12 |
@defining(User.findByLoginId(post.authorLoginId)){ user => |
13 | 13 |
<li class="row-fluid listitem"> |
14 | 14 |
<a href="@routes.ProjectApp.project(post.project.owner, post.project.name)" class="avatar-wrap list-avatar"> |
... | ... | @@ -53,7 +53,7 @@ |
53 | 53 |
|
54 | 54 |
<script type="text/javascript"> |
55 | 55 |
$(function(){ |
56 |
- yobi.Pagination.update($("#pagination"), @currentPage.getTotalPageCount()); |
|
56 |
+ yobi.Pagination.update($("#pagination"), @currentPage.getTotalPageCount); |
|
57 | 57 |
}); |
58 | 58 |
</script> |
59 | 59 |
} |
--- app/views/site/projectList.scala.html
+++ app/views/site/projectList.scala.html
... | ... | @@ -24,7 +24,7 @@ |
24 | 24 |
</div> |
25 | 25 |
</div> |
26 | 26 |
<ul class="project-list-wrap"> |
27 |
- @for(project <- currentPage.getList()) { |
|
27 |
+ @for(project <- currentPage.getList) { |
|
28 | 28 |
<li class="row-fluid listitem"> |
29 | 29 |
<div class="span5 listitem-col"> |
30 | 30 |
<a href="@routes.ProjectApp.project(project.owner,project.name)" class="avatar-wrap list-avatar"> |
... | ... | @@ -77,7 +77,7 @@ |
77 | 77 |
console.log($(this).data('href')); |
78 | 78 |
}); |
79 | 79 |
|
80 |
- yobi.Pagination.update($("#pagination"), @currentPage.getTotalPageCount()); |
|
80 |
+ yobi.Pagination.update($("#pagination"), @currentPage.getTotalPageCount); |
|
81 | 81 |
}); |
82 | 82 |
</script> |
83 | 83 |
} |
--- app/views/site/userList.scala.html
+++ app/views/site/userList.scala.html
... | ... | @@ -44,7 +44,7 @@ |
44 | 44 |
} |
45 | 45 |
</div> |
46 | 46 |
<ul class="user-list-wrap"> |
47 |
- @for(user <- currentPage.getList()) { |
|
47 |
+ @for(user <- currentPage.getList) { |
|
48 | 48 |
<li class="row-fluid listitem"> |
49 | 49 |
<div class="span3 listitem-col"> |
50 | 50 |
<a href="@routes.UserApp.userInfo(user.loginId)" class="avatar-wrap list-avatar"> |
... | ... | @@ -115,7 +115,7 @@ |
115 | 115 |
$('#alertDeletionWrap').modal('show'); |
116 | 116 |
}); |
117 | 117 |
|
118 |
- yobi.Pagination.update($("#pagination"), @currentPage.getTotalPageCount()); |
|
118 |
+ yobi.Pagination.update($("#pagination"), @currentPage.getTotalPageCount); |
|
119 | 119 |
}); |
120 | 120 |
</script> |
121 | 121 |
} |
--- app/views/user/edit.scala.html
+++ app/views/user/edit.scala.html
... | ... | @@ -113,7 +113,7 @@ |
113 | 113 |
<table class="table table-striped table-bordered"> |
114 | 114 |
@for(notiType <- models.enumeration.EventType.notiTypes) { |
115 | 115 |
<tr> |
116 |
- <th>@notiType.getDescr()</th> |
|
116 |
+ <th>@notiType.getDescr</th> |
|
117 | 117 |
<td> |
118 | 118 |
<div class="switch" data-on-label="On" data-off-label="Off"> |
119 | 119 |
<input class="notiUpdate" data-href="@routes.WatchProjectApp.toggle(project.id, notiType.name())" type="checkbox" data-toggle="switch" @if(UserProjectNotification.isEnabledNotiType(notiMap, project, notiType)){ checked="checked" }> |
--- app/views/user/partial_projectlist.scala.html
+++ app/views/user/partial_projectlist.scala.html
... | ... | @@ -14,7 +14,7 @@ |
14 | 14 |
<a href="@routes.UserApp.userInfo(project.owner)" class="owner-name-small">@project.owner</a> / <a href="@routes.ProjectApp.project(project.owner, project.name)" class="project-name">@project.name</a> |
15 | 15 |
@if(!project.isPublic){ <i class="yobicon-lock yobicon-small"></i> } |
16 | 16 |
</div> |
17 |
- @if(project.isForkedFromOrigin()){ |
|
17 |
+ @if(project.isForkedFromOrigin){ |
|
18 | 18 |
<div class="forked label"> |
19 | 19 |
<i class="yobicon-split yobicon-white vmiddle"></i> |
20 | 20 |
@Messages("fork.original") |
... | ... | @@ -24,13 +24,13 @@ |
24 | 24 |
} |
25 | 25 |
<div class="desc tag"> |
26 | 26 |
@for(label <- project.labels) { |
27 |
- <span class="project-label @label.category.toLowerCase()">@label.name</span> |
|
27 |
+ <span class="project-label @label.category.toLowerCase">@label.name</span> |
|
28 | 28 |
} |
29 | 29 |
</div> |
30 | 30 |
<div class="desc">@project.overview</div> |
31 | 31 |
<div class="name-tag"> |
32 | 32 |
@Messages("project.create") <strong>@JodaDateUtil.momentFromNow(project.createdDate, lang.language)</strong> |
33 |
- @if(project.lastPushedDateAgo() != null) {, @Messages("project.codeUpdate") <strong>@JodaDateUtil.momentFromNow(project.lastPushedDate.getTime(), lang.language)}</strong> |
|
33 |
+ @if(project.lastPushedDateAgo() != null) {, @Messages("project.codeUpdate") <strong>@JodaDateUtil.momentFromNow(project.lastPushedDate.getTime, lang.language)}</strong> |
|
34 | 34 |
</div> |
35 | 35 |
</div> |
36 | 36 |
</div> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?