svn commit: r1544849 - in /maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr: JXR.java JavaCodeTransform.java

[michaelo]

Author: michaelo
Date: Sat Nov 23 18:03:22 2013
New Revision: 1544849

URL: http://svn.apache.org/r1544849
Log:
[JXR-104] Remove NOTICE footer/bottom altogether because no other writes this 
one too

- Gone in preparations of JXR-61

Modified:
    maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
    
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java

Modified: maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java?rev=1544849&r1=1544848&r2=1544849&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java 
(original)
+++ maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java Sat 
Nov 23 18:03:22 2013
@@ -46,12 +46,6 @@ public class JXR
     private Log log;
 
     /**
-     * Description of the Notice.
-     */
-    public static final String NOTICE = "This page was automatically generated 
by "
-        + "<a href=\"http://maven.apache.org/\";>Maven</a>";
-
-    /**
      * The default list of include patterns to use.
      */
     private static final String[] DEFAULT_INCLUDES = {"**/*.java"};

Modified: 
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java?rev=1544849&r1=1544848&r2=1544849&view=diff
==============================================================================
--- 
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
 (original)
+++ 
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
 Sat Nov 23 18:03:22 2013
@@ -330,7 +330,7 @@ public class JavaCodeTransform
      */
     public final String getFooter()
     {
-        return "</pre>\n" + "<hr/>" + "<div id=\"footer\">" + JXR.NOTICE + 
"</div>" + "</body>\n" + "</html>\n";
+        return "</pre>\n" + "<hr/>" + "<div id=\"footer\"></div>" + 
"</body>\n" + "</html>\n";
     }
 
     /**
@@ -343,13 +343,10 @@ public class JavaCodeTransform
      * @param outputEncoding String
      * @param javadocLinkDir String
      * @param revision String
-     * @param showHeader boolean
-     * @param showFooter boolean
      * @throws IOException
      */
     public final void transform( Reader sourceReader, Writer destWriter, 
Locale locale, String inputEncoding,
-                                 String outputEncoding, String javadocLinkDir, 
String revision, boolean showHeader,
-                                 boolean showFooter )
+                                 String outputEncoding, String javadocLinkDir, 
String revision )
         throws IOException
     {
         this.locale = locale;
@@ -364,10 +361,7 @@ public class JavaCodeTransform
 
         String line = "";
 
-        if ( showHeader )
-        {
-            out.println( getHeader() );
-        }
+        out.println( getHeader() );
 
         int linenumber = 1;
         while ( ( line = in.readLine() ) != null )
@@ -383,10 +377,7 @@ public class JavaCodeTransform
             ++linenumber;
         }
 
-        if ( showFooter )
-        {
-            out.println( getFooter() );
-        }
+        out.println( getFooter() );
 
         out.flush();
     }
@@ -436,7 +427,7 @@ public class JavaCodeTransform
                 fw = new FileWriter( destfile );
             }
 
-            transform( fr, fw, locale, inputEncoding, outputEncoding, 
javadocLinkDir, revision, true, true );
+            transform( fr, fw, locale, inputEncoding, outputEncoding, 
javadocLinkDir, revision );
         }
         catch ( RuntimeException e )
         {