You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/07/26 18:28:52 UTC
cvs commit: avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl DefaultDependencyModel.java
mcconnell 2003/07/26 09:28:52
Modified: merlin/composition/src/java/org/apache/avalon/composition/model/impl
DefaultDependencyModel.java
Log:
Housekeeping.
Revision Changes Path
1.6 +0 -50 avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java
Index: DefaultDependencyModel.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultDependencyModel.java 25 Jul 2003 06:14:05 -0000 1.5
+++ DefaultDependencyModel.java 26 Jul 2003 16:28:52 -0000 1.6
@@ -180,56 +180,6 @@
}
/**
- * Select a model for a set of candidates taking into account the
- * the dependency directives and dependency descriptors associated
- * with the component type that this model is representing.
- *
- * @param key the dependency key
- * @param candidates the set of candidate models
- * @return the selected candidate
- */
- public Model select( Model[] candidates ) throws ModelException
- {
- if( m_directive != null )
- {
- if( m_directive.getSource() != null )
- {
- //
- // its an explicit assignment
- //
-
- String path = m_directive.getSource();
- String source = resolvePath( m_partition, path );
- for( int i=0; i<candidates.length; i++ )
- {
- final Model candidate = candidates[i];
- final String name = candidate.getQualifiedName();
- if( source.equals( name ) )
- {
- getLogger().debug(
- "selected [" + name + "] for key ["
- + m_descriptor.getKey() + "] using [" + path + "].");
- return candidate;
- }
- }
-
- //
- // and if we get here it means that the explicit
- // directive did not lead to a resolvable solution
- // so we need to get nasty and throw an exception
- //
-
- final String error =
- REZ.getString(
- "dependency.unresolvable-directive.error",
- m_descriptor.getKey(), m_partition, m_name, path );
- throw new ModelException( error );
- }
- }
- return null;
- }
-
- /**
* Filter a set of candidate service descriptors and return the
* set of acceptable service as a ordered sequence.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org