ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject svn commit: r476571 - in /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp: Jasper41Mangler.java JspNameMangler.java WLJspc.java compilers/DefaultJspCompilerAdapter.java compilers/JasperC.java
Date Sat, 18 Nov 2006 18:00:31 GMT
Author: peterreilly
Date: Sat Nov 18 10:00:30 2006
New Revision: 476571

URL: http://svn.apache.org/viewvc?view=rev&rev=476571
Log:
checkstyle

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java?view=diff&rev=476571&r1=476570&r2=476571
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java
Sat Nov 18 10:00:30 2006
@@ -81,6 +81,7 @@
     /**
      * taking in the substring representing the path relative to the source dir
      * return a new string representing the destination path
+     * @param path not used.
      * @return null as this is not implemented.
      * @todo
      */

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java?view=diff&rev=476571&r1=476570&r2=476571
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
Sat Nov 18 10:00:30 2006
@@ -26,6 +26,8 @@
  */
 public class JspNameMangler implements JspMangler {
 
+    // CheckStyle:ConstantNameCheck OFF - bc
+
     /**
      * this is the list of keywords which can not be used as classnames
      */
@@ -46,6 +48,7 @@
             "try", "void", "volatile", "while"
             };
 
+    // CheckStyle:ConstantNameCheck ON
 
     /**
      * map from a jsp file to a java filename; does not do packages
@@ -123,7 +126,7 @@
      * @param ch char to mangle
      * @return mangled string; 5 digit hex value
      */
-    private static final String mangleChar(char ch) {
+    private static String mangleChar(char ch) {
 
         if (ch == File.separatorChar) {
             ch = '/';
@@ -146,6 +149,8 @@
      * taking in the substring representing the path relative to the source dir
      * return a new string representing the destination path
      * not supported, as jasper in tomcat4.0 doesnt either
+     * @param path not used
+     * @return null always.
      */
     public String mapPath(String path) {
         return null;

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java?view=diff&rev=476571&r1=476570&r2=476571
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java Sat Nov
18 10:00:30 2006
@@ -99,6 +99,10 @@
     private String pathToPackage = "";
     private Vector filesToDo = new Vector();
 
+    /**
+     * Run the task.
+     * @throws BuildException if there is an error.
+     */
     public void execute() throws BuildException {
         if (!destinationDirectory.isDirectory()) {
             throw new BuildException("destination directory "
@@ -196,7 +200,7 @@
 
     /**
      * Set the classpath to be used for this compilation.
-     *
+     * @param classpath the classpath to use.
      */
     public void setClasspath(Path classpath) {
         if (compileClasspath == null) {
@@ -208,6 +212,7 @@
 
     /**
      * Maybe creates a nested classpath element.
+     * @return a path to be configured.
      */
     public Path createClasspath() {
         if (compileClasspath == null) {
@@ -248,9 +253,12 @@
         destinationPackage = packageName;
     }
 
-
-
-    protected void scanDir(String files[]) {
+    /**
+     * Scan the array of files and add the jsp
+     * files that need to be compiled to the filesToDo field.
+     * @param files the files to scan.
+     */
+    protected void scanDir(String[] files) {
 
         long now = (new Date()).getTime();
         File jspFile = null;
@@ -297,6 +305,13 @@
     }
 
 
+    /**
+     * Replace occurances of a string with a replacement string.
+     * @param inpString the string to convert.
+     * @param escapeChars the string to replace.
+     * @param replaceChars the string to place.
+     * @return the converted string.
+     */
     protected String replaceString(String inpString, String escapeChars,
                                    String replaceChars) {
         String localString = "";

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java?view=diff&rev=476571&r1=476570&r2=476571
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java
Sat Nov 18 10:00:30 2006
@@ -69,10 +69,14 @@
         jspc.log(niceSourceList.toString(), Project.MSG_VERBOSE);
     }
 
+    // CheckStyle:VisibilityModifier OFF - bc
+
     /**
      * our owner
      */
     protected JspC owner;
+
+    // CheckStyle:VisibilityModifier ON
 
     /**
      * set the owner

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java?view=diff&rev=476571&r1=476570&r2=476571
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
Sat Nov 18 10:00:30 2006
@@ -36,11 +36,14 @@
  */
 public class JasperC extends DefaultJspCompilerAdapter {
 
+    // CheckStyle:VisibilityModifier OFF - bc
 
     /**
      * what produces java classes from .jsp files
      */
     JspMangler mangler;
+
+    // CheckStyle:VisibilityModifier ON
 
     /**
      * Constructor for JasperC.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message