Author: benm Date: 2005-04-03 13:24:50 -0400 (Sun, 03 Apr 2005) New Revision: 42498
Added: trunk/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs Removed: trunk/mcs/class/System.XML/System.Xml.Xsl/Multiplexer.cs Log: Do a move to kill signs of hackishness Deleted: trunk/mcs/class/System.XML/System.Xml.Xsl/Multiplexer.cs =================================================================== --- trunk/mcs/class/System.XML/System.Xml.Xsl/Multiplexer.cs 2005-04-03 17:24:12 UTC (rev 42497) +++ trunk/mcs/class/System.XML/System.Xml.Xsl/Multiplexer.cs 2005-04-03 17:24:50 UTC (rev 42498) @@ -1,320 +0,0 @@ -// System.Xml.Xsl.XslTransform -// -// Authors: -// Tim Coleman <[EMAIL PROTECTED]> -// Gonzalo Paniagua Javier ([EMAIL PROTECTED]) -// -// (C) Copyright 2002 Tim Coleman -// (c) 2003 Ximian Inc. (http://www.ximian.com) -// - -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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 System; -using System.Collections; -using System.IO; -using System.Text; -using System.Runtime.InteropServices; -using System.Security; -using System.Security.Policy; -using System.Xml.XPath; -using Mono.Xml.Xsl; - -namespace System.Xml.Xsl { - public sealed class XslTransform { - - CompiledStylesheet s; - XmlResolver xmlResolver = new XmlUrlResolver (); - - [MonoTODO ("Security check.")] -#if NET_1_1 - [Obsolete ("You should pass XmlResolver to Transform() method", false)] -#endif - public XmlResolver XmlResolver { - set { - xmlResolver = value; - } - } - - #region Transform -#if NET_1_1 - [Obsolete ("You should pass XmlResolver to Transform() method", false)] -#endif - public XmlReader Transform (IXPathNavigable input, XsltArgumentList args) - { - return Transform (input.CreateNavigator (), args, xmlResolver); - } - -#if NET_1_1 - public XmlReader Transform (IXPathNavigable input, XsltArgumentList args, XmlResolver resolver) -#else - XmlReader Transform (IXPathNavigable input, XsltArgumentList args, XmlResolver resolver) -#endif - { - return Transform (input.CreateNavigator (), args, resolver); - } - -#if NET_1_1 - [Obsolete ("You should pass XmlResolver to Transform() method", false)] -#endif - public XmlReader Transform (XPathNavigator input, XsltArgumentList args) - { - return Transform (input, args, xmlResolver); - } -#if NET_1_1 - public XmlReader Transform (XPathNavigator input, XsltArgumentList args, XmlResolver resolver) -#else - XmlReader Transform (XPathNavigator input, XsltArgumentList args, XmlResolver resolver) -#endif - { - // todo: is this right? - MemoryStream stream = new MemoryStream (); - Transform (input, args, new XmlTextWriter (stream, null), resolver); - stream.Position = 0; - return new XmlTextReader (stream); - } - -#if NET_1_1 - [Obsolete ("You should pass XmlResolver to Transform() method", false)] -#endif - public void Transform (IXPathNavigable input, XsltArgumentList args, TextWriter output) - { - Transform (input.CreateNavigator (), args, output, xmlResolver); - } -#if NET_1_1 - public void Transform (IXPathNavigable input, XsltArgumentList args, TextWriter output, XmlResolver resolver) -#else - void Transform (IXPathNavigable input, XsltArgumentList args, TextWriter output, XmlResolver resolver) -#endif - { - Transform (input.CreateNavigator (), args, output, resolver); - } - -#if NET_1_1 - [Obsolete ("You should pass XmlResolver to Transform() method", false)] -#endif - public void Transform (IXPathNavigable input, XsltArgumentList args, Stream output) - { - Transform (input.CreateNavigator (), args, output, xmlResolver); - } -#if NET_1_1 - public void Transform (IXPathNavigable input, XsltArgumentList args, Stream output, XmlResolver resolver) -#else - void Transform (IXPathNavigable input, XsltArgumentList args, Stream output, XmlResolver resolver) -#endif - { - Transform (input.CreateNavigator (), args, output, resolver); - } - -#if NET_1_1 - [Obsolete ("You should pass XmlResolver to Transform() method", false)] -#endif - public void Transform (IXPathNavigable input, XsltArgumentList args, XmlWriter output) - { - Transform (input.CreateNavigator (), args, output, xmlResolver); - } -#if NET_1_1 - public void Transform (IXPathNavigable input, XsltArgumentList args, XmlWriter output, XmlResolver resolver) -#else - void Transform (IXPathNavigable input, XsltArgumentList args, XmlWriter output, XmlResolver resolver) -#endif - { - Transform (input.CreateNavigator (), args, output, resolver); - } - -#if NET_1_1 - [Obsolete ("You should pass XmlResolver to Transform() method", false)] -#endif - public void Transform (XPathNavigator input, XsltArgumentList args, XmlWriter output) - { - Transform (input, args, output, xmlResolver); - } -#if NET_1_1 - public void Transform (XPathNavigator input, XsltArgumentList args, XmlWriter output, XmlResolver resolver) -#else - void Transform (XPathNavigator input, XsltArgumentList args, XmlWriter output, XmlResolver resolver) -#endif - { - if (s == null) - throw new XsltException ("No stylesheet was loaded.", null); - - Outputter outputter = new GenericOutputter (output, s.Outputs, null); - new XslTransformProcessor (s).Process (input, outputter, args, resolver); - output.Flush (); - } - -#if NET_1_1 - [Obsolete ("You should pass XmlResolver to Transform() method", false)] -#endif - public void Transform (XPathNavigator input, XsltArgumentList args, Stream output) - { - Transform (input, args, output, xmlResolver); - } -#if NET_1_1 - public void Transform (XPathNavigator input, XsltArgumentList args, Stream output, XmlResolver resolver) -#else - void Transform (XPathNavigator input, XsltArgumentList args, Stream output, XmlResolver resolver) -#endif - { - XslOutput xslOutput = (XslOutput)s.Outputs[String.Empty]; - Transform (input, args, new StreamWriter (output, xslOutput.Encoding), resolver); - } - -#if NET_1_1 - [Obsolete ("You should pass XmlResolver to Transform() method", false)] -#endif - public void Transform (XPathNavigator input, XsltArgumentList args, TextWriter output) - { - Transform (input, args, output, xmlResolver); - } -#if NET_1_1 - public void Transform (XPathNavigator input, XsltArgumentList args, TextWriter output, XmlResolver resolver) -#else - void Transform (XPathNavigator input, XsltArgumentList args, TextWriter output, XmlResolver resolver) -#endif - { - Outputter outputter = new GenericOutputter(output, s.Outputs, output.Encoding); - new XslTransformProcessor (s).Process (input, outputter, args, resolver); - outputter.Done (); - output.Flush (); - } - -#if NET_1_1 - [Obsolete ("You should pass XmlResolver to Transform() method", false)] -#endif - public void Transform (string inputfile, string outputfile) - { - Transform (inputfile, outputfile, xmlResolver); - } - -#if NET_1_1 - public void Transform (string inputfile, string outputfile, XmlResolver resolver) -#else - void Transform (string inputfile, string outputfile, XmlResolver resolver) -#endif - { - using (Stream s = new FileStream (outputfile, FileMode.Create, FileAccess.ReadWrite)) { - Transform(new XPathDocument (inputfile).CreateNavigator (), null, s, resolver); - } - } - #endregion - - #region Load - public void Load (string url) - { - Load (url, null); - } - - public void Load (string url, XmlResolver resolver) - { - XmlResolver res = resolver; - if (res == null) - res = new XmlUrlResolver (); - Uri uri = res.ResolveUri (null, url); - using (Stream s = res.GetEntity (uri, null, typeof (Stream)) as Stream) { - XmlTextReader xtr = new XmlTextReader (uri.ToString (), s); - xtr.XmlResolver = res; - XmlValidatingReader xvr = new XmlValidatingReader (xtr); - xvr.XmlResolver = res; - xvr.ValidationType = ValidationType.None; - Load (new XPathDocument (xvr, XmlSpace.Preserve).CreateNavigator (), resolver, null); - } - } - -#if NET_1_1 - [Obsolete("You should pass evidence.", false)] -#endif - public void Load (XmlReader stylesheet) - { - Load (stylesheet, null, null); - } - -#if NET_1_1 - [Obsolete("You should pass evidence.", false)] -#endif - public void Load (XmlReader stylesheet, XmlResolver resolver) - { - Load (stylesheet, resolver, null); - } - -#if NET_1_1 - [Obsolete("You should pass evidence.", false)] -#endif - public void Load (XPathNavigator stylesheet) - { - Load (stylesheet, null, null); - } - -#if NET_1_1 - [Obsolete("You should pass evidence.", false)] -#endif - public void Load (XPathNavigator stylesheet, XmlResolver resolver) - { - Load (stylesheet, resolver, null); - } - -#if NET_1_1 - [Obsolete("You should pass evidence.", false)] -#endif - public void Load (IXPathNavigable stylesheet) - { - Load (stylesheet.CreateNavigator(), null); - } - -#if NET_1_1 - [Obsolete("You should pass evidence.", false)] -#endif - public void Load (IXPathNavigable stylesheet, XmlResolver resolver) - { - Load (stylesheet.CreateNavigator(), resolver); - } - - // Introduced in .NET 1.1 -#if NET_1_1 - public void Load (IXPathNavigable stylesheet, XmlResolver resolver, Evidence evidence) -#else - internal void Load (IXPathNavigable stylesheet, XmlResolver resolver, Evidence evidence) -#endif - { - Load (stylesheet.CreateNavigator(), resolver, evidence); - } - -#if NET_1_1 - public void Load (XPathNavigator stylesheet, XmlResolver resolver, Evidence evidence) -#else - internal void Load (XPathNavigator stylesheet, XmlResolver resolver, Evidence evidence) -#endif - { - s = new Compiler ().Compile (stylesheet, resolver, evidence); - } - -#if NET_1_1 - public void Load (XmlReader stylesheet, XmlResolver resolver, Evidence evidence) -#else - internal void Load (XmlReader stylesheet, XmlResolver resolver, Evidence evidence) -#endif - { - Load (new XPathDocument (stylesheet, XmlSpace.Preserve).CreateNavigator (), resolver, evidence); - } - #endregion - } -} Copied: trunk/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs (from rev 42497, trunk/mcs/class/System.XML/System.Xml.Xsl/Multiplexer.cs) _______________________________________________ Mono-patches maillist - [email protected] http://lists.ximian.com/mailman/listinfo/mono-patches
