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 2014/09/04 10:57:40 UTC
svn commit: r1622422 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/
tobago-core/src/main/java/org/apache/myface...
Author: lofwyr
Date: Thu Sep 4 08:57:40 2014
New Revision: 1622422
URL: http://svn.apache.org/r1622422
Log:
TOBAGO-1420: tc:time will be replaced with tc:date
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TimeRenderer.java
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITime.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TimeTagDeclaration.java
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java?rev=1622422&r1=1622421&r2=1622422&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java Thu Sep 4 08:57:40 2014
@@ -35,6 +35,6 @@ public class TimeExtensionHandler extend
}
protected String getSubRendererType() {
- return RendererTypes.TIME;
+ return RendererTypes.DATE;
}
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITime.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITime.java?rev=1622422&r1=1622421&r2=1622422&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITime.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITime.java Thu Sep 4 08:57:40 2014
@@ -25,7 +25,11 @@ import javax.faces.convert.Converter;
import javax.faces.convert.DateTimeConverter;
import java.util.TimeZone;
-public abstract class AbstractUITime extends AbstractUIInput {
+/**
+ * @deprecated please use <tc:date> with {@link AbstractUIDate}
+ */
+@Deprecated
+public abstract class AbstractUITime extends AbstractUIDate {
@Override
public Converter getConverter() {
@@ -45,9 +49,4 @@ public abstract class AbstractUITime ext
return converter;
}
}
-
- @Override
- public String getPlaceholder() {
- return null;
- }
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java?rev=1622422&r1=1622421&r2=1622422&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java Thu Sep 4 08:57:40 2014
@@ -42,6 +42,8 @@ import javax.faces.component.UIInput;
/**
* Renders a date input field.
+ *
+ * For a time input field set you'll need to set the <f:convertDateTime type="time"> inside the <tc:date>.
*/
@Tag(name = "date")
@UIComponentTag(
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TimeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TimeTagDeclaration.java?rev=1622422&r1=1622421&r2=1622422&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TimeTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TimeTagDeclaration.java Thu Sep 4 08:57:40 2014
@@ -19,15 +19,19 @@
package org.apache.myfaces.tobago.internal.taglib.component;
+import org.apache.myfaces.tobago.apt.annotation.Facet;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
+import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.RendererTypes;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasConverter;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasCss;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasCurrentCss;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasCurrentMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasPlaceholder;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.InputTagDeclaration;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
@@ -38,17 +42,26 @@ import javax.faces.component.UIInput;
/**
* Renders a time input field.
+ *
+ * @deprecated Please use tc:date with <f:convertDateTime type="time">
*/
+@Deprecated
@Tag(name = "time")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITime",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUITime",
uiComponentFacesClass = "javax.faces.component.UIInput",
componentFamily = UIInput.COMPONENT_FAMILY,
- rendererType = RendererTypes.TIME,
- allowedChildComponenents = "NONE")
+ rendererType = RendererTypes.DATE,
+ allowedChildComponenents = "NONE",
+ facets = {
+ @Facet(name = Facets.CHANGE,
+ description =
+ "This facet can contain a UICommand that is invoked in a case of a change event from the component")
+ })
public interface TimeTagDeclaration
- extends InputTagDeclaration, HasIdBindingAndRendered,
- IsReadonly, IsDisabled, HasLabel, HasTip, IsRequired, HasMarkup, HasCurrentMarkup, HasCss, HasCurrentCss {
+ extends InputTagDeclaration, HasIdBindingAndRendered, IsReadonly,
+ IsDisabled, HasConverter, HasLabel,
+ HasTip, IsRequired, HasMarkup, HasCurrentMarkup, HasPlaceholder, HasCss, HasCurrentCss {
}