From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 19 Oct 2010 06:39:11 +0000 (+0200)
Subject: Rename “isBlocked” property to “blocked”.
X-Git-Tag: 0.1-RC1~206
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=44f2f20011d28bc1420dcfcc8b9ff61183e86e24;p=Sone.git

Rename “isBlocked” property to “blocked”.
---

diff --git a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index dc4c0ab..97cf327 100644
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -56,7 +56,7 @@ public class SoneAccessor extends ReflectionAccessor {
 		} else if (member.equals("isCurrent")) {
 			Sone currentSone = (Sone) dataProvider.getData("currentSone");
 			return currentSone.equals(sone);
-		} else if (member.equals("isBlocked")) {
+		} else if (member.equals("blocked")) {
 			Sone currentSone = (Sone) dataProvider.getData("currentSone");
 			return currentSone.isSoneBlocked(sone.getId());
 		}
diff --git a/src/main/resources/templates/include/viewSone.html b/src/main/resources/templates/include/viewSone.html
index cecbb33..57ab384 100644
--- a/src/main/resources/templates/include/viewSone.html
+++ b/src/main/resources/templates/include/viewSone.html
@@ -16,7 +16,7 @@
 					<button type="submit"><%= View.Sone.Button.FollowSone|l10n|html></button>
 				</form>
 			<%/if>
-			<%if sone.isBlocked>
+			<%if sone.blocked>
 				<form class="unblock" action="unblockSone.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
 					<input type="hidden" name="sone" value="<% sone.id>" />