address feedback

Author: mmalerba

src/lib/core/datetime/date-adapter.ts

@@ -170,14 +170,6 @@ export abstract class DateAdapter<D> {
    */
   abstract isValid(date: D): boolean;
 
-  /**
-   * @param {obj} The object to check.
-   * @returns The given object if it is both a date instance and valid, otherwise null.
-   */
-  getValidDateOrNull(obj: any): D | null {
-    return (this.isDateInstance(obj) && this.isValid(obj)) ? obj : null;
-  }
-
   /**
    * Sets the locale used for all dates.
    * @param locale The new locale.

src/lib/core/datetime/native-date-adapter.spec.ts

@@ -312,20 +312,17 @@ describe('NativeDateAdapter', () => {
     let d = new Date();
     expect(adapter.isValid(d)).toBe(true);
     expect(adapter.isDateInstance(d)).toBe(true);
-    expect(adapter.getValidDateOrNull(d)).toBe(d);
   });
 
   it('should count an invalid date as an invalid date instance', () => {
     let d = new Date(NaN);
     expect(adapter.isValid(d)).toBe(false);
     expect(adapter.isDateInstance(d)).toBe(true);
-    expect(adapter.getValidDateOrNull(d)).toBeNull();
   });
 
   it('should count a string as not a date instance', () => {
     let d = '1/1/2017';
     expect(adapter.isDateInstance(d)).toBe(false);
-    expect(adapter.getValidDateOrNull(d)).toBeNull();
   });
 });
 

src/lib/datepicker/datepicker-input.ts

@@ -112,15 +112,14 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   /** The value of the input. */
   @Input()
   get value(): D | null {
-    return this._dateAdapter.getValidDateOrNull(
-        this._dateAdapter.parse(
-            this._elementRef.nativeElement.value, this._dateFormats.parse.dateInput));
+    return this._getValidDateOrNull(this._dateAdapter.parse(
+        this._elementRef.nativeElement.value, this._dateFormats.parse.dateInput));
   }
   set value(value: D | null) {
     if (value != null && !this._dateAdapter.isDateInstance(value)) {
       throw Error('Datepicker: value not recognized as a date object by DateAdapter.');
     }
-    value = this._dateAdapter.getValidDateOrNull(value);
+    value = this._getValidDateOrNull(value);
 
     let oldDate = this.value;
     this._renderer.setProperty(this._elementRef.nativeElement, 'value',
@@ -134,7 +133,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   @Input()
   get min(): D | null { return this._min; }
   set min(value: D | null) {
-    this._min = this._dateAdapter.getValidDateOrNull(value);
+    this._min = this._getValidDateOrNull(value);
     this._validatorOnChange();
   }
   private _min: D | null;
@@ -143,7 +142,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   @Input()
   get max(): D | null { return this._max; }
   set max(value: D | null) {
-    this._max = this._dateAdapter.getValidDateOrNull(value);
+    this._max = this._getValidDateOrNull(value);
     this._validatorOnChange();
   }
   private _max: D | null;
@@ -289,4 +288,12 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   _onChange() {
     this.dateChange.emit(new MdDatepickerInputEvent(this, this._elementRef.nativeElement));
   }
+
+  /**
+   * @param obj The object to check.
+   * @returns The given object if it is both a date instance and valid, otherwise null.
+   */
+  private _getValidDateOrNull(obj: any): D | null {
+    return (this._dateAdapter.isDateInstance(obj) && this._dateAdapter.isValid(obj)) ? obj : null;
+  }
 }

src/lib/datepicker/datepicker.ts

@@ -129,7 +129,7 @@ export class MdDatepicker<D> implements OnDestroy {
     // selected value is.
     return this._startAt || (this._datepickerInput ? this._datepickerInput.value : null);
   }
-  set startAt(date: D | null) { this._startAt = this._dateAdapter.getValidDateOrNull(date); }
+  set startAt(date: D | null) { this._startAt = this._getValidDateOrNull(date); }
   private _startAt: D | null;
 
   /** The view that the calendar should start in. */
@@ -343,4 +343,12 @@ export class MdDatepicker<D> implements OnDestroy {
         { overlayX: 'end', overlayY: 'bottom' }
       );
   }
+
+  /**
+   * @param obj The object to check.
+   * @returns The given object if it is both a date instance and valid, otherwise null.
+   */
+  private _getValidDateOrNull(obj: any): D | null {
+    return (this._dateAdapter.isDateInstance(obj) && this._dateAdapter.isValid(obj)) ? obj : null;
+  }
 }