Adding changes to export and DatePicker.java class