svn commit: r1303916 - in /lucene/dev/trunk/lucene: common-build.xml tools/prettify/stylesheet+prettify.css

[us...@apache.org]

Author: uschindler
Date: Thu Mar 22 17:49:36 2012
New Revision: 1303916

URL: http://svn.apache.org/viewvc?rev=1303916&view=rev
Log:
LUCENE-3903: Fix javadocs for Java 7 (different stylesheets, less code duplication, prettyprint no longer dependent on impl-specific function names)

Removed:
    lucene/dev/trunk/lucene/tools/prettify/stylesheet+prettify.css
Modified:
    lucene/dev/trunk/lucene/common-build.xml

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1303916&r1=1303915&r2=1303916&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Thu Mar 22 17:49:36 2012
@@ -877,8 +877,8 @@
     <attribute name="overview" default="${src.dir}/overview.html"/>
     <sequential>
       <antcall target="download-java6-javadoc-packagelist"/>
+      <delete file="@{destdir}/stylesheet.css" failonerror="false"/>
       <copy todir="@{destdir}" file="${prettify.dir}/prettify.js" overwrite="false" />
-      <copy todir="@{destdir}" file="${prettify.dir}/prettify.css" overwrite="false" />
       <record name="@{destdir}/log_javadoc.txt" action="start" append="no"/>
       <javadoc
           overview="@{overview}"
@@ -895,7 +895,6 @@
           source="${ant.java.version}"
           windowtitle="${Name} ${version} API"
           doctitle="@{title}"
-          stylesheetfile="${prettify.dir}/stylesheet+prettify.css"
           maxmemory="${javadoc.maxmemory}"
           bottom="Copyright &amp;copy; ${year} Apache Software Foundation.  All Rights Reserved.">
         <tag name="lucene.experimental" 
@@ -904,16 +903,33 @@
         description="NOTE: This API is for internal purposes only and might change in incompatible ways in the next release."/>
       	<link offline="true" packagelistLoc="${javadoc.dir}"/>
         <link offline="true" href="${javadoc.link}" packagelistLoc="${javadoc.packagelist.dir}/java6"/>
-        <header><![CDATA[
-           <script src="{@docRoot}/prettify.js" type="text/javascript"></script>
-           <script language="JavaScript">window.onload=function(){windowTitle();prettyPrint();}</script>
-        ]]></header>
+        <bottom><![CDATA[
+          <script src='{@docRoot}/prettify.js' type='text/javascript'></script>
+          <script type='text/javascript'>
+            (function(){
+              var oldonload = window.onload;
+              if (typeof oldonload != 'function') {
+                window.onload = prettyPrint;
+              } else {
+                window.onload = function() {
+                  oldonload();
+                  prettyPrint();
+                }
+              }
+            })();
+          </script>
+        ]]></bottom>
       	
       	<sources />
       	      	
         <classpath refid="javadoc.classpath"/>
       </javadoc>
       <record name="@{destdir}/log_javadoc.txt" action="stop"/>
+      
+      <!-- append prettify.css -->
+      <concat destfile="@{destdir}/stylesheet.css" append="true">
+        <filelist dir="${prettify.dir}" files="prettify.css"/>
+      </concat>
 
       <delete>
         <fileset file="@{destdir}/log_javadoc.txt">