Skip to content
This repository was archived by the owner on Sep 25, 2024. It is now read-only.

Commit f8d6e23

Browse files
author
Eric Maupin
committed
[mac] Remove last error handling
This all needs to move to the EditorContainer left view
1 parent 2eda0b6 commit f8d6e23

12 files changed

+9
-161
lines changed

‎Xamarin.PropertyEditing.Mac/Controls/BasePointEditorControl.cs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,6 @@ public override void ViewDidChangeEffectiveAppearance ()
7878
YLabel.TextColor = HostResources.GetNamedColor (NamedResources.DescriptionLabelColor);
7979
}
8080

81-
protected override void HandleErrorsChanged (object sender, System.ComponentModel.DataErrorsChangedEventArgs e)
82-
{
83-
UpdateErrorsDisplayed (ViewModel.GetErrors (ViewModel.Property.Name));
84-
}
85-
86-
protected override void UpdateErrorsDisplayed (IEnumerable errors)
87-
{
88-
if (ViewModel.HasErrors) {
89-
SetErrors (errors);
90-
} else {
91-
SetErrors (null);
92-
SetEnabled ();
93-
}
94-
}
95-
9681
protected override void SetEnabled ()
9782
{
9883
XEditor.Enabled = ViewModel.Property.CanWrite;

‎Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -133,21 +133,6 @@ protected virtual void OnInputUpdated (object sender, EventArgs e)
133133
ViewModel.Value = (T)Activator.CreateInstance (typeof(T), XEditor.Value, YEditor.Value, WidthEditor.Value, HeightEditor.Value);
134134
}
135135

136-
protected override void HandleErrorsChanged (object sender, System.ComponentModel.DataErrorsChangedEventArgs e)
137-
{
138-
UpdateErrorsDisplayed (ViewModel.GetErrors (ViewModel.Property.Name));
139-
}
140-
141-
protected override void UpdateErrorsDisplayed (IEnumerable errors)
142-
{
143-
if (ViewModel.HasErrors) {
144-
SetErrors (errors);
145-
} else {
146-
SetErrors (null);
147-
SetEnabled ();
148-
}
149-
}
150-
151136
protected override void SetEnabled ()
152137
{
153138
XEditor.Enabled = ViewModel.Property.CanWrite;

‎Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,6 @@ protected override void UpdateValue ()
5959
}
6060
}
6161

62-
protected override void UpdateErrorsDisplayed (IEnumerable errors)
63-
{
64-
if (ViewModel.HasErrors) {
65-
SetErrors (errors);
66-
} else {
67-
SetErrors (null);
68-
SetEnabled ();
69-
}
70-
}
71-
72-
protected override void HandleErrorsChanged (object sender, System.ComponentModel.DataErrorsChangedEventArgs e)
73-
{
74-
UpdateErrorsDisplayed (ViewModel.GetErrors (ViewModel.Property.Name));
75-
}
76-
7762
protected override void SetEnabled ()
7863
{
7964
BooleanEditor.Enabled = ViewModel.Property.CanWrite;

‎Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,11 @@ public override void ViewDidChangeEffectiveAppearance ()
9090
public override NSView FirstKeyView => this.popUpButton;
9191
public override NSView LastKeyView => this.popUpButton;
9292

93-
protected override void HandleErrorsChanged (object sender, DataErrorsChangedEventArgs e)
94-
{
95-
}
96-
9793
protected override void SetEnabled ()
9894
{
9995
this.popUpButton.Enabled = this.ViewModel?.Property.CanWrite ?? false;
10096
}
10197

102-
protected override void UpdateAccessibilityValues ()
103-
{
104-
}
105-
106-
protected override void UpdateErrorsDisplayed (IEnumerable errors)
107-
{
108-
}
109-
11098
string GetTitle ()
11199
{
112100
var title = LocalizationResources.CommonBrushTitleUnknown;

‎Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,13 @@ public override nint GetHeight (EditorViewModel vm)
3434
return subrowHeight * realVm.Choices.Count + 6;
3535
}
3636

37-
protected override void HandleErrorsChanged (object sender, DataErrorsChangedEventArgs e)
38-
{
39-
UpdateErrorsDisplayed (ViewModel.GetErrors (e.PropertyName));
40-
}
41-
4237
protected override void SetEnabled ()
4338
{
4439
foreach (var item in this.combinableList) {
4540
item.Key.Enabled = ViewModel.Property.CanWrite;
4641
}
4742
}
4843

49-
protected override void UpdateErrorsDisplayed (IEnumerable errors)
50-
{
51-
if (ViewModel.HasErrors) {
52-
SetErrors (errors);
53-
} else {
54-
SetErrors (null);
55-
SetEnabled ();
56-
}
57-
}
58-
5944
protected override void OnViewModelChanged (PropertyViewModel oldModel)
6045
{
6146
base.OnViewModelChanged (oldModel);

‎Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,6 @@ protected NSNumberFormatterStyle NumberStyle {
7171
}
7272
}
7373

74-
protected override void UpdateErrorsDisplayed (IEnumerable errors)
75-
{
76-
if (ViewModel.HasErrors) {
77-
SetErrors (errors);
78-
} else {
79-
SetErrors (null);
80-
SetEnabled ();
81-
}
82-
}
83-
84-
protected override void HandleErrorsChanged (object sender, System.ComponentModel.DataErrorsChangedEventArgs e)
85-
{
86-
UpdateErrorsDisplayed (ViewModel.GetErrors (ViewModel.Property.Name));
87-
}
88-
8974
protected override void SetEnabled ()
9075
{
9176
NumericEditor.Enabled = CanEnable;

‎Xamarin.PropertyEditing.Mac/Controls/ObjectEditorControl.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ protected override void UpdateValue ()
4747
{
4848
}
4949

50-
protected override void UpdateErrorsDisplayed (IEnumerable errors)
51-
{
52-
}
53-
54-
protected override void HandleErrorsChanged (object sender, DataErrorsChangedEventArgs e)
55-
{
56-
}
57-
5850
protected override void SetEnabled ()
5951
{
6052
this.createObject.Enabled = ViewModel.Property.CanWrite;

‎Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ public PredefinedValuesEditor (IHostResourceProvider hostResources)
6565
private NSView firstKeyView;
6666
private NSView lastKeyView;
6767

68-
protected override void HandleErrorsChanged (object sender, DataErrorsChangedEventArgs e)
69-
{
70-
UpdateErrorsDisplayed (ViewModel.GetErrors (e.PropertyName));
71-
}
72-
7368
protected override void SetEnabled ()
7469
{
7570
if (ViewModel.IsConstrainedToPredefined) {
@@ -79,16 +74,6 @@ protected override void SetEnabled ()
7974
}
8075
}
8176

82-
protected override void UpdateErrorsDisplayed (IEnumerable errors)
83-
{
84-
if (ViewModel.HasErrors) {
85-
SetErrors (errors);
86-
} else {
87-
SetErrors (null);
88-
SetEnabled ();
89-
}
90-
}
91-
9277
protected override void OnViewModelChanged (PropertyViewModel oldModel)
9378
{
9479
base.OnViewModelChanged (oldModel);

‎Xamarin.PropertyEditing.Mac/Controls/PropertyEditorControl.cs‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,12 @@ public PropertyViewModel ViewModel {
4747
PropertyViewModel oldModel = this.viewModel;
4848
if (oldModel != null) {
4949
oldModel.PropertyChanged -= OnPropertyChanged;
50-
oldModel.ErrorsChanged -= HandleErrorsChanged;
5150
}
5251

5352
this.viewModel = value;
5453
OnViewModelChanged (oldModel);
5554
if (this.viewModel != null) {
5655
this.viewModel.PropertyChanged += OnPropertyChanged;
57-
this.viewModel.ErrorsChanged += HandleErrorsChanged;
5856
}
5957
}
6058
}
@@ -105,7 +103,9 @@ public virtual nint GetHeight (EditorViewModel vm)
105103
return 24;
106104
}
107105

108-
protected abstract void UpdateValue ();
106+
protected virtual void UpdateValue ()
107+
{
108+
}
109109

110110
protected virtual void OnViewModelChanged (PropertyViewModel oldModel)
111111
{
@@ -123,17 +123,13 @@ protected virtual void OnPropertyChanged (object sender, System.ComponentModel.P
123123
}
124124
}
125125

126-
/// <summary>
127-
/// Update the display with any errors we need to show or remove
128-
/// </summary>
129-
/// <param name="errors">The error messages to display to the user</param>
130-
protected abstract void UpdateErrorsDisplayed (IEnumerable errors);
131-
132-
protected abstract void HandleErrorsChanged (object sender, System.ComponentModel.DataErrorsChangedEventArgs e);
133-
134-
protected abstract void SetEnabled ();
126+
protected virtual void SetEnabled ()
127+
{
128+
}
135129

136-
protected abstract void UpdateAccessibilityValues ();
130+
protected virtual void UpdateAccessibilityValues ()
131+
{
132+
}
137133
}
138134

139135
internal abstract class PropertyEditorControl<TViewModel>

‎Xamarin.PropertyEditing.Mac/Controls/RatioEditorControl.cs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ public RatioEditorControl (IHostResourceProvider hostResources)
4242
public override NSView FirstKeyView => ratioEditor.NumericEditor;
4343
public override NSView LastKeyView => ratioEditor.DecrementButton;
4444

45-
protected override void HandleErrorsChanged (object sender, DataErrorsChangedEventArgs e)
46-
{
47-
UpdateErrorsDisplayed (ViewModel.GetErrors (ViewModel.Property.Name));
48-
}
49-
5045
protected override void SetEnabled ()
5146
{
5247
this.ratioEditor.Enabled = ViewModel.Property.CanWrite;
@@ -58,16 +53,6 @@ protected override void UpdateAccessibilityValues ()
5853
this.ratioEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityNumeric, ViewModel.Property.Name);
5954
}
6055

61-
protected override void UpdateErrorsDisplayed (IEnumerable errors)
62-
{
63-
if (ViewModel.HasErrors) {
64-
SetErrors (errors);
65-
} else {
66-
SetErrors (null);
67-
SetEnabled ();
68-
}
69-
}
70-
7156
protected override void UpdateValue ()
7257
{
7358
this.ratioEditor.StringValue = ViewModel.ValueString;

0 commit comments

Comments
 (0)