donaldp 2002/06/23 01:52:25
Modified: container/src/java/org/apache/myrmidon/components/configurer
ConfigurationState.java DefaultConfigurer.java
Added: container/src/java/org/apache/myrmidon/components/configurer
ObjectConfigurer.java
Removed: container/src/java/org/apache/myrmidon/components/configurer
DefaultObjectConfigurer.java
Log:
Rename DefaultObjectConfigurer to ObjectConfigurer
Revision Changes Path
1.8 +4 -4
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/ConfigurationState.java
Index: ConfigurationState.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/ConfigurationState.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConfigurationState.java 23 Jun 2002 08:51:29 -0000 1.7
+++ ConfigurationState.java 23 Jun 2002 08:52:25 -0000 1.8
@@ -17,10 +17,10 @@
class ConfigurationState
{
private final int[] m_propertyCount;
- private final DefaultObjectConfigurer m_configurer;
+ private final ObjectConfigurer m_configurer;
private final Object m_object;
- public ConfigurationState( final DefaultObjectConfigurer configurer,
+ public ConfigurationState( final ObjectConfigurer configurer,
final Object object,
final int propertyCount )
{
@@ -32,7 +32,7 @@
/**
* Returns the configurer being used to configure the object.
*/
- public DefaultObjectConfigurer getConfigurer()
+ public ObjectConfigurer getConfigurer()
{
return m_configurer;
}
1.56 +8 -8
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
Index: DefaultConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- DefaultConfigurer.java 23 Jun 2002 08:51:29 -0000 1.55
+++ DefaultConfigurer.java 23 Jun 2002 08:52:25 -0000 1.56
@@ -111,7 +111,7 @@
{
// Start configuration of the object
final String elemName = model.getName();
- final DefaultObjectConfigurer configurer = getConfigurer( clazz
);
+ final ObjectConfigurer configurer = getConfigurer( clazz );
final ConfigurationState state = configurer.startConfiguration(
object );
// Set each of the attributes
@@ -234,7 +234,7 @@
throws ModelException
{
// Locate the configurer for this object
- final DefaultObjectConfigurer configurer = getConfigurer( clazz );
+ final ObjectConfigurer configurer = getConfigurer( clazz );
// TODO - this ain't right, the validation is going to be screwed up
final ConfigurationState state = configurer.startConfiguration(
object );
@@ -431,14 +431,14 @@
/**
* Locates the configurer for a particular class.
*/
- private DefaultObjectConfigurer getConfigurer( final Class clazz )
+ private ObjectConfigurer getConfigurer( final Class clazz )
throws ModelException
{
- DefaultObjectConfigurer configurer =
- (DefaultObjectConfigurer)m_configurerCache.get( clazz );
+ ObjectConfigurer configurer =
+ (ObjectConfigurer)m_configurerCache.get( clazz );
if( null == configurer )
{
- configurer = DefaultObjectConfigurer.getConfigurer( clazz );
+ configurer = ObjectConfigurer.getConfigurer( clazz );
m_configurerCache.put( clazz, configurer );
}
return configurer;
@@ -499,7 +499,7 @@
* @param configurer The configurer for the class being configured.
* @param name The attribute/element name.
*/
- private PropertyConfigurer getConfigurerFromName( final
DefaultObjectConfigurer configurer,
+ private PropertyConfigurer getConfigurerFromName( final ObjectConfigurer
configurer,
final String name,
boolean ignoreRoleName,
final boolean isAdder,
1.10 +363 -21
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/ObjectConfigurer.java
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
