You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2001/11/17 08:05:31 UTC
cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo BlockDescriptor.java BlockInfo.java DependencyDescriptor.java ServiceDescriptor.java
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 <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
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 <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
-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: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>