ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gscok...@apache.org
Subject svn commit: r953144 - in /ant/ivy/core/trunk/src/java/org/apache/ivy: core/retrieve/RetrieveEngine.java plugins/parser/m2/PomModuleDescriptorBuilder.java plugins/repository/sftp/SFTPRepository.java
Date Wed, 09 Jun 2010 20:25:32 GMT
Author: gscokart
Date: Wed Jun  9 20:25:32 2010
New Revision: 953144

URL: http://svn.apache.org/viewvc?rev=953144&view=rev
Log:
Some more spaces for checkstyle validation

Modified:
    ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java?rev=953144&r1=953143&r2=953144&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java Wed Jun 
9 20:25:32 2010
@@ -357,9 +357,9 @@ public class RetrieveEngine {
                 for (int i = artifactsList.size() - 2; i >= 0; i--) {
                     ArtifactDownloadReport current = (ArtifactDownloadReport) artifactsList.get(i);
                     if (winnerMD.equals(current.getArtifact().getModuleRevisionId())) {
-                        throw new RuntimeException("Multiple artifacts of the module " +
winnerMD +
-                                " are retrieved to the same file! Update the retrieve pattern
" +
-                        		" to fix this error.");
+                        throw new RuntimeException("Multiple artifacts of the module " +
winnerMD
+                                + " are retrieved to the same file! Update the retrieve pattern
"
+                                + " to fix this error.");
                     }
                 }
                 

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java?rev=953144&r1=953143&r2=953144&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
Wed Jun  9 20:25:32 2010
@@ -193,6 +193,9 @@ public class PomModuleDescriptorBuilder 
     
     private ParserSettings parserSettings;
 
+    private static final String WRONG_NUMBER_OF_PARTS_MSG = "what seemed to be a dependency
"
+            + "management extra info exclusion had the wrong number of parts (should have
2) ";
+
     
     public PomModuleDescriptorBuilder(
             ModuleDescriptorParser parser, Resource res, ParserSettings ivySettings) {
@@ -362,7 +365,7 @@ public class PomModuleDescriptorBuilder 
                                     dep.getGroupId(), dep.getArtifactId());
             ivyModuleDescriptor.addExtraInfo(scopeKey, dep.getScope());
         }
-        if(!dep.getExcludedModules().isEmpty()) {
+        if (!dep.getExcludedModules().isEmpty()) {
             final String exclusionPrefix = getDependencyMgtExtraInfoPrefixForExclusion(
                     dep.getGroupId(), dep.getArtifactId());
             int index = 0;
@@ -488,9 +491,9 @@ public class PomModuleDescriptorBuilder 
             if (key.startsWith(exclusionPrefix)) {
                 final String full_exclusion = (String) ent.getValue();
                 final String[] exclusion_parts = full_exclusion.split(EXTRA_INFO_DELIMITER);
-                if(exclusion_parts.length != 2) {
-                    Message.error("what seemed to be a dependency management extra info exclusion
" +
-                            "had the wrong number of parts (should have 2) " + exclusion_parts.length
+ " : " + full_exclusion);
+                if (exclusion_parts.length != 2) {
+                    Message.error(WRONG_NUMBER_OF_PARTS_MSG + exclusion_parts.length + "
: "
+                            + full_exclusion);
                     continue;
                 }
                 exclusionIds.add(ModuleId.newInstance(exclusion_parts[0], exclusion_parts[1]));

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java?rev=953144&r1=953143&r2=953144&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java
Wed Jun  9 20:25:32 2010
@@ -206,7 +206,7 @@ public class SFTPRepository extends Abst
             Collection r = c.ls(path);
             if (r != null) {
                 if (!path.endsWith("/")) {
-                	path = parent + "/";
+                    path = parent + "/";
                 }
                 List result = new ArrayList();
                 for (Iterator iter = r.iterator(); iter.hasNext();) {



Mime
View raw message