Fixed the order of variable declarations passed to the MarkupGenerator.

OP-TED · May 10, 2024 · d78b076 · d78b076
1 parent 4059aed
commit d78b076
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/eu/europa/ted/efx/model/templates/ContentBlock.java b/src/main/java/eu/europa/ted/efx/model/templates/ContentBlock.java
@@ -125,7 +125,7 @@ public Set<Variable> getOwnVariables() {
     if (this.context != null && this.context.variable() != null) {
       variables.add(this.context.variable());
     }
-    variables.addAll(this.variables);
+    variables.addAll(this.variables.declaredOrder());
     return variables;
   }
 

diff --git a/src/main/java/eu/europa/ted/efx/model/variables/VariableList.java b/src/main/java/eu/europa/ted/efx/model/variables/VariableList.java
@@ -1,5 +1,6 @@
 package eu.europa.ted.efx.model.variables;
 
+import java.util.Collections;
 import java.util.LinkedList;
 
 import eu.europa.ted.efx.model.ParsedEntity;
@@ -8,4 +9,11 @@ public class VariableList extends LinkedList<Variable> implements ParsedEntity {
 
   public VariableList() {
   }
+
+  public VariableList declaredOrder() {
+    VariableList reversedList = new VariableList();
+    reversedList.addAll(this);
+    Collections.reverse(reversedList);
+    return reversedList;
+  }
 }