Commit @7473b861a753609e5c219cdd82951b3b164e8f0c

Keesun Baik 2015-04-07

PullRequestEvent: fix to use getter

@7473b861a753609e5c219cdd82951b3b164e8f0c

bcbfef8

7473b86

app/models/PullRequestEvent.java

--- app/models/PullRequestEvent.java

+++ app/models/PullRequestEvent.java


         event.senderLoginId = notiEvent.getSender().loginId;
         event.pullRequest = pullRequest;
         event.eventType = notiEvent.eventType;
-        event.oldValue = notiEvent.oldValue;
+        event.oldValue = notiEvent.getOldValue();
         event.newValue = notiEvent.newValue;
 
         add(event);

 
         return commits;
     }
+
+    public String getOldValue() {
+        return oldValue;
+    }
+
+    public String getNewValue() {
+        return newValue;
+    }
 }

bcbfef8

7473b86

app/views/git/partial_pull_request_event.scala.html

--- app/views/git/partial_pull_request_event.scala.html

+++ app/views/git/partial_pull_request_event.scala.html


 @defining(User.findByLoginId(event.senderLoginId)) { user =>
     @event.eventType match {
         case EventType.PULL_REQUEST_REVIEW_STATE_CHANGED => {
-            @if(event.newValue == PullRequestReviewAction.DONE.name) {
+            @if(event.getNewValue == PullRequestReviewAction.DONE.name) {
             <li class="event" id="comment-@event.id">
                 <span class="state changed">@Messages("pullRequest.review")</span>
                 @Html(Messages("notification.pullrequest.reviewed",linkToUser(user.loginId, user.name)))

         }
         case EventType.PULL_REQUEST_STATE_CHANGED => {
         <li class="event" id="comment-@event.id">
-            <span class="state @event.newValue">@Messages("pullRequest.event." + event.newValue)</span>
-            @State.getValue(event.newValue) match {
+            <span class="state @event.getNewValue">@Messages("pullRequest.event." + event.getNewValue)</span>
+            @State.getValue(event.getNewValue) match {
                 case State.MERGED => {
-                    @Html(Messages("pullRequest.event.message." + event.newValue, linkToUser(user.loginId, user.name),
+                    @Html(Messages("pullRequest.event.message." + event.getNewValue, linkToUser(user.loginId, user.name),
                         linkToCommit(event.pullRequest.toProject, event.pullRequest.mergedCommitIdTo)))
                 }
                 case _ => {
-                    @Html(Messages("pullRequest.event.message." + event.newValue, linkToUser(user.loginId, user.name)))
+                    @Html(Messages("pullRequest.event.message." + event.getNewValue, linkToUser(user.loginId, user.name)))
                 }
             }
             <span class="date">

 
         case EventType.PULL_REQUEST_MERGED => {
         <li class="event" id="comment-@event.id">
-            <span class="state @event.newValue">@Messages("pullRequest.event." + event.newValue)</span>
-            @Html(Messages("pullRequest.event.message." + event.newValue, linkToUser(user.loginId, user.name)))
+            <span class="state @event.getNewValue">@Messages("pullRequest.event." + event.getNewValue)</span>
+            @Html(Messages("pullRequest.event.message." + event.getNewValue, linkToUser(user.loginId, user.name)))
             <span class="date">
                 <a href="#event-@event.id" title="@getDateString(event.getDate())">@agoOrDateString(event.getDate())</a>
             </span>

             <span class="date">
                 <a href="#event-@event.id" title="@getDateString(event.getDate())">@agoOrDateString(event.getDate())</a>
             </span>
-            @if(event.oldValue != null) {
-            <a href="@urlToCompare(pull.toProject, event.oldValue)" class="ybtn ybtn-mini">@Messages("pullRequest.additional.changes")</a>
+            @if(event.getOldValue != null) {
+            <a href="@urlToCompare(pull.toProject, event.getOldValue)" class="ybtn ybtn-mini">@Messages("pullRequest.additional.changes")</a>
             }
 
             <ul class="commit-list">

Add a comment

Open 0
Closed 0

List

...	...	@@ -68,7 +68,7 @@
68	68	event.senderLoginId = notiEvent.getSender().loginId;
69	69	event.pullRequest = pullRequest;
70	70	event.eventType = notiEvent.eventType;
71		- event.oldValue = notiEvent.oldValue;
	71	+ event.oldValue = notiEvent.getOldValue();
72	72	event.newValue = notiEvent.newValue;
73	73
74	74	add(event);
...	...	@@ -161,4 +161,12 @@
161	161
162	162	return commits;
163	163	}
	164	+
	165	+ public String getOldValue() {
	166	+ return oldValue;
	167	+ }
	168	+
	169	+ public String getNewValue() {
	170	+ return newValue;
	171	+ }
164	172	}

...	...	@@ -52,7 +52,7 @@
52	52	@defining(User.findByLoginId(event.senderLoginId)) { user =>
53	53	@event.eventType match {
54	54	case EventType.PULL_REQUEST_REVIEW_STATE_CHANGED => {
55		- @if(event.newValue == PullRequestReviewAction.DONE.name) {
	55	+ @if(event.getNewValue == PullRequestReviewAction.DONE.name) {
56	56	<li class="event" id="comment-@event.id">
57	57	<span class="state changed">@Messages("pullRequest.review")</span>
58	58	@Html(Messages("notification.pullrequest.reviewed",linkToUser(user.loginId, user.name)))
...	...	@@ -72,14 +72,14 @@
72	72	}
73	73	case EventType.PULL_REQUEST_STATE_CHANGED => {
74	74	<li class="event" id="comment-@event.id">
75		- <span class="state @event.newValue">@Messages("pullRequest.event." + event.newValue)</span>
76		- @State.getValue(event.newValue) match {
	75	+ <span class="state @event.getNewValue">@Messages("pullRequest.event." + event.getNewValue)</span>
	76	+ @State.getValue(event.getNewValue) match {
77	77	case State.MERGED => {
78		- @Html(Messages("pullRequest.event.message." + event.newValue, linkToUser(user.loginId, user.name),
	78	+ @Html(Messages("pullRequest.event.message." + event.getNewValue, linkToUser(user.loginId, user.name),
79	79	linkToCommit(event.pullRequest.toProject, event.pullRequest.mergedCommitIdTo)))
80	80	}
81	81	case _ => {
82		- @Html(Messages("pullRequest.event.message." + event.newValue, linkToUser(user.loginId, user.name)))
	82	+ @Html(Messages("pullRequest.event.message." + event.getNewValue, linkToUser(user.loginId, user.name)))
83	83	}
84	84	}
85	85	<span class="date">
...	...	@@ -90,8 +90,8 @@
90	90
91	91	case EventType.PULL_REQUEST_MERGED => {
92	92	<li class="event" id="comment-@event.id">
93		- <span class="state @event.newValue">@Messages("pullRequest.event." + event.newValue)</span>
94		- @Html(Messages("pullRequest.event.message." + event.newValue, linkToUser(user.loginId, user.name)))
	93	+ <span class="state @event.getNewValue">@Messages("pullRequest.event." + event.getNewValue)</span>
	94	+ @Html(Messages("pullRequest.event.message." + event.getNewValue, linkToUser(user.loginId, user.name)))
95	95	<span class="date">
96	96	<a href="#event-@event.id" title="@getDateString(event.getDate())">@agoOrDateString(event.getDate())</a>
97	97	</span>
...	...	@@ -105,8 +105,8 @@
105	105	<span class="date">
106	106	<a href="#event-@event.id" title="@getDateString(event.getDate())">@agoOrDateString(event.getDate())</a>
107	107	</span>
108		- @if(event.oldValue != null) {
109		- <a href="@urlToCompare(pull.toProject, event.oldValue)" class="ybtn ybtn-mini">@Messages("pullRequest.additional.changes")</a>
	108	+ @if(event.getOldValue != null) {
	109	+ <a href="@urlToCompare(pull.toProject, event.getOldValue)" class="ybtn ybtn-mini">@Messages("pullRequest.additional.changes")</a>
110	110	}
111	111
112	112	<ul class="commit-list">

Delete comment