mojo: Refactor method name generation for java bindings.

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 os
 import re
@@ skipping 131 matching lines @@
     if mojom.IsAnyArrayKind(kind):
       return _DecodeMethodName(kind.kind) + 's'
     if mojom.IsEnumKind(kind):
       return _DecodeMethodName(mojom.INT32)
     if mojom.IsInterfaceRequestKind(kind):
       return "readInterfaceRequest"
     if mojom.IsInterfaceKind(kind):
       return "readServiceInterface"
     return _spec_to_decode_method[kind.spec]
   methodName = _DecodeMethodName(kind)
-  additionalParams = ''
+  params = [ str(offset) ]
   if (kind == mojom.BOOL):
-    additionalParams = ', %d' % bit
+    params.append(str(bit))
   if mojom.IsInterfaceKind(kind):
-    additionalParams = ', %s.MANAGER' % GetJavaType(context, kind)
+    params.append('%s.MANAGER' % GetJavaType(context, kind))
   if mojom.IsAnyArrayKind(kind) and mojom.IsInterfaceKind(kind.kind):
-    additionalParams = ', %s.MANAGER' % GetJavaType(context, kind.kind)
-  return '%s(%s%s)' % (methodName, offset, additionalParams)
+    params.append('%s.MANAGER' % GetJavaType(context, kind.kind))
+  return '%s(%s)' % (methodName, ', '.join(params))
 
 @contextfilter
 def EncodeMethod(context, kind, variable, offset, bit):
-  additionalParams = ''
+  params = [ variable, str(offset) ]
   if (kind == mojom.BOOL):
-    additionalParams = ', %d' % bit
+    params.append(str(bit))
   if mojom.IsInterfaceKind(kind):
-    additionalParams = ', %s.MANAGER' % GetJavaType(context, kind)
+    params.append('%s.MANAGER' % GetJavaType(context, kind))
   if mojom.IsAnyArrayKind(kind) and mojom.IsInterfaceKind(kind.kind):
-    additionalParams = ', %s.MANAGER' % GetJavaType(context, kind.kind)
-  return 'encode(%s, %s%s)' % (variable, offset, additionalParams)
+    params.append('%s.MANAGER' % GetJavaType(context, kind.kind))
+  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
 
 def GetNameForKind(context, kind):
   def _GetNameHierachy(kind):
     hierachy = []
@@ skipping 231 matching lines @@
   def GetJinjaParameters(self):
     return {
       'lstrip_blocks': True,
       'trim_blocks': True,
     }
 
   def GetGlobals(self):
     return {
       'module': self.module,
     }