diff --git a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java index cd74bf9..b604ea2 100644 --- a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java +++ b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java @@ -66,13 +66,7 @@ protected EgovDateUtil() { public static String getCalcDateAsString(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) { Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); - if (EgovStringUtil.equals(sGuBun, "day")) { - cd.add(Calendar.DATE, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "month")) { - cd.add(Calendar.MONTH, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "year")) { - cd.add(Calendar.YEAR, iTerm); - } + addCalender(iTerm, sGuBun, cd); return getFormalYear(cd) + getFormalMonth(cd) + getFormalDay(cd); } @@ -100,13 +94,7 @@ public static String getCalcYearAsString(String sYearPara, String sMonthPara, St Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); - if (EgovStringUtil.equals(sGuBun, "day")) { - cd.add(Calendar.DATE, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "month")) { - cd.add(Calendar.MONTH, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "year")) { - cd.add(Calendar.YEAR, iTerm); - } + addCalender(iTerm, sGuBun, cd); return getFormalYear(cd); } @@ -132,13 +120,7 @@ public static String getCalcYearAsString(String sYearPara, String sMonthPara, St public static String getCalcMonthAsString(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) { Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); - if (EgovStringUtil.equals(sGuBun, "day")) { - cd.add(Calendar.DATE, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "month")) { - cd.add(Calendar.MONTH, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "year")) { - cd.add(Calendar.YEAR, iTerm); - } + addCalender(iTerm, sGuBun, cd); return getFormalMonth(cd); } @@ -164,13 +146,7 @@ public static String getCalcMonthAsString(String sYearPara, String sMonthPara, S public static String getCalcDayAsString(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) { Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); - if (EgovStringUtil.equals(sGuBun, "day")) { - cd.add(Calendar.DATE, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "month")) { - cd.add(Calendar.MONTH, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "year")) { - cd.add(Calendar.YEAR, iTerm); - } + addCalender(iTerm, sGuBun, cd); return getFormalDay(cd); } @@ -196,13 +172,7 @@ public static String getCalcDayAsString(String sYearPara, String sMonthPara, Str public static int getCalcYearAsInt(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) { Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); - if (EgovStringUtil.equals(sGuBun, "day")) { - cd.add(Calendar.DATE, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "month")) { - cd.add(Calendar.MONTH, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "year")) { - cd.add(Calendar.YEAR, iTerm); - } + addCalender(iTerm, sGuBun, cd); return cd.get(Calendar.YEAR); } @@ -228,13 +198,7 @@ public static int getCalcYearAsInt(String sYearPara, String sMonthPara, String s public static int getCalcMonthAsInt(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) { Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); - if (EgovStringUtil.equals(sGuBun, "day")) { - cd.add(Calendar.DATE, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "month")) { - cd.add(Calendar.MONTH, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "year")) { - cd.add(Calendar.YEAR, iTerm); - } + addCalender(iTerm, sGuBun, cd); return cd.get(Calendar.MONTH) + 1; } @@ -260,6 +224,18 @@ public static int getCalcMonthAsInt(String sYearPara, String sMonthPara, String public static int getCalcDayAsInt(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) { Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); + addCalender(iTerm, sGuBun, cd); + + return cd.get(Calendar.DAY_OF_MONTH); + } + + /** + * sGuBun의 종류에 따라 년/월/일 캘린더에 추가 + * @param iTerm + * @param sGuBun + * @param cd + */ + private static void addCalender(int iTerm, String sGuBun, Calendar cd) { if (EgovStringUtil.equals(sGuBun, "day")) { cd.add(Calendar.DATE, iTerm); } else if (EgovStringUtil.equals(sGuBun, "month")) { @@ -267,8 +243,6 @@ public static int getCalcDayAsInt(String sYearPara, String sMonthPara, String sD } else if (EgovStringUtil.equals(sGuBun, "year")) { cd.add(Calendar.YEAR, iTerm); } - - return cd.get(Calendar.DAY_OF_MONTH); } /**