You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/08/18 09:39:41 UTC
svn commit: r1756749 -
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDate.java
Author: lofwyr
Date: Thu Aug 18 09:39:41 2016
New Revision: 1756749
URL: http://svn.apache.org/viewvc?rev=1756749&view=rev
Log:
TOBAGO 1483 Let tc date use a Bootstrap component as picker
* fix picker, if there is no value defined.
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDate.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDate.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDate.java?rev=1756749&r1=1756748&r2=1756749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDate.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDate.java Thu Aug 18 09:39:41 2016
@@ -27,24 +27,23 @@ import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.DateTimeConverter;
+import java.util.Date;
public abstract class AbstractUIDate extends AbstractUIInput {
private static final Logger LOG = LoggerFactory.getLogger(AbstractUIDate.class);
public String getPattern() {
- String pattern = null;
final FacesContext facesContext = getFacesContext();
- final Converter converter = ComponentUtils.getConverter(facesContext, this, getSubmittedValue());
- if (converter instanceof DateTimeConverter) {
- pattern = DateFormatUtils.findPattern((DateTimeConverter) converter);
- }
- if (pattern == null) {
+ Converter converter = ComponentUtils.getConverter(facesContext, this, getSubmittedValue());
+ if (!(converter instanceof DateTimeConverter)) {
+ // hack for prototyping, if there is no value behind the component.
+ converter = facesContext.getApplication().createConverter(Date.class);
if (LOG.isWarnEnabled()) {
- LOG.warn("Can't find the pattern for the converter in component {}! DatePicker may not work correctly.",
+ LOG.warn("Can't find a converter to get a pattern in component {}! Using default.",
getClientId(facesContext));
}
}
- return pattern;
+ return DateFormatUtils.findPattern((DateTimeConverter) converter);
}
}