bodewig 01/11/21 09:31:25
Modified: src/main/org/apache/tools/ant/taskdefs/optional/jsp
JspC.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers
CompilerAdapterFactory.java
Log:
remove tabs
Revision Changes Path
1.5 +36 -36
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
Index: JspC.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JspC.java 2001/11/09 00:52:47 1.4
+++ JspC.java 2001/11/21 17:31:25 1.5
@@ -99,7 +99,7 @@
* </jspc>
* </pre>
*
- * @version $Revision: 1.4 $ $Date: 2001/11/09 00:52:47 $
+ * @version $Revision: 1.5 $ $Date: 2001/11/21 17:31:25 $
* @author <a href="mailto:[EMAIL PROTECTED]">Matthew Watson</a>
* <p> Large Amount of cutting and pasting from the Javac task...
* @author James Davidson <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
@@ -119,7 +119,7 @@
private int verbose = 0;
protected Vector compileList = new Vector();
protected boolean failOnError = true;
-
+
/**
* -uribase <dir>The uri directory compilations should be relative to
* (Default is "/")
@@ -132,7 +132,7 @@
* against,
*/
private File uriroot;
-
+
private final static String FAIL_MSG
= "Compile failed, messages should have been provided.";
/* ------------------------------------------------------------ */
@@ -213,8 +213,8 @@
{
mapped = mapped_;
}
-
- /**
+
+ /**
* -uribase. the uri context of relative URI
* references in the JSP pages. If it does not
* exist then it is derived from the location of the file
@@ -226,9 +226,9 @@
this.uribase = uribase;
}
- public File getUribase() {
- return uriroot;
- }
+ public File getUribase() {
+ return uriroot;
+ }
/**
* -uriroot <dir>The root directory that uri files should be resolved
@@ -240,11 +240,11 @@
this.uriroot = uriroot;
}
- public File getUriroot() {
- return uriroot;
- }
-
-
+ public File getUriroot() {
+ return uriroot;
+ }
+
+
/* ------------------------------------------------------------ */
/** Set the classpath to be used for this compilation */
public void setClasspath(Path cp) {
@@ -305,7 +305,7 @@
// scan source directories and dest directory to build up both copy
// lists and compile lists
resetFileLists();
- int filecount=0;
+ int filecount=0;
for (int i = 0; i < list.length; i++) {
File srcDir = (File)project.resolveFile(list[i]);
if (!srcDir.exists()) {
@@ -316,7 +316,7 @@
DirectoryScanner ds = this.getDirectoryScanner(srcDir);
String[] files = ds.getIncludedFiles();
- filecount=files.length;
+ filecount=files.length;
scanDir(srcDir, dest, files);
}
@@ -326,7 +326,7 @@
if (compiler == null) {
compiler = "jasper";
}
- log("compiling "+compileList.size()+"
files",Project.MSG_VERBOSE);
+ log("compiling "+compileList.size()+" files",Project.MSG_VERBOSE);
if (compileList.size() > 0) {
@@ -349,15 +349,15 @@
log(FAIL_MSG, Project.MSG_ERR);
}
}
+ }
+ else {
+ if(filecount==0) {
+ log("there were no files to compile",Project.MSG_INFO);
+ }
+ else {
+ log("all files are up to date",Project.MSG_VERBOSE);
+ }
}
- else {
- if(filecount==0) {
- log("there were no files to
compile",Project.MSG_INFO);
- }
- else {
- log("all files are up to
date",Project.MSG_VERBOSE);
- }
- }
}
/* ------------------------------------------------------------ */
/**
@@ -391,19 +391,19 @@
if (!javaFile.exists() ||
srcFile.lastModified() > javaFile.lastModified())
- {
- if (!javaFile.exists()) {
- log("Compiling " + srcFile.getPath() +
- " because java file "
- + javaFile.getPath() + " does not exist",
- Project.MSG_DEBUG);
- } else {
- log("Compiling " + srcFile.getPath() +
- " because it is out of date with respect to "
- + javaFile.getPath(), Project.MSG_DEBUG);
+ {
+ if (!javaFile.exists()) {
+ log("Compiling " + srcFile.getPath() +
+ " because java file "
+ + javaFile.getPath() + " does not exist",
+ Project.MSG_DEBUG);
+ } else {
+ log("Compiling " + srcFile.getPath() +
+ " because it is out of date with respect to "
+ + javaFile.getPath(), Project.MSG_DEBUG);
+ }
+ compileList.addElement(srcFile.getAbsolutePath());
}
- compileList.addElement(srcFile.getAbsolutePath());
- }
}
}
}
1.3 +9 -9
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java
Index: CompilerAdapterFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CompilerAdapterFactory.java 2001/10/28 21:30:21 1.2
+++ CompilerAdapterFactory.java 2001/11/21 17:31:25 1.3
@@ -87,14 +87,14 @@
*/
public static CompilerAdapter getCompiler( String compilerType, Task
task )
throws BuildException {
- /* If I've done things right, this should be the extent of the
- * conditional statements required.
- */
- if ( compilerType.equalsIgnoreCase("jasper") ) {
- return new JasperC();
- }
- return resolveClassName( compilerType );
+ /* If I've done things right, this should be the extent of the
+ * conditional statements required.
+ */
+ if ( compilerType.equalsIgnoreCase("jasper") ) {
+ return new JasperC();
}
+ return resolveClassName( compilerType );
+ }
/**
* Tries to resolve the given classname into a compiler adapter.
@@ -114,11 +114,11 @@
throw new BuildException( className + " can\'t be found.", cnfe
);
} catch ( ClassCastException cce ) {
throw new BuildException(className + " isn\'t the classname of "
- + "a compiler adapter.", cce);
+ + "a compiler adapter.", cce);
} catch ( Throwable t ) {
// for all other possibilities
throw new BuildException(className + " caused an interesting "
- + "exception.", t);
+ + "exception.", t);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
