Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 41007 invoked from network); 17 Nov 2001 07:19:27 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 17 Nov 2001 07:19:27 -0000 Received: (qmail 15610 invoked by uid 97); 17 Nov 2001 07:19:38 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org Received: (qmail 15594 invoked by uid 97); 17 Nov 2001 07:19:38 -0000 Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-cvs@jakarta.apache.org Received: (qmail 15583 invoked by uid 97); 17 Nov 2001 07:19:37 -0000 Date: 17 Nov 2001 07:05:31 -0000 Message-ID: <20011117070531.55401.qmail@icarus.apache.org> From: donaldp@apache.org To: jakarta-avalon-phoenix-cvs@apache.org Subject: cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo BlockDescriptor.java BlockInfo.java DependencyDescriptor.java ServiceDescriptor.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N donaldp 01/11/16 23:05:31 Modified: src/java/org/apache/avalon/phoenix/metainfo BlockDescriptor.java BlockInfo.java DependencyDescriptor.java ServiceDescriptor.java Log: Ran styleformatter overcode base. Revision Changes Path 1.4 +2 -2 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/BlockDescriptor.java Index: BlockDescriptor.java =================================================================== RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/BlockDescriptor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BlockDescriptor.java 2001/09/20 12:19:35 1.3 +++ BlockDescriptor.java 2001/11/17 07:05:31 1.4 @@ -15,8 +15,8 @@ */ public class BlockDescriptor { - private final String m_classname; - private final Version m_version; + private final String m_classname; + private final Version m_version; //private final ConfigSchema m_schema; public BlockDescriptor( final String classname, final Version version ) 1.5 +10 -9 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/BlockInfo.java Index: BlockInfo.java =================================================================== RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/BlockInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BlockInfo.java 2001/08/27 08:16:28 1.4 +++ BlockInfo.java 2001/11/17 07:05:31 1.5 @@ -11,27 +11,28 @@ /** * This descrbes information about the block that is used by administration tools and kernel. - * + * * @author Peter Donald */ public class BlockInfo implements Info { - private final BlockDescriptor m_descriptor; - private final ServiceDescriptor[] m_services; - private final DependencyDescriptor[] m_dependencies; + private final BlockDescriptor m_descriptor; + private final ServiceDescriptor[] m_services; + private final DependencyDescriptor[] m_dependencies; /** * Basic constructor that takes as parameters all parts. */ - public BlockInfo( final BlockDescriptor descriptor, - final ServiceDescriptor[] services, + public BlockInfo( final BlockDescriptor descriptor, + final ServiceDescriptor[] services, final DependencyDescriptor[] dependencies ) { m_descriptor = descriptor; m_services = services; m_dependencies = dependencies; } + /** * Return meta information that is generallly only required by administration tools. * @@ -43,7 +44,7 @@ { return m_descriptor; } - + /** * This returns a list of Services that this block exports. * @@ -57,7 +58,7 @@ /** * Return an array of Service dependencies that this Block depends upon. * - * @return an array of Service dependencies (may be null) + * @return an array of Service dependencies (may be null) */ public DependencyDescriptor[] getDependencies() { @@ -79,7 +80,7 @@ return m_dependencies[ i ]; } } - + return null; } } 1.4 +3 -3 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/DependencyDescriptor.java Index: DependencyDescriptor.java =================================================================== RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/DependencyDescriptor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DependencyDescriptor.java 2001/08/26 17:11:26 1.3 +++ DependencyDescriptor.java 2001/11/17 07:05:31 1.4 @@ -7,8 +7,8 @@ */ package org.apache.avalon.phoenix.metainfo; -import org.apache.avalon.framework.Version; + /** * A descriptor that describes dependency information for Block. * @@ -16,8 +16,8 @@ */ public final class DependencyDescriptor { - private final String m_role; - private final ServiceDescriptor m_service; + private final String m_role; + private final ServiceDescriptor m_service; /** * Constructor that has all parts as parameters. 1.4 +6 -7 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/ServiceDescriptor.java Index: ServiceDescriptor.java =================================================================== RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/ServiceDescriptor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ServiceDescriptor.java 2001/08/26 17:11:26 1.3 +++ ServiceDescriptor.java 2001/11/17 07:05:31 1.4 @@ -11,13 +11,13 @@ /** * This interface describes a particular service that a component offers. - * + * * @author Peter Donald */ -public final class ServiceDescriptor +public final class ServiceDescriptor { - private final Version m_version; - private final String m_name; + private final Version m_version; + private final String m_name; public ServiceDescriptor( final String name, final Version version ) { @@ -36,7 +36,7 @@ } /** - * Return name of Service (which coresponds to the interface + * Return name of Service (which coresponds to the interface * name eg org.apache.block.Logger) * * @return the name of the Service @@ -46,7 +46,6 @@ return m_name; } - /** * Determine if other service will match this service. * To match a service has to have same name and must comply with version. @@ -56,7 +55,7 @@ */ public boolean matches( final ServiceDescriptor other ) { - return + return other.getName().equals( m_name ) && other.getVersion().complies( m_version ); } -- To unsubscribe, e-mail: For additional commands, e-mail: