Browse Source
Use Ant2 propertys that are objects rather than strings
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270573 13f79535-47bb-0310-9956-ffa450edef68master
Peter Donald
24 years ago
2 changed files with 4 additions and 6 deletions
Unified View
Diff Options
-
+2 -3proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
-
+2 -3proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
+ 2
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
View File
| @@ -360,7 +360,7 @@ public class JspC extends MatchingTask | |||||
| // compile the source files | // compile the source files | ||||
| String compiler = getProject().getProperty( "jsp.compiler" ); | |||||
| Object compiler = getProperty( "jsp.compiler" ); | |||||
| if( compiler == null ) | if( compiler == null ) | ||||
| { | { | ||||
| compiler = "jasper"; | compiler = "jasper"; | ||||
| @@ -369,9 +369,8 @@ public class JspC extends MatchingTask | |||||
| if( compileList.size() > 0 ) | if( compileList.size() > 0 ) | ||||
| { | { | ||||
| CompilerAdapter adapter = | CompilerAdapter adapter = | ||||
| CompilerAdapterFactory.getCompiler( compiler, this ); | |||||
| CompilerAdapterFactory.getCompiler( compiler.toString(), this ); | |||||
| getLogger().info( "Compiling " + compileList.size() + | getLogger().info( "Compiling " + compileList.size() + | ||||
| " source file" | " source file" | ||||
| + ( compileList.size() == 1 ? "" : "s" ) | + ( compileList.size() == 1 ? "" : "s" ) | ||||
+ 2
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
View File
| @@ -360,7 +360,7 @@ public class JspC extends MatchingTask | |||||
| // compile the source files | // compile the source files | ||||
| String compiler = getProject().getProperty( "jsp.compiler" ); | |||||
| Object compiler = getProperty( "jsp.compiler" ); | |||||
| if( compiler == null ) | if( compiler == null ) | ||||
| { | { | ||||
| compiler = "jasper"; | compiler = "jasper"; | ||||
| @@ -369,9 +369,8 @@ public class JspC extends MatchingTask | |||||
| if( compileList.size() > 0 ) | if( compileList.size() > 0 ) | ||||
| { | { | ||||
| CompilerAdapter adapter = | CompilerAdapter adapter = | ||||
| CompilerAdapterFactory.getCompiler( compiler, this ); | |||||
| CompilerAdapterFactory.getCompiler( compiler.toString(), this ); | |||||
| getLogger().info( "Compiling " + compileList.size() + | getLogger().info( "Compiling " + compileList.size() + | ||||
| " source file" | " source file" | ||||
| + ( compileList.size() == 1 ? "" : "s" ) | + ( compileList.size() == 1 ? "" : "s" ) | ||||