X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.UI.WebControls%2FAccessDataSource.cs;h=8d4ea9d48639603223e7112bd6ae7cb635064506;hb=ab2094334d17ac5cd72f12af3d06a91c6f66bd9b;hp=486070871fcee315a39c6d0c239d4cbee96ec6fa;hpb=669beaed8380fa592533c8755f72593b4422d01d;p=mono.git

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSource.cs
index 486070871fc..8d4ea9d4863 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSource.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSource.cs
@@ -4,7 +4,7 @@
 // Authors:
 //   Sanjay Gupta (gsanjay@novell.com)
 //
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2010 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -26,28 +26,26 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System.IO;
 using System.ComponentModel;
 using System.Data.Common;
 using System.Drawing;
 using System.Security.Permissions;
 
-namespace System.Web.UI.WebControls {
-
+namespace System.Web.UI.WebControls
+{
 	// CAS
 	[AspNetHostingPermissionAttribute (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermissionAttribute (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	// attributes
 	[DesignerAttribute ("System.Web.UI.Design.WebControls.AccessDataSourceDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
 	[ToolboxBitmap ("")]
-	public class AccessDataSource : SqlDataSource {
-
+	public class AccessDataSource : SqlDataSource
+	{
 		const string PROVIDER_NAME = "System.Data.OleDb";
 		const string PROVIDER_STRING = "Microsoft.Jet.OLEDB.4.0";
 
-		string dataFile;
+		//string dataFile;
 		string connectionString;
 
 		public AccessDataSource () : base ()
@@ -58,27 +56,21 @@ namespace System.Web.UI.WebControls {
 		public AccessDataSource (string dataFile, string selectCommand) : 
 			base (String.Empty, selectCommand)
 		{
-			this.dataFile = dataFile;
+			//this.dataFile = dataFile;
 			this.ProviderName = PROVIDER_NAME;
 		}
 
 		protected override SqlDataSourceView CreateDataSourceView (string viewName)
 		{
 			AccessDataSourceView view = new AccessDataSourceView (this, viewName, this.Context);
-			view.DataSourceViewChanged += new EventHandler (ViewChanged);
 			if (IsTrackingViewState)
 				((IStateManager) view).TrackViewState ();				
 			return view;
 		}
 
-		void ViewChanged (object source, EventArgs e)
-		{
-			RaiseDataSourceChangedEvent (e);
-		}
-
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		[Browsable (false)]
-		[MonoTODO]
+		[MonoTODO("AccessDataSource does not support SQL Cache Dependencies")]
 		public override string SqlCacheDependency {
 			get { throw new NotSupportedException ("AccessDataSource does not supports SQL Cache Dependencies."); }
 			set { throw new NotSupportedException ("AccessDataSource does not supports SQL Cache Dependencies."); }
@@ -92,8 +84,8 @@ namespace System.Web.UI.WebControls {
 
 		string GetPhysicalDataFilePath ()
 		{
-			if (DataFile == null || DataFile == "")
-				return "";
+			if (String.IsNullOrEmpty (DataFile))
+				return String.Empty;
 
 			// more here?  how do we handle |DataDirectory|?
 			return HttpContext.Current.Request.MapPath (DataFile);
@@ -104,8 +96,7 @@ namespace System.Web.UI.WebControls {
 		public override string ConnectionString {
 			get {
 				if (connectionString == null) {
-					connectionString = String.Format ("Provider={0}; Data Source={1}",
-									  PROVIDER_STRING, GetPhysicalDataFilePath ());
+					connectionString = String.Concat ("Provider=", PROVIDER_STRING, "; Data Source=", GetPhysicalDataFilePath ());
 				}
 
 				return connectionString;
@@ -122,7 +113,7 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescriptionAttribute ("MS Office Access database file name")]
 		[EditorAttribute ("System.Web.UI.Design.MdbDataFileEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 		public string DataFile {
-			get { return ViewState.GetString ("DataFile", ""); }
+			get { return ViewState.GetString ("DataFile", String.Empty); }
 			set {
 				ViewState ["DataFile"] = value;
 				connectionString = null;
@@ -136,7 +127,7 @@ namespace System.Web.UI.WebControls {
 			set { throw new InvalidOperationException
 				("Setting ProviderName on an AccessDataSource is not allowed");
 			}
-		}		
+		}
 	}
 }
-#endif
+