Skip to content

Commit 20553c8

Browse files
JMJM
JM
authored and
JM
committed
Various code modifications to remain in sync with API naming changes in the underlying data source classes.
1 parent 46555cb commit 20553c8

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,18 @@
8080
<TextBlock Text="ODATA SERVICES" Style="{StaticResource HeaderText1}"/>
8181
<ComboBox x:Name="cboOdataSources" SelectionChanged="cboOdataSources_SelectionChanged" Style="{StaticResource ComboBoxText}">
8282
<local:DataSourceConfigurationInfo BaseUri="http://data.scottsdaleaz.gov/Planning/BuildingPermits.svc" EntitySet="BuildingPermits" Description="Scottsdale Building Permits">
83-
<!-- Limit the amount of data fetched from this OData service by setting the DesiredFIelds property. Refer to
83+
<!-- Limit the amount of data fetched from this OData service by setting the FieldsRequested property. Refer to
8484
the cboOdataSources_SelectionChanged event handler code in MainWindow.xaml.cs to see how we apply these settings when
8585
we create a new ODataDataSource instance. -->
86-
<local:DataSourceConfigurationInfo.DesiredFields>
86+
<local:DataSourceConfigurationInfo.FieldsRequested>
8787
<x:Array Type="sys:String">
8888
<sys:String>PermitNumber</sys:String>
8989
<sys:String>PermitStatus</sys:String>
9090
<sys:String>IssueDate</sys:String>
9191
<sys:String>Address</sys:String>
9292
<sys:String>Zone</sys:String>
9393
</x:Array>
94-
</local:DataSourceConfigurationInfo.DesiredFields>
94+
</local:DataSourceConfigurationInfo.FieldsRequested>
9595
</local:DataSourceConfigurationInfo>
9696
<local:DataSourceConfigurationInfo BaseUri="http://data.scottsdaleaz.gov/Planning/BuildingPermits.svc" EntitySet="BuildingInspections" Description="Scottsdale Building Inspections"/>
9797
<local:DataSourceConfigurationInfo BaseUri="http://data.scottsdaleaz.gov/MunicipalServices/CapitalImprovementProjects.svc" EntitySet="Projects" Description="Scottsdale Capital Improvement Projects"/>
@@ -115,8 +115,8 @@
115115
<TextBlock Text="DATASOURCE SETTINGS" Style="{StaticResource HeaderText1}"/>
116116

117117
<!-- Desired Page Size -->
118-
<TextBlock Text="DESIRED PAGE SIZE" Style="{StaticResource HeaderText2}"/>
119-
<igEditors:XamNumericEditor x:Name="numDesiredPageSize" Width="100" HorizontalAlignment="Left" Mask="9999" EditModeEnded="numDesiredPageSize_EditModeEnded" SpinButtonDisplayMode="Always" SpinIncrement="10" Style="{StaticResource NumericEditorText}">
118+
<TextBlock Text="PAGE SIZE REQUESTED" Style="{StaticResource HeaderText2}"/>
119+
<igEditors:XamNumericEditor x:Name="numPageSizeRequested" Width="100" HorizontalAlignment="Left" Mask="9999" EditModeEnded="numPageSizeRequested_EditModeEnded" SpinButtonDisplayMode="Always" SpinIncrement="10" Style="{StaticResource NumericEditorText}">
120120
<igEditors:XamNumericEditor.ValueConstraint>
121121
<igEditors:ValueConstraint MinInclusive="5" MaxInclusive="1000"/>
122122
</igEditors:XamNumericEditor.ValueConstraint>
@@ -125,7 +125,7 @@
125125
<!-- Maximum number of cached pages -->
126126
<Rectangle Width="1" Height="20" Fill="Transparent"/>
127127
<TextBlock Text="MAX # CACHED PAGES" Style="{StaticResource HeaderText2}"/>
128-
<igEditors:XamNumericEditor x:Name="numMaximumCachedPages" Width="100" HorizontalAlignment="Left" Mask="9999" EditModeEnded="numMaximumCachedPages_EditModeEnded" SpinButtonDisplayMode="Always" SpinIncrement="10" Style="{StaticResource NumericEditorText}">
128+
<igEditors:XamNumericEditor x:Name="numMaxCachedPages" Width="100" HorizontalAlignment="Left" Mask="9999" EditModeEnded="numMaxCachedPages_EditModeEnded" SpinButtonDisplayMode="Always" SpinIncrement="10" Style="{StaticResource NumericEditorText}">
129129
<igEditors:XamNumericEditor.ValueConstraint>
130130
<igEditors:ValueConstraint MinInclusive="5" MaxInclusive="1000"/>
131131
</igEditors:XamNumericEditor.ValueConstraint>

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public MainWindow()
3838
{
3939
InitializeComponent();
4040

41-
this.numDesiredPageSize.Value = 200;
42-
this.numMaximumCachedPages.Value = 200;
41+
this.numPageSizeRequested.Value = 200;
42+
this.numMaxCachedPages.Value = 200;
4343
this.cboOdataSources.SelectedIndex = 0;
4444
this.cboDataPresenterView.SelectedIndex = 0;
4545
this.cboRecordFilterLogicalOperator.SelectedIndex = 0;
@@ -95,12 +95,12 @@ private ODataDataSource CurrentDataSource
9595
}
9696
#endregion //CurrentDataSource
9797

98-
#region DesiredPageSize
99-
private int DesiredPageSize
98+
#region PageSizeRequested
99+
private int PageSizeRequested
100100
{
101-
get { return Convert.ToInt32((double)this.numDesiredPageSize.Value); }
101+
get { return Convert.ToInt32((double)this.numPageSizeRequested.Value); }
102102
}
103-
#endregion //DesiredPageSize
103+
#endregion //PageSizeRequested
104104

105105
#region GridView
106106
private Infragistics.Windows.DataPresenter.GridView GridView
@@ -115,12 +115,12 @@ private Infragistics.Windows.DataPresenter.GridView GridView
115115
}
116116
#endregion //GridView
117117

118-
#region MaximumCachedPages
119-
private int MaximumCachedPages
118+
#region MaxCachedPages
119+
private int MaxCachedPages
120120
{
121-
get { return Convert.ToInt32((double)this.numMaximumCachedPages.Value); }
121+
get { return Convert.ToInt32((double)this.numMaxCachedPages.Value); }
122122
}
123-
#endregion //MaximumCachedPages
123+
#endregion //MaxCachedPages
124124

125125
#region TreeView
126126
private Infragistics.Windows.DataPresenter.TreeView TreeView
@@ -235,9 +235,9 @@ private void cboOdataSources_SelectionChanged(object sender, SelectionChangedEve
235235
this.dataPresenter1.DataSource =
236236
new ODataDataSource { BaseUri = dataSourceConfigInfo.BaseUri,
237237
EntitySet = dataSourceConfigInfo.EntitySet,
238-
DesiredFields = dataSourceConfigInfo.DesiredFields,
239-
DesiredPageSize = this.DesiredPageSize,
240-
MaximumCachedPages = this.MaximumCachedPages };
238+
FieldsRequested = dataSourceConfigInfo.FieldsRequested,
239+
PageSizeRequested = this.PageSizeRequested,
240+
MaxCachedPages = this.MaxCachedPages };
241241
}
242242
}
243243
#endregion //cboOdataSources_SelectionChanged
@@ -294,21 +294,21 @@ private void colorPicker_SelectedColorChanged(object sender, Infragistics.Contro
294294
}
295295
#endregion //colorPicker_SelectedColorChanged
296296

297-
#region numDesiredPageSize_EditModeEnded
298-
private void numDesiredPageSize_EditModeEnded(object sender, Infragistics.Windows.Editors.Events.EditModeEndedEventArgs e)
297+
#region numPageSizeRequested_EditModeEnded
298+
private void numPageSizeRequested_EditModeEnded(object sender, Infragistics.Windows.Editors.Events.EditModeEndedEventArgs e)
299299
{
300300
if (null != this.CurrentDataSource)
301-
this.CurrentDataSource.DesiredPageSize = this.DesiredPageSize;
301+
this.CurrentDataSource.PageSizeRequested = this.PageSizeRequested;
302302
}
303-
#endregion //numDesiredPageSize_EditModeEnded
303+
#endregion //numPageSizeRequested_EditModeEnded
304304

305-
#region numMaximumCachedPages_EditModeEnded
306-
private void numMaximumCachedPages_EditModeEnded(object sender, Infragistics.Windows.Editors.Events.EditModeEndedEventArgs e)
305+
#region numMaxCachedPages_EditModeEnded
306+
private void numMaxCachedPages_EditModeEnded(object sender, Infragistics.Windows.Editors.Events.EditModeEndedEventArgs e)
307307
{
308308
if (null != this.CurrentDataSource)
309-
this.CurrentDataSource.MaximumCachedPages = this.MaximumCachedPages;
309+
this.CurrentDataSource.MaxCachedPages = this.MaxCachedPages;
310310
}
311-
#endregion //numMaximumCachedPages_EditModeEnded
311+
#endregion //numMaxCachedPages_EditModeEnded
312312

313313
#endregion //Event Handlers
314314
}
@@ -321,7 +321,7 @@ public class DataSourceConfigurationInfo
321321
public string BaseUri { get; set; }
322322
public string Description { get; set; }
323323
public string EntitySet{ get; set; }
324-
public string[] DesiredFields { get; set; }
324+
public string[] FieldsRequested { get; set; }
325325
}
326326
#endregion //DataSourceConfigurationInfo Class
327327
}

0 commit comments

Comments
 (0)