You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2002/07/02 09:38:22 UTC
cvs commit: jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace ProjectEntry.java
donaldp 2002/07/02 00:38:22
Modified: container/src/java/org/apache/myrmidon/components/workspace
ProjectEntry.java
Log:
Use TaskContext rather than ExecutionFrame
Revision Changes Path
1.18 +17 -16 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/ProjectEntry.java
Index: ProjectEntry.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/ProjectEntry.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ProjectEntry.java 30 Jun 2002 10:49:40 -0000 1.17
+++ ProjectEntry.java 2 Jul 2002 07:38:21 -0000 1.18
@@ -8,18 +8,18 @@
package org.apache.myrmidon.components.workspace;
import java.util.HashMap;
-import java.util.Map;
import java.util.Iterator;
-import org.apache.myrmidon.interfaces.embeddor.ExecutionFrame;
+import java.util.Map;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.myrmidon.api.TaskContext;
+import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.interfaces.model.Target;
+import org.apache.myrmidon.interfaces.property.NameValidator;
+import org.apache.myrmidon.interfaces.property.NameValidatorManager;
import org.apache.myrmidon.interfaces.workspace.ProjectRef;
import org.apache.myrmidon.interfaces.workspace.ProjectRefs;
-import org.apache.myrmidon.interfaces.property.NameValidatorManager;
-import org.apache.myrmidon.interfaces.property.NameValidator;
-import org.apache.myrmidon.api.TaskException;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
/**
* This contains details for each project that is being executed by a
@@ -36,7 +36,6 @@
final static String KEY = ProjectEntry.class.getName();
- private final ExecutionFrame m_frame;
private final Project m_project;
private final NameValidator m_projectValidator;
private final NameValidator m_targetValidator;
@@ -52,18 +51,20 @@
/** Self reference to the project. */
private final ProjectRef m_selfRef;
+ private TaskContext m_taskContext;
public ProjectEntry( final Project project,
- final ExecutionFrame frame )
+ final TaskContext taskContext )
throws TaskException
{
m_project = project;
- m_frame = frame;
+ m_taskContext = taskContext;
- // Lookup the name validators
try
{
- final NameValidatorManager validatorManager = (NameValidatorManager)frame.lookup( NameValidatorManager.ROLE );
+ // Lookup the name validators
+ final NameValidatorManager validatorManager =
+ (NameValidatorManager)m_taskContext.getService( NameValidatorManager.class );
m_projectValidator = validatorManager.getValidator( NameValidatorManager.PROJECT_STYLE );
m_targetValidator = validatorManager.getValidator( NameValidatorManager.TARGET_STYLE );
}
@@ -171,7 +172,7 @@
final String message = REZ.getString( "no-target-name.error" );
throw new TaskException( message );
}
- if( ! name.equals( Project.IMPLICIT_TARGET_NAME ) )
+ if( !name.equals( Project.IMPLICIT_TARGET_NAME ) )
{
try
{
@@ -192,9 +193,9 @@
m_targets.put( target.getName(), target );
}
- public ExecutionFrame getFrame()
+ public TaskContext getContext()
{
- return m_frame;
+ return m_taskContext;
}
public TargetState getTargetState( final Target target )
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>