You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jl...@apache.org on 2014/01/14 11:52:22 UTC
svn commit: r1558007 - in
/ant/easyant/core/trunk/src/main/java/org/apache/easyant: core/ core/ant/
core/ant/helper/ core/configuration/ core/ivy/ core/parser/ core/report/
man/ tasks/ tasks/findclasspath/
Author: jlboudart
Date: Tue Jan 14 10:52:21 2014
New Revision: 1558007
URL: http://svn.apache.org/r1558007
Log:
Cleanup unnecessary cast, @deprecated, code formatting
Modified:
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/Phase.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/configuration/EasyantConfigurationFactory.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ivy/InheritableScope.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/EasyantOption.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/FindParentDirectory.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/GoOffline.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PathTask.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PluginReport.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PropertyTask.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/RegisterArtifact.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/FindClasspathTask.java
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java Tue Jan 14 10:52:21 2014
@@ -261,7 +261,7 @@ public class EasyAntEngine {
project.addBuildListener(createLogger());
for (int i = 0; i < configuration.getListeners().size(); i++) {
- String className = (String) configuration.getListeners().get(i);
+ String className = configuration.getListeners().get(i);
BuildListener listener = (BuildListener) ClasspathUtils.newInstance(className,
EasyAntEngine.class.getClassLoader(), BuildListener.class);
project.setProjectReference(listener);
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java Tue Jan 14 10:52:21 2014
@@ -484,7 +484,7 @@ public class EasyAntMain implements AntM
private static int findTargetPosition(List<String> names, String name) {
int res = names.size();
for (int i = 0; i < names.size() && res == names.size(); i++) {
- if (name.compareTo((String) names.get(i)) < 0) {
+ if (name.compareTo(names.get(i)) < 0) {
res = i;
}
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/Phase.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/Phase.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/Phase.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/Phase.java Tue Jan 14 10:52:21 2014
@@ -22,19 +22,17 @@ import org.apache.tools.ant.RuntimeConfi
import org.apache.tools.ant.Target;
import org.apache.tools.ant.Task;
-
/**
* A special kind of target that must be empty.
- *
+ *
* @since Ant 1.8.0
*/
public class Phase extends Target {
-
+
// no "clone" constructor since I'm not really sure where it is
// used
- private static final String NO_CHILDREN_ALLOWED
- = "you must not nest child elements into a phase";
+ private static final String NO_CHILDREN_ALLOWED = "you must not nest child elements into a phase";
/**
* Throws an exception.
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java Tue Jan 14 10:52:21 2014
@@ -163,7 +163,7 @@ public class ProjectUtils {
Map.Entry<?, ?> entry = (Map.Entry<?, ?>) i.next();
String name = (String) entry.getKey();
Target target = (Target) entry.getValue();
- Target otherTarget = (Target) locationMap.get(target.getLocation());
+ Target otherTarget = locationMap.get(target.getLocation());
// Place this entry in the location map if
// a) location is not in the map
// b) location is in map, but it's name is longer
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java Tue Jan 14 10:52:21 2014
@@ -267,7 +267,7 @@ public class EasyAntProjectHelper extend
}
}
- Target t = (Target) projectTargets.get(phase);
+ Target t = projectTargets.get(phase);
if (t != null) {
if (!(t instanceof Phase)) {
throw new BuildException("referenced target " + phase + " is not a phase");
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/configuration/EasyantConfigurationFactory.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/configuration/EasyantConfigurationFactory.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/configuration/EasyantConfigurationFactory.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/configuration/EasyantConfigurationFactory.java Tue Jan 14 10:52:21 2014
@@ -39,18 +39,15 @@ public class EasyantConfigurationFactory
return new EasyAntConfiguration();
}
- public EasyAntConfiguration createConfigurationFromFile(
- final EasyAntConfiguration easyAntConfiguration,
+ public EasyAntConfiguration createConfigurationFromFile(final EasyAntConfiguration easyAntConfiguration,
URL configUrl) throws Exception {
-
- return parser.parseAndMerge(configUrl,easyAntConfiguration);
+
+ return parser.parseAndMerge(configUrl, easyAntConfiguration);
}
-
- public EasyAntConfiguration createConfigurationFromFile(
- URL configurationFile) throws Exception {
+
+ public EasyAntConfiguration createConfigurationFromFile(URL configurationFile) throws Exception {
EasyAntConfiguration easyAntConfiguration = createDefaultConfiguration();
- return createConfigurationFromFile(easyAntConfiguration,
- configurationFile);
+ return createConfigurationFromFile(easyAntConfiguration, configurationFile);
}
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ivy/InheritableScope.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ivy/InheritableScope.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ivy/InheritableScope.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ivy/InheritableScope.java Tue Jan 14 10:52:21 2014
@@ -18,5 +18,5 @@
package org.apache.easyant.core.ivy;
public enum InheritableScope {
- CHILD,BOTH
+ CHILD, BOTH
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java Tue Jan 14 10:52:21 2014
@@ -788,7 +788,7 @@ public class DefaultEasyAntXmlModuleDesc
}
DefaultExtendsDescriptor ed = new DefaultExtendsDescriptor(parent, location,
- (String[]) extendTypes.toArray(new String[extendTypes.size()]), local);
+ extendTypes.toArray(new String[extendTypes.size()]), local);
getMd().addInheritedDescriptor(ed);
mergeWithOtherModuleDescriptor(extendTypes, parent);
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java Tue Jan 14 10:52:21 2014
@@ -306,6 +306,7 @@ public class EasyAntReport {
* @return a list of all the properties available in this module or in all imported modules
* @deprecated since 0.10 use getPropertyDescriptors() method instead or getPropertiesFromCurrentModule()
*/
+ @Deprecated
public Map<String, PropertyDescriptor> getAvailableProperties() {
return getPropertyDescriptors();
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/EasyantOption.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/EasyantOption.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/EasyantOption.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/EasyantOption.java Tue Jan 14 10:52:21 2014
@@ -28,86 +28,85 @@ import org.apache.tools.ant.BuildExcepti
import org.apache.tools.ant.Project;
/**
- * Base class for all classes implementing functionality
- * for project switches that are accepted on command
- * line when invoking easyant.
+ * Base class for all classes implementing functionality for project switches that are accepted on command line when
+ * invoking easyant.
*
- * For example,
- * <br>
- * easyant -listTargets
+ * For example, <br>
+ * easyant -listTargets
*
* <p />
- * The -listTargets and similar switches (like -describe etc.) are
- * all extending this class.
+ * The -listTargets and similar switches (like -describe etc.) are all extending this class.
*
- * For each manual switch that is intended to be supported by easyant,
- * a new implementing class for this class must be added that
- * implements the switch functionality.
+ * For each manual switch that is intended to be supported by easyant, a new implementing class for this class must be
+ * added that implements the switch functionality.
*
*/
public abstract class EasyantOption extends Option {
-
+
private static final long serialVersionUID = 1L;
-
+
public static final String LINE_SEP = System.getProperty("line.separator");
private Project project;
private EasyAntReport eareport;
- private boolean stopBuild=false;
-
- public EasyantOption(String opt, boolean hasArg, String description)
- throws IllegalArgumentException {
+ private boolean stopBuild = false;
+
+ public EasyantOption(String opt, boolean hasArg, String description) throws IllegalArgumentException {
super(opt, hasArg, description);
}
- public EasyantOption(String opt, String longOpt, boolean hasArg,
- String description) throws IllegalArgumentException {
+
+ public EasyantOption(String opt, String longOpt, boolean hasArg, String description)
+ throws IllegalArgumentException {
super(opt, longOpt, hasArg, description);
}
- public EasyantOption(String opt, String description)
- throws IllegalArgumentException {
+
+ public EasyantOption(String opt, String description) throws IllegalArgumentException {
super(opt, description);
}
+
public void execute() {
- if (getProject()==null) {
+ if (getProject() == null) {
throw new IllegalStateException("project can't be null");
}
project.log(LINE_SEP + "Project Manual");
project.log("--------------");
}
+
public Project getProject() {
return project;
}
+
public void setProject(Project project) {
this.project = project;
}
+
public EasyAntReport getEareport() {
- if (eareport==null) {
+ if (eareport == null) {
try {
- File moduleDescriptor = new File(
- project.getProperty(EasyAntMagicNames.EASYANT_FILE));
- File optionalAntModule = new File(moduleDescriptor.getParent(),
- EasyAntConstants.DEFAULT_BUILD_FILE);
+ File moduleDescriptor = new File(project.getProperty(EasyAntMagicNames.EASYANT_FILE));
+ File optionalAntModule = new File(moduleDescriptor.getParent(), EasyAntConstants.DEFAULT_BUILD_FILE);
File overrideAntModule = new File(moduleDescriptor.getParent(),
EasyAntConstants.DEFAULT_OVERRIDE_BUILD_FILE);
- PluginService pluginService = (PluginService)project.getReference(EasyAntMagicNames.PLUGIN_SERVICE_INSTANCE);
- setEareport(pluginService.generateEasyAntReport(moduleDescriptor,optionalAntModule,overrideAntModule));
+ PluginService pluginService = (PluginService) project
+ .getReference(EasyAntMagicNames.PLUGIN_SERVICE_INSTANCE);
+ setEareport(pluginService.generateEasyAntReport(moduleDescriptor, optionalAntModule, overrideAntModule));
} catch (Exception e) {
- throw new BuildException("EasyAntMan could not be initialized. Details: " + e.getMessage(),e);
+ throw new BuildException("EasyAntMan could not be initialized. Details: " + e.getMessage(), e);
}
}
return eareport;
}
+
public void setEareport(EasyAntReport eareport) {
this.eareport = eareport;
}
+
public boolean isStopBuild() {
return stopBuild;
}
+
public void setStopBuild(boolean stopBuild) {
this.stopBuild = stopBuild;
}
-
-
-
-
+
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java Tue Jan 14 10:52:21 2014
@@ -39,11 +39,9 @@ public class ListPlugins extends Easyant
Set<ImportedModuleReport> moduleReps = getEareport().getImportedModuleReports();
for (ImportedModuleReport importedModuleReport : moduleReps) {
getProject()
- .log(
- "\t"
- + importedModuleReport.getModuleMrid()
- + (importedModuleReport.getAs() == null ? "" : ": Known as "
- + importedModuleReport.getAs()));
+ .log("\t"
+ + importedModuleReport.getModuleMrid()
+ + (importedModuleReport.getAs() == null ? "" : ": Known as " + importedModuleReport.getAs()));
}
getProject().log(
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java Tue Jan 14 10:52:21 2014
@@ -43,7 +43,7 @@ public class BindTarget extends Task {
Project.MSG_DEBUG);
return;
}
- Target t = (Target) getProject().getTargets().get(getTarget());
+ Target t = getProject().getTargets().get(getTarget());
if (t == null) {
throw new BuildException("unable to find target " + getTarget());
}
@@ -93,7 +93,7 @@ public class BindTarget extends Task {
throw new BuildException("can't add target " + getTarget() + " to extension-point " + getExtensionOf()
+ " because the extension-point" + " is unknown.");
}
- Target p = (Target) getProject().getTargets().get(getExtensionOf());
+ Target p = getProject().getTargets().get(getExtensionOf());
if (!(p instanceof ExtensionPoint)) {
throw new BuildException("referenced target " + getExtensionOf() + " is not a extension-point");
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/FindParentDirectory.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/FindParentDirectory.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/FindParentDirectory.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/FindParentDirectory.java Tue Jan 14 10:52:21 2014
@@ -27,32 +27,32 @@ import org.apache.tools.ant.Task;
* Find parent directory containing a given file
*/
public class FindParentDirectory extends Task {
-
- private String filename=null;
- private String property=null;
- private boolean haltonmissing=true;
- private boolean haltonfirstfound=false;
+
+ private String filename = null;
+ private String property = null;
+ private boolean haltonmissing = true;
+ private boolean haltonfirstfound = false;
public void execute() throws BuildException {
if (getFilename() == null || getProperty() == null) {
throw new BuildException("filename and property attributes are mandatory");
}
- File f = new File(getProject().getBaseDir(),getFilename());
+ File f = new File(getProject().getBaseDir(), getFilename());
String highest = null;
- boolean canContinue=true;
- while (canContinue && f.getParentFile() !=null) {
+ boolean canContinue = true;
+ while (canContinue && f.getParentFile() != null) {
f = f.getParentFile();
File child = new File(f, getFilename());
- log ("Searching "+ getFilename() + " in "+ child.getAbsolutePath(),Project.MSG_DEBUG);
+ log("Searching " + getFilename() + " in " + child.getAbsolutePath(), Project.MSG_DEBUG);
if (child.exists()) {
- log (getFilename() + " found !",Project.MSG_DEBUG);
+ log(getFilename() + " found !", Project.MSG_DEBUG);
highest = f.getAbsolutePath();
if (isHaltonfirstfound()) {
- canContinue=false;
+ canContinue = false;
}
- //at least halt when first is found
- } else if(highest !=null && isHaltonmissing()) {
- canContinue=false;
+ // at least halt when first is found
+ } else if (highest != null && isHaltonmissing()) {
+ canContinue = false;
}
}
if (highest == null) {
@@ -63,6 +63,7 @@ public class FindParentDirectory extends
/**
* get file name to search on parent directories
+ *
* @return a relative filename
*/
public String getFilename() {
@@ -71,14 +72,17 @@ public class FindParentDirectory extends
/**
* file name to search on parent directories
- * @param filename a relative filename
+ *
+ * @param filename
+ * a relative filename
*/
public void setFilename(String filename) {
this.filename = filename;
}
/**
- * Get property to set when parent directory contains requested file
+ * Get property to set when parent directory contains requested file
+ *
* @return name of the property
*/
public String getProperty() {
@@ -87,7 +91,9 @@ public class FindParentDirectory extends
/**
* Set the property name used when parent directory contains requested file
- * @param property name of the property
+ *
+ * @param property
+ * name of the property
*/
public void setProperty(String property) {
this.property = property;
@@ -95,7 +101,8 @@ public class FindParentDirectory extends
/**
* Specify if the task should stop when a parent directory is missing the requested file
- * @return
+ *
+ * @return
*/
public boolean isHaltonmissing() {
return haltonmissing;
@@ -103,6 +110,7 @@ public class FindParentDirectory extends
/**
* Specify if the task should stop when a parent directory is missing the requested file
+ *
* @param haltonmissing
*/
public void setHaltonmissing(boolean haltonmissing) {
@@ -111,6 +119,7 @@ public class FindParentDirectory extends
/**
* Specify if the task should stop when first parent directory is found
+ *
* @return
*/
public boolean isHaltonfirstfound() {
@@ -119,10 +128,11 @@ public class FindParentDirectory extends
/**
* Specify if the task should stop when first parent directory is found
+ *
* @param haltonfirstfound
*/
public void setHaltonfirstfound(boolean haltonfirstfound) {
this.haltonfirstfound = haltonfirstfound;
}
-
+
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/GoOffline.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/GoOffline.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/GoOffline.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/GoOffline.java Tue Jan 14 10:52:21 2014
@@ -96,17 +96,18 @@ public class GoOffline extends AbstractE
*/
private void installBuildTypeAndPlugins(EasyAntReport easyAntReport) {
for (ImportedModuleReport importedModule : easyAntReport.getImportedModuleReports()) {
- install(ModuleRevisionId.parse(importedModule.getModuleMrid()),getEasyantResolverName(),EasyAntMagicNames.EASYANT_IVY_INSTANCE);
+ install(ModuleRevisionId.parse(importedModule.getModuleMrid()), getEasyantResolverName(),
+ EasyAntMagicNames.EASYANT_IVY_INSTANCE);
if (importedModule.getEasyantReport() != null) {
- //install module dependencies
- ResolveReport resolveReport=importedModule.getEasyantReport().getResolveReport();
+ // install module dependencies
+ ResolveReport resolveReport = importedModule.getEasyantReport().getResolveReport();
for (Iterator<?> iterator = resolveReport.getDependencies().iterator(); iterator.hasNext();) {
IvyNode dependency = (IvyNode) iterator.next();
install(dependency.getResolvedId(), getEasyantResolverName(),
EasyAntMagicNames.EASYANT_IVY_INSTANCE);
}
// install plugins declared inside current module
-
+
installBuildTypeAndPlugins(importedModule.getEasyantReport());
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PathTask.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PathTask.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PathTask.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PathTask.java Tue Jan 14 10:52:21 2014
@@ -27,13 +27,10 @@ import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Path.PathElement;
/**
- * This task defines or contributes to an existing path.
- * This task is similar to path task provided by ant but add
- * an override attribute with these values:
- * true: new definition will take precedence over preceding one if any
- * false: new definition will be discarded if any definition already exists
- * append: new definition will be added to the existing one if any
- * prepend: new definition will be added at the beginning of the existing one if any
+ * This task defines or contributes to an existing path. This task is similar to path task provided by ant but add an
+ * override attribute with these values: true: new definition will take precedence over preceding one if any false: new
+ * definition will be discarded if any definition already exists append: new definition will be added to the existing
+ * one if any prepend: new definition will be added at the beginning of the existing one if any
*/
public class PathTask extends Task {
public static final String OVERWRITE_TRUE = "true";
@@ -58,10 +55,8 @@ public class PathTask extends Task {
}
Object element = getProject().getReference(pathid);
if (element == null) {
- if (OVERWRITE_PREPEND.equals(overwrite)
- || OVERWRITE_APPEND.equals(overwrite)) {
- throw new BuildException("destination path not found: "
- + pathid);
+ if (OVERWRITE_PREPEND.equals(overwrite) || OVERWRITE_APPEND.equals(overwrite)) {
+ throw new BuildException("destination path not found: " + pathid);
}
getProject().addReference(pathid, path);
} else {
@@ -69,8 +64,7 @@ public class PathTask extends Task {
return;
}
if (!(element instanceof Path)) {
- throw new BuildException("destination path is not a path: "
- + element.getClass());
+ throw new BuildException("destination path is not a path: " + element.getClass());
}
if (OVERWRITE_TRUE.equals(overwrite)) {
getProject().addReference(pathid, path);
@@ -114,7 +108,8 @@ public class PathTask extends Task {
}
/**
- * Get a path id
+ * Get a path id
+ *
* @return a pathId
*/
public String getPathid() {
@@ -122,7 +117,8 @@ public class PathTask extends Task {
}
/**
- * @param pathid a pathId
+ * @param pathid
+ * a pathId
*/
public void setPathid(String pathid) {
this.pathid = pathid;
@@ -130,6 +126,7 @@ public class PathTask extends Task {
/**
* return a string which define if a path is overwritable (Possible values are true/false/append/prepend)
+ *
* @return Possible values are true/false/append/prepend
*/
public String getOverwrite() {
@@ -138,7 +135,9 @@ public class PathTask extends Task {
/**
* specify if easyant should overwrite the path (Possible values are true/false/append/prepend)
- * @param overwrite Possible values are true/false/append/prepend
+ *
+ * @param overwrite
+ * Possible values are true/false/append/prepend
*/
public void setOverwrite(String overwrite) {
this.overwrite = overwrite;
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PluginReport.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PluginReport.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PluginReport.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PluginReport.java Tue Jan 14 10:52:21 2014
@@ -232,7 +232,7 @@ public class PluginReport extends Abstra
// add the provided XSLT parameters
for (Iterator<Param> it = params.iterator(); it.hasNext();) {
- XSLTProcess.Param param = (XSLTProcess.Param) it.next();
+ XSLTProcess.Param param = it.next();
transformer.setParameter(param.getName(), param.getExpression());
}
ModuleRevisionId moduleRevisionId = easyantReport.getModuleDescriptor().getModuleRevisionId();
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PropertyTask.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PropertyTask.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PropertyTask.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PropertyTask.java Tue Jan 14 10:52:21 2014
@@ -23,9 +23,8 @@ import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Property;
/**
- * This task is similar to the Property task provided by ant except that you can
- * specify build configurations If no build configurations are specified the
- * property will be loaded in all cases, otherwise the property will be loaded
+ * This task is similar to the Property task provided by ant except that you can specify build configurations If no
+ * build configurations are specified the property will be loaded in all cases, otherwise the property will be loaded
* only if the build configuration is active
*
*/
@@ -35,19 +34,20 @@ public class PropertyTask extends Proper
@Override
public void execute() throws BuildException {
- //Build the message
- StringBuilder message= new StringBuilder("property ");
- if (getName() != null ) {
+ // Build the message
+ StringBuilder message = new StringBuilder("property ");
+ if (getName() != null) {
message.append(getName());
}
- if (getFile()!=null) {
+ if (getFile() != null) {
message.append("file ").append(getFile());
}
-
- if (BuildConfigurationHelper.isBuildConfigurationActive(getBuildConfigurations(), getProject(), message.toString())) {
+
+ if (BuildConfigurationHelper.isBuildConfigurationActive(getBuildConfigurations(), getProject(),
+ message.toString())) {
super.execute();
} else {
- log("this property will be skipped ", Project.MSG_DEBUG);
+ log("this property will be skipped ", Project.MSG_DEBUG);
}
}
@@ -58,7 +58,7 @@ public class PropertyTask extends Proper
public void setBuildConfigurations(String confs) {
this.buildConfigurations = confs;
}
-
+
public void setConf(String conf) {
this.buildConfigurations = conf;
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/RegisterArtifact.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/RegisterArtifact.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/RegisterArtifact.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/RegisterArtifact.java Tue Jan 14 10:52:21 2014
@@ -65,7 +65,7 @@ public class RegisterArtifact extends Iv
md.addArtifact(declaredConfs[j], artifact);
}
} else {
- //create configuration if it doesn't exist
+ // create configuration if it doesn't exist
if (md.getConfiguration(configurations[i]) == null) {
Configuration generatedConfiguration = new Configuration(configurations[i]);
md.addConfiguration(generatedConfiguration);
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java Tue Jan 14 10:52:21 2014
@@ -268,7 +268,7 @@ public class SubModule extends AbstractE
subModule.setJavaVersionProperty();
for (int i = 0; i < getProject().getBuildListeners().size(); i++) {
- BuildListener buildListener = (BuildListener) getProject().getBuildListeners().elementAt(i);
+ BuildListener buildListener = getProject().getBuildListeners().elementAt(i);
subModule.addBuildListener(buildListener);
}
// explicitly add the execution timer to time
@@ -560,7 +560,7 @@ public class SubModule extends AbstractE
// Needed for backward compatibility
Set<String> set = new HashSet<String>();
for (int i = properties.size() - 1; i >= 0; --i) {
- Property p = (Property) properties.get(i);
+ Property p = properties.get(i);
if (p.getName() != null && !p.getName().equals("")) {
if (set.contains(p.getName())) {
properties.remove(i);
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/FindClasspathTask.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/FindClasspathTask.java?rev=1558007&r1=1558006&r2=1558007&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/FindClasspathTask.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/FindClasspathTask.java Tue Jan 14 10:52:21 2014
@@ -24,8 +24,7 @@ import org.apache.easyant.tasks.Abstract
import org.apache.tools.ant.BuildException;
/**
- * This task provides a mechanism to build a plugin classpath depending on
- * rules.
+ * This task provides a mechanism to build a plugin classpath depending on rules.
*/
public class FindClasspathTask extends AbstractEasyAntTask {
private String pathid;
@@ -38,7 +37,7 @@ public class FindClasspathTask extends A
private List<AbstractFindClassPathStrategy> strategies = new ArrayList<AbstractFindClassPathStrategy>();
public void execute() throws BuildException {
- //define the default strategy if there is no nested strategy
+ // define the default strategy if there is no nested strategy
if (getStrategies().size() == 0) {
add(createStrategy(new ProjectDependencyStrategy()));
add(createStrategy(new BasicConfigurationStrategy()));
@@ -123,7 +122,7 @@ public class FindClasspathTask extends A
}
}
}
-
+
protected AbstractFindClassPathStrategy createStrategy(AbstractFindClassPathStrategy strategy) {
strategy.setProject(getProject());
return strategy;