summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2007-05-17 10:18:16 (EDT)
committer pelder2007-05-17 10:18:16 (EDT)
commit3ebd4453cb08ff74dadb6d93084c228ac8f114c1 (patch)
treec0236eaa0c917e05aa5eb024783244cde09550dd
parentc688d1c8d4c019c79f20a00de707e61619912414 (diff)
downloadorg.eclipse.jet-3ebd4453cb08ff74dadb6d93084c228ac8f114c1.zip
org.eclipse.jet-3ebd4453cb08ff74dadb6d93084c228ac8f114c1.tar.gz
org.eclipse.jet-3ebd4453cb08ff74dadb6d93084c228ac8f114c1.tar.bz2
[187373] JET Code generation of custom tag attributes is in random order
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/javaTags/resourceTag.html2
-rw-r--r--plugins/org.eclipse.jet.core/src/org/eclipse/jet/core/parser/ast/XMLElement.java6
-rw-r--r--tests/org.eclipse.jet.tests.core/data/parser/ast/taglibs.jet.JETASTParser.astdump.expected2
-rw-r--r--tests/org.eclipse.jet.tests/data/simplifiedCompiler/templates/simple.v2.input.jet.expected.java4
-rw-r--r--tests/org.eclipse.jet.tests/data/taglibs.jet.astdump.expected2
-rw-r--r--tests/org.eclipse.jet.tests/data/taglibs.jet.expected.java4
6 files changed, 10 insertions, 10 deletions
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/javaTags/resourceTag.html b/doc/org.eclipse.jet.doc/references/taglibs/javaTags/resourceTag.html
index b0c152e..81d6c45 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/javaTags/resourceTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/javaTags/resourceTag.html
@@ -49,7 +49,7 @@
</TR>
<TR>
<TD width="10%">template</TD>
- <TD><BR> <BR> A project-relative path of a JET template to execute. The template provides the resource file's contents.<BR> <BR> A project-relative path of a JET template to execute. The template provides the resource file's contents.<BR> </TD>
+ <TD><BR> A project-relative path of a JET template to execute. The template provides the resource file's contents.<BR> </TD>
</TR>
</TBODY>
</TABLE>
diff --git a/plugins/org.eclipse.jet.core/src/org/eclipse/jet/core/parser/ast/XMLElement.java b/plugins/org.eclipse.jet.core/src/org/eclipse/jet/core/parser/ast/XMLElement.java
index 547ed6c..3bbfb10 100644
--- a/plugins/org.eclipse.jet.core/src/org/eclipse/jet/core/parser/ast/XMLElement.java
+++ b/plugins/org.eclipse.jet.core/src/org/eclipse/jet/core/parser/ast/XMLElement.java
@@ -10,14 +10,14 @@
*
* </copyright>
*
- * $Id: XMLElement.java,v 1.2 2007/04/12 18:02:42 pelder Exp $
+ * $Id: XMLElement.java,v 1.3 2007/05/17 14:18:10 pelder Exp $
* /
*******************************************************************************/
package org.eclipse.jet.core.parser.ast;
import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
import org.eclipse.jet.taglib.TagDefinition;
@@ -64,7 +64,7 @@ public abstract class XMLElement extends BodyElement {
super(ast, line, colOffset, start, end);
this.name = name;
this.tagDefinition = td;
- this.attributes = Collections.unmodifiableMap(new HashMap(attributes)); // defensive
+ this.attributes = Collections.unmodifiableMap(new LinkedHashMap(attributes)); // defensive
// copy
}
diff --git a/tests/org.eclipse.jet.tests.core/data/parser/ast/taglibs.jet.JETASTParser.astdump.expected b/tests/org.eclipse.jet.tests.core/data/parser/ast/taglibs.jet.JETASTParser.astdump.expected
index b99d6d3..86277b0 100644
--- a/tests/org.eclipse.jet.tests.core/data/parser/ast/taglibs.jet.JETASTParser.astdump.expected
+++ b/tests/org.eclipse.jet.tests.core/data/parser/ast/taglibs.jet.JETASTParser.astdump.expected
@@ -6,9 +6,9 @@
</data>
<tag name="test:tokenize" line="4" col="1">
+ <attribute name="string">a,b,c,d,e,f,g</attribute>
<attribute name="sep">,</attribute>
<attribute name="var">token</attribute>
- <attribute name="string">a,b,c,d,e,f,g</attribute>
<content>
<data></data>
<tag name="test:other" line="5" col="1">
diff --git a/tests/org.eclipse.jet.tests/data/simplifiedCompiler/templates/simple.v2.input.jet.expected.java b/tests/org.eclipse.jet.tests/data/simplifiedCompiler/templates/simple.v2.input.jet.expected.java
index 10083d8..218813b 100644
--- a/tests/org.eclipse.jet.tests/data/simplifiedCompiler/templates/simple.v2.input.jet.expected.java
+++ b/tests/org.eclipse.jet.tests/data/simplifiedCompiler/templates/simple.v2.input.jet.expected.java
@@ -19,14 +19,14 @@ public class _jet_simplev2input implements JET2Template {
static final TagInfo test_tokenize_4_1 = new TagInfo("test:tokenize", //$NON-NLS-1$
4, 1,
new String[] {
+ "string", //$NON-NLS-1$
"sep", //$NON-NLS-1$
"var", //$NON-NLS-1$
- "string", //$NON-NLS-1$
},
new String[] {
+ "a,b,c,d,e,f,g", //$NON-NLS-1$
",", //$NON-NLS-1$
"token", //$NON-NLS-1$
- "a,b,c,d,e,f,g", //$NON-NLS-1$
} );
static final TagInfo test_other_5_1 = new TagInfo("test:other", //$NON-NLS-1$
5, 1,
diff --git a/tests/org.eclipse.jet.tests/data/taglibs.jet.astdump.expected b/tests/org.eclipse.jet.tests/data/taglibs.jet.astdump.expected
index b73ff74..459e7ce 100644
--- a/tests/org.eclipse.jet.tests/data/taglibs.jet.astdump.expected
+++ b/tests/org.eclipse.jet.tests/data/taglibs.jet.astdump.expected
@@ -7,9 +7,9 @@
</data>
<tag name="test:tokenize" line="4" col="1">
+ <attribute name="string">a,b,c,d,e,f,g</attribute>
<attribute name="sep">,</attribute>
<attribute name="var">token</attribute>
- <attribute name="string">a,b,c,d,e,f,g</attribute>
<content>
<data>
</data>
diff --git a/tests/org.eclipse.jet.tests/data/taglibs.jet.expected.java b/tests/org.eclipse.jet.tests/data/taglibs.jet.expected.java
index 7e4b77e..2209083 100644
--- a/tests/org.eclipse.jet.tests/data/taglibs.jet.expected.java
+++ b/tests/org.eclipse.jet.tests/data/taglibs.jet.expected.java
@@ -17,14 +17,14 @@ public class X implements JET2Template {
final TagInfo _jettd_test_tokenize_4_1 = new TagInfo("test:tokenize", //$NON-NLS-1$
4, 1,
new String[] {
+ "string", //$NON-NLS-1$
"sep", //$NON-NLS-1$
"var", //$NON-NLS-1$
- "string", //$NON-NLS-1$
},
new String[] {
+ "a,b,c,d,e,f,g", //$NON-NLS-1$
",", //$NON-NLS-1$
"token", //$NON-NLS-1$
- "a,b,c,d,e,f,g", //$NON-NLS-1$
} );
final TagInfo _jettd_test_other_5_1 = new TagInfo("test:other", //$NON-NLS-1$
5, 1,