diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/dates/ERDEditDatePopupCommon.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/dates/ERDEditDatePopupCommon.java
index 63317d3a56c..0522d346c07 100644
--- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/dates/ERDEditDatePopupCommon.java
+++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/dates/ERDEditDatePopupCommon.java
@@ -44,11 +44,11 @@ public class ERDEditDatePopupCommon extends ERDCustomEditComponent {
     protected String month;
     protected String year;
     public String currentMonth;
-    protected NSMutableArray yearList;
-    protected static NSArray monthList;
-    protected NSArray monthNameList;
-    protected static NSArray defaultMonthNameList;
-    protected static NSArray dayList;
+    protected NSMutableArray<String> yearList;
+    protected static NSArray<String> monthList;
+    protected NSArray<String> monthNameList;
+    protected static NSArray<String> defaultMonthNameList;
+    protected static NSArray<String> dayList;
 
     protected static final NSTimestampFormatter DAY_FORMAT =
         new NSTimestampFormatter("%d");
@@ -83,23 +83,24 @@ public void reset() {
         monthNameList = null;
     }
 
-    public NSArray dayList() {
+    public NSArray<String>  dayList() {
         if (dayList == null) {
-            dayList = new NSMutableArray(new Object[] {
+            dayList = new NSMutableArray<String> (
                 "01","02","03","04","05","06","07","08","09","10",
                 "11","12","13","14","15","16","17","18","19","20",
                 "21","22","23","24","25","26","27","28","29","30","31"
-            });
+            );
         }
         return dayList;
     }
 
-    public NSArray monthNameList() {
+    @SuppressWarnings("unchecked")
+	public NSArray<String> monthNameList() {
         if (monthNameList == null) {
-            monthNameList = (NSArray)ERXLocalizer.currentLocalizer().valueForKey("ERDDatePopup.monthList");
+            monthNameList = (NSArray<String>)ERXLocalizer.currentLocalizer().valueForKey("ERDDatePopup.monthList");
             if(monthNameList == null) {
                 if(defaultMonthNameList == null) {
-                    defaultMonthNameList = new NSArray(new Object[] { "Jan",  "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"});
+                    defaultMonthNameList = new NSArray<String>("Jan",  "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
                 }
                 monthNameList = defaultMonthNameList;
             }
@@ -107,19 +108,19 @@ public NSArray monthNameList() {
         return monthNameList;
     }
 
-    public NSArray monthList() {
+    public NSArray<String> monthList() {
         if (monthList == null) {
-            monthList = new NSArray(new Object[] {
+            monthList = new NSArray<String>(
                 "01","02","03","04","05","06",
                 "07","08","09","10","11","12"
-            });
+            );
         }
         return monthList;
     }
 
-    public NSArray yearList() {
+    public NSArray<String> yearList() {
         if (yearList == null) {
-            yearList = new NSMutableArray();
+            yearList = new NSMutableArray<String>();
             int startYear = 1950, endYear = 2050;
             String yearRangeTop = null, yearRangeBottom = null;
             if ((valueForBinding("yearRangeTop") != null) && (valueForBinding("yearRangeBottom") != null)) {