ymikulski 2002/08/28 06:06:13
Modified: csframework/src/cs/Context DefaultContext.cs
csframework/src/cs/Configuration
DefaultConfigurationSerializer.cs
ConfigurationCollection.cs AbstractConfiguration.cs
Log:
no message
Revision Changes Path
1.2 +13 -12
jakarta-avalon-excalibur/csframework/src/cs/Context/DefaultContext.cs
Index: DefaultContext.cs
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/csframework/src/cs/Context/DefaultContext.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultContext.cs 13 Aug 2002 12:58:47 -0000 1.1
+++ DefaultContext.cs 28 Aug 2002 13:06:12 -0000 1.2
@@ -102,7 +102,19 @@
object component = Components[key];
object result = null;
- if (component != null)
+ if (component == null)
+ {
+ // If there is no one, check the parent.
+ if (Parent == null)
+ {
+ throw new
ContextException(string.Format("Unable to locate {0}.", key));
+ }
+ else
+ {
+ result = Parent[key];
+ }
+ }
+ else
{
if (component is IResolvable)
{
@@ -113,17 +125,6 @@
result = component;
}
}
-
- // If there is no one, check the parent.
- if (Parent == null)
- {
- throw new
ContextException(string.Format("Unable to locate {0}.", key));
- }
- else
- {
- result = Parent[key];
- }
-
return result;
}
1.2 +4 -1
jakarta-avalon-excalibur/csframework/src/cs/Configuration/DefaultConfigurationSerializer.cs
Index: DefaultConfigurationSerializer.cs
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/csframework/src/cs/Configuration/DefaultConfigurationSerializer.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultConfigurationSerializer.cs 23 Aug 2002 22:03:59 -0000 1.1
+++ DefaultConfigurationSerializer.cs 28 Aug 2002 13:06:13 -0000 1.2
@@ -105,7 +105,10 @@
// attribute deserialization
foreach (XmlAttribute attr in node.Attributes)
{
- configuration.Attributes[attr.Name] = attr.Value;
+ if (string.Compare(attr.Prefix, string.Empty) == 0)
+ {
+ configuration.Attributes[attr.Name] =
attr.Value;
+ }
}
// child deserialization
1.3 +7 -17
jakarta-avalon-excalibur/csframework/src/cs/Configuration/ConfigurationCollection.cs
Index: ConfigurationCollection.cs
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/csframework/src/cs/Configuration/ConfigurationCollection.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfigurationCollection.cs 21 Aug 2002 20:14:03 -0000 1.2
+++ ConfigurationCollection.cs 28 Aug 2002 13:06:13 -0000 1.3
@@ -175,6 +175,7 @@
this.baseEnumerator = mappings.GetEnumerator();
}
+/*
public IConfiguration Current
{
get
@@ -183,15 +184,7 @@
}
}
-
- object IEnumerator.Current
- {
- get
- {
- return baseEnumerator.Current;
- }
-
- }
+*/
public bool MoveNext()
{
@@ -199,10 +192,12 @@
return baseEnumerator.MoveNext();
}
- bool IEnumerator.MoveNext()
+ object IEnumerator.Current
{
-
- return baseEnumerator.MoveNext();
+ get
+ {
+ return baseEnumerator.Current;
+ }
}
@@ -212,11 +207,6 @@
baseEnumerator.Reset();
}
- void IEnumerator.Reset()
- {
- baseEnumerator.Reset();
-
- }
}
}
1.2 +0 -5
jakarta-avalon-excalibur/csframework/src/cs/Configuration/AbstractConfiguration.cs
Index: AbstractConfiguration.cs
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/csframework/src/cs/Configuration/AbstractConfiguration.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractConfiguration.cs 21 Aug 2002 20:14:31 -0000 1.1
+++ AbstractConfiguration.cs 28 Aug 2002 13:06:13 -0000 1.2
@@ -92,11 +92,6 @@
{
get
{
- if (val == null)
- {
- throw new ConfigurationException(
string.Format("No value is associated with the " +
- "configuration element {0} at {1}",
Name, Location));
- }
return val;
}
set
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
