Code tidy-up in code generator

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488799 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 180 insertions, 321 deletions

diff --git a/gentools/src/org/apache/qpid/gentools/AmqpClass.java b/gentools/src/org/apache/qpid/gentools/AmqpClass.java
index b8a7769bbc..3f66e15567 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpClass.java
+++ b/gentools/src/org/apache/qpid/gentools/AmqpClass.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.gentools;
 
 import java.io.PrintStream;
-import java.util.Iterator;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -97,25 +96,21 @@ public class AmqpClass implements Printable, NodeAware
 		String tab = Utils.createSpaces(tabSize);
 		out.println(margin + "[C] " + name + ": " + versionSet);
 		
-		Iterator<Integer> iItr = indexMap.keySet().iterator();
-		while (iItr.hasNext())
+		for (Integer thisIndex : indexMap.keySet())
 		{
-			int index = iItr.next();
-			AmqpVersionSet indexVersionSet = indexMap.get(index);
-			out.println(margin + tab + "[I] " + index + indexVersionSet);
+			AmqpVersionSet indexVersionSet = indexMap.get(thisIndex);
+			out.println(margin + tab + "[I] " + thisIndex + indexVersionSet);
 		}
 		
-		Iterator<String> sItr = fieldMap.keySet().iterator();
-		while (sItr.hasNext())
+		for (String thisFieldName : fieldMap.keySet())
 		{
-			AmqpField thisField = fieldMap.get(sItr.next());
+			AmqpField thisField = fieldMap.get(thisFieldName);
 			thisField.print(out, marginSize + tabSize, tabSize);
 		}
 		
-		sItr = methodMap.keySet().iterator();
-		while (sItr.hasNext())
+		for (String thisMethodName : methodMap.keySet())
 		{
-			AmqpMethod thisMethod = methodMap.get(sItr.next());
+			AmqpMethod thisMethod = methodMap.get(thisMethodName);
 			thisMethod.print(out, marginSize + tabSize, tabSize);
 		}
 	}
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpConstant.java b/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
index 9ff69600bb..6ccd2dbf99 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
+++ b/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.gentools;
 
 import java.io.PrintStream;
-import java.util.Iterator;
 import java.util.TreeMap;
 
 /**
@@ -113,13 +112,11 @@ public class AmqpConstant extends TreeMap<String, AmqpVersionSet>
     public String getStringValue(AmqpVersion version)
     throws AmqpTypeMappingException
     {
-        Iterator<String> sItr = keySet().iterator();
-        while (sItr.hasNext())
+    	for (String thisValue : keySet())
         {
-            String value = sItr.next();
-            AmqpVersionSet versionSet = get(value);
+            AmqpVersionSet versionSet = get(thisValue);
             if (versionSet.contains(version))
-                return value;
+                return thisValue;
         }
         throw new AmqpTypeMappingException("Unable to find value for constant \"" + name +
             "\" for version " + version.toString() + ".");
@@ -199,11 +196,9 @@ public class AmqpConstant extends TreeMap<String, AmqpVersionSet>
         else
         {
             out.println(margin + tab + "[C] " + name + ": " + versionSet);
-            Iterator<String> sItr = keySet().iterator();
-            while (sItr.hasNext())
+            for (String thisValue : keySet())
             {
-                String value = sItr.next();
-                out.println(margin + tab + tab + "= \"" + value + "\" " + get(value));
+                 out.println(margin + tab + tab + "= \"" + thisValue + "\" " + get(thisValue));
             }
         }
     }
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java b/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
index 93e2d5a7ee..732ef46635 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
+++ b/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
@@ -71,10 +71,8 @@ public class AmqpConstantSet extends TreeSet<AmqpConstant> implements Printable,
                         thisConstant.versionSet.add(version);
                         // Now, find the value in the map
                         boolean foundValue = false;
-                        Iterator<String> vItr = thisConstant.keySet().iterator();
-                        while (vItr.hasNext() && !foundValue)
+                        for (String thisValue : thisConstant.keySet())
                         {
-                            String thisValue = vItr.next();
                             if (value.compareTo(thisValue) == 0)
                             {
                                 foundValue = true;
@@ -105,10 +103,9 @@ public class AmqpConstantSet extends TreeSet<AmqpConstant> implements Printable,
     public void print(PrintStream out, int marginSize, int tabSize)
     {
         out.println(Utils.createSpaces(marginSize) + "Constants: ");
-        Iterator<AmqpConstant> cItr = iterator();
-        while (cItr.hasNext())
+        for (AmqpConstant thisAmqpConstant : this)
         {
-            cItr.next().print(out, marginSize, tabSize);
+        	thisAmqpConstant.print(out, marginSize, tabSize);
         }
     }
     
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpDomain.java b/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
index ecb1285ef2..4796f31fb3 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
+++ b/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.gentools;
 
 import java.io.PrintStream;
-import java.util.Iterator;
 import java.util.TreeMap;
 
 @SuppressWarnings("serial")
@@ -48,13 +47,11 @@ public class AmqpDomain extends TreeMap<String, AmqpVersionSet> implements Print
 	public String getDomainType(AmqpVersion version)
 	    throws AmqpTypeMappingException
 	{
-		Iterator<String> i = keySet().iterator();
-		while (i.hasNext())
+		for (String thisDomainType : keySet())
 		{
-			String type = i.next();
-			AmqpVersionSet versionSet = get(type);
+			AmqpVersionSet versionSet = get(thisDomainType);
 			if (versionSet.contains(version))
-				return type;
+				return thisDomainType;
 		} throw new AmqpTypeMappingException("Unable to find version " + version + ".");
 	}
 	
@@ -72,12 +69,10 @@ public class AmqpDomain extends TreeMap<String, AmqpVersionSet> implements Print
 		String tab = Utils.createSpaces(tabSize);
 		out.println(margin + domainName + ":");
 		
-		Iterator<String> i = keySet().iterator();
-		while (i.hasNext())
+		for (String thisDomainType : keySet())
 		{
-			String type = i.next();
-			AmqpVersionSet vs = get(type);
-			out.println(margin + tab + type + " : " + vs.toString());
+			AmqpVersionSet vs = get(thisDomainType);
+			out.println(margin + tab + thisDomainType + " : " + vs.toString());
 		}
 	}
 }
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java b/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
index d653bd5fed..a2a9ce3aa9 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
+++ b/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.gentools;
 
 import java.io.PrintStream;
-import java.util.Iterator;
 import java.util.TreeMap;
 
 import org.w3c.dom.Node;
@@ -110,11 +109,9 @@ public class AmqpDomainMap extends TreeMap<String, AmqpDomain> implements Printa
 	public void print(PrintStream out, int marginSize, int tabSize)
 	{
         out.println(Utils.createSpaces(marginSize) + "Domain Map:");
-		Iterator<String> i = keySet().iterator();
-		while (i.hasNext())
+        for (String thisDomainName : keySet())
 		{
-			String domainName = i.next();
-			AmqpDomain domain = get(domainName);
+			AmqpDomain domain = get(thisDomainName);
 			domain.print(out, marginSize + tabSize, tabSize);
 		}
 	}
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpField.java b/gentools/src/org/apache/qpid/gentools/AmqpField.java
index 02ac7a7599..8e87641445 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpField.java
+++ b/gentools/src/org/apache/qpid/gentools/AmqpField.java
@@ -22,7 +22,6 @@ package org.apache.qpid.gentools;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.Iterator;
 
 import org.w3c.dom.Node;
 
@@ -79,12 +78,10 @@ public class AmqpField implements Printable, NodeAware, VersionConsistencyCheck
 		if (domainMap.size() == 1)
 			return true; // By definition
 		ArrayList<String> codeTypeList = new ArrayList<String>();
-		Iterator<String> itr = domainMap.keySet().iterator();
-		while (itr.hasNext())
+		for (String thisDomainName : domainMap.keySet())
 		{
-			String domainName = itr.next();
-			AmqpVersionSet versionSet = domainMap.get(domainName);
-			String codeType = converter.getGeneratedType(domainName, versionSet.first());
+			AmqpVersionSet versionSet = domainMap.get(thisDomainName);
+			String codeType = converter.getGeneratedType(thisDomainName, versionSet.first());
 			if (!codeTypeList.contains(codeType))
 				codeTypeList.add(codeType);
 		}
@@ -101,9 +98,10 @@ public class AmqpField implements Printable, NodeAware, VersionConsistencyCheck
 		// Since the various doamin names map to the same code type, add the version occurrences
 		// across all domains to see we have all possible versions covered
 		int vCntr = 0;
-		Iterator<String> itr = domainMap.keySet().iterator();
-		while (itr.hasNext())
-			vCntr += domainMap.get(itr.next()).size();
+		for (String thisDomainName : domainMap.keySet())
+		{
+			vCntr += domainMap.get(thisDomainName).size();
+		}
 		return vCntr == generator.globalVersionSet.size();
 	}
 	
@@ -112,20 +110,16 @@ public class AmqpField implements Printable, NodeAware, VersionConsistencyCheck
 		String margin = Utils.createSpaces(marginSize);
 		out.println(margin + "[F] " + name + ": " + versionSet);
 
-		Iterator<Integer> iItr = ordinalMap.keySet().iterator();
-		while (iItr.hasNext())
+		for (Integer thisOrdinal : ordinalMap.keySet())
 		{
-			Integer ordinalValue = iItr.next();
-			AmqpVersionSet versionList = ordinalMap.get(ordinalValue);
-			out.println(margin + "  [O] " + ordinalValue + " : " + versionList.toString());
+			AmqpVersionSet versionList = ordinalMap.get(thisOrdinal);
+			out.println(margin + "  [O] " + thisOrdinal + " : " + versionList.toString());
 		}
 
-		Iterator<String> sItr = domainMap.keySet().iterator();
-		while (sItr.hasNext())
+		for (String thisDomainName : domainMap.keySet())
 		{
-			String domainKey = sItr.next();
-			AmqpVersionSet versionList = domainMap.get(domainKey);
-			out.println(margin + "  [D] " + domainKey + " : " + versionList.toString());
+			AmqpVersionSet versionList = domainMap.get(thisDomainName);
+			out.println(margin + "  [D] " + thisDomainName + " : " + versionList.toString());
 		}
 	}
 	
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java b/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
index adb5793b44..e9f6ee5093 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
+++ b/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
@@ -32,14 +32,15 @@ public class AmqpFieldMap extends TreeMap<String, AmqpField> implements VersionC
 	public AmqpFieldMap getFieldMapForOrdinal(int ordinal)
 	{
 		AmqpFieldMap newMap = new AmqpFieldMap();
-		Iterator<String> fItr = keySet().iterator();
-		while (fItr.hasNext())
+		for (String thisFieldName: keySet())
 		{
-			AmqpField field = get(fItr.next());
+			AmqpField field = get(thisFieldName);
 			TreeMap<Integer, AmqpVersionSet> ordinalMap = field.ordinalMap;
 			AmqpVersionSet ordinalVersions = ordinalMap.get(ordinal);
 			if (ordinalVersions != null)
+			{
 				newMap.put(field.name, field);
+			}
 		}
 		return newMap;
 	}
@@ -49,18 +50,16 @@ public class AmqpFieldMap extends TreeMap<String, AmqpField> implements VersionC
 		throws AmqpTypeMappingException
 	{
 		AmqpOrdinalFieldMap ordinalFieldMap = new AmqpOrdinalFieldMap();
-		Iterator<String> fItr = keySet().iterator();
-		while (fItr.hasNext())
+		for (String thisFieldName: keySet())
 		{
-			AmqpField field = get(fItr.next());
+			AmqpField field = get(thisFieldName);
 			if (version == null || field.versionSet.contains(version))
 			{
 				String domain = "";
 				boolean dFound = false;
-				Iterator<String> dItr = field.domainMap.keySet().iterator();
-				while (dItr.hasNext() && !dFound)
+				for (String thisDomainName : field.domainMap.keySet())
 				{
-					domain = dItr.next();
+					domain = thisDomainName;
 					AmqpVersionSet versionSet = field.domainMap.get(domain);
 					if (version == null || versionSet.contains(version))
 					{
@@ -72,10 +71,9 @@ public class AmqpFieldMap extends TreeMap<String, AmqpField> implements VersionC
 				
 				int ordinal = -1;
 				boolean oFound = false;
-				Iterator<Integer> oItr = field.ordinalMap.keySet().iterator();
-				while (oItr.hasNext() && !oFound)
+				for (Integer thisOrdinal : field.ordinalMap.keySet())
 				{
-					ordinal = oItr.next();
+					ordinal = thisOrdinal;
 					AmqpVersionSet versionSet = field.ordinalMap.get(ordinal);
 					if (version == null || versionSet.contains(version))
 						oFound = true;
@@ -102,10 +100,9 @@ public class AmqpFieldMap extends TreeMap<String, AmqpField> implements VersionC
 	public int getNumFields(AmqpVersion version)
 	{
 		int fCntr = 0;
-		Iterator<String> fItr = keySet().iterator();
-		while (fItr.hasNext())
+		for (String thisFieldName : keySet())
 		{
-			AmqpField field = get(fItr.next());
+			AmqpField field = get(thisFieldName);
 			if (field.versionSet.contains(version))
 				fCntr++;
 		}
@@ -156,7 +153,6 @@ public class AmqpFieldMap extends TreeMap<String, AmqpField> implements VersionC
 	
 	public String parseFieldMapOrdinally(Method generateMethod, Method bitGenerateMethod,
 		int indentSize, int tabSize, Generator codeGenerator)
-//	int indentSize, int tabSize, AmqpVersionSet versionSet, AmqpDomainMap globalDomainMap)
 	    throws AmqpTypeMappingException, IllegalAccessException, InvocationTargetException
 	{
 		String indent = Utils.createSpaces(indentSize);
@@ -320,10 +316,9 @@ public class AmqpFieldMap extends TreeMap<String, AmqpField> implements VersionC
 	
 	public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
 	{
-		Iterator<String> fItr = keySet().iterator();
-		while (fItr.hasNext())
+		for (String thisFieldName : keySet())
 		{
-			AmqpField field = get(fItr.next());
+			AmqpField field = get(thisFieldName);
 			if (!field.isVersionConsistent(globalVersionSet))
 				return false;
 		}
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpMethod.java b/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
index 5a8a9db50e..126949b44f 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
+++ b/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.gentools;
 
 import java.io.PrintStream;
-import java.util.Iterator;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -99,18 +98,15 @@ public class AmqpMethod implements Printable, NodeAware, VersionConsistencyCheck
 			serverMethodFlagMap + (clientMethodFlagMap.isSet() ? ", " : "") : "") +
 			(clientMethodFlagMap.isSet() ? "C " + clientMethodFlagMap : "") + "}" + ": " + versionSet);
 		
-		Iterator<Integer> iItr = indexMap.keySet().iterator();
-		while (iItr.hasNext())
+		for (Integer thisIndex : indexMap.keySet())
 		{
-			int index = iItr.next();
-			AmqpVersionSet indexVersionSet = indexMap.get(index);
-			out.println(margin + tab + "[I] " + index + indexVersionSet);
+			AmqpVersionSet indexVersionSet = indexMap.get(thisIndex);
+			out.println(margin + tab + "[I] " + thisIndex + indexVersionSet);
 		}
 		
-		Iterator<String> sItr = fieldMap.keySet().iterator();
-		while (sItr.hasNext())
+		for (String thisFieldName : fieldMap.keySet())
 		{
-			AmqpField thisField = fieldMap.get(sItr.next());
+			AmqpField thisField = fieldMap.get(thisFieldName);
 			thisField.print(out, marginSize + tabSize, tabSize);
 		}
 	}
@@ -143,21 +139,19 @@ public class AmqpMethod implements Printable, NodeAware, VersionConsistencyCheck
 		throws AmqpTypeMappingException
 	{
 		AmqpOverloadedParameterMap parameterVersionMap = new AmqpOverloadedParameterMap();
-		Iterator<AmqpVersion> vItr = globalVersionSet.iterator();
-		while (vItr.hasNext())
+		for (AmqpVersion thisVersion : globalVersionSet)
 		{
-			AmqpVersion version = vItr.next();
-			AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(version, true, generator);
+			AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(thisVersion, true, generator);
 			AmqpVersionSet methodVersionSet = parameterVersionMap.get(ordinalFieldMap);
 			if (methodVersionSet == null)
 			{
 				methodVersionSet = new AmqpVersionSet();
-				methodVersionSet.add(version);
+				methodVersionSet.add(thisVersion);
 				parameterVersionMap.put(ordinalFieldMap, methodVersionSet);
 			}
 			else
 			{
-				methodVersionSet.add(version);
+				methodVersionSet.add(thisVersion);
 			}
 		}
 		return parameterVersionMap;
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpModel.java b/gentools/src/org/apache/qpid/gentools/AmqpModel.java
index 7143c4e8ca..caf8bbcdaf 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpModel.java
+++ b/gentools/src/org/apache/qpid/gentools/AmqpModel.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.gentools;
 
 import java.io.PrintStream;
-import java.util.Iterator;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -66,11 +65,9 @@ public class AmqpModel implements Printable, NodeAware
 			"[C]=class; [M]=method; [F]=field; [D]=domain; [I]=index; [O]=ordinal" + Utils.lineSeparator);
 		out.println(Utils.createSpaces(marginSize) + "Model:");
 
-		Iterator<String> i = classMap.keySet().iterator();
-		while (i.hasNext())
+		for (String thisClassName : classMap.keySet())
 		{
-			String className = i.next();
-			AmqpClass thisClass = classMap.get(className);
+			AmqpClass thisClass = classMap.get(thisClassName);
 			thisClass.print(out, marginSize + tabSize, tabSize);
 		}
 	}
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java b/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
index e1495cda5a..34d3b7ca5f 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
+++ b/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
@@ -79,12 +79,10 @@ public class AmqpOrdinalFieldMap extends TreeMap<Integer, String[]> implements C
 	public String toString()
 	{
 		StringBuffer sb = new StringBuffer();
-		Iterator<Integer> itr = keySet().iterator();
-		while (itr.hasNext())
+		for (Integer thisOrdinal : keySet())
 		{
-			int ordinal = itr.next();
-			String[] pair = get(ordinal);
-			sb.append("[" + ordinal + "] " + pair[0] + " : " + pair[1] + Utils.lineSeparator);
+			String[] pair = get(thisOrdinal);
+			sb.append("[" + thisOrdinal + "] " + pair[0] + " : " + pair[1] + Utils.lineSeparator);
 		}
 		return sb.toString();
 	}
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java b/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
index 234e3452a2..3f4a9f39e6 100644
--- a/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
+++ b/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
@@ -20,7 +20,6 @@
  */
 package org.apache.qpid.gentools;
 
-import java.util.Iterator;
 import java.util.TreeMap;
 
 @SuppressWarnings("serial")
@@ -36,13 +35,11 @@ public class AmqpOrdinalVersionMap extends TreeMap<Integer, AmqpVersionSet> impl
     public int getOrdinal(AmqpVersion version)
     throws AmqpTypeMappingException
     {
-        Iterator<Integer> itr = keySet().iterator();
-        while (itr.hasNext())
+    	for (Integer thisOrdinal : keySet())
         {
-            int ordinal = itr.next();
-            AmqpVersionSet versionSet = get(ordinal);
+            AmqpVersionSet versionSet = get(thisOrdinal);
             if (versionSet.contains(version))
-                return ordinal;
+                return thisOrdinal;
         }
         throw new AmqpTypeMappingException("Unable to locate version " + version + " in ordianl version map.");
     }
diff --git a/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/gentools/src/org/apache/qpid/gentools/CppGenerator.java
index c96cb2b08f..98863b2f88 100644
--- a/gentools/src/org/apache/qpid/gentools/CppGenerator.java
+++ b/gentools/src/org/apache/qpid/gentools/CppGenerator.java
@@ -558,7 +558,7 @@ public class CppGenerator extends Generator
     protected void processConstantList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
         AmqpConstantSet constantSet)
         throws AmqpTemplateException, AmqpTypeMappingException
-        {
+    {
         String codeSnippet;
         int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
         String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
@@ -575,8 +575,8 @@ public class CppGenerator extends Generator
         {
             throw new AmqpTemplateException("Template token " + token + " unknown.");
         }
-       sb.insert(listMarkerStartIndex, codeSnippet);
-        }
+        sb.insert(listMarkerStartIndex, codeSnippet);
+    }
 		
 	// === Protected and private helper functions unique to C++ implementation ===
     
@@ -588,34 +588,32 @@ public class CppGenerator extends Generator
     {
         String indent = Utils.createSpaces(indentSize);
         StringBuffer sb = new StringBuffer();
-        Iterator<AmqpConstant> cItr = constantSet.iterator();
-        while (cItr.hasNext())
+        for (AmqpConstant thisConstant : constantSet)
         {
-            AmqpConstant constant = cItr.next();
-            if (constant.isVersionConsistent(globalVersionSet))
+            if (thisConstant.isVersionConsistent(globalVersionSet))
             {
                 // return a constant
-                String value = constant.firstKey();
-                sb.append(indent + "static const char* " + constant.name + "() { return \"" +
-                    constant.firstKey() + "\"; }" + cr);
+                String value = thisConstant.firstKey();
+                sb.append(indent + "static const char* " + thisConstant.name + "() { return \"" +
+                    thisConstant.firstKey() + "\"; }" + cr);
                 if (Utils.containsOnlyDigits(value))
                 {
-                    sb.append(indent + "static int " + constant.name + "AsInt() { return " +
-                        constant.firstKey() + "; }" + cr);
+                    sb.append(indent + "static int " + thisConstant.name + "AsInt() { return " +
+                        thisConstant.firstKey() + "; }" + cr);
                 }
                 if (Utils.containsOnlyDigitsAndDecimal(value))
                 {
-                    sb.append(indent + "static double " + constant.name + "AsDouble() { return (double)" +
-                        constant.firstKey() + "; }" + cr);
+                    sb.append(indent + "static double " + thisConstant.name + "AsDouble() { return (double)" +
+                        thisConstant.firstKey() + "; }" + cr);
                 }
                 sb.append(cr);
-           }
+            }
             else
             {
                 // Return version-specific constant
-                sb.append(generateVersionDependentGet(constant, "const char*", "", "\"", "\"", indentSize, tabSize));
-                sb.append(generateVersionDependentGet(constant, "int", "AsInt", "", "", indentSize, tabSize));
-                sb.append(generateVersionDependentGet(constant, "double", "AsDouble", "(double)", "", indentSize, tabSize));
+                sb.append(generateVersionDependentGet(thisConstant, "const char*", "", "\"", "\"", indentSize, tabSize));
+                sb.append(generateVersionDependentGet(thisConstant, "int", "AsInt", "", "", indentSize, tabSize));
+                sb.append(generateVersionDependentGet(thisConstant, "double", "AsDouble", "(double)", "", indentSize, tabSize));
                 sb.append(cr);
             }
         }        
@@ -633,27 +631,25 @@ public class CppGenerator extends Generator
             "() const" + cr);
         sb.append(indent + "{" + cr);
         boolean first = true;
-        Iterator<String> sItr = constant.keySet().iterator();
-        while (sItr.hasNext())
+        for (String thisValue : constant.keySet())
         {
-            String value = sItr.next();
-            AmqpVersionSet versionSet = constant.get(value);
+            AmqpVersionSet versionSet = constant.get(thisValue);
             sb.append(indent + tab + (first ? "" : "else ") + "if (" + generateVersionCheck(versionSet) +
                 ")" + cr);
             sb.append(indent + tab + "{" + cr);
-            if (methodReturnType.compareTo("int") == 0 && !Utils.containsOnlyDigits(value))
+            if (methodReturnType.compareTo("int") == 0 && !Utils.containsOnlyDigits(thisValue))
             {
                 sb.append(generateConstantDeclarationException(constant.name, methodReturnType,
                     indentSize + (2*tabSize), tabSize));
             }
-            else if (methodReturnType.compareTo("double") == 0 && !Utils.containsOnlyDigitsAndDecimal(value))
+            else if (methodReturnType.compareTo("double") == 0 && !Utils.containsOnlyDigitsAndDecimal(thisValue))
             {
                 sb.append(generateConstantDeclarationException(constant.name, methodReturnType,
                     indentSize + (2*tabSize), tabSize));                            
             }
             else
             {
-                sb.append(indent + tab + tab + "return " + returnPrefix + value + returnPostfix + ";" + cr);
+                sb.append(indent + tab + tab + "return " + returnPrefix + thisValue + returnPostfix + ";" + cr);
             }
             sb.append(indent + tab + "}" + cr);
             first = false;
@@ -681,7 +677,7 @@ public class CppGenerator extends Generator
             methodReturnType + " for AMQP version \" <<" + cr);        
         sb.append(indent + tab + "version.toString() << \".\";" + cr);        
         sb.append(indent + "throw ProtocolVersionException(ss.str());" + cr);        
-       return sb.toString();       
+        return sb.toString();       
     }
 	
 	// Methods used for generation of code snippets for Server/ClientOperations class generation
@@ -690,25 +686,25 @@ public class CppGenerator extends Generator
 	{
 		String indent = Utils.createSpaces(indentSize);
 		StringBuffer sb = new StringBuffer();
-		Iterator<String> cItr = model.classMap.keySet().iterator();
-		while (cItr.hasNext())
+		for (String thisClassName : model.classMap.keySet())
 		{
-			AmqpClass thisClass = model.classMap.get(cItr.next());
+			AmqpClass thisClass = model.classMap.get(thisClassName);
 			// Only generate for this class if there is at least one method of the
 			// required chassis (server/client flag).
 			boolean chassisFoundFlag = false;
-			Iterator<String> mItr = thisClass.methodMap.keySet().iterator();
-			while (mItr.hasNext() && !chassisFoundFlag)
+			for (String thisMethodName : thisClass.methodMap.keySet())
 			{
-				AmqpMethod method = thisClass.methodMap.get(mItr.next());
+				AmqpMethod method = thisClass.methodMap.get(thisMethodName);
 				boolean clientChassisFlag = method.clientMethodFlagMap.isSet();
 				boolean serverChassisFlag = method.serverMethodFlagMap.isSet();
 				if ((serverFlag && serverChassisFlag) || (!serverFlag && clientChassisFlag))
 					chassisFoundFlag = true;
 			}
 			if (chassisFoundFlag)
+			{
 				sb.append(indent + "virtual AMQP_" + (serverFlag ? "Server" : "Client") + "Operations::" +
 				    thisClass.name + "Handler* get" + thisClass.name + "Handler() = 0;" + cr);
+			}
 		}
 		return sb.toString();
 	}
@@ -720,16 +716,15 @@ public class CppGenerator extends Generator
 		String tab = Utils.createSpaces(tabSize);
 		StringBuffer sb = new StringBuffer();
 		boolean first = true;
-		Iterator<String> cItr = model.classMap.keySet().iterator();
-		while (cItr.hasNext())
+		for (String thisClassName : model.classMap.keySet())
 		{
-			AmqpClass thisClass = model.classMap.get(cItr.next());
-			String className = thisClass.name + "Handler";
+			AmqpClass thisClass = model.classMap.get(thisClassName);
+			String handlerClassName = thisClass.name + "Handler";
 			if (!first)
 				sb.append(cr);
-			sb.append(indent + "// ==================== class " + className +
+			sb.append(indent + "// ==================== class " + handlerClassName +
 				" ====================" + cr);
-			sb.append(indent + "class " + className);
+			sb.append(indent + "class " + handlerClassName);
 			if (thisClass.versionSet.size() != globalVersionSet.size())
 				sb.append(" // AMQP Version(s) " + thisClass.versionSet + cr);
 			else
@@ -741,18 +736,18 @@ public class CppGenerator extends Generator
             sb.append(indent + tab + "// Constructors and destructors" + cr);
             sb.append(cr);
 			sb.append(indent + "protected:" + cr);
-            sb.append(indent + tab + className + "() {}" + cr);
+            sb.append(indent + tab + handlerClassName + "() {}" + cr);
 			sb.append(indent + "public:" + cr);
-			sb.append(indent + tab + className +
+			sb.append(indent + tab + handlerClassName +
 				"(u_int8_t major, u_int8_t minor) : version(major, minor) {}" + cr);
-			sb.append(indent + tab + className +
+			sb.append(indent + tab + handlerClassName +
 					"(ProtocolVersion version) : version(version) {}" + cr);
-			sb.append(indent + tab + "virtual ~" + className + "() {}" + cr);
+			sb.append(indent + tab + "virtual ~" + handlerClassName + "() {}" + cr);
 			sb.append(cr);
 			sb.append(indent + tab + "// Protocol methods" + cr);
 			sb.append(cr);
 			sb.append(generateInnerClassMethods(thisClass, serverFlag, true, indentSize + tabSize, tabSize));
-			sb.append(indent + "}; // class " + className + cr);
+			sb.append(indent + "}; // class " + handlerClassName + cr);
 			first = false;
 		}
 		return sb.toString();		
@@ -766,10 +761,9 @@ public class CppGenerator extends Generator
 		StringBuffer sb = new StringBuffer();
         String outerClassName = "AMQP_" + (serverFlag ? "Server" : "Client") + (abstractMethodFlag ? "Operations" : "Proxy");
 		boolean first = true;
-		Iterator<String> mItr = thisClass.methodMap.keySet().iterator();
-		while (mItr.hasNext())
+		for (String thisMethodName : thisClass.methodMap.keySet())
 		{
-			AmqpMethod method = thisClass.methodMap.get(mItr.next());
+			AmqpMethod method = thisClass.methodMap.get(thisMethodName);
 			boolean clientChassisFlag = method.clientMethodFlagMap.isSet();
 			boolean serverChassisFlag = method.serverMethodFlagMap.isSet();
 			if ((serverFlag && serverChassisFlag) || (!serverFlag && clientChassisFlag))
@@ -777,15 +771,13 @@ public class CppGenerator extends Generator
 				String methodName = parseForReservedWords(method.name, outerClassName + "." + thisClass.name);				
 				AmqpOverloadedParameterMap overloadededParameterMap =
 					method.getOverloadedParameterLists(thisClass.versionSet, this);
-				Iterator<AmqpOrdinalFieldMap> ofmItr = overloadededParameterMap.keySet().iterator();
-				while (ofmItr.hasNext())
+				for (AmqpOrdinalFieldMap thisFieldMap : overloadededParameterMap.keySet())
 				{
-					AmqpOrdinalFieldMap fieldMap = ofmItr.next();
-					AmqpVersionSet versionSet = overloadededParameterMap.get(fieldMap);
+					AmqpVersionSet versionSet = overloadededParameterMap.get(thisFieldMap);
 					if (!first)
 						sb.append(cr);
 					sb.append(indent + "virtual void " + methodName + "( u_int16_t channel");
-					sb.append(generateMethodParameterList(fieldMap, indentSize + (5*tabSize), true, true, true));
+					sb.append(generateMethodParameterList(thisFieldMap, indentSize + (5*tabSize), true, true, true));
 					sb.append(" )");
 					if (abstractMethodFlag)
 						sb.append(" = 0");
@@ -808,10 +800,9 @@ public class CppGenerator extends Generator
         String indent = Utils.createSpaces(indentSize);
         StringBuffer sb = new StringBuffer();
         String outerClassName = "AMQP_" + (serverFlag ? "Server" : "Client") + "Operations";
-        Iterator<String> cItr = model.classMap.keySet().iterator();
-        while (cItr.hasNext())
+        for (String thisClassName : model.classMap.keySet())
         {
-            AmqpClass thisClass = model.classMap.get(cItr.next());
+            AmqpClass thisClass = model.classMap.get(thisClassName);
             sb.append(indent + outerClassName + "::" + thisClass.name + "Handler* " +
                 thisClass.name + "HandlerPtr;" + cr);
         }
@@ -824,10 +815,9 @@ public class CppGenerator extends Generator
         String indent = Utils.createSpaces(indentSize);
         StringBuffer sb = new StringBuffer();
         String outerClassName = "AMQP_" + (serverFlag ? "Server" : "Client") + "Operations";
-        Iterator<String> cItr = model.classMap.keySet().iterator();
-        while (cItr.hasNext())
+        for (String thisClassName : model.classMap.keySet())
         {
-            AmqpClass thisClass = model.classMap.get(cItr.next());
+            AmqpClass thisClass = model.classMap.get(thisClassName);
             sb.append(indent + "virtual inline " + outerClassName + "::" + thisClass.name + "Handler* get" +
                 thisClass.name + "Handler() { return &" + Utils.firstLower(thisClass.name) + ";}" + cr);
         }
@@ -840,10 +830,9 @@ public class CppGenerator extends Generator
 		String indent = Utils.createSpaces(indentSize);
 		StringBuffer sb = new StringBuffer();
         String outerClassName = "AMQP_" + (serverFlag ? "Server" : "Client") + "Proxy";
-		Iterator<String> cItr = model.classMap.keySet().iterator();
-		while (cItr.hasNext())
+        for (String thisClassName : model.classMap.keySet())
 		{
-			AmqpClass thisClass = model.classMap.get(cItr.next());
+			AmqpClass thisClass = model.classMap.get(thisClassName);
 			String instanceName = parseForReservedWords(Utils.firstLower(thisClass.name), outerClassName);
 			String className = parseForReservedWords(thisClass.name, null);
 			sb.append(indent + className + " " + instanceName + ";");
@@ -861,10 +850,9 @@ public class CppGenerator extends Generator
 		String indent = Utils.createSpaces(indentSize);
 		StringBuffer sb = new StringBuffer();
         String outerClassName = "AMQP_" + (serverFlag ? "Server" : "Client") + "Proxy";
-		Iterator<String> cItr = model.classMap.keySet().iterator();
-		while (cItr.hasNext())
+        for (String thisClassName : model.classMap.keySet())
 		{
-			AmqpClass thisClass = model.classMap.get(cItr.next());
+			AmqpClass thisClass = model.classMap.get(thisClassName);
 			String className = parseForReservedWords(thisClass.name, outerClassName);
 			sb.append(indent + className + "& get" + className + "();");
 			if (thisClass.versionSet.size() != globalVersionSet.size())
@@ -883,10 +871,9 @@ public class CppGenerator extends Generator
 		String tab = Utils.createSpaces(tabSize);
 		StringBuffer sb = new StringBuffer();
 		boolean first = true;
-		Iterator<String> cItr = model.classMap.keySet().iterator();
-		while (cItr.hasNext())
+        for (String thisClassName : model.classMap.keySet())
 		{
-			AmqpClass thisClass = model.classMap.get(cItr.next());
+			AmqpClass thisClass = model.classMap.get(thisClassName);
 			String className = thisClass.name;
 			String superclassName = "AMQP_" + (serverFlag ? "Server" : "Client") + "Operations::" +
 				thisClass.name + "Handler";
@@ -980,10 +967,9 @@ public class CppGenerator extends Generator
 		String indent = Utils.createSpaces(indentSize);
 		StringBuffer sb = new StringBuffer();
 		boolean firstClassFlag = true;
-		Iterator<String> cItr = model.classMap.keySet().iterator();
-		while (cItr.hasNext())
+        for (String thisClassName : model.classMap.keySet())
 		{
-			AmqpClass thisClass = model.classMap.get(cItr.next());
+			AmqpClass thisClass = model.classMap.get(thisClassName);
 			String className = thisClass.name;
 			if (!firstClassFlag)
 				sb.append(cr);
@@ -1003,10 +989,9 @@ public class CppGenerator extends Generator
 		StringBuffer sb = new StringBuffer();
 		String outerclassName = "AMQP_" + (serverFlag ? "Server" : "Client") + "Proxy";
 		boolean first = true;
-		Iterator<String> mItr = thisClass.methodMap.keySet().iterator();
-		while (mItr.hasNext())
+		for (String thisMethodName : thisClass.methodMap.keySet())
 		{
-			AmqpMethod method = thisClass.methodMap.get(mItr.next());
+			AmqpMethod method = thisClass.methodMap.get(thisMethodName);
 			String methodBodyClassName = thisClass.name + Utils.firstUpper(method.name) + "Body";
 			boolean clientChassisFlag = method.clientMethodFlagMap.isSet();
 			boolean serverChassisFlag = method.serverMethodFlagMap.isSet();
@@ -1016,22 +1001,20 @@ public class CppGenerator extends Generator
 				String methodName = parseForReservedWords(method.name, outerclassName + "." + thisClass.name);
 				AmqpOverloadedParameterMap overloadededParameterMap =
 					method.getOverloadedParameterLists(thisClass.versionSet, this);
-				Iterator<AmqpOrdinalFieldMap> ofmItr = overloadededParameterMap.keySet().iterator();
-				while (ofmItr.hasNext())
+				for (AmqpOrdinalFieldMap thisFieldMap : overloadededParameterMap.keySet())
 				{
-					AmqpOrdinalFieldMap fieldMap = ofmItr.next();
-					AmqpVersionSet versionSet = overloadededParameterMap.get(fieldMap);
+					AmqpVersionSet versionSet = overloadededParameterMap.get(thisFieldMap);
 					if (!first)
 						sb.append(cr);
 					sb.append(indent + "void " + outerclassName + "::" + thisClass.name + "::" +
                         methodName + "( u_int16_t channel");
-					sb.append(generateMethodParameterList(fieldMap, indentSize + (5*tabSize), true, true, true));
+					sb.append(generateMethodParameterList(thisFieldMap, indentSize + (5*tabSize), true, true, true));
 					sb.append(" )");
 					if (versionSet.size() != globalVersionSet.size())
 						sb.append(" // AMQP Version(s) " + versionSet);
 					sb.append(cr);
 					sb.append(indent + "{" + cr);
-					sb.append(generateMethodBodyCallContext(fieldMap, outerclassName, methodBodyClassName,
+					sb.append(generateMethodBodyCallContext(thisFieldMap, outerclassName, methodBodyClassName,
                         versionConsistentFlag, versionSet, indentSize + tabSize, tabSize));
 					sb.append(indent + "}" + cr);
 					sb.append(cr);
@@ -1057,16 +1040,14 @@ public class CppGenerator extends Generator
 		else
 		{
 			boolean firstOverloadedMethodFlag = true;
-			Iterator<AmqpVersion> vItr = versionSet.iterator();
-			while (vItr.hasNext())
+			for (AmqpVersion thisVersion : versionSet)
 			{
-				AmqpVersion version = vItr.next();
 				sb.append(indent);
 				if (!firstOverloadedMethodFlag)
 					sb.append("else ");
-				sb.append("if (" + generateVersionCheck(version) + ")" + cr);
+				sb.append("if (" + generateVersionCheck(thisVersion) + ")" + cr);
 				sb.append(indent + "{" + cr);
-				sb.append(generateMethodBodyCall(fieldMap, methodBodyClassName, version,
+				sb.append(generateMethodBodyCall(fieldMap, methodBodyClassName, thisVersion,
 					indentSize + tabSize, tabSize));
 				sb.append(indent + "}" + cr);
 				firstOverloadedMethodFlag = false;
@@ -1106,10 +1087,9 @@ public class CppGenerator extends Generator
         }
         else
         {
-            Iterator<String> cItr = model.classMap.keySet().iterator();
-            while (cItr.hasNext())
+        	for (String thisClassName : model.classMap.keySet())
             {
-                thisClass = model.classMap.get(cItr.next());
+                thisClass = model.classMap.get(thisClassName);
                 sb.append(generateClassMethodBodyInclude(thisClass, indentSize));
            }
         }
@@ -1120,10 +1100,9 @@ public class CppGenerator extends Generator
     {
         StringBuffer sb = new StringBuffer();
         String indent = Utils.createSpaces(indentSize);
-        Iterator<String> mItr = thisClass.methodMap.keySet().iterator();
-        while (mItr.hasNext())
+        for (String thisMethodName : thisClass.methodMap.keySet())
         {
-            AmqpMethod method = thisClass.methodMap.get(mItr.next());
+            AmqpMethod method = thisClass.methodMap.get(thisMethodName);
             sb.append(indent + "#include <" + thisClass.name +
                 Utils.firstUpper(method.name) + "Body.h>" + cr);
         }
@@ -1135,13 +1114,11 @@ public class CppGenerator extends Generator
 	protected String getIndex(AmqpOrdinalVersionMap indexMap, AmqpVersion version)
 		throws AmqpTemplateException
 	{
-		Iterator<Integer> iItr = indexMap.keySet().iterator();
-		while (iItr.hasNext())
+		for (Integer thisIndex : indexMap.keySet())
 		{
-			int index = iItr.next();
-			AmqpVersionSet versionSet = indexMap.get(index);
+			AmqpVersionSet versionSet = indexMap.get(thisIndex);
 			if (versionSet.contains(version))
-				return String.valueOf(index);
+				return String.valueOf(thisIndex);			
 		}
 		throw new AmqpTemplateException("Unable to find index for version " + version); 
 	}
@@ -1155,38 +1132,11 @@ public class CppGenerator extends Generator
         if (version == null)
             version = globalVersionSet.first();
         AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(version, true, this);
-        Iterator<Integer> oItr = ordinalFieldMap.keySet().iterator();
-        while (oItr.hasNext())
+        for (Integer thisOrdinal : ordinalFieldMap.keySet())
         {
-            String[] fieldDomainPair = ordinalFieldMap.get(oItr.next());
-            sb.append(indent + fieldDomainPair[FIELD_DOMAIN] + " " + fieldDomainPair[FIELD_NAME] + ";" + cr);
+            String[] fieldDomainPair = ordinalFieldMap.get(thisOrdinal);
+            sb.append(indent + fieldDomainPair[FIELD_DOMAIN] + " " + fieldDomainPair[FIELD_NAME] + ";" + cr);        	
         }
-        // TODO: Replace the pattern below with that above in the JavaGenerator and elsewhere here.
-//		Iterator<String> fItr = fieldMap.keySet().iterator();
-//		while(fItr.hasNext())
-//		{
-//			AmqpField fieldDetails = fieldMap.get(fItr.next());
-//			if (version == null) // Version consistent - there *should* be only one domain
-//			{
-//				String domainName =  fieldDetails.domainMap.firstKey();
-//				String codeType = getGeneratedType(domainName, globalVersionSet.first());
-//				sb.append(indent + codeType + " " + fieldDetails.name + ";" + cr);
-//			}
-//			else
-//			{
-//				Iterator<String> dItr = fieldDetails.domainMap.keySet().iterator();
-//				while (dItr.hasNext())
-//				{
-//					String domainName = dItr.next();
-//					AmqpVersionSet versionSet = fieldDetails.domainMap.get(domainName);
-//					if (versionSet.contains(version))
-//					{
-//						String codeType = getGeneratedType(domainName, version);
-//						sb.append(indent + codeType + " " + fieldDetails.name + ";" + cr);
-//					}
-//				}
-//			}
-//		}
 		return sb.toString();
 	}
 	
@@ -1195,35 +1145,17 @@ public class CppGenerator extends Generator
 	{
 		String indent = Utils.createSpaces(indentSize);
 		StringBuffer sb = new StringBuffer();
-		Iterator<String> fItr = fieldMap.keySet().iterator();
-		while(fItr.hasNext())
-		{
-			AmqpField fieldDetails = fieldMap.get(fItr.next());
-			if (version == null) // Version consistent - there *should* be only one domain
-			{
-				String domainName =  fieldDetails.domainMap.firstKey();
-				String codeType = getGeneratedType(domainName, globalVersionSet.first());
-				sb.append(indent + "inline " + setRef(codeType) + " get" +
-					Utils.firstUpper(fieldDetails.name) + "() { return " +
-					fieldDetails.name + "; }" + cr);
-			}
-			else
-			{
-				Iterator<String> dItr = fieldDetails.domainMap.keySet().iterator();
-				while (dItr.hasNext())
-				{
-					String domainName = dItr.next();
-					AmqpVersionSet versionSet = fieldDetails.domainMap.get(domainName);
-					if (versionSet.contains(version))
-					{
-						String codeType = getGeneratedType(domainName, version);
-						sb.append(indent + "inline " + setRef(codeType) + " get" +
-								Utils.firstUpper(fieldDetails.name) + "() { return " +
-								fieldDetails.name + "; }" + cr);
-					}
-				}
-			}
-		}
+		
+        if (version == null)
+            version = globalVersionSet.first();
+        AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(version, true, this);
+        for (Integer thisOrdinal : ordinalFieldMap.keySet())
+        {
+            String[] fieldDomainPair = ordinalFieldMap.get(thisOrdinal);
+			sb.append(indent + "inline " + setRef(fieldDomainPair[FIELD_DOMAIN]) + " get" +
+				Utils.firstUpper(fieldDomainPair[FIELD_NAME]) + "() { return " +
+				fieldDomainPair[FIELD_NAME] + "; }" + cr);
+        }
 		return sb.toString();
 	}
 	
@@ -1232,42 +1164,21 @@ public class CppGenerator extends Generator
 	{
 		String indent = Utils.createSpaces(indentSize);
 		StringBuffer sb = new StringBuffer();
-		Iterator<String> fItr = fieldMap.keySet().iterator();
-		boolean firstFlag = true;
-		while(fItr.hasNext())
-		{
-			AmqpField fieldDetails = fieldMap.get(fItr.next());
-            if (version == null) // Version consistent - there *should* be only one domain
-            {
-                String domainName =  fieldDetails.domainMap.firstKey();
-                String codeType = getGeneratedType(domainName, globalVersionSet.first());
-                String cast = codeType.compareTo("u_int8_t") == 0 ? "(int)" : "";
-                sb.append(indent + "out << \"");
-                if (!firstFlag)
-                    sb.append("; ");
-                sb.append(fieldDetails.name + "=\" << " + cast + fieldDetails.name + ";" + cr);
-               firstFlag = false;
-            }
-            else
-            {
-                Iterator<String> dItr = fieldDetails.domainMap.keySet().iterator();
-                while (dItr.hasNext())
-                {
-                    String domainName = dItr.next();
-                    AmqpVersionSet versionSet = fieldDetails.domainMap.get(domainName);
-                    if (versionSet.contains(version))
-                    {
-                        String codeType = getGeneratedType(domainName, version);
-                        String cast = codeType.compareTo("u_int8_t") == 0 ? "(int)" : "";
-                        sb.append(indent + "out << \"");
-                        if (!firstFlag)
-                            sb.append("; ");
-                        sb.append(fieldDetails.name + "=\" << " + cast + fieldDetails.name + ";" + cr);                    
-                        firstFlag = false;
-                    }
-                }
-            }
-		}
+		
+        if (version == null)
+            version = globalVersionSet.first();
+        AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(version, true, this);
+        boolean firstFlag = true;
+        for (Integer thisOrdinal : ordinalFieldMap.keySet())
+        {
+            String[] fieldDomainPair = ordinalFieldMap.get(thisOrdinal);
+            String cast = fieldDomainPair[FIELD_DOMAIN].compareTo("u_int8_t") == 0 ? "(int)" : "";
+            sb.append(indent + "out << \"");
+            if (!firstFlag)
+                sb.append("; ");
+            sb.append(fieldDomainPair[FIELD_NAME] + "=\" << " + cast + fieldDomainPair[FIELD_NAME] + ";" + cr);
+            firstFlag = false;
+        }
 		return sb.toString();		
 	}
 	
@@ -1573,14 +1484,12 @@ public class CppGenerator extends Generator
         String indent = Utils.createSpaces(indentSize);
         StringBuffer sb = new StringBuffer();
         
-        Iterator<String> cItr = model.classMap.keySet().iterator();
-        while (cItr.hasNext())
+        for (String thisClassName : model.classMap.keySet())
         {
-            AmqpClass thisClass = model.classMap.get(cItr.next());
-            Iterator<String> mItr = thisClass.methodMap.keySet().iterator();
-            while (mItr.hasNext())
+            AmqpClass thisClass = model.classMap.get(thisClassName);
+            for (String thisMethodName : thisClass.methodMap.keySet())
             {
-                AmqpMethod method = thisClass.methodMap.get(mItr.next());
+                AmqpMethod method = thisClass.methodMap.get(thisMethodName);
                 sb.append(indent + "#include \"" + thisClass.name + Utils.firstUpper(method.name) + "Body.h\"" + cr);
             }
         }
@@ -1593,14 +1502,12 @@ public class CppGenerator extends Generator
         String indent = Utils.createSpaces(indentSize);
         StringBuffer sb = new StringBuffer();
         
-        Iterator<String> cItr = model.classMap.keySet().iterator();
-        while (cItr.hasNext())
+        for (String thisClassName : model.classMap.keySet())
         {
-            AmqpClass thisClass = model.classMap.get(cItr.next());
-            Iterator<String> mItr = thisClass.methodMap.keySet().iterator();
-            while (mItr.hasNext())
+            AmqpClass thisClass = model.classMap.get(thisClassName);
+            for (String thisMethodName : thisClass.methodMap.keySet())
             {
-                AmqpMethod method = thisClass.methodMap.get(mItr.next());
+                AmqpMethod method = thisClass.methodMap.get(thisMethodName);
                 sb.append(indent + "const " + thisClass.name + Utils.firstUpper(method.name) + "Body " +
                     Utils.firstLower(thisClass.name) + "_" + method.name + ";" + cr);
             }
@@ -1617,14 +1524,12 @@ public class CppGenerator extends Generator
         
         for (AmqpVersion version : globalVersionSet)
         {
-            Iterator<String> cItr = model.classMap.keySet().iterator();
-            while (cItr.hasNext())
+            for (String thisClassName : model.classMap.keySet())
             {
-                AmqpClass thisClass = model.classMap.get(cItr.next());
-                Iterator<String> mItr = thisClass.methodMap.keySet().iterator();
-                while (mItr.hasNext())
+                AmqpClass thisClass = model.classMap.get(thisClassName);
+                for (String thisMethodName : thisClass.methodMap.keySet())
                 {
-                    AmqpMethod method = thisClass.methodMap.get(mItr.next());
+                    AmqpMethod method = thisClass.methodMap.get(thisMethodName);
                     String namespace = method.isVersionConsistent(globalVersionSet) ? "" : version.namespace() + "::";
                     try
                     {
diff --git a/gentools/src/org/apache/qpid/gentools/Main.java b/gentools/src/org/apache/qpid/gentools/Main.java
index 4f33ff8bde..39fb6c3c45 100644
--- a/gentools/src/org/apache/qpid/gentools/Main.java
+++ b/gentools/src/org/apache/qpid/gentools/Main.java
@@ -174,7 +174,7 @@ public class Main
         };
         classTemplateFiles = new File[]
         {
-            new File(tmplDir + Utils.fileSeparator + "PropertyContentHeaderClass.tmpl")
+//            new File(tmplDir + Utils.fileSeparator + "PropertyContentHeaderClass.tmpl")
         };
         methodTemplateFiles = new File[]
         {