akarasulu 2003/11/02 18:09:05
Modified: merlin/util/defaults .cvsignore
merlin/util/defaults/src/java/org/apache/avalon/defaults
SimpleDefaultsFinder.java
Log:
Added extra convenience constructor.
Revision Changes Path
1.2 +1 -0 avalon/merlin/util/defaults/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/merlin/util/defaults/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2 Nov 2003 16:59:38 -0000 1.1
+++ .cvsignore 3 Nov 2003 02:09:05 -0000 1.2
@@ -1,3 +1,4 @@
.classpath
.project
target
+maven.log
1.2 +112 -99
avalon/merlin/util/defaults/src/java/org/apache/avalon/defaults/SimpleDefaultsFinder.java
Index: SimpleDefaultsFinder.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/util/defaults/src/java/org/apache/avalon/defaults/SimpleDefaultsFinder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleDefaultsFinder.java 2 Nov 2003 16:59:38 -0000 1.1
+++ SimpleDefaultsFinder.java 3 Nov 2003 02:09:05 -0000 1.2
@@ -1,99 +1,112 @@
-/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
- "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact [EMAIL PROTECTED]
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-
-package org.apache.avalon.defaults ;
-
-
-import java.util.Properties ;
-
-
-/**
- * Attempts to discover defaults using an array of Properties as value sources.
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">Alex Karasulu</a>
- * @author $Author$
- * @version $Revision$
- */
-public class SimpleDefaultsFinder implements DefaultsFinder
-{
- /** Properties array to use for discovery */
- private Properties [] m_sources ;
- /** halt on first finding flag */
- private boolean m_haltOnDiscovery = true ;
-
-
- /**
- * Creates a simple defaults filder that searches a set of source Properties
- * for default values.
- *
- * @param a_sources the source Properties to discover values in
- * @param a_haltOnDiscovery true to halt search when first value is
- * discovered, false to continue search overriding values until the last
- * value is discovered.
- */
- public SimpleDefaultsFinder( Properties [] a_sources,
- boolean a_haltOnDiscovery )
- {
- m_sources = a_sources ;
- m_haltOnDiscovery = a_haltOnDiscovery ;
- }
-
-
- /**
- * Applies default discovery using properties in array of properties.
- *
- * @see org.apache.avalon.defaults.DefaultsFinder#find(
- * org.apache.avalon.defaults.Defaults)
- */
- public void find( Defaults a_defaults )
- {
- Defaults.discover( a_defaults, m_sources, m_haltOnDiscovery ) ;
- }
-}
+/*
+
+ ============================================================================
+ The Apache Software License, Version 1.1
+ ============================================================================
+
+ Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modifica-
+ tion, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ 3. The end-user documentation included with the redistribution, if any, must
+ include the following acknowledgment: "This product includes software
+ developed by the Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself, if
+ and wherever such third-party acknowledgments normally appear.
+
+ 4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
+ "Apache Software Foundation" must not be used to endorse or promote
+ products derived from this software without prior written
+ permission. For written permission, please contact [EMAIL PROTECTED]
+
+ 5. Products derived from this software may not be called "Apache", nor may
+ "Apache" appear in their name, without prior written permission of the
+ Apache Software Foundation.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many individuals
+ on behalf of the Apache Software Foundation. For more information on the
+ Apache Software Foundation, please see <http://www.apache.org/>.
+
+*/
+
+package org.apache.avalon.defaults ;
+
+
+import java.util.Properties ;
+
+
+/**
+ * Attempts to discover defaults using an array of Properties as value sources.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Alex Karasulu</a>
+ * @author $Author$
+ * @version $Revision$
+ */
+public class SimpleDefaultsFinder implements DefaultsFinder
+{
+ /** Properties array to use for discovery */
+ private Properties [] m_sources ;
+ /** halt on first finding flag */
+ private boolean m_haltOnDiscovery = true ;
+
+
+ /**
+ * Creates a simple defaults filder that searches a single source Properties
+ * for default values.
+ *
+ * @param a_source single source Properties to discover values in
+ */
+ public SimpleDefaultsFinder( Properties a_source )
+ {
+ m_sources = new Properties [] { a_source } ;
+ m_haltOnDiscovery = false ;
+ }
+
+
+ /**
+ * Creates a simple defaults filder that searches a set of source Properties
+ * for default values.
+ *
+ * @param a_sources the source Properties to discover values in
+ * @param a_haltOnDiscovery true to halt search when first value is
+ * discovered, false to continue search overriding values until the last
+ * value is discovered.
+ */
+ public SimpleDefaultsFinder( Properties [] a_sources,
+ boolean a_haltOnDiscovery )
+ {
+ m_sources = a_sources ;
+ m_haltOnDiscovery = a_haltOnDiscovery ;
+ }
+
+
+ /**
+ * Applies default discovery using properties in array of properties.
+ *
+ * @see org.apache.avalon.defaults.DefaultsFinder#find(
+ * org.apache.avalon.defaults.Defaults)
+ */
+ public void find( Defaults a_defaults )
+ {
+ Defaults.discover( a_defaults, m_sources, m_haltOnDiscovery ) ;
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
