summaryrefslogtreecommitdiffstats
path: root/src/DotNetOpenAuth.Core.UI/ComponentModel
diff options
context:
space:
mode:
Diffstat (limited to 'src/DotNetOpenAuth.Core.UI/ComponentModel')
-rw-r--r--src/DotNetOpenAuth.Core.UI/ComponentModel/ConverterBase.cs3
-rw-r--r--src/DotNetOpenAuth.Core.UI/ComponentModel/SuggestedStringsConverter.cs2
-rw-r--r--src/DotNetOpenAuth.Core.UI/ComponentModel/SuggestedStringsConverterContract.cs30
3 files changed, 1 insertions, 34 deletions
diff --git a/src/DotNetOpenAuth.Core.UI/ComponentModel/ConverterBase.cs b/src/DotNetOpenAuth.Core.UI/ComponentModel/ConverterBase.cs
index ca17197..eec2304 100644
--- a/src/DotNetOpenAuth.Core.UI/ComponentModel/ConverterBase.cs
+++ b/src/DotNetOpenAuth.Core.UI/ComponentModel/ConverterBase.cs
@@ -145,7 +145,7 @@ namespace DotNetOpenAuth.ComponentModel {
/// </exception>
[SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "System.Diagnostics.Contracts.__ContractsRuntime.Assume(System.Boolean,System.String,System.String)", Justification = "No localization required.")]
public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType) {
- Contract.Assume(destinationType != null, "Missing contract.");
+ Assumes.True(destinationType != null, "Missing contract.");
if (destinationType.IsInstanceOfType(value)) {
return value;
}
@@ -181,7 +181,6 @@ namespace DotNetOpenAuth.ComponentModel {
[Pure]
[SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "Potentially expensive call.")]
protected virtual ICollection GetStandardValuesForCache() {
- Contract.Ensures(Contract.Result<ICollection>() != null);
return new T[0];
}
diff --git a/src/DotNetOpenAuth.Core.UI/ComponentModel/SuggestedStringsConverter.cs b/src/DotNetOpenAuth.Core.UI/ComponentModel/SuggestedStringsConverter.cs
index 126b140..fd960d3 100644
--- a/src/DotNetOpenAuth.Core.UI/ComponentModel/SuggestedStringsConverter.cs
+++ b/src/DotNetOpenAuth.Core.UI/ComponentModel/SuggestedStringsConverter.cs
@@ -17,7 +17,6 @@ namespace DotNetOpenAuth.ComponentModel {
/// A type that generates suggested strings for Intellisense,
/// but doesn't actually convert between strings and other types.
/// </summary>
- [ContractClass(typeof(SuggestedStringsConverterContract))]
public abstract class SuggestedStringsConverter : ConverterBase<string> {
/// <summary>
/// Initializes a new instance of the <see cref="SuggestedStringsConverter"/> class.
@@ -38,7 +37,6 @@ namespace DotNetOpenAuth.ComponentModel {
/// <returns>A collection of values.</returns>
internal static ICollection GetStandardValuesForCacheShared(Type type) {
Requires.NotNull(type, "type");
- Contract.Ensures(Contract.Result<ICollection>() != null);
var fields = from field in type.GetFields(BindingFlags.Static | BindingFlags.Public)
select field.GetValue(null);
diff --git a/src/DotNetOpenAuth.Core.UI/ComponentModel/SuggestedStringsConverterContract.cs b/src/DotNetOpenAuth.Core.UI/ComponentModel/SuggestedStringsConverterContract.cs
deleted file mode 100644
index dbd2278..0000000
--- a/src/DotNetOpenAuth.Core.UI/ComponentModel/SuggestedStringsConverterContract.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="SuggestedStringsConverterContract.cs" company="Outercurve Foundation">
-// Copyright (c) Outercurve Foundation. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace DotNetOpenAuth.ComponentModel {
- using System;
- using System.Collections;
- using System.ComponentModel.Design.Serialization;
- using System.Diagnostics.Contracts;
- using System.Linq;
- using System.Reflection;
-
- /// <summary>
- /// Contract class for the <see cref="SuggestedStringsConverter"/> class.
- /// </summary>
- [ContractClassFor(typeof(SuggestedStringsConverter))]
- internal abstract class SuggestedStringsConverterContract : SuggestedStringsConverter {
- /// <summary>
- /// Gets the type to reflect over for the well known values.
- /// </summary>
- protected override Type WellKnownValuesType {
- get {
- Contract.Ensures(Contract.Result<Type>() != null);
- throw new NotImplementedException();
- }
- }
- }
-}