X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthorization%2FIsaOperationCondition.java;h=4771302b234792fd507732c21c4ef8bd47b43937;hb=17775e14ecfb286e59f67117e5cee7e21e95ab1f;hp=e5a4d6862138a93aa8507dab279219c3af512d01;hpb=162af365e45e54e5e8d656be276914df2005eaec;p=utils

diff --git a/security/src/main/java/org/wamblee/security/authorization/IsaOperationCondition.java b/security/src/main/java/org/wamblee/security/authorization/IsaOperationCondition.java
index e5a4d686..4771302b 100644
--- a/security/src/main/java/org/wamblee/security/authorization/IsaOperationCondition.java
+++ b/security/src/main/java/org/wamblee/security/authorization/IsaOperationCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 the original author or authors.
+ * Copyright 2005-2010 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
+ */ 
 package org.wamblee.security.authorization;
 
 import org.wamblee.persistence.AbstractPersistent;
@@ -22,12 +21,11 @@ import org.wamblee.persistence.AbstractPersistent;
  * Determiens if an operation is a subclass of a specified operation.
  */
 public class IsaOperationCondition extends AbstractPersistent implements
-        OperationCondition {
-
+    OperationCondition {
     /**
      * Operation that the other operation must be a subclass of.
      */
-    private Class<? extends Operation> _operation;
+    private Class<? extends Operation> operation;
 
     /**
      * Constructs the condition.
@@ -36,7 +34,7 @@ public class IsaOperationCondition extends AbstractPersistent implements
      *            Operation that an operation must be an instance of.
      */
     public IsaOperationCondition(Class<? extends Operation> aOperation) {
-        _operation = aOperation;
+        operation = aOperation;
     }
 
     /**
@@ -44,16 +42,18 @@ public class IsaOperationCondition extends AbstractPersistent implements
      * 
      */
     public IsaOperationCondition() {
-        _operation = null;
+        operation = null;
     }
 
     /*
      * (non-Javadoc)
      * 
-     * @see org.wamblee.security.authorization.OperationCondition#matches(org.wamblee.security.authorization.Operation)
+     * @see
+     * org.wamblee.security.authorization.OperationCondition#matches(org.wamblee
+     * .security.authorization.Operation)
      */
     public boolean matches(Operation aOperation) {
-        return _operation.isInstance(aOperation);
+        return operation.isInstance(aOperation);
     }
 
     /**
@@ -62,10 +62,11 @@ public class IsaOperationCondition extends AbstractPersistent implements
      * @return Operation string.
      */
     protected String getOperationString() {
-        if (_operation == null) {
-            return null; 
+        if (operation == null) {
+            return null;
         }
-        return _operation.getName(); 
+
+        return operation.getName();
     }
 
     /**
@@ -73,15 +74,18 @@ public class IsaOperationCondition extends AbstractPersistent implements
      * 
      * @param aOperation
      *            Operation string.
+     * 
      */
     protected void setOperationString(String aOperation) {
-        if  (aOperation == null ) { 
+        if (aOperation == null) {
             return;
         }
-        try { 
-            _operation = (Class<? extends Operation>)Class.forName(aOperation);
-        } catch (Exception e) { 
-            throw new IllegalArgumentException("Unknown class '" + aOperation + "'");
+
+        try {
+            operation = (Class<? extends Operation>) Class.forName(aOperation);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Unknown class '" + aOperation +
+                "'");
         }
     }
 
@@ -92,7 +96,6 @@ public class IsaOperationCondition extends AbstractPersistent implements
      */
     @Override
     public String toString() {
-        return "IsaOperationCondition(operation=" + _operation.getName() + ")";
+        return "IsaOperationCondition(operation=" + operation.getName() + ")";
     }
-
 }