2005-08-31 Chris Toshok <[email protected]>

	* XmlDataSource.cs (GetXmlDataDocument): rename this to
	GetXmlDocument, and change the return value from XmlDataDocument
	to XmlDocument.
	(LoadXmlDataDocument): similar change.
	(Save): xmlDataDocument -> xmlDocument.
	(CanBeSaved): there's no ReadOnly attribute.
	(LoadViewState, SaveViewState, TrackViewState): nuke.
	(GetHierarchicalView): xmlDataDocument -> xmlDocument.
	(CacheDuration): stub out with NIE.
	(CacheExpirationPolocy): same.
	(CacheKeyDependency): same.
	(EnableCaching): same.
	(ReadOnly): nuke.
	(Data, DataFile): xmlDataDocument -> xmlDocument.
	(Schema, SchemaFile): nuke.
	(Transform, TransformFile): xmlDataDocument -> xmlDocument.


svn path=/trunk/mcs/; revision=49218

mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,22 @@
+2005-08-31  Chris Toshok  <[email protected]>
+
+	* XmlDataSource.cs (GetXmlDataDocument): rename this to
+	GetXmlDocument, and change the return value from XmlDataDocument
+	to XmlDocument.
+	(LoadXmlDataDocument): similar change.
+	(Save): xmlDataDocument -> xmlDocument.
+	(CanBeSaved): there's no ReadOnly attribute.
+	(LoadViewState, SaveViewState, TrackViewState): nuke.
+	(GetHierarchicalView): xmlDataDocument -> xmlDocument.
+	(CacheDuration): stub out with NIE.
+	(CacheExpirationPolocy): same.
+	(CacheKeyDependency): same.
+	(EnableCaching): same.
+	(ReadOnly): nuke.
+	(Data, DataFile): xmlDataDocument -> xmlDocument.
+	(Schema, SchemaFile): nuke.
+	(Transform, TransformFile): xmlDataDocument -> xmlDocument.
+	
 2005-08-30  Lluis Sanchez Gual  <[email protected]> 
 
 	* SubMenuStyle.cs, MenuItemStyle.cs, TreeNodeStyle.cs:

mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSource.cs

@@ -3,8 +3,10 @@
 //
 // Authors:
 //	Ben Maurer ([email protected])
+//      Chris Toshok ([email protected])
 //
 // (C) 2003 Ben Maurer
+// (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
 //
@@ -67,18 +69,18 @@ namespace System.Web.UI.WebControls {
 				eh (this, e);
 		}
 		
-		XmlDataDocument xmlDataDocument;
-		public XmlDataDocument GetXmlDataDocument ()
+		XmlDocument xmlDocument;
+		public XmlDocument GetXmlDocument ()
 		{
-			if (xmlDataDocument == null) {
-				xmlDataDocument = new XmlDataDocument ();
-				LoadXmlDataDocument (xmlDataDocument);
+			if (xmlDocument == null) {
+				xmlDocument = new XmlDocument ();
+				LoadXmlDocument (xmlDocument);
 			}
-			return xmlDataDocument;
+			return xmlDocument;
 		}
 		
 		[MonoTODO ("XSLT, schema")]
-		void LoadXmlDataDocument (XmlDataDocument document)
+		void LoadXmlDocument (XmlDocument document)
 		{
 			if (Transform == "" && TransformFile == "") {
 				if (DataFile != "")
@@ -95,36 +97,18 @@ namespace System.Web.UI.WebControls {
 			if (!CanBeSaved)
 				throw new InvalidOperationException ();
 			
-			xmlDataDocument.Save (MapPathSecure (DataFile));
+			xmlDocument.Save (MapPathSecure (DataFile));
 		}
 		
 		bool CanBeSaved {
 			get {
-				return !ReadOnly && Transform == "" && TransformFile == "" && DataFile != "";
+				return Transform == "" && TransformFile == "" && DataFile != "";
 			}
 		}
 		
-		[MonoTODO]
-		protected override void LoadViewState (object savedState)
-		{
-			base.LoadViewState (savedState);
-		}
-		
-		[MonoTODO]
-		protected override object SaveViewState ()
-		{
-			return base.SaveViewState ();
-		}
-		
-		[MonoTODO]
-		protected override void TrackViewState ()
-		{
-			base.TrackViewState ();
-		}
-		
 		protected override HierarchicalDataSourceView GetHierarchicalView (string viewPath)
 		{
-			XmlNode doc = this.GetXmlDataDocument ();
+			XmlNode doc = this.GetXmlDocument ();
 			XmlNodeList ret = null;
 			
 			if (viewPath != "") {
@@ -154,7 +138,8 @@ namespace System.Web.UI.WebControls {
 			if (viewName == "")
 				viewName = "DefaultView";
 			
-			return new XmlDataSourceView (this, viewName, GetXmlDataDocument ().DocumentElement.SelectNodes (XPath != "" ? XPath : "./*"));
+			Console.WriteLine ("XPath = {0}", XPath);
+			return new XmlDataSourceView (this, viewName, GetXmlDocument ().DocumentElement.SelectNodes (XPath != "" ? XPath : "./*"));
 		}
 		
 		ICollection IDataSource.GetViewNames ()
@@ -162,98 +147,82 @@ namespace System.Web.UI.WebControls {
 			return new string [] { "DefaultView" };
 		}
 		
-		public virtual bool AutoSave {
+		[DefaultValue (0)]
+		//[TypeConverter (typeof(DataSourceCacheDurationConverter))]
+		[MonoTODO]
+		public virtual int CacheDuration {
 			get {
-				object ret = ViewState ["AutoSave"];
-				return ret != null ? (bool)ret : true;
+				throw new NotImplementedException ();
 			}
 			set {
-				ViewState ["AutoSave"] = value;
+				throw new NotImplementedException ();
 			}
 		}
-		
-		// TODO: stub these apis
-		//protected virtual FileDataSourceCache Cache { get; }
-		//public virtual int CacheDuration { get; set; }
-		//public virtual DataSourceCacheExpiry CacheExpirationPolicy { get; set; }
-		//public virtual string CacheKeyDependency { get; set; }
-		//public virtual bool EnableCaching { get; set; }
-		
-		[DefaultValue ("")]
-		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[WebSysDescription ("Inline XML data.")]
-		[WebCategory ("Data")]
-	    [EditorAttribute ("System.ComponentModel.Design.MultilineStringEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-//		[TypeConverter (typeof(MultilineStringConverter))]
-		public virtual string Data {
+
+		[DefaultValue (DataSourceCacheExpiry.Absolute)]
+		[MonoTODO]
+		public virtual DataSourceCacheExpiry CacheExpirationPolicy {
 			get {
-				string ret = ViewState ["Data"] as string;
-				return ret != null ? ret : "";
+				throw new NotImplementedException ();
 			}
 			set {
-				if (Data != value) {
-					ViewState ["Data"] = value;
-					xmlDataDocument = null;
-					OnDataSourceChanged(EventArgs.Empty);
-				}
+				throw new NotImplementedException ();
 			}
 		}
-		
-		[DefaultValueAttribute ("")]
-		[EditorAttribute ("System.Web.UI.Design.XmlDataFileEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		public virtual string DataFile {
+
+		[DefaultValue ("")]
+		[MonoTODO]
+		public virtual string CacheKeyDependency {
 			get {
-				string ret = ViewState ["DataFile"] as string;
-				return ret != null ? ret : "";
+				throw new NotImplementedException ();
 			}
 			set {
-				if (DataFile != value) {
-					ViewState ["DataFile"] = value;
-					xmlDataDocument = null;
-					OnDataSourceChanged(EventArgs.Empty);
-				}
+				throw new NotImplementedException ();
 			}
 		}
-		
-		public virtual bool ReadOnly {
+
+		[DefaultValue (true)]
+		[MonoTODO]
+		public virtual bool EnableCaching {
 			get {
-				object ret = ViewState ["ReadOnly"];
-				return ret != null ? (bool)ret : true;
+				throw new NotImplementedException ();
 			}
 			set {
-				ViewState ["ReadOnly"] = value;
+				throw new NotImplementedException ();
 			}
 		}
-		
-//		[TypeConverterAttribute (typeof(System.ComponentModel.MultilineStringConverter)]
-		[EditorAttribute ("System.ComponentModel.Design.MultilineStringEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
-		[DefaultValueAttribute ("")]
-		public virtual string Schema {
+
+		[DefaultValue ("")]
+		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("Inline XML data.")]
+		[WebCategory ("Data")]
+		[EditorAttribute ("System.ComponentModel.Design.MultilineStringEditor," + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
+//		[TypeConverter (typeof(MultilineStringConverter))]
+		public virtual string Data {
 			get {
-				string ret = ViewState ["Schema"] as string;
+				string ret = ViewState ["Data"] as string;
 				return ret != null ? ret : "";
 			}
 			set {
-				if (Schema != value) {
-					ViewState ["Schema"] = value;
-					xmlDataDocument = null;
+				if (Data != value) {
+					ViewState ["Data"] = value;
+					xmlDocument = null;
 					OnDataSourceChanged(EventArgs.Empty);
 				}
 			}
 		}
 		
 		[DefaultValueAttribute ("")]
-		[EditorAttribute ("System.Web.UI.Design.XsdSchemaFileEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		public virtual string SchemaFile {
+		[EditorAttribute ("System.Web.UI.Design.XmlDataFileEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
+		public virtual string DataFile {
 			get {
-				string ret = ViewState ["SchemaFile"] as string;
+				string ret = ViewState ["DataFile"] as string;
 				return ret != null ? ret : "";
 			}
 			set {
-				if (SchemaFile != value) {
-					ViewState ["SchemaFile"] = value;
-					xmlDataDocument = null;
+				if (DataFile != value) {
+					ViewState ["DataFile"] = value;
+					xmlDocument = null;
 					OnDataSourceChanged(EventArgs.Empty);
 				}
 			}
@@ -261,14 +230,14 @@ namespace System.Web.UI.WebControls {
 		
 		XsltArgumentList transformArgumentList;
 		
-	    [BrowsableAttribute (false)]
+		[BrowsableAttribute (false)]
 		public virtual XsltArgumentList TransformArgumentList {
 			get { return transformArgumentList; }
 			set { transformArgumentList = value; }
 		}
 		
 		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
-		[EditorAttribute ("System.ComponentModel.Design.MultilineStringEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
+		[EditorAttribute ("System.ComponentModel.Design.MultilineStringEditor," + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 		[DefaultValueAttribute ("")]
 //		[TypeConverterAttribute (typeof(System.ComponentModel.MultilineStringConverter))]
 		public virtual string Transform {
@@ -279,7 +248,7 @@ namespace System.Web.UI.WebControls {
 			set {
 				if (Transform != value) {
 					ViewState ["Transform"] = value;
-					xmlDataDocument = null;
+					xmlDocument = null;
 					OnDataSourceChanged(EventArgs.Empty);
 				}
 			}
@@ -295,7 +264,7 @@ namespace System.Web.UI.WebControls {
 			set {
 				if (TransformFile != value) {
 					ViewState ["TransformFile"] = value;
-					xmlDataDocument = null;
+					xmlDocument = null;
 					OnDataSourceChanged(EventArgs.Empty);
 				}
 			}