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

[rich]

Author: rich
Date: Mon Dec 20 18:05:01 2004
New Revision: 122927

URL: http://svn.apache.org/viewcvs?view=rev&rev=122927
Log:
Fixed an NPE during incremental comple of a page flow that depends on a shared 
flow, where the shared flow is not present in the list of source files to 
compile.

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


Modified:
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java
   
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/CompilerUtils.java
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java?view=diff&rev=122927&p1=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java&r1=122926&p2=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java&r2=122927
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java
     Mon Dec 20 18:05:01 2004
@@ -653,7 +653,7 @@
 
         if ( position != null )
         {
-            File file = decl.getPosition().file();
+            File file = position.file();
             String path = file.getAbsoluteFile().getPath();
             int pos = path.indexOf( TMP_SRC_DIR );
             

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=122927&p1=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java&r1=122926&p2=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java&r2=122927
==============================================================================
--- 
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 20 18:05:01 2004
@@ -272,7 +272,7 @@
         {
             TypeDeclaration type = entry.getValue();
             _sharedFlowTypeNames.put( entry.getKey(), type.getQualifiedName() 
);
-            File file = type.getPosition().file();
+            File file = CompilerUtils.getOriginalFile( type );
             _sharedFlowFiles.put( entry.getKey(), file );
             _referencedFiles.add( file );
         }