Author: rich Date: Thu Dec 16 13:55:35 2004 New Revision: 122587 URL: http://svn.apache.org/viewcvs?view=rev&rev=122587 Log: Fixed some NPEs caused by the new page flow inheritance support.
DRT: netui (WinXP) BB: self (linux) Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FacesBackingChecker.java incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowChecker.java Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FacesBackingChecker.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FacesBackingChecker.java?view=diff&rev=122587&p1=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FacesBackingChecker.java&r1=122586&p2=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FacesBackingChecker.java&r2=122587 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FacesBackingChecker.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FacesBackingChecker.java Thu Dec 16 13:55:35 2004 @@ -71,7 +71,7 @@ } } - FlowControllerInfo fcInfo = new FlowControllerInfo( jpfClass ); + FlowControllerInfo fcInfo = new FlowControllerInfo( jpfClass, getWebappRoot() ); fcInfo.startBuild( getEnv(), jpfClass ); CommandHandlerGrammar chg = Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java?view=diff&rev=122587&p1=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java&r1=122586&p2=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java&r2=122587 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java Thu Dec 16 13:55:35 2004 @@ -55,6 +55,7 @@ private Map< String, String > _messageResourcesByKey = new HashMap< String, String >(); private boolean _navigateToActionEnabled = false; private boolean _navigateToPageEnabled = false; + private boolean _isNested; private MergedControllerAnnotation _mergedControllerAnnotation; @@ -117,11 +118,18 @@ super( CompilerUtils.getOriginalFile( jclass ), jclass.getQualifiedName() ); } + public FlowControllerInfo( ClassDeclaration jclass, File webappRoot ) + { + this( jclass ); + _webappRoot = webappRoot; + } + void startBuild( AnnotationProcessorEnvironment env, ClassDeclaration jclass ) { _isBuilding = true; _mergedControllerAnnotation = new MergedControllerAnnotation(); mergeControllerAnnotations( _mergedControllerAnnotation, jclass ); + _isNested = _mergedControllerAnnotation.isNested(); setSharedFlowInfo( env ); } @@ -139,7 +147,7 @@ public boolean isNested() { - return _mergedControllerAnnotation.isNested(); + return _isNested; } public ActionInfo[] getReturnActions() Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowChecker.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowChecker.java?view=diff&rev=122587&p1=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowChecker.java&r1=122586&p2=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowChecker.java&r2=122587 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowChecker.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowChecker.java Thu Dec 16 13:55:35 2004 @@ -82,7 +82,7 @@ protected GenStrutsApp createStrutsApp( File sourceFile, ClassDeclaration jclass ) throws XmlException, IOException, NoWebInfDirectoryException { - return new GenSharedFlowStrutsApp( sourceFile, jclass, getEnv(), null, true ); + return new GenSharedFlowStrutsApp( sourceFile, jclass, getEnv(), getFlowControllerInfo(), true ); } protected AnnotationGrammar getControllerGrammar()
