Skip to content

Commit edecaab

Browse files
ig-robstoffersig-robstoffers
authored
Merge pull request #15 from Infragistics/vnext
Merge vnext into master
2 parents f190f91 + 33c02b0 commit edecaab

File tree

9 files changed

+98
-34
lines changed

9 files changed

+98
-34
lines changed

‎DataSource.DataProviders.OData/DataSource.DataProviders.OData.Core/DataSource.DataProviders.OData.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414

1515
<ItemGroup>
1616
<Reference Include="Infragistics.Core">
17-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2019.2\Source\Build\netstandard2.0\Infragistics.Core.dll</HintPath>
17+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2020.1\Source\Build\netstandard2.0\Infragistics.Core.dll</HintPath>
1818
<SpecificVersion>false</SpecificVersion>
1919
</Reference>
2020
<Reference Include="Infragistics.Core.DataVisualization">
21-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2019.2\Source\Build\netstandard2.0\Infragistics.Core.DataVisualization.dll</HintPath>
21+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2020.1\Source\Build\netstandard2.0\Infragistics.Core.DataVisualization.dll</HintPath>
2222
<SpecificVersion>false</SpecificVersion>
2323
</Reference>
2424
<Reference Include="Infragistics.Core.Platform">
25-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2019.2\Source\Build\netstandard2.0\Infragistics.Core.Platform.dll</HintPath>
25+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2020.1\Source\Build\netstandard2.0\Infragistics.Core.Platform.dll</HintPath>
2626
<SpecificVersion>false</SpecificVersion>
2727
</Reference>
2828
</ItemGroup>

‎DataSource.DataProviders.OData/DataSource.DataProviders.OData/DataSource.DataProviders.OData.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="InfragisticsWPF4.DataVisualization.v19.2, Version=19.2.0.9000, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL">
35+
<Reference Include="InfragisticsWPF4.DataVisualization.v20.1, Version=20.1.0.9000, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL">
3636
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2019.2\Source\Build\InfragisticsWPF4.DataVisualization.v19.2.dll</HintPath>
37+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2020.1\Source\Build\InfragisticsWPF4.DataVisualization.v20.1.dll</HintPath>
3838
</Reference>
39-
<Reference Include="InfragisticsWPF4.v19.2, Version=19.2.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
39+
<Reference Include="InfragisticsWPF4.v20.1, Version=20.1.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
4040
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2019.2\Source\Build\InfragisticsWPF4.v19.2.dll</HintPath>
41+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2020.1\Source\Build\InfragisticsWPF4.v20.1.dll</HintPath>
4242
</Reference>
4343
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4444
<HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>

‎DataSource.DataProviders.SQLite/DataSource.DataProviders.SQLite.Core/DataSource.DataProviders.SQLite.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
<ItemGroup>
1818
<Reference Include="Infragistics.Core">
19-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2019.2\Source\Build\netstandard2.0\Infragistics.Core.dll</HintPath>
19+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2020.1\Source\Build\netstandard2.0\Infragistics.Core.dll</HintPath>
2020
<SpecificVersion>false</SpecificVersion>
2121
</Reference>
2222
<Reference Include="Infragistics.Core.DataVisualization">
23-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2019.2\Source\Build\netstandard2.0\Infragistics.Core.DataVisualization.dll</HintPath>
23+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2020.1\Source\Build\netstandard2.0\Infragistics.Core.DataVisualization.dll</HintPath>
2424
<SpecificVersion>false</SpecificVersion>
2525
</Reference>
2626
<Reference Include="Infragistics.Core.Platform">
27-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2019.2\Source\Build\netstandard2.0\Infragistics.Core.Platform.dll</HintPath>
27+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2020.1\Source\Build\netstandard2.0\Infragistics.Core.Platform.dll</HintPath>
2828
<SpecificVersion>false</SpecificVersion>
2929
</Reference>
3030
</ItemGroup>

‎DataSource.DataProviders.SQLite/DataSource.DataProviders.SQLite/DataSource.DataProviders.SQLite.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="InfragisticsWPF4.DataVisualization.v19.2, Version=19.2.0.9000, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL">
36-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2019.2\Source\Build\InfragisticsWPF4.DataVisualization.v19.2.dll</HintPath>
35+
<Reference Include="InfragisticsWPF4.DataVisualization.v20.1, Version=20.1.0.9000, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL">
36+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2020.1\Source\Build\InfragisticsWPF4.DataVisualization.v20.1.dll</HintPath>
3737
<SpecificVersion>False</SpecificVersion>
3838
</Reference>
39-
<Reference Include="InfragisticsWPF4.v19.2, Version=19.2.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
40-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2019.2\Source\Build\InfragisticsWPF4.v19.2.dll</HintPath>
39+
<Reference Include="InfragisticsWPF4.v20.1, Version=20.1.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
40+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2020.1\Source\Build\InfragisticsWPF4.v20.1.dll</HintPath>
4141
<SpecificVersion>False</SpecificVersion>
4242
</Reference>
4343
<Reference Include="PresentationCore" />

‎DataSource.DataProviders.SQLite/SQLiteDataProvider/SQLiteDataSourceFilterExpressionVisitor.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ public override void VisitFunctionExpression(IFunctionFilterExpression expressio
283283
case FilterExpressionFunctionType.Ceiling:
284284
throw new NotImplementedException();
285285
//functionName = "ceiling";
286-
break;
287286
case FilterExpressionFunctionType.Concat:
288287
between = " || ";
289288
break;
@@ -294,18 +293,15 @@ public override void VisitFunctionExpression(IFunctionFilterExpression expressio
294293
break;
295294
case FilterExpressionFunctionType.Day:
296295
throw new NotImplementedException();
297-
break;
298296
case FilterExpressionFunctionType.EndsWith:
299297
unquote = true;
300298
between = " LIKE '%";
301299
postfix = "'";
302300
break;
303301
case FilterExpressionFunctionType.Floor:
304302
throw new NotImplementedException();
305-
break;
306303
case FilterExpressionFunctionType.Hour:
307304
throw new NotImplementedException();
308-
break;
309305
case FilterExpressionFunctionType.IndexOf:
310306
functionName = "intstr";
311307
break;
@@ -314,10 +310,8 @@ public override void VisitFunctionExpression(IFunctionFilterExpression expressio
314310
break;
315311
case FilterExpressionFunctionType.Minute:
316312
throw new NotImplementedException();
317-
break;
318313
case FilterExpressionFunctionType.Month:
319314
throw new NotImplementedException();
320-
break;
321315
case FilterExpressionFunctionType.Replace:
322316
functionName = "replace";
323317
break;
@@ -326,7 +320,6 @@ public override void VisitFunctionExpression(IFunctionFilterExpression expressio
326320
break;
327321
case FilterExpressionFunctionType.Second:
328322
throw new NotImplementedException();
329-
break;
330323
case FilterExpressionFunctionType.StartsWith:
331324
unquote = true;
332325
between = " LIKE '";
@@ -346,7 +339,6 @@ public override void VisitFunctionExpression(IFunctionFilterExpression expressio
346339
break;
347340
case FilterExpressionFunctionType.Year:
348341
throw new NotImplementedException();
349-
break;
350342
}
351343

352344
if (functionName != null)

‎DataSource.DataProviders.SQLite/SQLiteDataProvider/SQLiteVirtualDataSourceDataProvider.cs‎

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111
using System.Reflection;
1212
#if !PCL
1313
using Infragistics.Controls.DataSource;
14+
using Infragistics.Controls.DataSource.Transactions;
1415
#endif
1516

1617
#if PCL
1718
using Infragistics.Core.Controls.DataSource;
19+
using Infragistics.Core.Controls.DataSource.Transactions;
1820
#endif
1921

2022
#if DATA_PRESENTER
@@ -23,8 +25,7 @@ namespace Reference.DataSources.OData
2325
namespace Infragistics.Controls.DataSource
2426
#endif
2527
{
26-
public class SQLiteVirtualDataSourceDataProvider
27-
: IDataSourceVirtualDataProvider
28+
public class SQLiteVirtualDataSourceDataProvider : IDataSourceVirtualDataProvider
2829
{
2930

3031
private SQLiteVirtualDataSourceDataProviderWorker _worker;
@@ -733,6 +734,42 @@ public DataSourceSchemaPropertyType ResolveSchemaPropertyType(string propertyPat
733734

734735
return DataSourceSchemaPropertyType.ObjectValue;
735736
}
737+
738+
private DataSourceBatchCompletedCallback _batchCompleted;
739+
public DataSourceBatchCompletedCallback BatchCompleted
740+
{
741+
get
742+
{
743+
return _batchCompleted;
744+
}
745+
set
746+
{
747+
_batchCompleted = value;
748+
}
749+
}
750+
751+
public void SetItemValue(object item, string valueName, object value)
752+
{
753+
// does nothing.
754+
}
755+
756+
public void RemoveItem(object item)
757+
{
758+
// does nothing.
759+
}
760+
761+
public void AddItem(object item)
762+
{
763+
// does nothing.
764+
}
765+
766+
public void CreateBatchRequest(TransactionState[] changes)
767+
{
768+
if (_worker != null)
769+
{
770+
_worker.CreateBatchRequest(changes);
771+
}
772+
}
736773
}
737774

738775

‎DataSource.DataProviders.SQLite/SQLiteDataProvider/SQLiteVirtualDataSourceDataProviderWorker.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ protected override void ProcessCompletedTask(AsyncDataSourcePageTaskHolder compl
497497
return;
498498
}
499499
}
500-
catch (TaskCanceledException e)
500+
catch (TaskCanceledException)
501501
{
502502
RetryIndex(pageIndex, currentDelay);
503503
//TODO: other exceptions? Is there a way to skip this state for canceled stuff?

‎ODataDataProvider/ODataVirtualDataSourceDataProvider.cs‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
using System.Diagnostics;
1111
#if !PCL
1212
using Infragistics.Controls.DataSource;
13+
using Infragistics.Controls.DataSource.Transactions;
1314
#endif
1415

1516
#if PCL
1617
using Infragistics.Core.Controls.DataSource;
18+
using Infragistics.Core.Controls.DataSource.Transactions;
1719
#endif
1820

1921
#if DATA_PRESENTER
@@ -22,8 +24,7 @@ namespace Reference.DataSources.OData
2224
namespace Infragistics.Controls.DataSource
2325
#endif
2426
{
25-
public class ODataVirtualDataSourceDataProvider
26-
: IDataSourceVirtualDataProvider
27+
public class ODataVirtualDataSourceDataProvider : IDataSourceVirtualDataProvider
2728
{
2829

2930
private ODataVirtualDataSourceDataProviderWorker _worker;
@@ -668,7 +669,41 @@ public DataSourceSchemaPropertyType ResolveSchemaPropertyType(string propertyPat
668669

669670
return DataSourceSchemaPropertyType.ObjectValue;
670671
}
671-
}
672672

673-
673+
private DataSourceBatchCompletedCallback _batchCompleted;
674+
public DataSourceBatchCompletedCallback BatchCompleted
675+
{
676+
get
677+
{
678+
return _batchCompleted;
679+
}
680+
set
681+
{
682+
_batchCompleted = value;
683+
}
684+
}
685+
686+
public void SetItemValue(object item, string valueName, object value)
687+
{
688+
// does nothing.
689+
}
690+
691+
public void RemoveItem(object item)
692+
{
693+
// does nothing.
694+
}
695+
696+
public void AddItem(object item)
697+
{
698+
// does nothing.
699+
}
700+
701+
public void CreateBatchRequest(TransactionState[] changes)
702+
{
703+
if (_worker != null)
704+
{
705+
_worker.CreateBatchRequest(changes);
706+
}
707+
}
708+
}
674709
}

‎ODataDataProvider/ODataVirtualDataSourceDataProviderWorker.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ protected override void Initialize()
9494

9595
lock (SyncLock)
9696
{
97-
_client = new ODataClient(new ODataClientSettings(_baseUri)
97+
_client = new ODataClient(new ODataClientSettings()
9898
{
99+
BaseUri = new Uri(_baseUri),
99100
IgnoreUnmappedProperties = true
100101
});
101102
}
@@ -206,7 +207,7 @@ protected override void ProcessCompletedTask(AsyncDataSourcePageTaskHolder compl
206207
return;
207208
}
208209
}
209-
catch (TaskCanceledException e)
210+
catch (TaskCanceledException)
210211
{
211212
RetryIndex(pageIndex, currentDelay);
212213
//TODO: other exceptions? Is there a way to skip this state for canceled stuff?
@@ -436,7 +437,7 @@ private ISectionInformation[] ResolveGroupInformation()
436437

437438
return groupInformation.ToArray();
438439
}
439-
catch (Exception e)
440+
catch (Exception)
440441
{
441442
return null;
442443
}
@@ -518,7 +519,7 @@ private ISummaryResult[] ResolveSummaryInformation()
518519

519520
return CreateSummaryResults(summaryData);
520521
}
521-
catch (Exception e)
522+
catch (Exception)
522523
{
523524
return null;
524525
}
@@ -666,7 +667,6 @@ private DataSourceSchemaPropertyType ResolvePropertyType(string propertyName)
666667
}
667668

668669
private string _filterString = null;
669-
private string _selectedString = null;
670670
public const int SchemaRequestIndex = -1;
671671
private SortDescriptionCollection _groupDescriptions;
672672
private bool _isAggregationSupportedByServer = false;

0 commit comments

Comments
 (0)