jon         01/07/01 17:43:50

  Modified:    src/java/org/apache/turbine/om/security
                        TurbineGroupPeer.java TurbinePermissionPeer.java
                        TurbineRolePeer.java TurbineUserPeer.java
  Log:
  jikes 1.14 is anal...
  
  need to be explicit about which buildCriteria method to use...we are using
  the one in the superclass...
  
  this should fix gump errors as well
  
  -jon
  
  Revision  Changes    Path
  1.2       +2 -2      
jakarta-turbine/src/java/org/apache/turbine/om/security/TurbineGroupPeer.java
  
  Index: TurbineGroupPeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/TurbineGroupPeer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TurbineGroupPeer.java     2001/06/26 20:09:42     1.1
  +++ TurbineGroupPeer.java     2001/07/02 00:43:48     1.2
  @@ -72,7 +72,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
  - * @version $Id: TurbineGroupPeer.java,v 1.1 2001/06/26 20:09:42 mpoeschl Exp $
  + * @version $Id: TurbineGroupPeer.java,v 1.2 2001/07/02 00:43:48 jon Exp $
    */
   public class TurbineGroupPeer
       extends org.apache.turbine.om.security.BaseTurbineGroupPeer
  @@ -133,7 +133,7 @@
        * Builds a criteria object based upon an Group object
        */
       public static Criteria buildCriteria(Group group) {
  -        return buildCriteria((TurbineGroup)group);
  +        return BaseTurbineGroupPeer.buildCriteria((TurbineGroup)group);
       }
   
       /**
  
  
  
  1.2       +2 -2      
jakarta-turbine/src/java/org/apache/turbine/om/security/TurbinePermissionPeer.java
  
  Index: TurbinePermissionPeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/TurbinePermissionPeer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TurbinePermissionPeer.java        2001/06/26 20:09:43     1.1
  +++ TurbinePermissionPeer.java        2001/07/02 00:43:48     1.2
  @@ -73,7 +73,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
  - * @version $Id: TurbinePermissionPeer.java,v 1.1 2001/06/26 20:09:43 mpoeschl Exp $
  + * @version $Id: TurbinePermissionPeer.java,v 1.2 2001/07/02 00:43:48 jon Exp $
    */
   public class TurbinePermissionPeer
       extends org.apache.turbine.om.security.BaseTurbinePermissionPeer
  @@ -86,7 +86,7 @@
        */
       public static Criteria buildCriteria( Permission permission )
       {
  -        return buildCriteria((TurbinePermission)permission);
  +        return 
BaseTurbinePermissionPeer.buildCriteria((TurbinePermission)permission);
       }
   
       /**
  
  
  
  1.2       +2 -2      
jakarta-turbine/src/java/org/apache/turbine/om/security/TurbineRolePeer.java
  
  Index: TurbineRolePeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/TurbineRolePeer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TurbineRolePeer.java      2001/06/26 20:09:42     1.1
  +++ TurbineRolePeer.java      2001/07/02 00:43:48     1.2
  @@ -74,7 +74,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
  - * @version $Id: TurbineRolePeer.java,v 1.1 2001/06/26 20:09:42 mpoeschl Exp $
  + * @version $Id: TurbineRolePeer.java,v 1.2 2001/07/02 00:43:48 jon Exp $
    */
   public class TurbineRolePeer
       extends org.apache.turbine.om.security.BaseTurbineRolePeer
  @@ -87,7 +87,7 @@
        */
       public static Criteria buildCriteria(Role role)
       {
  -        return buildCriteria((TurbineRole)role);
  +        return BaseTurbineRolePeer.buildCriteria((TurbineRole)role);
       }
   
       /**
  
  
  
  1.4       +2 -2      
jakarta-turbine/src/java/org/apache/turbine/om/security/TurbineUserPeer.java
  
  Index: TurbineUserPeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/TurbineUserPeer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TurbineUserPeer.java      2001/06/30 00:46:20     1.3
  +++ TurbineUserPeer.java      2001/07/02 00:43:48     1.4
  @@ -69,7 +69,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
  - * @version $Id: TurbineUserPeer.java,v 1.3 2001/06/30 00:46:20 jmcnally Exp $
  + * @version $Id: TurbineUserPeer.java,v 1.4 2001/07/02 00:43:48 jon Exp $
    */
   public class TurbineUserPeer
       extends org.apache.turbine.om.security.BaseTurbineUserPeer
  @@ -106,7 +106,7 @@
        */
       public static Criteria buildCriteria(User user)
       {
  -       return buildCriteria((TurbineUser)user);
  +       return BaseTurbineUserPeer.buildCriteria((TurbineUser)user);
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to