From 6d5ce5b54d4424f74298d7aac6778539e286b8f4 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Tue, 5 Mar 2002 09:22:40 +0000 Subject: [PATCH] No need for separation between ConfigurationState and DefaultConfigurationState at this stage so push it all into one class git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271744 13f79535-47bb-0310-9956-ffa450edef68 --- ...ltConfigurationState.java => ConfigurationState.java} | 9 +++------ .../components/configurer/DefaultObjectConfigurer.java | 4 ++-- .../components/configurer/DefaultPropertyConfigurer.java | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) rename proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/{DefaultConfigurationState.java => ConfigurationState.java} (82%) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurationState.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ConfigurationState.java similarity index 82% rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurationState.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ConfigurationState.java index f4d0749b1..54748122d 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurationState.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ConfigurationState.java @@ -9,21 +9,18 @@ package org.apache.myrmidon.components.configurer; /** * A default configuration state implementation. Keeps track of which - * of the object's properties have been set. Also keeps track of the - * objects created by the creator methods, but not yet set by the adder - * methods. + * of the object's properties have been set. * * @author Adam Murdoch * @version $Revision$ $Date$ */ -class DefaultConfigurationState - implements ConfigurationState +class ConfigurationState { private final int[] m_propertyCount; private final ObjectConfigurer m_configurer; private final Object m_object; - public DefaultConfigurationState( final ObjectConfigurer configurer, + public ConfigurationState( final ObjectConfigurer configurer, final Object object, final int propertyCount ) { diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java index d40a7bbd9..4ea55ad25 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java @@ -251,7 +251,7 @@ class DefaultObjectConfigurer 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 @@ class DefaultObjectConfigurer throws ConfigurationException { // Make sure there are no pending created objects - final DefaultConfigurationState defState = (DefaultConfigurationState)state; + final ConfigurationState defState = (ConfigurationState)state; return defState.getObject(); } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java index 71fae50de..03cc96135 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java @@ -63,7 +63,7 @@ class DefaultPropertyConfigurer 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 )