svn commit: r111750 - /incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java

[ri...@apache.org]

Author: rich
Date: Mon Dec 13 14:07:02 2004
New Revision: 111750

URL: http://svn.apache.org/viewcvs?view=rev&rev=111750
Log:
Changed FlowControllerInfo (the info object built up during Page Flow annotation processing) to avoid returning null for getSharedFlow{...}(), even when processing a shared flow (.jpfs) file.

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


Modified:
   incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java

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=111750&p1=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java&r1=111749&p2=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java&r2=111750
==============================================================================
--- 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	Mon Dec 13 14:07:02 2004
@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.Collections;
 import java.io.File;
 
 
@@ -38,9 +39,9 @@
     private boolean _nested = false;
     private Set _returnActions = null;
     private File _webappRoot = null;
-    private Map< String, TypeDeclaration > _sharedFlowTypes;
-    private LinkedHashMap< String, String > _sharedFlowTypeNames;
-    private LinkedHashMap< String, File > _sharedFlowFiles;
+    private Map< String, TypeDeclaration > _sharedFlowTypes = Collections.emptyMap();
+    private Map< String, String > _sharedFlowTypeNames = Collections.emptyMap();
+    private Map< String, File > _sharedFlowFiles = Collections.emptyMap();
     private List< File > _referencedFiles = new ArrayList< File >();
     private boolean _isBuilding = false;
     private Map< String, String > _messageResourcesByKey = new HashMap< String, String >();
@@ -117,6 +118,7 @@
     void startBuild()
     {
         _isBuilding = true;
+        _sharedFlowTypes = Collections.emptyMap();
     }
     
     void endBuild()