merge fix

Evolveum · Mar 1, 2019 · ef6c283 · ef6c283
1 parent fe62804
commit ef6c283
Showing 1 changed file with 24 additions and 14 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -1532,35 +1532,45 @@ public static String getLocalizedDate(Date date, String style) {
 		return converter.convertToString(date, WebComponentUtil.getCurrentLocale());
 	}
 
-	public static String getShortDateTimeFormatValue(XMLGregorianCalendar date, PageBase pageBase) {
-		return getShortDateTimeFormatValue(XmlTypeConverter.toDate(date), pageBase);
+	public static String getShortDateTimeFormattedValue(XMLGregorianCalendar date, PageBase pageBase) {
+		return getShortDateTimeFormattedValue(XmlTypeConverter.toDate(date), pageBase);
 	}
 
-	public static String getShortDateTimeFormatValue(Date date, PageBase pageBase) {
+	public static String getShortDateTimeFormattedValue(Date date, PageBase pageBase) {
 		if (date == null) {
 			return "";
 		}
-		AdminGuiConfigurationDisplayFormatsType displayFormats = pageBase.getAdminGuiConfiguration().getDisplayFormats();
-		if (displayFormats == null || StringUtils.isEmpty(displayFormats.getShortDateTimeFormat())){
-			return getLocalizedDate(date, DateLabelComponent.SHORT_MEDIUM_STYLE);
-		} else {
-			return getLocalizedDate(date, displayFormats.getShortDateTimeFormat());
-		}
+		String shortDateTimeFortam = getShortDateTimeFormat(pageBase);
+		return getLocalizedDate(date, shortDateTimeFortam);
 	}
 
-	public static String getLongDateTimeFormatValue(XMLGregorianCalendar date, PageBase pageBase) {
-		return getLongDateTimeFormatValue(XmlTypeConverter.toDate(date), pageBase);
+	public static String getLongDateTimeFormattedValue(XMLGregorianCalendar date, PageBase pageBase) {
+		return getLongDateTimeFormattedValue(XmlTypeConverter.toDate(date), pageBase);
 	}
 
-	public static String getLongDateTimeFormatValue(Date date, PageBase pageBase) {
+	public static String getLongDateTimeFormattedValue(Date date, PageBase pageBase) {
 		if (date == null) {
 			return "";
 		}
+		String longDateTimeFormat = getLongDateTimeFormat(pageBase);
+		return getLocalizedDate(date, longDateTimeFormat);
+	}
+
+	public static String getShortDateTimeFormat(PageBase pageBase){
+		AdminGuiConfigurationDisplayFormatsType displayFormats = pageBase.getAdminGuiConfiguration().getDisplayFormats();
+		if (displayFormats == null || StringUtils.isEmpty(displayFormats.getShortDateTimeFormat())){
+			return DateLabelComponent.SHORT_MEDIUM_STYLE;
+		} else {
+			return displayFormats.getShortDateTimeFormat();
+		}
+	}
+
+	public static String getLongDateTimeFormat(PageBase pageBase){
 		AdminGuiConfigurationDisplayFormatsType displayFormats = pageBase.getAdminGuiConfiguration().getDisplayFormats();
 		if (displayFormats == null || StringUtils.isEmpty(displayFormats.getLongDateTimeFormat())){
-			return getLocalizedDate(date, DateLabelComponent.LONG_MEDIUM_STYLE);
+			return DateLabelComponent.LONG_MEDIUM_STYLE;
 		} else {
-			return getLocalizedDate(date, displayFormats.getLongDateTimeFormat());
+			return displayFormats.getLongDateTimeFormat();
 		}
 	}