Cleaned up misc bits in the sample app.

Author: JM

DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/MainWindow.xaml

@@ -12,10 +12,6 @@
         xmlns:sys="clr-namespace:System;assembly=mscorlib"
         mc:Ignorable="d"
         Title="MainWindow" Height="700" Width="1100">
-    <Window.Resources>
-        <local:ColorToBrushConverter x:Key="colorToBrushConverter"/>
-    </Window.Resources>
-    
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="5*"/>
@@ -108,8 +104,6 @@
                     <local:DataSourceConfigurationInfo BaseUri="http://data.scottsdaleaz.gov/Finance/BusinessLicenses.svc" EntitySet="BusinessLicenses"  Description="Scottsdale Business Licenses"/>
                     <local:DataSourceConfigurationInfo BaseUri="http://data.scottsdaleaz.gov/Purchasing/Solicitations.svc" EntitySet="Solicitations"  Description="Scottsdale Purchasing Solicitations"/>
                     <local:DataSourceConfigurationInfo BaseUri="http://packages.nuget.org/v1/FeedService.svc" EntitySet="Packages"  Description="NuGet Packages"/>
-                    <local:DataSourceConfigurationInfo BaseUri="http://odata.research.microsoft.com/odata.svc" EntitySet="Projects"  Description="Microsoft Research - Projects"/>
-                    <local:DataSourceConfigurationInfo BaseUri="http://odata.research.microsoft.com/odata.svc" EntitySet="Publications"  Description="Microsoft Research - Publications"/>
                 </ComboBox>
                 <CheckBox x:Name="chkNullOutDatasource" IsChecked="True" Style="{StaticResource CheckBoxText}">Null out datasource before setting new</CheckBox>
 

DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/MainWindow.xaml.cs

@@ -289,74 +289,4 @@ public class DataSourceConfigurationInfo
 		public string[] DesiredFields { get; set; }
 	}
 	#endregion //DataSourceConfigurationInfo Class
-
-	#region ColorToBrushConverter Class
-	public class ColorToBrushConverter : IValueConverter
-	{
-		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			return Process(value, targetType, parameter, culture);
-		}
-
-		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			return Process(value, targetType, parameter, culture);
-		}
-
-		private static object Process(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			if (value is string)
-			{
-				Color color = Parse((string)value);
-
-				if (targetType == typeof(Brush) || targetType == typeof(SolidColorBrush))
-					return new SolidColorBrush(color);
-				else
-				if (targetType == typeof(Color) || targetType == typeof(Nullable<Color>))
-					return color;
-			}
-
-			if (value is SolidColorBrush)
-			{
-				if (targetType == typeof(Brush) || targetType == typeof(SolidColorBrush))
-					return value;
-				else
-				if (targetType == typeof(Color) || targetType == typeof(Nullable<Color>))
-					return ((SolidColorBrush)value).Color;
-			}
-
-			if (value == null)
-			{
-				if (targetType == typeof(Brush) || targetType == typeof(SolidColorBrush))
-					return new SolidColorBrush(Color.FromArgb(0, 0, 0, 0));
-				else
-				if (targetType == typeof(Color) || targetType == typeof(Nullable<Color>))
-					return Color.FromArgb(0, 0, 0, 0);
-			}
-
-			if (value is Color)
-			{
-				if (targetType == typeof(Brush) || targetType == typeof(SolidColorBrush))
-					return new SolidColorBrush((Color)value);
-				else
-				if (targetType == typeof(Color) || targetType == typeof(Nullable<Color>))
-					return value;
-			}
-
-			throw new NotSupportedException("ColorToBrushConverter cannot convert value!");
-		}
-
-		private static Color Parse(string color)
-		{
-			var offset = color.StartsWith("#") ? 1 : 0;
-
-			var a = Byte.Parse(color.Substring(0 + offset, 2), NumberStyles.HexNumber);
-			var r = Byte.Parse(color.Substring(2 + offset, 2), NumberStyles.HexNumber);
-			var g = Byte.Parse(color.Substring(4 + offset, 2), NumberStyles.HexNumber);
-			var b = Byte.Parse(color.Substring(6 + offset, 2), NumberStyles.HexNumber);
-
-			return Color.FromArgb(a, r, g, b);
-		}
-	}
-	#endregion //ColorToBrushConverter Class
 }