Resolve N_SE-36424 issue.

Change-Id: I01825bd2bc0f01c2e1fd8c1bcdb6e142eea90be9
Signed-off-by: SungWan Kim <sw0726.kim@samsung.com>

diff --git a/src/ClDayPanel.cpp b/src/ClDayPanel.cpp
index 557b6e2..728d7e9 100644 (file)
--- a/src/ClDayPanel.cpp
+++ b/src/ClDayPanel.cpp
@@ -1247,6 +1247,10 @@ DayPanel::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& curre
                pCurrent->UpdateEvent();
        }
 
+       DateTime maxDateTime = Calendarbook::GetMaxDateTime();
+       maxDateTime.AddYears(-1);
+       DateTime minDateTime = Calendarbook::GetMinDateTime();
+       minDateTime.AddYears(1);
        for (int i = VIEW_SCROLL_EFFECT_NEXT; i < VIEW_SCROLL_EFFECT_COUNT; ++i)
        {
                DayEventPanel* pPanel = new (std::nothrow) DayEventPanel();
@@ -1255,19 +1259,19 @@ DayPanel::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& curre
                {
                case VIEW_SCROLL_EFFECT_NEXT:
                        date.AddDays(1);
-                       if (date > Calendarbook::GetMaxDateTime())
+                       if (date > maxDateTime)
                        {
-                               DateTime minDate = Calendarbook::GetMinDateTime();
-                               date.SetValue(minDate.GetYear() + 1, minDate.GetMonth(), minDate.GetDay(), date.GetHour(), date.GetMinute());
+                               DateTime minDate = minDateTime;
+                               date.SetValue(minDate.GetYear(), minDate.GetMonth(), minDate.GetDay(), date.GetHour(), date.GetMinute());
                        }
                        pPanel->Initialize(Rectangle(0, 0, GetWidth(), GetHeight()), date, *__pPm);
                        break;
                case VIEW_SCROLL_EFFECT_PREVIEW:
                        date.AddDays(-1);
-                       if (date < Calendarbook::GetMinDateTime())
+                       if (date < minDateTime)
                        {
-                               DateTime maxDate = Calendarbook::GetMaxDateTime();
-                               date.SetValue(maxDate.GetYear() - 1, maxDate.GetMonth(), maxDate.GetDay(), date.GetHour(), date.GetMinute());
+                               DateTime maxDate = maxDateTime;
+                               date.SetValue(maxDate.GetYear(), maxDate.GetMonth(), maxDate.GetDay(), date.GetHour(), date.GetMinute());
                        }
                        pPanel->Initialize(Rectangle(0, 0, GetWidth(), GetHeight()), date, *__pPm);
                        break;
@@ -1374,6 +1378,10 @@ DayPanel::GetPreviewControl(void)
 void
 DayPanel::OnPanningAnimationEnded(ViewScrollEffect direction)
 {
+       DateTime maxDateTime = Calendarbook::GetMaxDateTime();
+       maxDateTime.AddYears(-1);
+       DateTime minDateTime = Calendarbook::GetMinDateTime();
+       minDateTime.AddYears(1);
        if (__pPanelDayEvent[VIEW_SCROLL_EFFECT_NEXT] != null && __pPanelDayEvent[VIEW_SCROLL_EFFECT_PREVIEW] != null)
        {
                if (direction == VIEW_SCROLL_EFFECT_PREVIEW)
@@ -1381,10 +1389,10 @@ DayPanel::OnPanningAnimationEnded(ViewScrollEffect direction)
                        DayEventPanel* pPanel = static_cast<DayEventPanel*>(__pPanelDayEvent[VIEW_SCROLL_EFFECT_NEXT]);
                        DateTime date = __pPm->GetCurrentDate();
                        date.AddDays(-2);
-                       if (date < Calendarbook::GetMinDateTime())
+                       if (date < minDateTime)
                        {
-                               DateTime maxDate = Calendarbook::GetMaxDateTime();
-                               date.SetValue(maxDate.GetYear() - 1, maxDate.GetMonth(), maxDate.GetDay(), date.GetHour(), date.GetMinute());
+                               DateTime maxDate = maxDateTime;
+                               date.SetValue(maxDate.GetYear(), maxDate.GetMonth(), maxDate.GetDay(), date.GetHour(), date.GetMinute());
                        }
                        pPanel->SetDate(date);
                        pPanel->RequestRedraw(false);
@@ -1398,10 +1406,10 @@ DayPanel::OnPanningAnimationEnded(ViewScrollEffect direction)
                        DayEventPanel* pPanel = static_cast<DayEventPanel*>(__pPanelDayEvent[VIEW_SCROLL_EFFECT_PREVIEW]);
                        DateTime date = __pPm->GetCurrentDate();
                        date.AddDays(2);
-                       if (date > Calendarbook::GetMaxDateTime())
+                       if (date > maxDateTime)
                        {
-                               DateTime minDate = Calendarbook::GetMinDateTime();
-                               date.SetValue(minDate.GetYear() + 1, minDate.GetMonth(), minDate.GetDay(), date.GetHour(), date.GetMinute());
+                               DateTime minDate = minDateTime;
+                               date.SetValue(minDate.GetYear(), minDate.GetMonth(), minDate.GetDay(), date.GetHour(), date.GetMinute());
                        }
                        pPanel->SetDate(date);
                        pPanel->RequestRedraw(false);
@@ -1436,16 +1444,21 @@ DayPanel::DrawEvents(void)
        DateTime date = pPanel->GetDate();
        pPanel->SetDate(__pPm->GetCurrentDate());
 
+       DateTime maxDateTime = Calendarbook::GetMaxDateTime();
+       maxDateTime.AddYears(-1);
+       DateTime minDateTime = Calendarbook::GetMinDateTime();
+       minDateTime.AddYears(1);
+
        DayEventPanel* pNextPanel = static_cast<DayEventPanel*>(__pPanelDayEvent[VIEW_SCROLL_EFFECT_NEXT]);
        if (pNextPanel != null)
        {
                date = pNextPanel->GetDate();
                DateTime nextDate = __pPm->GetCurrentDate();
                nextDate.AddDays(1);
-               if (nextDate > Calendarbook::GetMaxDateTime())
+               if (nextDate > maxDateTime)
                {
-                       DateTime minDate = Calendarbook::GetMinDateTime();
-                       nextDate.SetValue(minDate.GetYear() + 1, minDate.GetMonth(), minDate.GetDay(), nextDate.GetHour(), nextDate.GetMinute());
+                       DateTime minDate = minDateTime;
+                       nextDate.SetValue(minDate.GetYear(), minDate.GetMonth(), minDate.GetDay(), nextDate.GetHour(), nextDate.GetMinute());
                }
                pNextPanel->SetDate(nextDate);
        }
@@ -1456,10 +1469,10 @@ DayPanel::DrawEvents(void)
                date = pPrevPanel->GetDate();
                DateTime prevDate = __pPm->GetCurrentDate();
                prevDate.AddDays(-1);
-               if (prevDate < Calendarbook::GetMinDateTime())
+               if (prevDate < minDateTime)
                {
-                       DateTime maxDate = Calendarbook::GetMaxDateTime();
-                       prevDate.SetValue(maxDate.GetYear() - 1, maxDate.GetMonth(), maxDate.GetDay(), prevDate.GetHour(), prevDate.GetMinute());
+                       DateTime maxDate = maxDateTime;
+                       prevDate.SetValue(maxDate.GetYear(), maxDate.GetMonth(), maxDate.GetDay(), prevDate.GetHour(), prevDate.GetMinute());
                }
                pPrevPanel->SetDate(prevDate);
        }

diff --git a/src/ClMonthPanel.cpp b/src/ClMonthPanel.cpp
index c11682d..daa90cb 100644 (file)
--- a/src/ClMonthPanel.cpp
+++ b/src/ClMonthPanel.cpp
@@ -974,6 +974,10 @@ MonthPanel::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& cur
                __pListViewEvent->UpdateList();
        }
 
+       DateTime maxDateTime = Calendarbook::GetMaxDateTime();
+       maxDateTime.AddYears(-1);
+       DateTime minDateTime = Calendarbook::GetMinDateTime();
+       minDateTime.AddYears(1);
        for (int i = VIEW_SCROLL_EFFECT_NEXT; i < VIEW_SCROLL_EFFECT_COUNT; ++i)
        {
                MonthCalendarPanel* pPanel = new (std::nothrow) MonthCalendarPanel();
@@ -982,19 +986,19 @@ MonthPanel::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& cur
                {
                case VIEW_SCROLL_EFFECT_NEXT:
                        date.AddMonths(1);
-                       if (date > Calendarbook::GetMaxDateTime())
+                       if (date > maxDateTime)
                        {
-                               DateTime minDate = Calendarbook::GetMinDateTime();
-                               date.SetValue(minDate.GetYear() + 1, minDate.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
+                               DateTime minDate = minDateTime;
+                               date.SetValue(minDate.GetYear(), minDate.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
                        }
                        pPanel->Initialize(Rectangle(0, Y_CALENDAR, GetWidth(), GetHeight()), date, *__pPm);
                        break;
                case VIEW_SCROLL_EFFECT_PREVIEW:
                        date.AddMonths(-1);
-                       if (date < Calendarbook::GetMinDateTime())
+                       if (date < minDateTime)
                        {
-                               DateTime maxDate = Calendarbook::GetMaxDateTime();
-                               date.SetValue(maxDate.GetYear() - 1, maxDate.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
+                               DateTime maxDate = maxDateTime;
+                               date.SetValue(maxDate.GetYear(), maxDate.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
                        }
                        pPanel->Initialize(Rectangle(0, Y_CALENDAR, GetWidth(), GetHeight()), date, *__pPm);
                        break;
@@ -1076,6 +1080,10 @@ MonthPanel::GetPreviewControl(void)
 void
 MonthPanel::OnPanningAnimationEnded(ViewScrollEffect direction)
 {
+       DateTime maxDateTime = Calendarbook::GetMaxDateTime();
+       maxDateTime.AddYears(-1);
+       DateTime minDateTime = Calendarbook::GetMinDateTime();
+       minDateTime.AddYears(1);
        if (__pPanelMonthCalendar[VIEW_SCROLL_EFFECT_NEXT] != null && __pPanelMonthCalendar[VIEW_SCROLL_EFFECT_PREVIEW] != null)
        {
                if (direction == VIEW_SCROLL_EFFECT_PREVIEW)
@@ -1083,10 +1091,10 @@ MonthPanel::OnPanningAnimationEnded(ViewScrollEffect direction)
                        MonthCalendarPanel* pPanel = static_cast<MonthCalendarPanel*>(__pPanelMonthCalendar[VIEW_SCROLL_EFFECT_NEXT]);
                        DateTime date = static_cast<MonthCalendarPanel*>(__pPanelMonthCalendar[VIEW_SCROLL_EFFECT_PREVIEW])->GetDate();
                        date.AddMonths(-1);
-                       if (date < Calendarbook::GetMinDateTime())
+                       if (date < minDateTime)
                        {
-                               DateTime maxDate = Calendarbook::GetMaxDateTime();
-                               date.SetValue(maxDate.GetYear() - 1, maxDate.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
+                               DateTime maxDate = maxDateTime;
+                               date.SetValue(maxDate.GetYear(), maxDate.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
                        }
                        pPanel->SetDate(date);
                        pPanel->RequestRedraw(false);
@@ -1103,10 +1111,10 @@ MonthPanel::OnPanningAnimationEnded(ViewScrollEffect direction)
                        MonthCalendarPanel* pPanel = static_cast<MonthCalendarPanel*>(__pPanelMonthCalendar[VIEW_SCROLL_EFFECT_PREVIEW]);
                        DateTime date = static_cast<MonthCalendarPanel*>(__pPanelMonthCalendar[VIEW_SCROLL_EFFECT_NEXT])->GetDate();
                        date.AddMonths(1);
-                       if (date > Calendarbook::GetMaxDateTime())
+                       if (date > maxDateTime)
                        {
-                               DateTime minDate = Calendarbook::GetMinDateTime();
-                               date.SetValue(minDate.GetYear() + 1, minDate.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
+                               DateTime minDate = minDateTime;
+                               date.SetValue(minDate.GetYear(), minDate.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
                        }
                        pPanel->SetDate(date);
                        pPanel->RequestRedraw(false);
@@ -1141,15 +1149,19 @@ MonthPanel::DrawCalendar(void)
                __pListViewEvent->UpdateList();
        }
 
+       DateTime maxDateTime = Calendarbook::GetMaxDateTime();
+       maxDateTime.AddYears(-1);
+       DateTime minDateTime = Calendarbook::GetMinDateTime();
+       minDateTime.AddYears(1);
        MonthCalendarPanel* pNextPanel = static_cast<MonthCalendarPanel*>(__pPanelMonthCalendar[VIEW_SCROLL_EFFECT_NEXT]);
        if (pNextPanel != null)
        {
                DateTime nextDate = __pPm->GetCurrentDate();
                nextDate.AddMonths(1);
-               if (nextDate > Calendarbook::GetMaxDateTime())
+               if (nextDate > maxDateTime)
                {
-                       DateTime minDate = Calendarbook::GetMinDateTime();
-                       nextDate.SetValue(minDate.GetYear() + 1, minDate.GetMonth(), nextDate.GetDay(), nextDate.GetHour(), nextDate.GetMinute());
+                       DateTime minDate = minDateTime;
+                       nextDate.SetValue(minDate.GetYear(), minDate.GetMonth(), nextDate.GetDay(), nextDate.GetHour(), nextDate.GetMinute());
                }
                pNextPanel->SetDate(nextDate);
                pNextPanel->SetSize(pNextPanel->GetWidth(), pCurrent->GetHeight());
@@ -1160,10 +1172,10 @@ MonthPanel::DrawCalendar(void)
        {
                DateTime prevDate = __pPm->GetCurrentDate();
                prevDate.AddMonths(-1);
-               if (prevDate < Calendarbook::GetMinDateTime())
+               if (prevDate < minDateTime)
                {
-                       DateTime maxDate = Calendarbook::GetMaxDateTime();
-                       prevDate.SetValue(maxDate.GetYear() - 1, maxDate.GetMonth(), prevDate.GetDay(), prevDate.GetHour(), prevDate.GetMinute());
+                       DateTime maxDate = maxDateTime;
+                       prevDate.SetValue(maxDate.GetYear(), maxDate.GetMonth(), prevDate.GetDay(), prevDate.GetHour(), prevDate.GetMinute());
                }
                pPrevPanel->SetDate(prevDate);
                pPrevPanel->SetSize(pPrevPanel->GetWidth(), pCurrent->GetHeight());

diff --git a/src/ClYearPanel.cpp b/src/ClYearPanel.cpp
index cd46e17..dc00a2a 100644 (file)
--- a/src/ClYearPanel.cpp
+++ b/src/ClYearPanel.cpp
@@ -474,6 +474,11 @@ YearPanel::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& curr
 
        __pPm->SetViewType(VIEW_TYPE_NONE);
 
+       DateTime maxDateTime = Calendarbook::GetMaxDateTime();
+       maxDateTime.AddYears(-1);
+       DateTime minDateTime = Calendarbook::GetMinDateTime();
+       minDateTime.AddYears(1);
+
        // Create month calendars.
        for (int i = VIEW_SCROLL_EFFECT_NEXT; i < VIEW_SCROLL_EFFECT_COUNT; ++i)
        {
@@ -483,20 +488,20 @@ YearPanel::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& curr
                {
                case VIEW_SCROLL_EFFECT_NEXT:
                        date.AddYears(1);
-                       if (date > Calendarbook::GetMaxDateTime())
+                       if (date > maxDateTime)
                        {
-                               DateTime minDate = Calendarbook::GetMinDateTime();
-                               date.SetValue(minDate.GetYear() + 1, date.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
+                               DateTime minDate = minDateTime;
+                               date.SetValue(minDate.GetYear(), date.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
                        }
                        pCalendarPanel->Initialize(Rectangle(0, 0, GetWidth(), GetHeight()), date,
                                                                                __pBitmapWeekText, __pBitmapWeekdayText, __pBitmapHolidayText, __pBitmapTodayText, __pBitmapFocus);
                        break;
                case VIEW_SCROLL_EFFECT_PREVIEW:
                        date.AddYears(-1);
-                       if (date < Calendarbook::GetMinDateTime())
+                       if (date < minDateTime)
                        {
-                               DateTime maxDate = Calendarbook::GetMaxDateTime();
-                               date.SetValue(maxDate.GetYear() - 1, date.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
+                               DateTime maxDate = maxDateTime;
+                               date.SetValue(maxDate.GetYear(), date.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
                        }
                        pCalendarPanel->Initialize(Rectangle(0, 0, GetWidth(), GetHeight()), date,
                                                                                __pBitmapWeekText, __pBitmapWeekdayText, __pBitmapHolidayText, __pBitmapTodayText, __pBitmapFocus);
@@ -567,6 +572,10 @@ YearPanel::GetPreviewControl(void)
 void
 YearPanel::OnPanningAnimationEnded(ViewScrollEffect direction)
 {
+       DateTime maxDateTime = Calendarbook::GetMaxDateTime();
+       maxDateTime.AddYears(-1);
+       DateTime minDateTime = Calendarbook::GetMinDateTime();
+       minDateTime.AddYears(1);
        if (__pPanelYearCalendar[VIEW_SCROLL_EFFECT_NEXT] != null && __pPanelYearCalendar[VIEW_SCROLL_EFFECT_PREVIEW] != null)
        {
                if (direction == VIEW_SCROLL_EFFECT_PREVIEW)
@@ -574,10 +583,10 @@ YearPanel::OnPanningAnimationEnded(ViewScrollEffect direction)
                        CalendarPanel* pPanel = static_cast<CalendarPanel*>(__pPanelYearCalendar[VIEW_SCROLL_EFFECT_NEXT]);
                        DateTime date = __pPm->GetCurrentDate();
                        date.AddYears(-2);
-                       if (date < Calendarbook::GetMinDateTime())
+                       if (date < minDateTime)
                        {
-                               DateTime maxDate = Calendarbook::GetMaxDateTime();
-                               date.SetValue(maxDate.GetYear() - 1, date.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
+                               DateTime maxDate = maxDateTime;
+                               date.SetValue(maxDate.GetYear(), date.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
                        }
                        pPanel->SetDate(date);
                        pPanel->RequestRedraw(false);
@@ -591,9 +600,9 @@ YearPanel::OnPanningAnimationEnded(ViewScrollEffect direction)
                        CalendarPanel* pPanel = static_cast<CalendarPanel*>(__pPanelYearCalendar[VIEW_SCROLL_EFFECT_PREVIEW]);
                        DateTime date = __pPm->GetCurrentDate();
                        date.AddYears(2);
-                       if (date > Calendarbook::GetMaxDateTime())
+                       if (date > maxDateTime)
                        {
-                               DateTime minDate = Calendarbook::GetMinDateTime();
+                               DateTime minDate = minDateTime;
                                date.SetValue(minDate.GetYear() + 1, date.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
                        }
                        pPanel->SetDate(date);
@@ -790,14 +799,19 @@ YearPanel::Update(bool draw)
        CalendarPanel* pCurrent = static_cast<CalendarPanel*>(__pPanelYearCalendar[VIEW_SCROLL_EFFECT_CURRENT]);
        pCurrent->SetDate(date);
 
+       DateTime maxDateTime = Calendarbook::GetMaxDateTime();
+       maxDateTime.AddYears(-1);
+       DateTime minDateTime = Calendarbook::GetMinDateTime();
+       minDateTime.AddYears(1);
+
        CalendarPanel* pNext = static_cast<CalendarPanel*>(__pPanelYearCalendar[VIEW_SCROLL_EFFECT_NEXT]);
        if (pNext != null)
        {
                date.AddYears(1);
-               if (date > Calendarbook::GetMaxDateTime())
+               if (date > maxDateTime)
                {
-                       DateTime minDate = Calendarbook::GetMinDateTime();
-                       date.SetValue(minDate.GetYear() + 1, date.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
+                       DateTime minDate = minDateTime;
+                       date.SetValue(minDate.GetYear(), date.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
                }
                pNext->SetDate(date);
        }
@@ -807,10 +821,10 @@ YearPanel::Update(bool draw)
        {
                date = __pPm->GetCurrentDate();
                date.AddYears(-1);
-               if (date < Calendarbook::GetMinDateTime())
+               if (date < minDateTime)
                {
-                       DateTime maxDate = Calendarbook::GetMaxDateTime();
-                       date.SetValue(maxDate.GetYear() - 1, date.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
+                       DateTime maxDate = maxDateTime;
+                       date.SetValue(maxDate.GetYear(), date.GetMonth(), date.GetDay(), date.GetHour(), date.GetMinute());
                }
                pPreview->SetDate(date);
        }