diff options
Diffstat (limited to 'main/src/addins/Xml/Dom')
-rw-r--r-- | main/src/addins/Xml/Dom/XAttribute.cs | 7 | ||||
-rw-r--r-- | main/src/addins/Xml/Dom/XCData.cs | 7 | ||||
-rw-r--r-- | main/src/addins/Xml/Dom/XClosingTag.cs | 6 | ||||
-rw-r--r-- | main/src/addins/Xml/Dom/XComment.cs | 8 | ||||
-rw-r--r-- | main/src/addins/Xml/Dom/XContainer.cs | 6 | ||||
-rw-r--r-- | main/src/addins/Xml/Dom/XDocType.cs | 9 | ||||
-rw-r--r-- | main/src/addins/Xml/Dom/XDocument.cs | 6 | ||||
-rw-r--r-- | main/src/addins/Xml/Dom/XElement.cs | 8 | ||||
-rw-r--r-- | main/src/addins/Xml/Dom/XNode.cs | 7 | ||||
-rw-r--r-- | main/src/addins/Xml/Dom/XObject.cs | 19 | ||||
-rw-r--r-- | main/src/addins/Xml/Dom/XProcessingInstruction.cs | 8 |
11 files changed, 41 insertions, 50 deletions
diff --git a/main/src/addins/Xml/Dom/XAttribute.cs b/main/src/addins/Xml/Dom/XAttribute.cs index f34f456727..c82a8e7a8b 100644 --- a/main/src/addins/Xml/Dom/XAttribute.cs +++ b/main/src/addins/Xml/Dom/XAttribute.cs @@ -23,21 +23,20 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
- -using ICSharpCode.NRefactory; +using MonoDevelop.Ide.Editor;
namespace MonoDevelop.Xml.Dom { public class XAttribute : XObject, INamedXObject { - public XAttribute (TextLocation start, XName name, string value) : base (start) + public XAttribute (DocumentLocation start, XName name, string value) : base (start) { this.Name = name; this.Value = value; } - public XAttribute (TextLocation start) : base (start) + public XAttribute (DocumentLocation start) : base (start) { } diff --git a/main/src/addins/Xml/Dom/XCData.cs b/main/src/addins/Xml/Dom/XCData.cs index 001f80521b..f850d91cec 100644 --- a/main/src/addins/Xml/Dom/XCData.cs +++ b/main/src/addins/Xml/Dom/XCData.cs @@ -24,15 +24,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory; +using MonoDevelop.Ide.Editor; namespace MonoDevelop.Xml.Dom { public class XCData : XNode { - public XCData (TextLocation start) : base (start) {} - public XCData (DomRegion region) : base (region) {} + public XCData (DocumentLocation start) : base (start) {} + public XCData (DocumentRegion region) : base (region) {} protected XCData () {} protected override XObject NewInstance () { return new XCData (); } diff --git a/main/src/addins/Xml/Dom/XClosingTag.cs b/main/src/addins/Xml/Dom/XClosingTag.cs index c134dea6a4..3973ad2ab8 100644 --- a/main/src/addins/Xml/Dom/XClosingTag.cs +++ b/main/src/addins/Xml/Dom/XClosingTag.cs @@ -24,15 +24,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.NRefactory; +using MonoDevelop.Ide.Editor; namespace MonoDevelop.Xml.Dom { public class XClosingTag : XNode, INamedXObject { - public XClosingTag (TextLocation start) : base (start) {} + public XClosingTag (DocumentLocation start) : base (start) {} - public XClosingTag (XName name, TextLocation start) : base (start) + public XClosingTag (XName name, DocumentLocation start) : base (start) { this.Name = name; } diff --git a/main/src/addins/Xml/Dom/XComment.cs b/main/src/addins/Xml/Dom/XComment.cs index 57231b974f..08a7998065 100644 --- a/main/src/addins/Xml/Dom/XComment.cs +++ b/main/src/addins/Xml/Dom/XComment.cs @@ -23,16 +23,14 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
- -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory; +using MonoDevelop.Ide.Editor;
namespace MonoDevelop.Xml.Dom { public class XComment : XNode { - public XComment (TextLocation start) : base (start) {} - public XComment (DomRegion region) : base (region) {} + public XComment (DocumentLocation start) : base (start) {} + public XComment (DocumentRegion region) : base (region) {} protected XComment () {} protected override XObject NewInstance () { return new XComment (); } diff --git a/main/src/addins/Xml/Dom/XContainer.cs b/main/src/addins/Xml/Dom/XContainer.cs index 997def1ad0..dd6e0c10fd 100644 --- a/main/src/addins/Xml/Dom/XContainer.cs +++ b/main/src/addins/Xml/Dom/XContainer.cs @@ -25,14 +25,14 @@ // THE SOFTWARE.
using System.Collections.Generic; -using System.Text; -using ICSharpCode.NRefactory; +using System.Text;
+using MonoDevelop.Ide.Editor; namespace MonoDevelop.Xml.Dom { public abstract class XContainer : XNode { - protected XContainer (TextLocation start) : base (start) { } + protected XContainer (DocumentLocation start) : base (start) { } XNode firstNode; XNode lastChild; diff --git a/main/src/addins/Xml/Dom/XDocType.cs b/main/src/addins/Xml/Dom/XDocType.cs index ff29a31322..a91f85be96 100644 --- a/main/src/addins/Xml/Dom/XDocType.cs +++ b/main/src/addins/Xml/Dom/XDocType.cs @@ -24,15 +24,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory; +using MonoDevelop.Ide.Editor; namespace MonoDevelop.Xml.Dom { public class XDocType : XNode, INamedXObject { - public XDocType (TextLocation start) : base (start) {} - public XDocType (DomRegion region) : base (region) {} + public XDocType (DocumentLocation start) : base (start) {} + public XDocType (DocumentRegion region) : base (region) {} protected XDocType () {} protected override XObject NewInstance () { return new XDocType (); } @@ -40,7 +39,7 @@ namespace MonoDevelop.Xml.Dom public XName RootElement { get; set; } public string PublicFpi { get; set; } public bool IsPublic { get { return PublicFpi != null; } } - public DomRegion InternalDeclarationRegion { get; set; } + public DocumentRegion InternalDeclarationRegion { get; set; } public string Uri { get; set; } public override string FriendlyPathRepresentation { diff --git a/main/src/addins/Xml/Dom/XDocument.cs b/main/src/addins/Xml/Dom/XDocument.cs index dc6cfafccc..2425c065c7 100644 --- a/main/src/addins/Xml/Dom/XDocument.cs +++ b/main/src/addins/Xml/Dom/XDocument.cs @@ -24,8 +24,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System; -using ICSharpCode.NRefactory; +using System;
+using MonoDevelop.Ide.Editor; namespace MonoDevelop.Xml.Dom { @@ -33,7 +33,7 @@ namespace MonoDevelop.Xml.Dom { public XElement RootElement { get; private set; } - public XDocument () : base (new TextLocation (1, 1)) {} + public XDocument () : base (new DocumentLocation (1, 1)) {} protected override XObject NewInstance () { return new XDocument (); } public override string FriendlyPathRepresentation { diff --git a/main/src/addins/Xml/Dom/XElement.cs b/main/src/addins/Xml/Dom/XElement.cs index a49a2b81d4..81ff5eceba 100644 --- a/main/src/addins/Xml/Dom/XElement.cs +++ b/main/src/addins/Xml/Dom/XElement.cs @@ -25,8 +25,8 @@ // THE SOFTWARE.
using System.Collections.Generic; -using System.Text; -using ICSharpCode.NRefactory; +using System.Text;
+using MonoDevelop.Ide.Editor; namespace MonoDevelop.Xml.Dom { @@ -35,12 +35,12 @@ namespace MonoDevelop.Xml.Dom XNode closingTag; readonly XAttributeCollection attributes; - public XElement (TextLocation start) : base (start) + public XElement (DocumentLocation start) : base (start) { attributes = new XAttributeCollection (this); } - public XElement (TextLocation start, XName name) : this (start) + public XElement (DocumentLocation start, XName name) : this (start) { this.Name = name; } diff --git a/main/src/addins/Xml/Dom/XNode.cs b/main/src/addins/Xml/Dom/XNode.cs index d98b02b761..37fd74d643 100644 --- a/main/src/addins/Xml/Dom/XNode.cs +++ b/main/src/addins/Xml/Dom/XNode.cs @@ -24,15 +24,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory; +using MonoDevelop.Ide.Editor; namespace MonoDevelop.Xml.Dom { public abstract class XNode : XObject { - protected XNode (TextLocation start) : base (start) {} - protected XNode (DomRegion region) : base (region) {} + protected XNode (DocumentLocation start) : base (start) {} + protected XNode (DocumentRegion region) : base (region) {} protected XNode () {} public XNode NextSibling { get; internal protected set; } diff --git a/main/src/addins/Xml/Dom/XObject.cs b/main/src/addins/Xml/Dom/XObject.cs index f999256eea..c55d3e3742 100644 --- a/main/src/addins/Xml/Dom/XObject.cs +++ b/main/src/addins/Xml/Dom/XObject.cs @@ -25,22 +25,21 @@ // THE SOFTWARE.
using System.Collections.Generic; -using System.Text; -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory; +using System.Text;
+using MonoDevelop.Ide.Editor; namespace MonoDevelop.Xml.Dom { public abstract class XObject { - DomRegion region; + DocumentRegion region; - protected XObject (TextLocation start) + protected XObject (DocumentLocation start) { - region = new DomRegion (start, TextLocation.Empty); + region = new DocumentRegion (start, DocumentLocation.Empty); } - protected XObject (DomRegion region) + protected XObject (DocumentRegion region) { this.region = region; } @@ -57,13 +56,13 @@ namespace MonoDevelop.Xml.Dom } } - public DomRegion Region { + public DocumentRegion Region { get { return region; } } - public void End (TextLocation endLocation) + public void End (DocumentLocation endLocation) { - region = new DomRegion (region.Begin, endLocation); + region = new DocumentRegion (region.Begin, endLocation); } public bool IsEnded { diff --git a/main/src/addins/Xml/Dom/XProcessingInstruction.cs b/main/src/addins/Xml/Dom/XProcessingInstruction.cs index 9089897116..03d907fe62 100644 --- a/main/src/addins/Xml/Dom/XProcessingInstruction.cs +++ b/main/src/addins/Xml/Dom/XProcessingInstruction.cs @@ -23,16 +23,14 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
- -using ICSharpCode.NRefactory.TypeSystem; -using ICSharpCode.NRefactory; +using MonoDevelop.Ide.Editor;
namespace MonoDevelop.Xml.Dom { public class XProcessingInstruction : XNode { - public XProcessingInstruction (TextLocation start) : base (start) {} - public XProcessingInstruction (DomRegion region) : base (region) {} + public XProcessingInstruction (DocumentLocation start) : base (start) {} + public XProcessingInstruction (DocumentRegion region) : base (region) {} protected XProcessingInstruction () {} protected override XObject NewInstance () { return new XProcessingInstruction (); } |