diff options
| -rw-r--r-- | gentools/org/apache/qpid/gentools/AmqpClass.java | 4 | ||||
| -rw-r--r-- | gentools/org/apache/qpid/gentools/AmqpField.java | 9 | ||||
| -rw-r--r-- | gentools/org/apache/qpid/gentools/AmqpMethod.java | 4 | ||||
| -rw-r--r-- | gentools/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java (renamed from gentools/org/apache/qpid/gentools/AmqpOrdinalMap.java) | 2 | ||||
| -rw-r--r-- | gentools/org/apache/qpid/gentools/JavaGenerator.java | 2 |
5 files changed, 10 insertions, 11 deletions
diff --git a/gentools/org/apache/qpid/gentools/AmqpClass.java b/gentools/org/apache/qpid/gentools/AmqpClass.java index 4ded7db94a..8c0fc83e4a 100644 --- a/gentools/org/apache/qpid/gentools/AmqpClass.java +++ b/gentools/org/apache/qpid/gentools/AmqpClass.java @@ -30,7 +30,7 @@ public class AmqpClass implements Printable, NodeAware public AmqpFieldMap fieldMap; public AmqpMethodMap methodMap; public String name; - public AmqpOrdinalMap indexMap; + public AmqpOrdinalVersionMap indexMap; public AmqpClass(String name, LanguageConverter converter) { @@ -39,7 +39,7 @@ public class AmqpClass implements Printable, NodeAware versionList = new AmqpVersionSet(); fieldMap = new AmqpFieldMap(); methodMap = new AmqpMethodMap(); - indexMap = new AmqpOrdinalMap(); + indexMap = new AmqpOrdinalVersionMap(); } public void addFromNode(Node classNode, int ordinal, AmqpVersion version) diff --git a/gentools/org/apache/qpid/gentools/AmqpField.java b/gentools/org/apache/qpid/gentools/AmqpField.java index a46c424887..9f8321e22a 100644 --- a/gentools/org/apache/qpid/gentools/AmqpField.java +++ b/gentools/org/apache/qpid/gentools/AmqpField.java @@ -20,7 +20,6 @@ package org.apache.qpid.gentools; import java.io.PrintStream; import java.util.ArrayList; import java.util.Iterator; -import java.util.TreeMap; import org.w3c.dom.Node; @@ -28,8 +27,8 @@ public class AmqpField implements Printable, NodeAware { public LanguageConverter converter; public AmqpVersionSet versionSet; - public TreeMap<String, AmqpVersionSet> domainMap; - public AmqpOrdinalMap ordinalMap; + public AmqpDomainVersionMap domainMap; + public AmqpOrdinalVersionMap ordinalMap; public String name; public AmqpField(String name, LanguageConverter converter) @@ -37,8 +36,8 @@ public class AmqpField implements Printable, NodeAware this.name = name; this.converter = converter; versionSet = new AmqpVersionSet(); - domainMap = new TreeMap<String, AmqpVersionSet>(); - ordinalMap = new AmqpOrdinalMap(); + domainMap = new AmqpDomainVersionMap(); + ordinalMap = new AmqpOrdinalVersionMap(); } public void addFromNode(Node fieldNode, int ordinal, AmqpVersion version) diff --git a/gentools/org/apache/qpid/gentools/AmqpMethod.java b/gentools/org/apache/qpid/gentools/AmqpMethod.java index 37c254e32c..8de8643ac2 100644 --- a/gentools/org/apache/qpid/gentools/AmqpMethod.java +++ b/gentools/org/apache/qpid/gentools/AmqpMethod.java @@ -29,7 +29,7 @@ public class AmqpMethod implements Printable, NodeAware public AmqpVersionSet versionSet; public AmqpFieldMap fieldMap; public String name; - public AmqpOrdinalMap indexMap; + public AmqpOrdinalVersionMap indexMap; public AmqpMethod(String name, LanguageConverter converter) { @@ -37,7 +37,7 @@ public class AmqpMethod implements Printable, NodeAware this.converter = converter; versionSet = new AmqpVersionSet(); fieldMap = new AmqpFieldMap(); - indexMap = new AmqpOrdinalMap(); + indexMap = new AmqpOrdinalVersionMap(); } public void addFromNode(Node methodNode, int ordinal, AmqpVersion version) diff --git a/gentools/org/apache/qpid/gentools/AmqpOrdinalMap.java b/gentools/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java index a340376d0e..3ec8d59842 100644 --- a/gentools/org/apache/qpid/gentools/AmqpOrdinalMap.java +++ b/gentools/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java @@ -3,7 +3,7 @@ package org.apache.qpid.gentools; import java.util.TreeMap; @SuppressWarnings("serial") -public class AmqpOrdinalMap extends TreeMap<Integer, AmqpVersionSet> +public class AmqpOrdinalVersionMap extends TreeMap<Integer, AmqpVersionSet> { } diff --git a/gentools/org/apache/qpid/gentools/JavaGenerator.java b/gentools/org/apache/qpid/gentools/JavaGenerator.java index dc19d0e14a..48cd51f1c6 100644 --- a/gentools/org/apache/qpid/gentools/JavaGenerator.java +++ b/gentools/org/apache/qpid/gentools/JavaGenerator.java @@ -601,7 +601,7 @@ public class JavaGenerator extends Generator return sb.toString(); } - protected String generateIndexInitializer(String mapName, AmqpOrdinalMap indexMap, int indentSize) + protected String generateIndexInitializer(String mapName, AmqpOrdinalVersionMap indexMap, int indentSize) { String indent = Utils.createSpaces(indentSize); StringBuffer sb = new StringBuffer(); |