You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/12/08 21:31:03 UTC
svn commit: r724472 - in /maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks: Config.java DependenciesTask.java Messages.properties Settings.java

Author: ogusakov
Date: Mon Dec  8 12:31:02 2008
New Revision: 724472

URL: http://svn.apache.org/viewvc?rev=724472&view=rev
Log:
refactoring

Added:
    maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java   (contents, props changed)
      - copied, changed from r724468, maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Settings.java
Removed:
    maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Settings.java
Modified:
    maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/DependenciesTask.java
    maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties

Copied: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java (from r724468, maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Settings.java)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java?p2=maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java&p1=maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Settings.java&r1=724468&r2=724472&rev=724472&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Settings.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java Mon Dec  8 12:31:02 2008
@@ -20,7 +20,7 @@
  * @version $Id$
  *
  */
-public class Settings
+public class Config
 extends AbstractDataType
 {
   Collection<AbstractRepository> _repositories;

Propchange: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/DependenciesTask.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/DependenciesTask.java?rev=724472&r1=724471&r2=724472&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/DependenciesTask.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/DependenciesTask.java Mon Dec  8 12:31:02 2008
@@ -72,13 +72,13 @@
       else 
         return;
     
-    if( ! Settings.class.isAssignableFrom( so.getClass() ) )
+    if( ! Config.class.isAssignableFrom( so.getClass() ) )
       if( _failonerror )
         throw new BuildException( _lang.getMessage( "settings.id.object.wrong", _settingsid, so.getClass().getName() ));
       else 
         return;
     
-    Settings settings = (Settings)so;
+    Config settings = (Config)so;
     
     try
     {

Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties?rev=724472&r1=724471&r2=724472&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties Mon Dec  8 12:31:02 2008
@@ -1,5 +1,5 @@
 dependencies.task.name=Mercury Dependencies
 dependencies.task.desc=this task prepares a list of dependencies, resolves them and arranges into a path
-settings.id.mandatory=settingsid attribute is mandatory, cannot create repositories without it
+settings.id.mandatory=configid attribute is mandatory, cannot create repositories without it
 settings.id.object.null=object pointed by {0} is null 
 settings.id.object.wrong=object pointed by {0} is of type {1} instead of Settings