svn commit: r1324890 - in /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets: AbstractLockedDomainService.java HashLockedDomainService.java

[rb...@apache.org]

Author: rbaxter85
Date: Wed Apr 11 17:43:33 2012
New Revision: 1324890

URL: http://svn.apache.org/viewvc?rev=1324890&view=rev
Log:
SHINDIG-1747
AbstractLockedDomainService has a protected enabled variable as well as a public isEnabled method

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractLockedDomainService.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractLockedDomainService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractLockedDomainService.java?rev=1324890&r1=1324889&r2=1324890&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractLockedDomainService.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractLockedDomainService.java Wed Apr 11 17:43:33 2012
@@ -62,7 +62,7 @@ public abstract class AbstractLockedDoma
   protected static final String LOCKED_DOMAIN_REQUIRED_KEY = "gadgets.uri.iframe.lockedDomainRequired";
 
   protected static final String LOCKED_DOMAIN_FEATURE = "locked-domain";
-  protected final boolean enabled;
+  private final boolean enabled;
 
   protected final Map<String, Boolean> required;
   private boolean lockSecurityTokens = false;
@@ -125,7 +125,7 @@ public abstract class AbstractLockedDoma
    * @see org.apache.shindig.gadgets.LockedDomainService#isSafeForOpenProxy(java .lang.String)
    */
   public boolean isSafeForOpenProxy(String host) {
-    if (this.enabled) {
+    if (isEnabled()) {
       return !isHostUsingLockedDomain(host);
     }
     return true;

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java?rev=1324890&r1=1324889&r2=1324890&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java Wed Apr 11 17:43:33 2012
@@ -116,7 +116,7 @@ public class HashLockedDomainService ext
   @Override
   public String getLockedDomainForGadget(Gadget gadget, String container) throws GadgetException {
     container = getContainer(container);
-    if (this.enabled && !isExcludedFromLockedDomain(gadget, container)) {
+    if (isEnabled() && !isExcludedFromLockedDomain(gadget, container)) {
       if (isGadgetReqestingLocking(gadget) || isDomainLockingEnforced(container)) {
         return getLockedDomain(gadget, container);
       }
@@ -133,7 +133,7 @@ public class HashLockedDomainService ext
    */
   private String getLockedDomainPrefix(Gadget gadget) throws GadgetException {
     String ret = "";
-    if (this.enabled) {
+    if (isEnabled()) {
       ret = this.ldGen.getLockedDomainPrefix(getLockedDomainParticipants(gadget));
     }
     // Lower-case to prevent casing from being relevant.
@@ -143,7 +143,7 @@ public class HashLockedDomainService ext
   @Override
   public boolean isGadgetValidForHost(String host, Gadget gadget, String container) {
     container = getContainer(container);
-    if (this.enabled) {
+    if (isEnabled()) {
       if (isGadgetReqestingLocking(gadget) || isHostUsingLockedDomain(host)
               || isDomainLockingEnforced(container)) {
         String neededHost;
@@ -163,7 +163,7 @@ public class HashLockedDomainService ext
 
   @Override
   public boolean isHostUsingLockedDomain(String host) {
-    if (this.enabled) {
+    if (isEnabled()) {
       for (String suffix : this.lockedSuffixes.values()) {
         if (host.endsWith(suffix)) {
           return true;