adjust to changes in grid/datasource api

Author: gmurray81

DataSource.DataProviders.OData/ODataSampleApp/MainWindow.xaml.cs

@@ -31,9 +31,9 @@ public MainWindow()
             {
                 BaseUri = "http://services.odata.org/V4/Northwind/Northwind.svc",
                 EntitySet = "Orders",
-                DesiredPageSize = 200
+                PageSizeRequested = 200
             };
-            source.ShouldDeferAutoRefresh = true;
+            //source.DeferAutoRefresh = true;
             source.SchemaChanged += Source_SchemaChanged;
 
             source.SortDescriptions.Add(new SortDescription("ShipName", ListSortDirection.Descending));
@@ -47,13 +47,13 @@ public MainWindow()
 
             grid1.ItemsSource = source;
 
-            Task.Delay(10000).ContinueWith((t) =>
-            {
-                Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    source.ShouldDeferAutoRefresh = false;
-                }));
-            });
+            //Task.Delay(10000).ContinueWith((t) =>
+            //{
+            //    Dispatcher.BeginInvoke(new Action(() =>
+            //    {
+            //        source.DeferAutoRefresh = false;
+            //    }));
+            //});
         }
 
         private void Source_SchemaChanged(object sender, DataSourceSchemaChangedEventArgs args)

ODataDataProvider/ODataVirtualDataSourceDataProvider.cs

@@ -44,7 +44,7 @@ private void SortDescriptions_CollectionChanged(object sender, System.Collection
 
         public void AddPageRequest(int pageIndex, DataSourcePageRequestPriority priority)
         {
-            if (ShouldDeferAutoRefresh)
+            if (DeferAutoRefresh)
             {
                 return;
             }
@@ -103,13 +103,13 @@ private ODataVirtualDataSourceDataProviderWorkerSettings GetWorkerSettings()
             {
                 BaseUri = _baseUri,
                 EntitySet = _entitySet,
-                DesiredPageSize = _desiredPageSize,
+                PageSizeRequested = _pageSizeRequested,
                 TimeoutMilliseconds = _timeoutMilliseconds,
                 PageLoaded = _callback,
                 ExecutionContext = _executionContext,
                 SortDescriptions = _sortDescriptions,
                 FilterExpressions = _filterExpressions,
-                DesiredProperties = _desiredProperties
+                PropertiesRequested = _propertiesRequested
             };
         }
 
@@ -194,16 +194,16 @@ private void KillWorker()
             }
         }
 
-        private int _desiredPageSize = 200;
-        public int DesiredPageSize
+        private int _pageSizeRequested = 200;
+        public int PageSizeRequested
         {
             get
             {
-                return _desiredPageSize;
+                return _pageSizeRequested;
             }
             set
             {
-                _desiredPageSize = value;
+                _pageSizeRequested = value;
                 QueueAutoRefresh();
             }
         }
@@ -222,7 +222,7 @@ public string BaseUri
                 if (oldValue != _baseUri)
                 {
                     QueueAutoRefresh();
-                    if (Valid() && ShouldDeferAutoRefresh)
+                    if (Valid() && DeferAutoRefresh)
                     {
                         QueueSchemaFetch();
                     }
@@ -244,7 +244,7 @@ public string EntitySet
                 if (oldValue != _entitySet)
                 {
                     QueueAutoRefresh();
-                    if (Valid() && ShouldDeferAutoRefresh)
+                    if (Valid() && DeferAutoRefresh)
                     {
                         QueueSchemaFetch();
                     }
@@ -283,14 +283,20 @@ public object GetItemValue(object item, string valueName)
         private int _currentFullCount = 0;
         private IDataSourceSchema _currentSchema;
 
-        public int GetCount()
+        public int ActualCount
         {
-            return _currentFullCount;
+            get
+            {
+                return _currentFullCount;
+            }
         }
 
-        public IDataSourceSchema GetSchema()
+        public IDataSourceSchema ActualSchema
         {
-            return _currentSchema;
+            get
+            {
+                return _currentSchema;
+            }
         }
 
         private IDataSourceExecutionContext _executionContext;
@@ -320,22 +326,22 @@ public IDataSourceDataProviderUpdateNotifier UpdateNotifier
             }
         }
 
-        private bool _shouldDeferAutoRefresh = false;
-        public bool ShouldDeferAutoRefresh
+        private bool _deferAutoRefresh = false;
+        public bool DeferAutoRefresh
         {
             get
             {
-                return _shouldDeferAutoRefresh;
+                return _deferAutoRefresh;
             }
 
             set
             {
-                _shouldDeferAutoRefresh = value;
-                if (!_shouldDeferAutoRefresh)
+                _deferAutoRefresh = value;
+                if (!_deferAutoRefresh)
                 {
                     QueueAutoRefresh();
                 }
-                if (_shouldDeferAutoRefresh && Valid() && _currentSchema == null)
+                if (_deferAutoRefresh && Valid() && _currentSchema == null)
                 {
                     QueueSchemaFetch();
                 }
@@ -367,16 +373,16 @@ public SortDescriptionCollection SortDescriptions
             }
         }
 
-        private string[] _desiredProperties;
-        public string[] DesiredProperties
+        private string[] _propertiesRequested;
+        public string[] PropertiesRequested
         {
             get
             {
-                return _desiredProperties;
+                return _propertiesRequested;
             }
             set
             {
-                _desiredProperties = value;
+                _propertiesRequested = value;
                 QueueAutoRefresh();
             }
         }
@@ -390,7 +396,7 @@ public FilterExpressionCollection FilterExpressions
             }
         }
 
-        public bool AreSortingAndFilteringExternal
+        public bool NotifyUsingSourceIndexes
         {
             get
             {
@@ -478,7 +484,7 @@ internal void SchemaFetchInternal()
 
         protected virtual void SchemaFetchInternalOverride()
         {
-            if (!ShouldDeferAutoRefresh)
+            if (!DeferAutoRefresh)
             {
                 return;
             }
@@ -500,7 +506,7 @@ private void AddSchemaRequest()
         internal bool _autoRefreshQueued = false;
         public void QueueAutoRefresh()
         {
-            if (ShouldDeferAutoRefresh)
+            if (DeferAutoRefresh)
             {
                 return;
             }
@@ -518,7 +524,7 @@ public void QueueAutoRefresh()
 
         internal void DoRefreshInternal()
         {
-            if (ShouldDeferAutoRefresh)
+            if (DeferAutoRefresh)
             {
                 _autoRefreshQueued = false;
                 return;

ODataDataProvider/ODataVirtualDataSourceDataProviderWorker.cs

@@ -25,7 +25,7 @@ internal class ODataVirtualDataSourceDataProviderWorkerSettings
 
         public FilterExpressionCollection FilterExpressions { get; set; }
 
-        public string[] DesiredProperties { get; set; }
+        public string[] PropertiesRequested { get; set; }
     }
 
 
@@ -123,7 +123,7 @@ public ODataVirtualDataSourceDataProviderWorker(ODataVirtualDataSourceDataProvid
             _entitySet = settings.EntitySet;
             _sortDescriptions = settings.SortDescriptions;
             _filterExpressions = settings.FilterExpressions;
-            _desiredPropeties = settings.DesiredProperties;
+            _desiredPropeties = settings.PropertiesRequested;
             Task.Factory.StartNew(() => DoWork(), TaskCreationOptions.LongRunning);
         }