From 4abaa3ec23a745606ac529fb59bb69dec7d3b1ae Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 6 Jan 2002 02:05:41 +0000 Subject: [PATCH] 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-ffa450edef68 --- .../org/apache/tools/ant/taskdefs/optional/jsp/JspC.java | 5 ++--- .../org/apache/tools/ant/taskdefs/optional/jsp/JspC.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 97c60ca7e..da1b9462c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -360,7 +360,7 @@ public class JspC extends MatchingTask // compile the source files - String compiler = getProject().getProperty( "jsp.compiler" ); + Object compiler = getProperty( "jsp.compiler" ); if( compiler == null ) { compiler = "jasper"; @@ -369,9 +369,8 @@ public class JspC extends MatchingTask if( compileList.size() > 0 ) { - CompilerAdapter adapter = - CompilerAdapterFactory.getCompiler( compiler, this ); + CompilerAdapterFactory.getCompiler( compiler.toString(), this ); getLogger().info( "Compiling " + compileList.size() + " source file" + ( compileList.size() == 1 ? "" : "s" ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 97c60ca7e..da1b9462c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -360,7 +360,7 @@ public class JspC extends MatchingTask // compile the source files - String compiler = getProject().getProperty( "jsp.compiler" ); + Object compiler = getProperty( "jsp.compiler" ); if( compiler == null ) { compiler = "jasper"; @@ -369,9 +369,8 @@ public class JspC extends MatchingTask if( compileList.size() > 0 ) { - CompilerAdapter adapter = - CompilerAdapterFactory.getCompiler( compiler, this ); + CompilerAdapterFactory.getCompiler( compiler.toString(), this ); getLogger().info( "Compiling " + compileList.size() + " source file" + ( compileList.size() == 1 ? "" : "s" )