Author: ptw
Date: 2007-09-03 15:02:28 -0700 (Mon, 03 Sep 2007)
New Revision: 6334
Modified:
openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/compiler/ViewCompiler.java
Log:
Change 20070903-ptw-m by [EMAIL PROTECTED] on 2007-09-03 12:53:26 EDT
in /Users/ptw/OpenLaszlo/wafflecone
for http://svn.openlaszlo.org/openlaszlo/branches/wafflecone
Summary: Paper over source/binary include bug
Bugs Fixed:
LPP-4463 'ERROR:Class for tag include has not been defined yet'
Technical Reviewer: promanik (Message-Id: <[EMAIL PROTECTED]>)
QA Reviewer: mamye (pending)
Details:
Decline to compile an include tag if it leaks through to the view
compiler.
Tests:
Modified:
openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/compiler/ViewCompiler.java
===================================================================
---
openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/compiler/ViewCompiler.java
2007-09-03 21:45:15 UTC (rev 6333)
+++
openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/compiler/ViewCompiler.java
2007-09-03 22:02:28 UTC (rev 6334)
@@ -154,6 +154,15 @@
*/
void compileXML(Element element, FontInfo fontInfo)
{
+ // TODO: [2007-09-03 ptw] (LPP-4634) You should not be able to
+ // get here. This appears to happen when a binary file has
+ // already included a sub-library and that same sub-library is
+ // included by a source file. Since the include is already
+ // loaded, it is not expanded in expandIncludes, but because
+ // ViewCompiler.isElement returns true for everything, we end up
+ // here. For now, just don't do anything.
+ if ("include".equals(element.getName())) return;
+
// TODO: [12-27-2002 ows] use the log4j API instead of this property
boolean tracexml = mEnv.getBooleanProperty("trace.xml");
if (tracexml) {
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
