Wording of new trigger conditions #68

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Changelog of Pull Request Notifier for Bitbucket.
 
+## 2.4
+* Changing wording of trigger conditions in admin GUI.
+
 ## 2.3
 * Bugfix: Loading CSS and JS in admin-page
 

src/main/java/se/bjurr/prnfb/listener/PrnfbPullRequestEventListener.java

@@ -1,6 +1,7 @@
 package se.bjurr.prnfb.listener;
 
 import static com.google.common.base.Optional.absent;
+import static com.google.common.base.Optional.of;
 import static com.google.common.collect.Maps.newHashMap;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
@@ -150,7 +151,7 @@ public void notify(final PrnfbNotification notification, PrnfbPullRequestAction
 
   Optional<String> postContent = absent();
   if (notification.getPostContent().isPresent()) {
-   postContent = Optional.of(renderer.render(notification.getPostContent().get()));
+   postContent = of(renderer.render(notification.getPostContent().get()));
   }
   String renderedUrl = renderer.render(notification.getUrl());
   logger.info(notification.getName() + " > " //
@@ -163,9 +164,11 @@ public void notify(final PrnfbNotification notification, PrnfbPullRequestAction
     .withPostContent(postContent)//
     .appendBasicAuth(notification);
   for (Header header : notification.getHeaders()) {
-   urlInvoker.withHeader(header.getName(), renderer.render(header.getValue()));
+   urlInvoker//
+     .withHeader(header.getName(), renderer.render(header.getValue()));
   }
-  invoker.invoke(urlInvoker.withProxyServer(notification.getProxyServer()) //
+  invoker.invoke(urlInvoker//
+    .withProxyServer(notification.getProxyServer()) //
     .withProxyPort(notification.getProxyPort())//
     .withProxyUser(notification.getProxyUser())//
     .withProxyPassword(notification.getProxyPassword()));

src/main/resources/admin.vm

@@ -147,10 +147,10 @@
         </div>
         <div>
           <fieldset>
-            <legend>Trigger if pull request</legend>
-            <label><input type="radio" name="trigger_if_isconflicting" value="ALWAYS">Has, or has no, merge conflicts</label><br>
-            <label><input type="radio" name="trigger_if_isconflicting" value="NOT_CONFLICTING">Has no merge conflicts</label><br>
-            <label><input type="radio" name="trigger_if_isconflicting" value="CONFLICTING">Has merge conflicts</label><br>
+            <legend>Triggers apply</legend>
+            <label><input type="radio" name="trigger_if_isconflicting" value="ALWAYS">Always</label><br>
+            <label><input type="radio" name="trigger_if_isconflicting" value="NOT_CONFLICTING">To PRs without merge conflicts</label><br>
+            <label><input type="radio" name="trigger_if_isconflicting" value="CONFLICTING">To PRs with merge conflicts</label><br>
           </fieldset>
         </div>
         <div>