Merge "Fix javanano compiler generating uncompileable java code. This happened…

Merge "Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true."

src/google/protobuf/compiler/javanano/javanano_enum.cc

@@ -69,6 +69,17 @@ EnumGenerator::~EnumGenerator() {}
 
 void EnumGenerator::Generate(io::Printer* printer) {
   printer->Print("// enum $classname$\n", "classname", descriptor_->name());
+  bool is_own_file = params_.java_multiple_files() ||
+      ((descriptor_->containing_type() == NULL) &&
+       !params_.has_java_outer_classname(descriptor_->file()->name()));
+
+  if (is_own_file) {
+    printer->Print("public final class $classname$ {\n", "classname",
+        descriptor_->name());
+    printer->Indent();
+    printer->Print("private $classname$() {}\n", "classname",
+        descriptor_->name());
+  }
   for (int i = 0; i < canonical_values_.size(); i++) {
     map<string, string> vars;
     vars["name"] = canonical_values_[i]->name();
@@ -87,6 +98,10 @@ void EnumGenerator::Generate(io::Printer* printer) {
       "public static final int $name$ = $canonical_name$;\n");
   }
 
+  if (is_own_file) {
+    printer->Outdent();
+    printer->Print("}");
+  }
   printer->Print("\n");
 }
 

src/google/protobuf/unittest_enum_multiplejava_nano.proto

+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// http://code.google.com/p/protobuf/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: bduff@google.com (Brian Duff)
+//
+
+package protobuf_unittest_import;
+
+option java_package = "com.google.protobuf.nano";
+option java_outer_classname = "NanoEnumsWithMultipleFiles";
+option java_multiple_files = true;
+
+enum FirstTopLevelEnum {
+  FIRST_TOP_LEVEL_FIRST = 1;
+  FIRST_TOP_LEVEL_SECOND = 2;
+}
+
+enum SecondTopLevelEnum {
+  SECOND_TOP_LEVEL_FIRST = 1;
+  SECOND_TOP_LEVEL_SECOND = 2;
+}
+