ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/repository Libraries.java MavenRepository.java
Date Fri, 21 Jan 2005 14:03:46 GMT
peterreilly    2005/01/21 06:03:46

  Modified:    src/main/org/apache/tools/ant/taskdefs/repository
                        Libraries.java MavenRepository.java
  Log:
  checkstyle - space around operators
  
  Revision  Changes    Path
  1.7       +10 -9     ant/src/main/org/apache/tools/ant/taskdefs/repository/Libraries.java
  
  Index: Libraries.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/repository/Libraries.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Libraries.java	21 Jan 2005 13:15:34 -0000	1.6
  +++ Libraries.java	21 Jan 2005 14:03:46 -0000	1.7
  @@ -99,13 +99,13 @@
        * where maven stores stuff, and where we save stuff too, unless
        * declared otherwise.
        */
  -    public static final String MAVEN_LOCATION=".maven/repository";
  +    public static final String MAVEN_LOCATION = ".maven/repository";
   
       /**
        * name of the property which can provide an override of the repository dir
        * from {@link #MAVEN_LOCATION}
        */
  -    public static final String REPOSITORY_DIR_PROPERTY="ant.maven.repository.dir";
  +    public static final String REPOSITORY_DIR_PROPERTY = "ant.maven.repository.dir";
       /**
        * name of the property which can provide an override of the repository URL
        */
  @@ -134,8 +134,8 @@
           File mavenDir
                   = new File(System.getProperty("user.home"), MAVEN_LOCATION);
           String propertyDir = getProject().getProperty(REPOSITORY_DIR_PROPERTY);
  -        if(propertyDir!=null) {
  -            mavenDir=getProject().resolveFile(propertyDir);
  +        if (propertyDir != null) {
  +            mavenDir = getProject().resolveFile(propertyDir);
           }
           return mavenDir;
       }
  @@ -359,11 +359,12 @@
        */
       public void validate() {
           if (destDir == null) {
  -            destDir=locateDefaultDestDirectory();
  +            destDir = locateDefaultDestDirectory();
           }
           if (repository == null) {
  -            MavenRepository maven=(MavenRepository)getProject().createDataType(MavenRepository.TYPE_NAME);
  -            repository=maven;
  +            MavenRepository maven =
  +                (MavenRepository) getProject().createDataType(MavenRepository.TYPE_NAME);
  +            repository = maven;
           }
           Iterator it = libraries.iterator();
           while (it.hasNext()) {
  @@ -433,7 +434,7 @@
   
           if (isOffline()) {
               log("No retrieval, task is \"offline\"");
  -            retrieve=false;
  +            retrieve = false;
           }
   
           //see if we need to do a download
  @@ -568,7 +569,7 @@
               Library library = (Library) it.next();
               if (library.isToFetch()) {
                   count++;
  -            };
  +            }
           }
           return count;
       }
  
  
  
  1.6       +4 -4      ant/src/main/org/apache/tools/ant/taskdefs/repository/MavenRepository.java
  
  Index: MavenRepository.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/repository/MavenRepository.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MavenRepository.java	21 Jan 2005 07:12:52 -0000	1.5
  +++ MavenRepository.java	21 Jan 2005 14:03:46 -0000	1.6
  @@ -74,12 +74,12 @@
        * @throws BuildException if unhappy
        */
       public void validate() {
  -        if(getUrl()==null) {
  +        if (getUrl() == null) {
               //we have no URL yet; so use the maven one
  -            if(getProject()!=null) {
  -                String urlProperty=getProject()
  +            if (getProject() != null) {
  +                String urlProperty = getProject()
                           .getProperty(Libraries.REPOSITORY_URL_PROPERTY);
  -                if(urlProperty!=null) {
  +                if (urlProperty != null) {
                       setUrl(urlProperty);
                   } else {
                       setUrl(MAVEN_URL);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message