Extract interfaces and members renaming logic to a new HtmlRenamer class.

lib/dom/scripts/dartdomgenerator.py

 #!/usr/bin/python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """This is the entry point to create Dart APIs from the IDL database."""
 
 import dartgenerator
 import database
 import logging.config
 import multiemitter
 import optparse
 import os
 import shutil
 import subprocess
 import sys
 from generator import TypeRegistry
+from htmlrenamer import HtmlRenamer
 from systembase import GeneratorOptions
 from systemfrog import FrogSystem
-from systemhtml import HtmlInterfacesSystem, HtmlFrogSystem, HtmlSystemShared
+from systemhtml import HtmlInterfacesSystem, HtmlFrogSystem
 from systeminterface import InterfacesSystem
 from systemnative import NativeImplementationSystem
 from templateloader import TemplateLoader
 
 _logger = logging.getLogger('dartdomgenerator')
 
 _webkit_renames = {
     # W3C -> WebKit name conversion
     # TODO(vsm): Maybe Store these renames in the IDLs.
     'ApplicationCache': 'DOMApplicationCache',
@@ skipping 24 matching lines @@
   webkit_database = common_database.Clone()
 
   # Generate Dart interfaces for the WebKit DOM.
   generator.FilterInterfaces(database = webkit_database,
                              or_annotations = ['WebKit', 'Dart'],
                              exclude_displaced = ['WebKit'],
                              exclude_suppressed = ['WebKit', 'Dart'])
   generator.RenameTypes(webkit_database, _webkit_renames, True)
   generator.FixEventTargets(webkit_database)
 
-  def CreateGeneratorOptions(template_paths, conditions, type_registry,
-                             output_dir):
+  def CreateGeneratorOptions(template_paths, conditions, type_registry, output_dir,
+                             renamer=None):
+    template_loader = TemplateLoader(template_dir, template_paths, conditions)
     return GeneratorOptions(
-        TemplateLoader(template_dir, template_paths, conditions),
-        webkit_database, emitters, type_registry, output_dir)
+        template_loader, webkit_database, emitters, type_registry, renamer,
+        output_dir)
 
   def Generate(system):
     generator.Generate(webkit_database, system,
                        super_database=common_database,
                        webkit_renames=_webkit_renames)
 
   emitters = multiemitter.MultiEmitter()
 
   for system_name in system_names:
     if system_name in ['htmlfrog', 'htmldartium']:
-      renames = HtmlSystemShared.MakeHtmlRenames(webkit_database)
-      type_registry = TypeRegistry(renames)
+      renamer = HtmlRenamer(webkit_database)
+      type_registry = TypeRegistry(webkit_database, renamer)
       if system_name == 'htmlfrog':
         options = CreateGeneratorOptions(
             ['html/frog', 'html/impl', 'html', ''],
             {'DARTIUM': False, 'FROG': True},
-            type_registry,
-            html_output_dir)
+            type_registry, html_output_dir, renamer)
         backend = HtmlFrogSystem(options)
       else:
         options = CreateGeneratorOptions(
             ['dom/native', 'html/dartium', 'html/impl', ''],
             {'DARTIUM': True, 'FROG': False},
-            type_registry,
-            html_output_dir)
+            type_registry, html_output_dir, renamer)
         backend = NativeImplementationSystem(options, auxiliary_dir)
       options = CreateGeneratorOptions(
-          ['html/interface', 'html/impl', 'html', ''], {}, type_registry,
-          html_output_dir)
+          ['html/interface', 'html/impl', 'html', ''], {},
+          type_registry, html_output_dir, renamer)
       html_system = HtmlInterfacesSystem(options, backend)
       Generate(html_system)
     else:
-      type_registry = TypeRegistry({})
+      type_registry = TypeRegistry(webkit_database)
       options = CreateGeneratorOptions(
           ['dom/interface', 'dom', ''], {}, type_registry, dom_output_dir)
       interface_system = InterfacesSystem(options)
       if system_name == 'dummy':
         options = CreateGeneratorOptions(
             ['dom/dummy', 'dom', ''], {}, type_registry, dom_output_dir)
         implementation_system = dartgenerator.DummyImplementationSystem(
             options)
       elif system_name == 'frog':
         options = CreateGeneratorOptions(
@@ skipping 64 matching lines @@
   dom_output_dir = options.output_dir or os.path.join(current_dir,
       '../generated')
   html_output_dir = options.output_dir or os.path.join(current_dir,
       '../../html/generated')
   Generate(systems, database_dir, options.use_database_cache,
               dom_output_dir, html_output_dir)
   GenerateSingleFile(systems)
 
 if __name__ == '__main__':
   sys.exit(main())