svn commit: r155757 - in incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler: MergedControllerAnnotation.java genmodel/GenActionModel.java

[rich]

Author: rich
Date: Mon Feb 28 22:29:28 2005
New Revision: 155757

URL: http://svn.apache.org/viewcvs?view=rev&rev=155757
Log:
Fix for http://issues.apache.org/jira/browse/BEEHIVE-378 : Overriding 
loginRequired to false when when rolesAllowed is set in the parent Controller

DRT/BVT: netui (WinXP)
BB: self (linux)


Modified:
    
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
    
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionModel.java

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java?view=diff&r1=155756&r2=155757
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
 Mon Feb 28 22:29:28 2005
@@ -38,7 +38,7 @@
     private boolean _longLived;
     private List< String > _rolesAllowed;
     private List< String > _customValidatorConfigs;
-    private boolean _loginRequired;
+    private Boolean _loginRequired = null;
     private boolean _readOnly;
     private LinkedHashMap< String, AnnotationMirror > _forwards = new 
LinkedHashMap< String, AnnotationMirror >();
     private LinkedHashMap< String, AnnotationMirror > _sharedFlowRefs = new 
LinkedHashMap< String, AnnotationMirror >();
@@ -163,7 +163,7 @@
         return _customValidatorConfigs;
     }
 
-    public boolean isLoginRequired()
+    public Boolean isLoginRequired()
     {
         return _loginRequired;
     }

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionModel.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionModel.java?view=diff&r1=155756&r2=155757
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionModel.java
 Mon Feb 28 22:29:28 2005
@@ -66,14 +66,11 @@
         // loginRequired
         //
         Boolean loginRequired = CompilerUtils.getBoolean( annotation, 
LOGIN_REQUIRED_ATTR, true );
-        boolean loginRequiredSetOnAction = true;
-        
         if ( loginRequired == null )
         {
-            loginRequiredSetOnAction = false;
             loginRequired = 
parentApp.getFlowControllerInfo().getMergedControllerAnnotation().isLoginRequired();
         }
-        setLoginRequired( loginRequired );
+        if ( loginRequired != null ) setLoginRequired( loginRequired );
         
         //
         // prevent-double-submit
@@ -94,10 +91,7 @@
         //
         // rolesAllowed -- avoid setting this if loginRequired is explicitly 
false.
         //
-        if ( ! loginRequiredSetOnAction || loginRequired.booleanValue() )
-        {
-            setRolesAllowed( annotation, jclass, parentApp );
-        }
+        if ( loginRequired == null || loginRequired.booleanValue() ) 
setRolesAllowed( annotation, jclass, parentApp );
         
         //
         // type (delegating Action class, with the FlowController as parameter)