Browse Source

use generic enumerator

pull/252/head
Siegfried Pammer 15 years ago
parent
commit
0eb3aabc72
  1. 10
      ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlReader.cs

10
ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlReader.cs

@ -1087,12 +1087,12 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
// this property could be a markup extension // this property could be a markup extension
// try to convert it // try to convert it
int start = nodes.IndexOf(propertyElement) + 1; int start = nodes.IndexOf(propertyElement) + 1;
IEnumerator enumerator = nodes.GetEnumerator(); IEnumerator<XmlBamlNode> enumerator = nodes.GetEnumerator();
// move enumerator to the start of this property value // move enumerator to the start of this property value
for (int i = 0; i < start && enumerator.MoveNext(); i++) ; for (int i = 0; i < start && enumerator.MoveNext(); i++) ;
if (IsExtension(enumerator)) { if (IsExtension(enumerator) && start < nodes.Count - 1) {
start--; start--;
nodes.RemoveAt(start); nodes.RemoveAt(start);
nodes.RemoveLast(); nodes.RemoveLast();
@ -1165,11 +1165,11 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
} }
} }
bool IsExtension(IEnumerator enumerator) bool IsExtension(IEnumerator<XmlBamlNode> enumerator)
{ {
while (enumerator.MoveNext()) { while (enumerator.MoveNext()) {
object node = enumerator.Current; var node = enumerator.Current;
if (node is XmlBamlElement && !(node is XmlBamlEndElement) && !((XmlBamlElement)node).TypeDeclaration.IsExtension) if (node.NodeType == XmlNodeType.Element && !((XmlBamlElement)node).TypeDeclaration.IsExtension)
return false; return false;
} }

Loading…
Cancel
Save