Author: painter
Date: Tue Nov 6 17:37:22 2018
New Revision: 1845941
URL: http://svn.apache.org/viewvc?rev=1845941&view=rev
Log:
Javadoc cleanup
Modified:
turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java
turbine/fulcrum/trunk/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java
Modified:
turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java?rev=1845941&r1=1845940&r2=1845941&view=diff
==============================================================================
---
turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java
(original)
+++
turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java
Tue Nov 6 17:37:22 2018
@@ -47,6 +47,9 @@ import org.apache.commons.configuration.
* Starts up a commons configuration Configuration object via an
* Avalon container.
*
+ * avalon.component name="config" lifestyle="singleton"
+ * avalon.service type="org.apache.commons.configuration.Configuration"
+ * avalon.attribute key="urn:composition:deployment.timeout" value="0"
*
* The component configuration is carved after the
* <a
href="http://commons.apache.org/configuration/howto_configurationfactory.html";>CompositeConfiguraton</a>
@@ -69,9 +72,6 @@ import org.apache.commons.configuration.
* @author <a href="mailto:mcconn...@apache.org";>Stephen McConnell</a>
* @author <a href="mailto:t...@apache.org";>Thomas Vandahl</a>
* @version $Id$
- * @avalon.component name="config" lifestyle="singleton"
- * @avalon.service type="org.apache.commons.configuration.Configuration"
- * @avalon.attribute key="urn:composition:deployment.timeout" value="0"
*
*/
public class DefaultConfigurationService
@@ -115,22 +115,23 @@ public class DefaultConfigurationService
return configuration.containsKey(arg0);
}
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
@Override
public boolean equals(Object obj)
{
- if (obj == configuration) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (configuration.getClass() == obj.getClass()) {
- return configuration.equals(((CompositeConfiguration)obj));
- }
- return false;
+ if ( obj == null ) {
+ return false;
+ } else {
+ if ( (obj instanceof CompositeConfiguration) == false )
+ {
+ return false;
+ } else {
+ CompositeConfiguration mObj =
(CompositeConfiguration) obj;
+ return mObj.equals( this.configuration );
+ }
+ }
}
/**
@@ -649,9 +650,9 @@ public class DefaultConfigurationService
}
}
- /**
+ /* (non-Javadoc)
+ * avalon.entry key="urn:avalon:home" type="java.io.File"
* @see
org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
- * @avalon.entry key="urn:avalon:home" type="java.io.File"
*/
@Override
public void contextualize(Context context) throws ContextException
Modified:
turbine/fulcrum/trunk/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java?rev=1845941&r1=1845940&r2=1845941&view=diff
==============================================================================
---
turbine/fulcrum/trunk/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java
(original)
+++
turbine/fulcrum/trunk/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java
Tue Nov 6 17:37:22 2018
@@ -36,13 +36,16 @@ public class ConfigTest extends BaseUnit
/**
* Constructor for test.
*
- * @param testName name of the test being executed
+ * @param name name of the test being executed
*/
public ConfigTest(String name)
{
super( name );
}
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#setUp()
+ */
public void setUp() throws Exception
{
super.setUp();
@@ -60,7 +63,6 @@ public class ConfigTest extends BaseUnit
/**
* Verifies that the ConfigurationFactory works properly.
- *
*/
public void testLoad()
{
