xml.rb in rdoc-2.2.0

- old
+ new

@@ -32,28 +32,28 @@
   end
 
   ##
   # Generate:
   #
-  # * a list of HtmlFile objects for each TopLevel object.
-  # * a list of HtmlClass objects for each first level
+  # * a list of File objects for each TopLevel object.
+  # * a list of Class objects for each first level
   #   class or module in the TopLevel objects
   # * a complete list of all hyperlinkable terms (file,
   #   class, module, and method names)
 
   def build_indices
     @info.each do |toplevel|
-      @files << RDoc::Generator::HtmlFile.new(toplevel, @options, RDoc::Generator::FILE_DIR)
+      @files << RDoc::Generator::File.new(toplevel, @options, RDoc::Generator::FILE_DIR)
     end
 
     RDoc::TopLevel.all_classes_and_modules.each do |cls|
       build_class_list(cls, @files[0], RDoc::Generator::CLASS_DIR)
     end
   end
 
   def build_class_list(from, html_file, class_dir)
-    @classes << RDoc::Generator::HtmlClass.new(from, html_file, class_dir, @options)
+    @classes << RDoc::Generator::Class.new(from, html_file, class_dir, @options)
     from.each_classmodule do |mod|
       build_class_list(mod, html_file, class_dir)
     end
   end
 
@@ -65,12 +65,9 @@
     values = {
       'charset' => @options.charset,
       'files'   => gen_into(@files),
       'classes' => gen_into(@classes)
     }
-
-    # this method is defined in the template file
-    write_extra_pages if defined? write_extra_pages
 
     template = RDoc::TemplatePage.new @template::ONE_PAGE
 
     if @options.op_name
       opfile = File.open(@options.op_name, "w")