1 files changed, 13 insertions, 9 deletions
diff --git a/java/common/Option.tpl b/java/common/Option.tpl
index d45c004f6f..c1e8dcbe22 100644
--- a/java/common/Option.tpl
+++ b/java/common/Option.tpl
@@ -1,20 +1,24 @@
-package org.apache.qpid.transport;
+package $(pkg);
 
 public enum Option {
 
 ${
 from genutil import *
 
-options = {}
-
+names = ["NONE", "SYNC", "BATCH"]
 for c in composites:
   for f in c.query["field"]:
     t = resolve_type(f)
     if t["@name"] == "bit":
-      option = scream(f["@name"])
-      if not options.has_key(option):
-        options[option] = None
-        out("    $option,\n")}
-    BATCH,
-    NONE
+      names.append(scream(f["@name"]))
+
+options = {}
+
+for option in names:
+ if not options.has_key(option):
+    if options:
+      out(",\n    ")
+    options[option] = None
+    out("$option")
+}
 }