WebSVN - bacoAlunos - Path Comparison - /branches/v3/impl/src/java/pt/estgp/estgweb/web/tags Rev 1554 and /branches/v3/impl/src/java/pt/estgp/estgweb/web/tags Rev 1782

Ignore whitespace Rev 1554 → Rev 1782

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/tags/CanManageTag.java
 ,10 → 80,10
         {
             boolean valid = Boolean.parseBoolean(this.valid);
             IValid iValid = (IValid) owned;
-            return owned != null && userSession != null && userSession.getUser() != null && (iValid.isValid() == valid && owned.isOwnedBy(userSession.getUser(),false) || (userSession.getUser()).isSuperuserOrAdmin());
+            return owned != null && userSession != null && userSession.getUser() != null && (iValid.isValid() == valid && owned.checkIsOwnedBy(userSession.getUser(), false) || (userSession.getUser()).isSuperuserOrAdmin());
         }
         else
-            return owned != null && userSession != null && userSession.getUser() != null && (owned.isOwnedBy(userSession.getUser(),false) || (userSession.getUser()).isSuperuserOrAdmin());
+            return owned != null && userSession != null && userSession.getUser() != null && (owned.checkIsOwnedBy(userSession.getUser(), false) || (userSession.getUser()).isSuperuserOrAdmin());
     }

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/tags/NotOwnerTag.java
 ,7 → 69,7
         IOwned owned = (IOwned) RequestUtils.lookup(pageContext, name, property, null);
-        return !(owned != null && userSession.getUser() != null && (owned.isOwnedBy(userSession.getUser(),false) || (userSession.getUser()).isSuperuserOrAdmin()));
+        return !(owned != null && userSession.getUser() != null && (owned.checkIsOwnedBy(userSession.getUser(), false) || (userSession.getUser()).isSuperuserOrAdmin()));
     }

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/tags/IsTeacherOfCourseUnitTag.java
 ,7 → 47,7
     public boolean go()
     {
         UserSessionImpl userSession = (UserSessionImpl) pageContext.getRequest().getAttribute(Globals.USER_SESSION_KEY);
-        return userSession != null && userSession.getUser() != null && ((UserImpl)((userSession.getUser()))).isTeacherOfCourseUnit(courseUnitId);
+        return userSession != null && userSession.getUser() != null && ((UserImpl)((userSession.getUser()))).checkIsTeacherOfCourseUnit(courseUnitId);
     }
     public int doEndTag() throws JspException

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/tags/IsStudentOfCourseUnitTag.java
 ,7 → 47,7
     public boolean go()
     {
         UserSessionImpl userSession = (UserSessionImpl) pageContext.getRequest().getAttribute(Globals.USER_SESSION_KEY);
-        return userSession != null && userSession.getUser() != null && ((UserImpl)((userSession.getUser()))).isStudentfCourseUnit(courseUnitId);
+        return userSession != null && userSession.getUser() != null && ((UserImpl)((userSession.getUser()))).checkIsStudentfCourseUnit(courseUnitId);
     }
     public int doEndTag() throws JspException

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/tags/OwnerTag.java
 ,8 → 9,6
 import pt.estgp.estgweb.domain.UserSessionImpl;
 import pt.estgp.estgweb.domain.IOwned;
-import pt.estgp.estgweb.domain.IInternal;
-import pt.estgp.estgweb.domain.IValid;
 import pt.estgp.estgweb.Globals;
 public class OwnerTag extends BodyTagSupport
 ,7 → 70,7
         IOwned owned = (IOwned) RequestUtils.lookup(pageContext, name, property, null);
-        return owned != null && userSession.getUser() != null && (owned.isOwnedBy(userSession.getUser(),false) || (userSession.getUser()).isSuperuserOrAdmin());
+        return owned != null && userSession.getUser() != null && (owned.checkIsOwnedBy(userSession.getUser(), false) || (userSession.getUser()).isSuperuserOrAdmin());
     }

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/tags/IsInCourseUnitTag.java
 ,7 → 47,7
     public boolean go()
     {
         UserSessionImpl userSession = (UserSessionImpl) pageContext.getRequest().getAttribute(Globals.USER_SESSION_KEY);
-        return userSession != null && userSession.getUser() != null && ((UserImpl)((userSession.getUser()))).isInCourseUnit(courseUnitId);
+        return userSession != null && userSession.getUser() != null && ((UserImpl)((userSession.getUser()))).checkIsInCourseUnit(courseUnitId);
     }
     public int doEndTag() throws JspException

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/tags/CantManageTag.java
 ,7 → 12,6
 import pt.estgp.estgweb.domain.IOwned;
 import pt.estgp.estgweb.domain.IInternal;
 import pt.estgp.estgweb.domain.IValid;
-import pt.estgp.estgweb.Globals;
 import pt.estgp.estgweb.web.UserSessionProxy;
 public class CantManageTag extends BodyTagSupport
 ,10 → 83,10
         {
             boolean valid = Boolean.parseBoolean(this.valid);
             IValid iValid = (IValid) owned;
-            return owned != null && userSession.getUser() != null && (iValid.isValid() == valid && owned.isOwnedBy(userSession.getUser(),false) || (userSession.getUser()).isSuperuserOrAdmin());
+            return owned != null && userSession.getUser() != null && (iValid.isValid() == valid && owned.checkIsOwnedBy(userSession.getUser(), false) || (userSession.getUser()).isSuperuserOrAdmin());
         }
         else
-            return owned != null && userSession.getUser() != null && (owned.isOwnedBy(userSession.getUser(),false) || (userSession.getUser()).isSuperuserOrAdmin());
+            return owned != null && userSession.getUser() != null && (owned.checkIsOwnedBy(userSession.getUser(), false) || (userSession.getUser()).isSuperuserOrAdmin());
     }