mojo: Fix java generator

mojo/public/tools/bindings/generators/mojom_java_generator.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Generates java source files from a mojom.Module."""
 
 import argparse
 import ast
 import contextlib
 import os
@@ skipping 90 matching lines @@
 
 def UpperCamelCase(name):
   return ''.join([x.capitalize() for x in NameToComponent(name)])
 
 def CamelCase(name):
   uccc = UpperCamelCase(name)
   return uccc[0].lower() + uccc[1:]
 
 def ConstantStyle(name):
   components = NameToComponent(name)
-  if components[0] == 'k':
+  if components[0] == 'k' and len(components) > 1:
     components = components[1:]
+  # variable cannot starts with a digit.
+  if components[0][0].isdigit():
+    components[0] = '_' + components[0]
   return '_'.join([x.upper() for x in components])
 
 def GetNameForElement(element):
   if (mojom.IsEnumKind(element) or mojom.IsInterfaceKind(element) or
       mojom.IsStructKind(element)):
     return UpperCamelCase(element.name)
   if mojom.IsInterfaceRequestKind(element):
     return GetNameForElement(element.kind)
   if isinstance(element, (mojom.Method,
                           mojom.Parameter,
                           mojom.Field)):
     return CamelCase(element.name)
   if isinstance(element,  mojom.EnumValue):
     return (GetNameForElement(element.enum) + '.' +
             ConstantStyle(element.name))
   if isinstance(element, (mojom.NamedValue,
-                          mojom.Constant)):
+                          mojom.Constant,
+                          mojom.EnumField)):
     return ConstantStyle(element.name)
-  raise Exception('Unexpected element: ' % element)
+  raise Exception('Unexpected element: %s' % element)
 
 def GetInterfaceResponseName(method):
   return UpperCamelCase(method.name + 'Response')
 
 def ParseStringAttribute(attribute):
   assert isinstance(attribute, basestring)
   return attribute
 
 def GetJavaTrueFalse(value):
   return 'true' if value else 'false'
@@ skipping 66 matching lines @@
 @contextfilter
 def EncodeMethod(context, kind, variable, offset, bit):
   params = AppendEncodeDecodeParams(
       [ variable, str(offset) ], context, kind, bit)
   return 'encode(%s)' % ', '.join(params)
 
 def GetPackage(module):
   if 'JavaPackage' in module.attributes:
     return ParseStringAttribute(module.attributes['JavaPackage'])
   # Default package.
-  return 'org.chromium.mojom.' + module.namespace
+  if module.namespace:
+    return 'org.chromium.mojom.' + module.namespace
+  return 'org.chromium.mojom'
 
 def GetNameForKind(context, kind):
   def _GetNameHierachy(kind):
     hierachy = []
     if kind.parent_kind:
       hierachy = _GetNameHierachy(kind.parent_kind)
     hierachy.append(GetNameForElement(kind))
     return hierachy
 
   module = context.resolve('module')
@@ skipping 108 matching lines @@
   # This constructs the name of the embedding classes for module level constants
   # by extracting the mojom's filename and prepending it to Constants.
   return (UpperCamelCase(module.path.split('/')[-1].rsplit('.', 1)[0]) +
           'Constants')
 
 def GetMethodOrdinalName(method):
   return ConstantStyle(method.name) + '_ORDINAL'
 
 def HasMethodWithResponse(interface):
   for method in interface.methods:
-    if method.response_parameters:
+    if method.response_parameters is not None:
       return True
   return False
 
 def HasMethodWithoutResponse(interface):
   for method in interface.methods:
-    if not method.response_parameters:
+    if method.response_parameters is None:
       return True
   return False
 
 @contextlib.contextmanager
 def TempDir():
   dirname = tempfile.mkdtemp()
   try:
     yield dirname
   finally:
     shutil.rmtree(dirname)
@@ skipping 125 matching lines @@
     return {
       'lstrip_blocks': True,
       'trim_blocks': True,
     }
 
   def GetGlobals(self):
     return {
       'namespace': self.module.namespace,
       'module': self.module,
     }