Refactored

FlorianRappl · FlorianRappl · commit f653afd8c331 · 2019-05-01T14:25:33.000+02:00
diff --git a/src/AngleSharp.Xml/Dom/Internal/SvgDocument.cs b/src/AngleSharp.Xml/Dom/Internal/SvgDocument.cs
@@ -35,20 +35,11 @@ internal SvgDocument(IBrowsingContext context = null)
 
         #region Properties
 
-        public override IElement DocumentElement
-        {
-            get { return RootElement; }
-        }
+        public override IElement DocumentElement => RootElement;
 
-        public ISvgSvgElement RootElement
-        {
-            get { return this.FindChild<ISvgSvgElement>(); }
-        }
+        public ISvgSvgElement RootElement => this.FindChild<ISvgSvgElement>();
 
-        public override IEntityProvider Entities
-        {
-            get { return Context.GetProvider<IEntityProvider>() ?? XmlEntityProvider.Resolver; }
-        }
+        public override IEntityProvider Entities => Context.GetProvider<IEntityProvider>() ?? XmlEntityProvider.Resolver;
 
         #endregion
 
diff --git a/src/AngleSharp.Xml/Dom/Internal/XmlDocument.cs b/src/AngleSharp.Xml/Dom/Internal/XmlDocument.cs
@@ -27,26 +27,17 @@ internal XmlDocument(IBrowsingContext context = null)
 
         #region Properties
 
-        public override IElement DocumentElement
-        {
-            get { return this.FindChild<IElement>(); }
-        }
+        public override IElement DocumentElement => this.FindChild<IElement>();
 
-        public override IEntityProvider Entities
-        {
-            get { return Context.GetProvider<IEntityProvider>() ?? XmlEntityProvider.Resolver; }
-        }
+        public override IEntityProvider Entities => Context.GetProvider<IEntityProvider>() ?? XmlEntityProvider.Resolver;
 
         public Boolean IsValid => true;
 
         #endregion
 
         #region Methods
 
-        public override Element CreateElementFrom(String name, String prefix)
-        {
-            return new XmlElement(this, name, prefix);
-        }
+        public override Element CreateElementFrom(String name, String prefix) => new XmlElement(this, name, prefix);
 
         public override Node Clone(Document owner, Boolean deep)
         {
diff --git a/src/AngleSharp.Xml/Dtd/Declaration/Attribute/AttributeEnumeratedType.cs b/src/AngleSharp.Xml/Dtd/Declaration/Attribute/AttributeEnumeratedType.cs
@@ -29,10 +29,7 @@ public Boolean IsNotation
             set;
         }
 
-        public List<String> Names
-        {
-            get { return _names; }
-        }
+        public List<String> Names => _names;
 
         #endregion
 
diff --git a/src/AngleSharp.Xml/Dtd/Declaration/AttributeDeclaration.cs b/src/AngleSharp.Xml/Dtd/Declaration/AttributeDeclaration.cs
@@ -29,10 +29,7 @@ public AttributeDeclarationEntry this[Int32 index]
             get { return _attrs[index]; }
         }
 
-        public Int32 Count
-        {
-            get { return _attrs.Count; }
-        }
+        public Int32 Count => _attrs.Count;
 
         public IEnumerable<AttributeDeclarationEntry> Declarations
         {
diff --git a/src/AngleSharp.Xml/Dtd/Declaration/Element/ElementChoiceDeclarationEntry.cs b/src/AngleSharp.Xml/Dtd/Declaration/Element/ElementChoiceDeclarationEntry.cs
@@ -7,10 +7,7 @@ sealed class ElementChoiceDeclarationEntry : ElementChildrenDeclarationEntry
     {
         #region Properties
 
-        public List<ElementQuantifiedDeclarationEntry> Choice
-        {
-            get { return _children; }
-        }
+        public List<ElementQuantifiedDeclarationEntry> Choice => _children;
 
         #endregion
 
diff --git a/src/AngleSharp.Xml/Dtd/Declaration/Element/ElementDeclarationEntry.cs b/src/AngleSharp.Xml/Dtd/Declaration/Element/ElementDeclarationEntry.cs
@@ -16,20 +16,11 @@ abstract class ElementDeclarationEntry
 
         #region Properties
 
-        public ElementContentType Type
-        {
-            get { return _type; }
-        }
+        public ElementContentType Type => _type;
 
-        public static ElementAnyDeclarationEntry Any
-        {
-            get { return _any ?? (_any = new ElementAnyDeclarationEntry()); }
-        }
+        public static ElementAnyDeclarationEntry Any => _any ?? (_any = new ElementAnyDeclarationEntry());
 
-        public static ElementEmptyDeclarationEntry Empty
-        {
-            get { return _empty ?? (_empty = new ElementEmptyDeclarationEntry()); }
-        }
+        public static ElementEmptyDeclarationEntry Empty => _empty ?? (_empty = new ElementEmptyDeclarationEntry());
 
         #endregion
 
diff --git a/src/AngleSharp.Xml/Dtd/Declaration/Element/ElementMixedDeclarationEntry.cs b/src/AngleSharp.Xml/Dtd/Declaration/Element/ElementMixedDeclarationEntry.cs
@@ -24,10 +24,7 @@ public ElementMixedDeclarationEntry()
 
         #region Properties
 
-        public List<String> Names
-        {
-            get { return _names; }
-        }
+        public List<String> Names => _names;
 
         #endregion
 
diff --git a/src/AngleSharp.Xml/Dtd/Declaration/Element/ElementSequenceDeclarationEntry.cs b/src/AngleSharp.Xml/Dtd/Declaration/Element/ElementSequenceDeclarationEntry.cs
@@ -5,10 +5,7 @@ namespace AngleSharp.Xml.Dtd.Declaration
 
     sealed class ElementSequenceDeclarationEntry : ElementChildrenDeclarationEntry
     {
-        public List<ElementQuantifiedDeclarationEntry> Sequence
-        {
-            get { return _children; }
-        }
+        public List<ElementQuantifiedDeclarationEntry> Sequence => _children;
 
         public override Boolean Check(NodeInspector inspector)
         {
diff --git a/src/AngleSharp.Xml/Dtd/Declaration/Element/NodeInspector.cs b/src/AngleSharp.Xml/Dtd/Declaration/Element/NodeInspector.cs
@@ -21,30 +21,18 @@ public NodeInspector(IElement element)
             }
         }
 
-        public List<INode> Children
-        {
-            get { return nodes; }
-        }
+        public List<INode> Children => nodes;
 
-        public INode Current
-        {
-            get { return Children[Index]; }
-        }
+        public INode Current => Children[Index];
 
-        public Int32 Length
-        {
-            get { return Children.Count; }
-        }
+        public Int32 Length => Children.Count;
 
         public Int32 Index
         {
             get;
             set;
         }
 
-        public Boolean IsCompleted 
-        {
-            get { return Children.Count == Index; }
-        }
+        public Boolean IsCompleted => Children.Count == Index;
     }
 }
diff --git a/src/AngleSharp.Xml/Dtd/Parser/DtdContainer.cs b/src/AngleSharp.Xml/Dtd/Parser/DtdContainer.cs
@@ -97,18 +97,12 @@ public String Url
         /// <summary>
         /// Gets the root container.
         /// </summary>
-        public DtdContainer Root
-        {
-            get { return (_parent != null) ? _parent.Root : this; }
-        }
+        public DtdContainer Root => (_parent != null) ? _parent.Root : this;
 
         /// <summary>
         /// Gets the number of rules / nodes in this DTD (without the parent).
         /// </summary>
-        public Int32 Count
-        {
-            get { return _nodes.Count; }
-        }
+        public Int32 Count => _nodes.Count;
 
         /// <summary>
         /// Gets the text of this DTD (without the parents text).
@@ -122,42 +116,27 @@ public String Text
         /// <summary>
         /// Gets the enumeration over all the contained (self and parent) notations.
         /// </summary>
-        public IEnumerable<Notation> Notations
-        {
-            get { return _notations.Items(m => m._notations); }
-        }
+        public IEnumerable<Notation> Notations => _notations.Items(m => m._notations);
 
         /// <summary>
         /// Gets the enumeration over all the contained (self and parent) entities.
         /// </summary>
-        public IEnumerable<Entity> Entities
-        {
-            get { return _entities.Items(m => m._entities); }
-        }
+        public IEnumerable<Entity> Entities => _entities.Items(m => m._entities);
 
         /// <summary>
         /// Gets the enumeration over all the contained (self and parent) parameters.
         /// </summary>
-        public IEnumerable<Entity> Parameters
-        {
-            get { return _parameters.Items(m => m._parameters); }
-        }
+        public IEnumerable<Entity> Parameters => _parameters.Items(m => m._parameters);
 
         /// <summary>
         /// Gets the enumeration over all the contained (self and parent) attributes.
         /// </summary>
-        public IEnumerable<AttributeDeclaration> Attributes
-        {
-            get { return _attributes.Items(m => m._attributes); }
-        }
+        public IEnumerable<AttributeDeclaration> Attributes => _attributes.Items(m => m._attributes);
 
         /// <summary>
         /// Gets the enumeration over all the contained (self and parent) elements.
         /// </summary>
-        public IEnumerable<ElementDeclaration> Elements
-        {
-            get { return _elements.Items(m => m._elements); }
-        }
+        public IEnumerable<ElementDeclaration> Elements => _elements.Items(m => m._elements);
 
         #endregion
 
@@ -309,10 +288,7 @@ public void CopyTo(Node[] array, Int32 arrayIndex)
                 array[i] = _nodes[j];
         }
 
-        public Boolean IsReadOnly
-        {
-            get { return false; }
-        }
+        public Boolean IsReadOnly => false;
 
         public Boolean Remove(Node item)
         {
diff --git a/src/AngleSharp.Xml/Dtd/Parser/DtdParser.cs b/src/AngleSharp.Xml/Dtd/Parser/DtdParser.cs
@@ -60,10 +60,7 @@ public Boolean IsInternal
         /// <summary>
         /// Gets the DtdContainer, i.e. the result of the computation.
         /// </summary>
-        public DtdContainer Result
-        {
-            get { return _result; }
-        }
+        public DtdContainer Result => _result;
 
         #endregion
 
diff --git a/src/AngleSharp.Xml/Dtd/Parser/DtdPlainTokenizer.cs b/src/AngleSharp.Xml/Dtd/Parser/DtdPlainTokenizer.cs
@@ -274,10 +274,7 @@ public IntermediateStream(TextSource src)
             /// <summary>
             /// The content (of the original stream).
             /// </summary>
-            public String Content
-            {
-                get { return _base.Text; }
-            }
+            public String Content => _base.Text;
 
             /// <summary>
             /// The next character.
@@ -310,10 +307,7 @@ public Char Next
             /// <summary>
             /// The current character.
             /// </summary>
-            public Char Current
-            {
-                get { return _texts.Count == 0 ? _base.Text[_base.Index] : _texts.Peek()[_pos.Peek()]; }
-            }
+            public Char Current => _texts.Count == 0 ? _base.Text[_base.Index] : _texts.Peek()[_pos.Peek()];
 
             #endregion
 
diff --git a/src/AngleSharp.Xml/Dtd/Parser/DtdTokenizer.cs b/src/AngleSharp.Xml/Dtd/Parser/DtdTokenizer.cs
@@ -68,10 +68,7 @@ public DtdTokenizer(DtdContainer container, TextSource src)
         /// <summary>
         /// Gets the parsed content.
         /// </summary>
-        public String Content
-        {
-            get { return _stream.Content; }
-        }
+        public String Content => _stream.Content;
 
         /// <summary>
         /// Gets or sets if the DTD is from an external source.
diff --git a/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdAttributeToken.cs b/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdAttributeToken.cs
@@ -29,10 +29,7 @@ public DtdAttributeToken()
         /// <summary>
         /// Gets the list of attributes defined.
         /// </summary>
-        public List<AttributeDeclarationEntry> Attributes
-        {
-            get { return _attributes; }
-        }
+        public List<AttributeDeclarationEntry> Attributes => _attributes;
 
         #endregion
 
diff --git a/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdEntityToken.cs b/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdEntityToken.cs
@@ -37,10 +37,7 @@ public String SystemIdentifier
             set;
         }
 
-        public Boolean IsPublic
-        {
-            get { return PublicIdentifier != null; }
-        }
+        public Boolean IsPublic => PublicIdentifier != null;
 
         public Boolean IsExtern
         {
diff --git a/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdNotationToken.cs b/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdNotationToken.cs
@@ -30,19 +30,13 @@ public DtdNotationToken()
         /// Gets if the declaration is an external id (the system identifier
         /// has been set directly or indirectly).
         /// </summary>
-        public Boolean IsExternalId
-        {
-            get { return !String.IsNullOrEmpty(_systemIdentifier); }
-        }
+        public Boolean IsExternalId => !String.IsNullOrEmpty(_systemIdentifier);
 
         /// <summary>
         /// Gets if the declaration is an external id (the system identifier
         /// has been set directly or indirectly).
         /// </summary>
-        public Boolean IsPublicId
-        {
-            get { return !String.IsNullOrEmpty(_publicIdentifier) && String.IsNullOrEmpty(_systemIdentifier); }
-        }
+        public Boolean IsPublicId => !String.IsNullOrEmpty(_publicIdentifier) && String.IsNullOrEmpty(_systemIdentifier);
 
         /// <summary>
         /// Gets or sets the value of the public identifier.
diff --git a/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdToken.cs b/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdToken.cs
@@ -22,19 +22,13 @@ abstract class DtdToken
         /// <summary>
         /// Gets the end of file token.
         /// </summary>
-        public static DtdEndOfFileToken EOF
-        {
-            get { return eof ?? (eof = new DtdEndOfFileToken()); }
-        }
+        public static DtdEndOfFileToken EOF => eof ?? (eof = new DtdEndOfFileToken());
 
         #endregion
 
         #region Properties
 
-        public DtdTokenType Type
-        {
-            get { return _type; }
-        }
+        public DtdTokenType Type => _type;
 
         public String Name
         {
diff --git a/src/AngleSharp.Xml/Parser/XmlDomBuilder.cs b/src/AngleSharp.Xml/Parser/XmlDomBuilder.cs
@@ -402,11 +402,6 @@ private void AfterBody(XmlToken token)
 
         #region Helpers
 
-        private static Element CreateElement(Document document, String name, String prefix)
-        {
-            return new XmlElement(document, name, prefix);
-        }
-
         private Element CreateElement(String name)
         {
             var prefix = default(String);

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,7 @@ public Boolean IsNotation`
`29`	`29`	`set;`
`30`	`30`	`}`
`31`	`31`
`32`		`- public List<String> Names`
`33`		`- {`
`34`		`- get { return _names; }`
`35`		`- }`
	`32`	`+ public List<String> Names => _names;`
`36`	`33`
`37`	`34`	`#endregion`
`38`	`35`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,7 @@ public AttributeDeclarationEntry this[Int32 index]`
`29`	`29`	`get { return _attrs[index]; }`
`30`	`30`	`}`
`31`	`31`
`32`		`- public Int32 Count`
`33`		`- {`
`34`		`- get { return _attrs.Count; }`
`35`		`- }`
	`32`	`+ public Int32 Count => _attrs.Count;`
`36`	`33`
`37`	`34`	`public IEnumerable<AttributeDeclarationEntry> Declarations`
`38`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,7 @@ sealed class ElementChoiceDeclarationEntry : ElementChildrenDeclarationEntry`
`7`	`7`	`{`
`8`	`8`	`#region Properties`
`9`	`9`
`10`		`- public List<ElementQuantifiedDeclarationEntry> Choice`
`11`		`- {`
`12`		`- get { return _children; }`
`13`		`- }`
	`10`	`+ public List<ElementQuantifiedDeclarationEntry> Choice => _children;`
`14`	`11`
`15`	`12`	`#endregion`
`16`	`13`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,7 @@ namespace AngleSharp.Xml.Dtd.Declaration`
`5`	`5`
`6`	`6`	`sealed class ElementSequenceDeclarationEntry : ElementChildrenDeclarationEntry`
`7`	`7`	`{`
`8`		`- public List<ElementQuantifiedDeclarationEntry> Sequence`
`9`		`- {`
`10`		`- get { return _children; }`
`11`		`- }`
	`8`	`+ public List<ElementQuantifiedDeclarationEntry> Sequence => _children;`
`12`	`9`
`13`	`10`	`public override Boolean Check(NodeInspector inspector)`
`14`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,30 +21,18 @@ public NodeInspector(IElement element)`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`- public List<INode> Children`
`25`		`- {`
`26`		`- get { return nodes; }`
`27`		`- }`
	`24`	`+ public List<INode> Children => nodes;`
`28`	`25`
`29`		`- public INode Current`
`30`		`- {`
`31`		`- get { return Children[Index]; }`
`32`		`- }`
	`26`	`+ public INode Current => Children[Index];`
`33`	`27`
`34`		`- public Int32 Length`
`35`		`- {`
`36`		`- get { return Children.Count; }`
`37`		`- }`
	`28`	`+ public Int32 Length => Children.Count;`
`38`	`29`
`39`	`30`	`public Int32 Index`
`40`	`31`	`{`
`41`	`32`	`get;`
`42`	`33`	`set;`
`43`	`34`	`}`
`44`	`35`
`45`		`- public Boolean IsCompleted`
`46`		`- {`
`47`		`- get { return Children.Count == Index; }`
`48`		`- }`
	`36`	`+ public Boolean IsCompleted => Children.Count == Index;`
`49`	`37`	`}`
`50`	`38`	`}`