src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java

*** 227,253 ****
              indentation++;
  
              if (kind == ENUM) {
                  List<Element> enclosedElements =
                      new ArrayList<Element>(e.getEnclosedElements());
                  List<Element> enumConstants = new ArrayList<Element>();
                  for(Element element : enclosedElements) {
                      if (element.getKind() == ENUM_CONSTANT)
                          enumConstants.add(element);
                  }
! 
                  int i;
                  for(i = 0; i < enumConstants.size()-1; i++) {
                      this.visit(enumConstants.get(i), true);
                      writer.print(",");
                  }
-                 if (i >= 0 ) {
                      this.visit(enumConstants.get(i), true);
!                     writer.print(";");
!                 }
  
                  enclosedElements.removeAll(enumConstants);
                  for(Element element : enclosedElements)
                      this.visit(element);
              } else {
                  for(Element element : e.getEnclosedElements())
                      this.visit(element);
--- 227,254 ----
              indentation++;
  
              if (kind == ENUM) {
                  List<Element> enclosedElements =
                      new ArrayList<Element>(e.getEnclosedElements());
+                 // Handle any enum constants specially before other entities.
                  List<Element> enumConstants = new ArrayList<Element>();
                  for(Element element : enclosedElements) {
                      if (element.getKind() == ENUM_CONSTANT)
                          enumConstants.add(element);
                  }
!                 if (!enumConstants.isEmpty()) {
                      int i;
                      for(i = 0; i < enumConstants.size()-1; i++) {
                          this.visit(enumConstants.get(i), true);
                          writer.print(",");
                      }
                      this.visit(enumConstants.get(i), true);
!                     writer.println(";\n");
  
                      enclosedElements.removeAll(enumConstants);
+                 }
+ 
                  for(Element element : enclosedElements)
                      this.visit(element);
              } else {
                  for(Element element : e.getEnclosedElements())
                      this.visit(element);