[Java, C++] Tidy up.

Removes extraneous space in Java output when access order checks are
disabled.

Removes unnecessary access modifiers in C++ when access order checks are
disabled.

Author: ZachBray

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java

@@ -767,10 +767,13 @@ private static void generateGroupClassHeader(
         }
 
 
-        sb.append("\n").append(indent).append("private:");
-        generateAccessOrderListenerMethodForNextGroupElement(sb, accessOrderModel, indent, groupToken);
-        generateAccessOrderListenerMethodForResetGroupCount(sb, accessOrderModel, indent, groupToken);
-        sb.append("\n").append(indent).append("public:");
+        if (null != accessOrderModel)
+        {
+            sb.append("\n").append(indent).append("private:");
+            generateAccessOrderListenerMethodForNextGroupElement(sb, accessOrderModel, indent, groupToken);
+            generateAccessOrderListenerMethodForResetGroupCount(sb, accessOrderModel, indent, groupToken);
+            sb.append("\n").append(indent).append("public:");
+        }
 
         final CharSequence onNextAccessOrderCall = null == accessOrderModel ? "" :
             generateAccessOrderListenerCall(accessOrderModel, indent + TWO_INDENT, "onNextElementAccessed");

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java

@@ -654,7 +654,7 @@ private static void generateAccessOrderListenerMethodForNextGroupElement(
             selectLastElementInGroup);
 
         sb.append(indent).append("    }\n")
-            .append(indent).append("}\n");
+            .append(indent).append("}\n\n");
     }
 
     private static void generateAccessOrderListenerMethodForResetGroupCount(
@@ -681,7 +681,7 @@ private static void generateAccessOrderListenerMethodForResetGroupCount(
             accessOrderModel,
             resetCountToIndex);
 
-        sb.append(indent).append("}\n");
+        sb.append(indent).append("}\n\n");
     }
 
     private static void generateAccessOrderListenerMethodForVarDataLength(
@@ -964,8 +964,7 @@ private void generateGroupDecoderClassHeader(
 
         generateAccessOrderListenerMethodForNextGroupElement(sb, accessOrderModel, indent + "    ", groupToken);
 
-        sb.append("\n")
-            .append(indent).append("    public ").append(className).append(" next()\n")
+        sb.append(indent).append("    public ").append(className).append(" next()\n")
             .append(indent).append("    {\n")
             .append(indent).append("        if (index >= count)\n")
             .append(indent).append("        {\n")
@@ -1105,8 +1104,7 @@ private void generateGroupEncoderClassHeader(
         generateAccessOrderListenerMethodForNextGroupElement(sb, accessOrderModel, ind + "    ", groupToken);
         generateAccessOrderListenerMethodForResetGroupCount(sb, accessOrderModel, ind + "    ", groupToken);
 
-        sb.append("\n")
-            .append(ind).append("    public ").append(encoderName(groupName)).append(" next()\n")
+        sb.append(ind).append("    public ").append(encoderName(groupName)).append(" next()\n")
             .append(ind).append("    {\n")
             .append(generateAccessOrderListenerCall(accessOrderModel, ind + "        ", "onNextElementAccessed"))
             .append(ind).append("        if (index >= count)\n")
@@ -1123,8 +1121,7 @@ private void generateGroupEncoderClassHeader(
         final String resetCountPut = generatePut(
             numInGroupTypeCast, countOffset, numInGroupValue, byteOrderString(numInGroupToken.encoding()));
 
-        sb.append("\n")
-            .append(ind).append("    public int resetCountToIndex()\n")
+        sb.append(ind).append("    public int resetCountToIndex()\n")
             .append(ind).append("    {\n")
             .append(generateAccessOrderListenerCall(accessOrderModel, ind + "        ", "onResetCountToIndex"))
             .append(ind).append("        count = index;\n")