You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by jl...@apache.org on 2013/01/10 21:46:26 UTC
svn commit: r1431676 -
/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
Author: jlboudart
Date: Thu Jan 10 21:46:26 2013
New Revision: 1431676
URL: http://svn.apache.org/viewvc?rev=1431676&view=rev
Log:
Better handling of owning target on paths
Modified:
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java?rev=1431676&r1=1431675&r2=1431676&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java Thu Jan 10 21:46:26 2013
@@ -240,7 +240,8 @@ public class DefaultPluginServiceImpl im
}
if (Path.class.isAssignableFrom(taskClass)) {
Path path = (Path) maybeConfigureTask(task);
- handlePathParameter(task.getRuntimeConfigurableWrapper().getId(), path, eaReport);
+ handlePathParameter(task.getRuntimeConfigurableWrapper().getId(), path, task.getOwningTarget(),
+ eaReport);
}
if (PathTask.class.isAssignableFrom(taskClass)) {
PathTask pathTask = (PathTask) maybeConfigureTask(task);
@@ -352,19 +353,24 @@ public class DefaultPluginServiceImpl im
parameterReport.setName(id);
parameterReport.setRequired(false);
parameterReport.setDescription(fileSet.getDescription());
- parameterReport.setOwningTarget(target.getName());
+ if (target != null) {
+ parameterReport.setOwningTarget(target.getName());
+ }
eaReport.addParameterReport(parameterReport);
Message.debug("Ant file has a fileset called : " + parameterReport.getName());
}
}
- private void handlePathParameter(String pathid, Path path, EasyAntReport eaReport) {
+ private void handlePathParameter(String pathid, Path path, Target target, EasyAntReport eaReport) {
ParameterReport parameterReport = new ParameterReport(ParameterType.PATH);
if (pathid != null) {
parameterReport.setName(pathid);
parameterReport.setRequired(false);
parameterReport.setDescription(path.getDescription());
+ if (target != null) {
+ parameterReport.setOwningTarget(target.getName());
+ }
eaReport.addParameterReport(parameterReport);
Message.debug("Ant file has a path called : " + parameterReport.getName());
}
@@ -372,7 +378,7 @@ public class DefaultPluginServiceImpl im
private void handlePathParameter(PathTask pathTask, EasyAntReport eaReport) {
ParameterReport parameterReport = new ParameterReport(ParameterType.PATH);
- if (pathTask.getPathid() != null && pathTask.getDescription() != null) {
+ if (pathTask.getPathid() != null) {
parameterReport.setName(pathTask.getPathid());
parameterReport.setRequired(false);
parameterReport.setDescription(pathTask.getDescription());