You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2008/01/30 21:02:03 UTC
svn commit: r616881 - in /tiles/framework/trunk/tiles-compat/src:
main/java/org/apache/tiles/compat/definition/digester/
test/java/org/apache/tiles/compat/definition/digester/
Author: apetrelli
Date: Wed Jan 30 12:02:01 2008
New Revision: 616881
URL: http://svn.apache.org/viewvc?rev=616881&view=rev
Log:
TILES-244
Corrected the tiles-compat module.
Modified:
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java
Modified: tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java?rev=616881&r1=616880&r2=616881&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java Wed Jan 30 12:02:01 2008
@@ -71,14 +71,12 @@
// put / putAttribute rules
digester.addObjectCreate(putTag, PUT_ATTRIBUTE_HANDLER_CLASS);
digester.addRule(putTag, new FillAttributeRule());
- digester.addSetNext(putTag, "addAttribute",
- PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(putTag, new PutAttributeRule());
digester.addCallMethod(putTag, "setBody", 0);
// list rules
digester.addObjectCreate(listTag, LIST_HANDLER_CLASS);
digester.addSetProperties(listTag);
- digester.addSetNext(listTag, "addAttribute",
- PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(listTag, new PutAttributeRule());
// list elements rules
// We use Attribute class to avoid rewriting a new class.
// Name part can't be used in listElement attribute.
@@ -116,15 +114,13 @@
// first position ensure it will be called last (sic).
digester.addObjectCreate(putTag, PUT_ATTRIBUTE_HANDLER_CLASS);
digester.addRule(putTag, new FillAttributeRule());
- digester.addSetNext(putTag, "addAttribute",
- PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(putTag, new PutAttributeRule());
digester.addCallMethod(putTag, "setBody", 0);
// Definition level list rules
// This is rules for lists nested in a definition
digester.addObjectCreate(definitionListTag, LIST_HANDLER_CLASS);
digester.addSetProperties(definitionListTag);
- digester.addSetNext(definitionListTag, "addAttribute",
- PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(definitionListTag, new PutAttributeRule());
// list elements rules
// We use Attribute class to avoid rewriting a new class.
// Name part can't be used in listElement attribute.
@@ -168,16 +164,15 @@
// put / putAttribute rules
digester.addObjectCreate(putAttributeTag, PUT_ATTRIBUTE_HANDLER_CLASS);
digester.addRule(putTag, new FillAttributeRule());
- digester.addSetNext(putAttributeTag, "addAttribute",
- PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(putTag, new PutAttributeRule());
// put / putAttribute rules
digester.addObjectCreate(putTag, PUT_ATTRIBUTE_HANDLER_CLASS);
digester.addSetProperties(putTag);
- digester.addSetNext(putTag, "addAttribute", PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(putTag, new PutAttributeRule());
// list rules
digester.addObjectCreate(listTag, PUT_ATTRIBUTE_HANDLER_CLASS);
digester.addSetProperties(listTag);
- digester.addSetNext(listTag, "addAttribute", PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(listTag, new PutAttributeRule());
// list elements rules
// We use Attribute class to avoid rewriting a new class.
// Name part can't be used in listElement attribute.
Modified: tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java?rev=616881&r1=616880&r2=616881&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java Wed Jan 30 12:02:01 2008
@@ -68,6 +68,9 @@
/**
* Tests the read method to read Tiles 1.1 files.
+ *
+ * @throws DefinitionsFactoryException If the definitions factory fails.
+ * @throws IOException If an I/O exception happens.
*/
public void testReadOldFormat() throws DefinitionsFactoryException, IOException {
DefinitionsReader reader = new CompatibilityDigesterDefinitionsReader();
@@ -92,6 +95,9 @@
/**
* Tests the read method to read Tiles 2.0 files.
+ *
+ * @throws DefinitionsFactoryException If the definitions factory fails.
+ * @throws IOException If an I/O exception happens.
*/
public void testReadNewFormat() throws DefinitionsFactoryException, IOException {
DefinitionsReader reader = new CompatibilityDigesterDefinitionsReader();