Import RDoc 2.2.1 r185

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 7 deletions

diff --git a/lib/rdoc/generator/xml.rb b/lib/rdoc/generator/xml.rb
index 3335f2ce7..0d4c5a7ea 100644
--- a/lib/rdoc/generator/xml.rb
+++ b/lib/rdoc/generator/xml.rb
@@ -34,15 +34,15 @@ class RDoc::Generator::XML < RDoc::Generator::HTML
   ##
   # 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|
@@ -51,7 +51,7 @@ class RDoc::Generator::XML < RDoc::Generator::HTML
   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
@@ -68,9 +68,6 @@ class RDoc::Generator::XML < RDoc::Generator::HTML
       '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