You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by br...@apache.org on 2009/08/05 23:19:20 UTC
svn commit: r801415 -
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
Author: brindy
Date: Wed Aug 5 21:19:19 2009
New Revision: 801415
URL: http://svn.apache.org/viewvc?rev=801415&view=rev
Log:
PIVOT-180
Pass the current resource as a parent for the include WTKSerializer.
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java?rev=801415&r1=801414&r2=801415&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java Wed Aug 5 21:19:19 2009
@@ -524,7 +524,7 @@
if (attribute.localName.equals(INCLUDE_SRC_ATTRIBUTE)) {
src = attribute.value;
} else if (attribute.localName.equals(INCLUDE_RESOURCES_ATTRIBUTE)) {
- resources = new Resources(attribute.value);
+ resources = new Resources(resources, attribute.value);
} else if (attribute.localName.equals(INCLUDE_ASYNCHRONOUS_ATTRIBUTE)) {
// TODO
throw new UnsupportedOperationException("Asynchronous includes are not"