Author: jlboudart
Date: Tue Aug 20 08:32:03 2013
New Revision: 1515738
URL: http://svn.apache.org/r1515738
Log:
Cleaning commented code and adding missing brackets
Modified:
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/listerners/DefaultEasyAntLogger.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/DefaultEasyAntDescriptor.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ExtensionPointReport.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ImportedModuleReport.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.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/PluginUpdateChecker.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java
Modified:
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/listerners/DefaultEasyAntLogger.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/listerners/DefaultEasyAntLogger.java?rev=1515738&r1=1515737&r2=1515738&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/listerners/DefaultEasyAntLogger.java
(original)
+++
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/listerners/DefaultEasyAntLogger.java
Tue Aug 20 08:32:03 2013
@@ -62,7 +62,7 @@ public class DefaultEasyAntLogger extend
break;
}
}
- // if (verbose || !(error instanceof BuildException)) {
+
if (verbose) {
m.append(StringUtils.getStackTrace(error));
} else {
Modified:
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/DefaultEasyAntDescriptor.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/DefaultEasyAntDescriptor.java?rev=1515738&r1=1515737&r2=1515738&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/DefaultEasyAntDescriptor.java
(original)
+++
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/DefaultEasyAntDescriptor.java
Tue Aug 20 08:32:03 2013
@@ -30,7 +30,6 @@ import org.apache.ivy.core.module.descri
public class DefaultEasyAntDescriptor implements EasyAntModuleDescriptor {
public DefaultEasyAntDescriptor() {
- // super(md);
properties = new HashMap<String, PropertyDescriptor>();
plugins = new ArrayList<PluginDescriptor>();
buildConfigurations = new ArrayList<String>();
Modified:
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ExtensionPointReport.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ExtensionPointReport.java?rev=1515738&r1=1515737&r2=1515738&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ExtensionPointReport.java
(original)
+++
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ExtensionPointReport.java
Tue Aug 20 08:32:03 2013
@@ -72,18 +72,23 @@ public class ExtensionPointReport {
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj) {
return true;
- if (obj == null)
+ }
+ if (obj == null) {
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
+ }
ExtensionPointReport other = (ExtensionPointReport) obj;
if (name == null) {
- if (other.name != null)
+ if (other.name != null) {
return false;
- } else if (!name.equals(other.name))
+ }
+ } else if (!name.equals(other.name)) {
return false;
+ }
return true;
}
Modified:
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ImportedModuleReport.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ImportedModuleReport.java?rev=1515738&r1=1515737&r2=1515738&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ImportedModuleReport.java
(original)
+++
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ImportedModuleReport.java
Tue Aug 20 08:32:03 2013
@@ -112,33 +112,44 @@ public class ImportedModuleReport {
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj) {
return true;
- if (obj == null)
+ }
+ if (obj == null) {
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
+ }
ImportedModuleReport other = (ImportedModuleReport) obj;
if (module == null) {
- if (other.module != null)
+ if (other.module != null) {
return false;
- } else if (!module.equals(other.module))
+ }
+ } else if (!module.equals(other.module)) {
return false;
+ }
if (moduleMrid == null) {
- if (other.moduleMrid != null)
+ if (other.moduleMrid != null) {
return false;
- } else if (!moduleMrid.equals(other.moduleMrid))
+ }
+ } else if (!moduleMrid.equals(other.moduleMrid)) {
return false;
+ }
if (organisation == null) {
- if (other.organisation != null)
+ if (other.organisation != null) {
return false;
- } else if (!organisation.equals(other.organisation))
+ }
+ } else if (!organisation.equals(other.organisation)) {
return false;
+ }
if (revision == null) {
- if (other.revision != null)
+ if (other.revision != null) {
return false;
- } else if (!revision.equals(other.revision))
+ }
+ } else if (!revision.equals(other.revision)) {
return false;
+ }
return true;
}
Modified:
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java?rev=1515738&r1=1515737&r2=1515738&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
(original)
+++
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
Tue Aug 20 08:32:03 2013
@@ -551,8 +551,9 @@ public class DefaultPluginServiceImpl im
}
public EasyAntModuleDescriptor getEasyAntModuleDescriptor(File
moduleDescriptor) throws Exception {
- if (moduleDescriptor == null)
+ if (moduleDescriptor == null) {
throw new Exception("moduleDescriptor cannot be null");
+ }
if (!moduleDescriptor.exists()) {
throw new Exception("imposible to find the specified module
descriptor"
+ moduleDescriptor.getAbsolutePath());
@@ -707,7 +708,6 @@ public class DefaultPluginServiceImpl im
int index = pos.getIndex();
// directly check near, triggering characters:
if (s.length() - index >= 3 && '$' == s.charAt(index) && '{' ==
s.charAt(index + 1)) {
- // int start = index + 2;
int start = index;
// defer to String.indexOf() for protracted check:
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=1515738&r1=1515737&r2=1515738&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 Aug 20 08:32:03 2013
@@ -191,10 +191,6 @@ public class PluginReport extends Abstra
}
}
- // private void genreport(String[] confs) throws IOException {
- // genStyled(confs, getReportStylePath(), xslext);
- // }
-
private File getReportStylePath() throws IOException {
if (xslFile != null) {
return xslFile;
Modified:
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PluginUpdateChecker.java
URL:
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PluginUpdateChecker.java?rev=1515738&r1=1515737&r2=1515738&view=diff
==============================================================================
---
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PluginUpdateChecker.java
(original)
+++
ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/PluginUpdateChecker.java
Tue Aug 20 08:32:03 2013
@@ -70,7 +70,7 @@ public class PluginUpdateChecker extends
.append(moduleRevisionId.getOrganisation()) //
.append('#')//
.append(moduleRevisionId.getName())//
- .append("\t")// ;
+ .append("\t")//
.append(moduleRevisionId.getRevision())//
.append(" -> ")//
.append(resolvedRevision);
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=1515738&r1=1515737&r2=1515738&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 Aug 20 08:32:03 2013
@@ -320,8 +320,9 @@ public class SubModule extends AbstractE
}
List<ExecutionResult> childResults = (List<ExecutionResult>) child
.getReference(SubBuildExecutionTimer.EXECUTION_TIMER_SUBBUILD_RESULTS);
- if (childResults != null)
+ if (childResults != null) {
allresults.addAll(childResults);
+ }
}
/**
@@ -680,8 +681,9 @@ public class SubModule extends AbstractE
}
public TargetList(String... targets) {
- for (String target : targets)
+ for (String target : targets) {
add(target);
+ }
}
}
}
