donaldp 02/03/05 01:22:40
Modified:
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
DefaultPropertyConfigurer.java
DefaultObjectConfigurer.java
Added:
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
ConfigurationState.java
Removed:
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
DefaultConfigurationState.java
Log:
No need for separation between ConfigurationState and
DefaultConfigurationState at this stage so push it all into one class
Revision Changes Path
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java
Index: DefaultPropertyConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultPropertyConfigurer.java 5 Mar 2002 09:09:34 -0000 1.6
+++ DefaultPropertyConfigurer.java 5 Mar 2002 09:22:40 -0000 1.7
@@ -18,7 +18,7 @@
* create and set property values.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.6 $ $Date: 2002/03/05 09:09:34 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/05 09:22:40 $
*/
class DefaultPropertyConfigurer
implements PropertyConfigurer
@@ -63,7 +63,7 @@
public void addValue( final ConfigurationState state, final Object value
)
throws ConfigurationException
{
- final DefaultConfigurationState defState =
(DefaultConfigurationState)state;
+ final ConfigurationState defState = (ConfigurationState)state;
// Check the property count
if( defState.getPropertyCount( m_propIndex ) >= m_maxCount )
1.15 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java
Index: DefaultObjectConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultObjectConfigurer.java 5 Mar 2002 09:09:34 -0000 1.14
+++ DefaultObjectConfigurer.java 5 Mar 2002 09:22:40 -0000 1.15
@@ -24,7 +24,7 @@
* of a class.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.14 $ $Date: 2002/03/05 09:09:34 $
+ * @version $Revision: 1.15 $ $Date: 2002/03/05 09:22:40 $
*/
class DefaultObjectConfigurer
implements ObjectConfigurer
@@ -251,7 +251,7 @@
public ConfigurationState startConfiguration( Object object )
throws ConfigurationException
{
- return new DefaultConfigurationState( this, object,
m_allProps.size() );
+ return new ConfigurationState( this, object, m_allProps.size() );
}
/**
@@ -262,7 +262,7 @@
throws ConfigurationException
{
// Make sure there are no pending created objects
- final DefaultConfigurationState defState =
(DefaultConfigurationState)state;
+ final ConfigurationState defState = (ConfigurationState)state;
return defState.getObject();
}
1.5 +39 -5
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ConfigurationState.java
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
