Some fixes as I read the C# book

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

3 files changed, 37 insertions, 31 deletions

diff --git a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
index eadf04c0b3e..4abef62137d 100644
--- a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
+++ b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
@@ -23,11 +23,11 @@ namespace System.Data.Common
 		private DataTableMappingCollection tableMappings;
 
 		protected DataAdapter () {
-			this.acceptChangesDuringFill = false;
-			this.continueUpdateOnError = false;
-			this.missingMappingAction = Error;
-			this.missingSchemaAction = Error;
-			this.tableMappings = null;
+			acceptChangesDuringFill = false;
+			continueUpdateOnError = false;
+			missingMappingAction = MissingMappingAction.Error;
+			missingSchemaAction = MissingSchemaAction.Error;
+			tableMappings = null;
 		}
 		
 		public abstract int Fill (DataSet dataSet);
@@ -47,45 +47,45 @@ namespace System.Data.Common
 		
 		public bool AcceptChangesDuringFill {
 			get {
-				return this.acceptChangesDuringFill;
+				return acceptChangesDuringFill;
 			}
 			set {
-				this.acceptChangesDuringFill = value;
+				acceptChangesDuringFill = value;
 			}
 		}
 		
 		public bool ContinueUpdateOnError {
 			get {
-				return this.continueUpdateOnError;
+				return continueUpdateOnError;
 			}
 			set {
-				this.continueUpdateOnError = value;
+				continueUpdateOnError = value;
 			}
 		}
 
 		public MissingMappingAction MissingMappingAction {
 			get {
-				return this.missingMappingAction;
+				return missingMappingAction;
 			}
 			set {
-				this.missingMappingAction = value;
+				missingMappingAction = value;
 			}
 		}
 
 		public MissingSchemaAction MissingSchemaAction {
 			get {
-				return this.missingSchemaAction;
+				return missingSchemaAction;
 			}
 			set {
-				this.missingSchemaAction = value;
+				missingSchemaAction = value;
 			}
 		}
 
 		public DataTableMappingCollection TableMappings {
 			get {
-				if (this.tableMappings == null)
-					this.tableMappings = CreateTableMappings ();
-				return this.tableMappings;
+				if (tableMappings == null)
+					tableMappings = CreateTableMappings ();
+				return tableMappings;
 			}
 		}
 	}
diff --git a/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs b/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs
index f5d7d400fd9..f14770453d7 100644
--- a/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs
@@ -21,23 +21,23 @@ namespace System.Data.Common
 		private PermissionState permissionState;
 
 		protected DBDataPermission () {
-			this.allowBlankPassword = false;
-			this.permissionState = None;
+			allowBlankPassword = false;
+			permissionState = PermissionState.None;
 		}
 
 		protected DBDataPermission (PermissionState state) {
-			this.allowBlankPassword = false;
-			this.permissionState = state;
+			allowBlankPassword = false;
+			permissionState = state;
 		}
 
 		public DBDataPermission (PermissionState state, bool abp) {
-			this.allowBlankPassword = abp;
-			this.permissionState = state;
+			allowBlankPassword = abp;
+			permissionState = state;
 		}
 
 		public override IPermission Copy () {
 			DbDataPermission copy = new DbDataPermission (
-				this.permissionState, this.allowBlankPassword);
+				permissionState, allowBlankPassword);
 
 			return copy;
 		}
@@ -47,7 +47,9 @@ namespace System.Data.Common
 			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public override IPermission Intersect (IPermission target) {
+			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
@@ -56,7 +58,7 @@ namespace System.Data.Common
 		}
 
 		public bool IsUnrestricted () {
-			if (this.permissionState == Unrestricted)
+			if (permissionState == PermissionState.Unrestricted)
 				return true;
 			return false;
 		}
@@ -72,8 +74,12 @@ namespace System.Data.Common
 		}
 		
 		public bool AllowBlankPassword {
-			get { return this.allowBlankPassword; }
-			set { this.allowBlankPassword = value; }
+			get {
+				return allowBlankPassword;
+			}
+			set {
+				allowBlankPassword = value;
+			}
 		}
 	}
 }
diff --git a/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs b/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs
index baf702167f4..1a7d682165e 100644
--- a/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs
@@ -17,17 +17,17 @@ namespace System.Data.Common
 		private SecurityAction securityAction;
 		private bool allowBlankPassword;
 
-		protected DBDataPermissionAttribute(SecurityAction action) {
-			this.securityAction = action;
-			this.allowBlankPassword = false;
+		protected DBDataPermissionAttribute (SecurityAction action) {
+			securityAction = action;
+			allowBlankPassword = false;
 		}
 
 		public bool AllowBlankPassword {
 			get {
-				return this.allowBlankPassword;
+				return allowBlankPassword;
 			}
 			set {
-				this.allowBlankPassword = value;
+				allowBlankPassword = value;
 			}
 		}
 	}