Browse Source

Move DefaultProject into builder directory as that is the only place it is used. This is cleaning up the interdependencies between container components..

Detected by JDepend


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271059 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
819831f11e
4 changed files with 13 additions and 9 deletions
  1. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProject.java
  2. +9
    -6
      proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
  3. +3
    -0
      proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/Resources.properties
  4. +0
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Resources.properties

proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultProject.java → proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProject.java View File

@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.myrmidon.components.model;
package org.apache.myrmidon.components.builder;

import java.io.File;
import java.util.ArrayList;

+ 9
- 6
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java View File

@@ -17,13 +17,11 @@ import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.avalon.framework.CascadingException;

import org.apache.avalon.framework.Version;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.myrmidon.components.model.DefaultProject;
import org.apache.myrmidon.framework.Condition;
import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
import org.apache.myrmidon.interfaces.model.Project;
@@ -263,9 +261,11 @@ public class DefaultProjectBuilder
}
}

if( name.equals( "target" ) ) {
if( name.equals( "target" ) )
{
buildTarget( project, element );
} else
}
else
{
final String message =
REZ.getString( "ant.unknown-toplevel-element.error", name, element.getLocation() );
@@ -456,9 +456,12 @@ public class DefaultProjectBuilder

protected boolean validName( final String name )
{
if( -1 != name.indexOf( "->" ) ) {
if( -1 != name.indexOf( "->" ) )
{
return false;
} else {
}
else
{
return true;
}
}


+ 3
- 0
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/Resources.properties View File

@@ -26,3 +26,6 @@ ant.target-bad-dependency.error=Discovered empty dependency in target {0} at {1}
ant.malformed.version=Malformed version string "{0}" specified in version attribute of project.
ant.version-missing.error=Missing version attribute from project.
ant.bad-version.error=Incompatible build file version detected. Expected {0} but found {1}.

duplicate-project.error=Can not have two projects referenced in a file with the name {0}.
duplicate-target.error=Can not have two targets in a file with the name {0}.

+ 0
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Resources.properties View File

@@ -1,2 +0,0 @@
duplicate-project.error=Can not have two projects referenced in a file with the name {0}.
duplicate-target.error=Can not have two targets in a file with the name {0}.

Loading…
Cancel
Save