You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by km...@apache.org on 2009/02/03 04:38:58 UTC
svn commit: r740205 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/internal/structure/
main/resources/org/apache/tapestry5/internal/structure/
test/java/org/apache/tapestry5/integration/
Author: kmenard
Date: Tue Feb 3 03:38:58 2009
New Revision: 740205
URL: http://svn.apache.org/viewvc?rev=740205&view=rev
Log:
Oops. I somehow reverted these changes. Adding them back in now.
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StructureMessages.java
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/structure/StructureStrings.properties
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StructureMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StructureMessages.java?rev=740205&r1=740204&r2=740205&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StructureMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StructureMessages.java Tue Feb 3 03:38:58 2009
@@ -96,7 +96,7 @@
static String originalChildComponent(ComponentPageElement container, String childId, Location originalLocation)
{
- return MESSAGES.format("original-child-component", container.getCompleteId(), childId, originalLocation.getLine());
+ return MESSAGES.format("original-child-component", container.getCompleteId(), childId, originalLocation.getResource().getPath(), originalLocation.getLine());
}
static String duplicateBlock(ComponentPageElement component, String blockId)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/structure/StructureStrings.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/structure/StructureStrings.properties?rev=740205&r1=740204&r2=740205&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/structure/StructureStrings.properties (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/structure/StructureStrings.properties Tue Feb 3 03:38:58 2009
@@ -29,7 +29,7 @@
and may indicate that a reference to the page (or component within the page) was retained past the end of a request.
duplicate-child-component=Component %s already contains a child component with id '%s'. \
Embedded component ids must be unique (excluding case, which is ignored).
-original-child-component=Component %s declared original child component with id '%s' on line %s.
+original-child-component=Component %s declared original child component with id '%s' in %s on line %s.
duplicate-block=Component %s already contains a block with id '%s'. \
Block ids must be unique (excluding case, which is ignored).
field-persist-failure=Error persisting field %s:%s: %s
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java?rev=740205&r1=740204&r2=740205&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java Tue Feb 3 03:38:58 2009
@@ -2534,6 +2534,6 @@
start("Duplicate IDs");
assertTextPresent("Component DuplicateIds already contains a child component with id 'index'. Embedded component ids must be unique (excluding case, which is ignored).");
- assertTextPresent("Component DuplicateIds declared original child component with id 'index' on line 6.");
+ assertTextPresent("Component DuplicateIds declared original child component with id 'index' in DuplicateIds.tml on line 6.");
}
}