You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/08/29 04:58:52 UTC
svn commit: r690079 - in
/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces:
custom/aliasbean/ custom/buffer/ custom/htmlTag/ custom/navigation/
custom/navmenu/ custom/savestate/ custom/schedule/ validator/
Author: lu4242
Date: Thu Aug 28 19:58:51 2008
New Revision: 690079
URL: http://svn.apache.org/viewvc?rev=690079&view=rev
Log:
use annotations instead doclets when it is possible (since core12 is jdk 1.5 compatible)
Modified:
myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBean.java
myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBeansScope.java
myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/buffer/AbstractBuffer.java
myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/htmlTag/AbstractHtmlTag.java
myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/navigation/AbstractHtmlPanelNavigation.java
myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/navmenu/AbstractUINavigationMenuItem.java
myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/savestate/UISaveState.java
myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java
myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/validator/ValidatorBase.java
Modified: myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBean.java?rev=690079&r1=690078&r2=690079&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBean.java (original)
+++ myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBean.java Thu Aug 28 19:58:51 2008
@@ -34,6 +34,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperties;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
import org.apache.myfaces.shared_tomahawk.component.BindingAware;
import org.apache.myfaces.shared_tomahawk.util.RestoreStateUtils;
import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
@@ -68,24 +72,23 @@
* component, rather than the end of this component.
* </p>
*
- * @JSFComponent
- * name = "t:aliasBean"
- * tagClass = "org.apache.myfaces.custom.aliasbean.AliasBeanTag"
- * tagHandler = "org.apache.myfaces.custom.aliasbean.AliasBeanTagHandler"
- *
- * @JSFJspProperty
- * name = "rendered"
- * returnType = "boolean"
- * tagExcluded = "true"
- *
- * @JSFJspProperty
- * name = "binding"
- * returnType = "java.lang.String"
- * tagExcluded = "true"
- *
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFComponent(
+ name="t:aliasBean",
+ tagClass = "org.apache.myfaces.custom.aliasbean.AliasBeanTag",
+ tagHandler = "org.apache.myfaces.custom.aliasbean.AliasBeanTagHandler")
+@JSFJspProperties(properties={
+ @JSFJspProperty(
+ name = "rendered",
+ returnType = "boolean",
+ tagExcluded = true),
+ @JSFJspProperty(
+ name = "binding",
+ returnType = "java.lang.String",
+ tagExcluded = true)
+ })
public class AliasBean extends UIComponentBase implements BindingAware
{
private static final Log log = LogFactory.getLog(AliasBean.class);
@@ -122,9 +125,9 @@
* of this component as an alias to the "real" object specified
* by the value attribute of this component.
*
- * @JSFProperty
* @param aliasBeanExpression
*/
+ @JSFProperty
public void setAlias(String aliasBeanExpression)
{
alias.setAliasBeanExpression(aliasBeanExpression);
@@ -135,8 +138,8 @@
* a literal string (like "toto") or a reference to an existing
* bean (like "#{myBean.member1}").
*
- * @JSFProperty
*/
+ @JSFProperty
public String getValue()
{
String valueExpression = alias.getValueExpression();
Modified: myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBeansScope.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBeansScope.java?rev=690079&r1=690078&r2=690079&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBeansScope.java (original)
+++ myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBeansScope.java Thu Aug 28 19:58:51 2008
@@ -33,6 +33,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperties;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
import org.apache.myfaces.shared_tomahawk.util.RestoreStateUtils;
import org.apache.myfaces.shared_tomahawk.component.BindingAware;
@@ -49,24 +52,23 @@
* the scope of the nested AliasBean tags extends to the end of this component.
* </p>
*
- * @JSFComponent
- * name = "t:aliasBeansScope"
- * tagClass = "org.apache.myfaces.custom.aliasbean.AliasBeansScopeTag"
- * tagHandler = "org.apache.myfaces.custom.aliasbean.AliasBeansScopeTagHandler"
- *
- * @JSFJspProperty
- * name = "rendered"
- * returnType = "boolean"
- * tagExcluded = "true"
- *
- * @JSFJspProperty
- * name = "binding"
- * returnType = "java.lang.String"
- * tagExcluded = "true"
- *
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFComponent(
+ name = "t:aliasBeansScope",
+ tagClass = "org.apache.myfaces.custom.aliasbean.AliasBeansScopeTag",
+ tagHandler = "org.apache.myfaces.custom.aliasbean.AliasBeansScopeTagHandler")
+@JSFJspProperties(properties={
+ @JSFJspProperty(
+ name = "rendered",
+ returnType = "boolean",
+ tagExcluded = true),
+ @JSFJspProperty(
+ name = "binding",
+ returnType = "java.lang.String",
+ tagExcluded = true)
+ })
public class AliasBeansScope extends UIComponentBase implements BindingAware
{
static final Log log = LogFactory.getLog(AliasBeansScope.class);
Modified: myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/buffer/AbstractBuffer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/buffer/AbstractBuffer.java?rev=690079&r1=690078&r2=690079&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/buffer/AbstractBuffer.java (original)
+++ myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/buffer/AbstractBuffer.java Thu Aug 28 19:58:51 2008
@@ -22,6 +22,11 @@
import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperties;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
/**
* A component that renders its child components into an in-memory buffer rather than
* render them directly to the response stream.
@@ -49,29 +54,27 @@
* then output buffers B2,B1,B2.
* </p>
*
- * @JSFComponent
- * name = "t:buffer"
- * class = "org.apache.myfaces.custom.buffer.Buffer"
- * tagClass = "org.apache.myfaces.custom.buffer.BufferTag"
- *
- * @JSFJspProperty
- * name = "rendered"
- * returnType = "boolean"
- * tagExcluded = "true"
- *
- * @JSFJspProperty
- * name = "binding"
- * returnType = "java.lang.String"
- * tagExcluded = "true"
- *
- * @JSFJspProperty
- * name = "id"
- * returnType = "java.lang.String"
- * tagExcluded = "true"
- *
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFComponent(
+ name = "t:buffer",
+ clazz = "org.apache.myfaces.custom.buffer.Buffer",
+ tagClass = "org.apache.myfaces.custom.buffer.BufferTag")
+@JSFJspProperties(properties={
+ @JSFJspProperty(
+ name = "rendered",
+ returnType = "boolean",
+ tagExcluded = true),
+ @JSFJspProperty(
+ name = "binding",
+ returnType = "java.lang.String",
+ tagExcluded = true),
+ @JSFJspProperty(
+ name = "id",
+ returnType = "java.lang.String",
+ tagExcluded = true)
+ })
public abstract class AbstractBuffer extends UIComponentBase{
public static final String COMPONENT_TYPE = "org.apache.myfaces.Buffer";
@@ -103,10 +106,10 @@
* this is assigned to after rendering of this component (and its
* children) is complete.
*
- * @JSFProperty
- * required = "true"
- * localMethod = "true"
*/
+ @JSFProperty(
+ required = true,
+ localMethod = true)
protected abstract String getInto();
}
Modified: myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/htmlTag/AbstractHtmlTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/htmlTag/AbstractHtmlTag.java?rev=690079&r1=690078&r2=690079&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/htmlTag/AbstractHtmlTag.java (original)
+++ myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/htmlTag/AbstractHtmlTag.java Thu Aug 28 19:58:51 2008
@@ -21,6 +21,8 @@
import javax.faces.component.UIOutput;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
import org.apache.myfaces.component.ForceIdAware;
import org.apache.myfaces.component.StyleAware;
import org.apache.myfaces.component.UserRoleAware;
@@ -45,19 +47,17 @@
*
* Unless otherwise specified, all attributes accept static values or EL expressions.
*
- * @JSFComponent
- * name = "t:htmlTag"
- * class = "org.apache.myfaces.custom.htmlTag.HtmlTag"
- * tagClass = "org.apache.myfaces.custom.htmlTag.HtmlTagTag"
- *
- * @JSFJspProperty
- * name = "converter"
- * returnType = "javax.faces.convert.Converter"
- * tagExcluded = "true"
- *
* @author bdudney (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFComponent(
+ name = "t:htmlTag",
+ clazz = "org.apache.myfaces.custom.htmlTag.HtmlTag",
+ tagClass = "org.apache.myfaces.custom.htmlTag.HtmlTagTag")
+@JSFJspProperty(
+ name = "converter",
+ returnType = "javax.faces.convert.Converter",
+ tagExcluded = true)
public abstract class AbstractHtmlTag extends UIOutput
implements UserRoleAware, StyleAware, ForceIdAware
{
Modified: myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/navigation/AbstractHtmlPanelNavigation.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/navigation/AbstractHtmlPanelNavigation.java?rev=690079&r1=690078&r2=690079&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/navigation/AbstractHtmlPanelNavigation.java (original)
+++ myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/navigation/AbstractHtmlPanelNavigation.java Thu Aug 28 19:58:51 2008
@@ -30,6 +30,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
import org.apache.myfaces.component.AlignProperty;
import org.apache.myfaces.component.DataProperties;
import org.apache.myfaces.component.EventAware;
@@ -45,14 +47,13 @@
* Panel, that includes navigation items ({@link HtmlCommandNavigation}) and other
* components (separators).
*
- * @JSFComponent
- * name = "t:panelNavigation"
- * class = "org.apache.myfaces.custom.navigation.HtmlPanelNavigation"
- * tagClass = "org.apache.myfaces.custom.navigation.HtmlPanelNavigationTag"
- *
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFComponent(
+ name = "t:panelNavigation",
+ clazz = "org.apache.myfaces.custom.navigation.HtmlPanelNavigation",
+ tagClass = "org.apache.myfaces.custom.navigation.HtmlPanelNavigationTag")
public abstract class AbstractHtmlPanelNavigation
extends HtmlPanelGroup implements AlignProperty,
UniversalProperties, EventAware, DataProperties, PanelProperties
@@ -144,57 +145,57 @@
/**
* The CSS class of closed navigation items.
*
- * @JSFProperty
*/
+ @JSFProperty
public abstract String getItemClass();
/**
* The CSS class of open navigation items.
*
- * @JSFProperty
*/
+ @JSFProperty
public abstract String getOpenItemClass();
/**
* The CSS class of the active navigation item.
*
- * @JSFProperty
*/
+ @JSFProperty
public abstract String getActiveItemClass();
/**
* The CSS class for the td element of a separator.
*
- * @JSFProperty
*/
+ @JSFProperty
public abstract String getSeparatorClass();
/**
* The CSS Style of closed navigation items.
*
- * @JSFProperty
*/
+ @JSFProperty
public abstract String getItemStyle();
/**
* The CSS Style of open navigation items.
*
- * @JSFProperty
*/
+ @JSFProperty
public abstract String getOpenItemStyle();
/**
* The CSS Style of the active navigation item.
*
- * @JSFProperty
*/
+ @JSFProperty
public abstract String getActiveItemStyle();
/**
* The CSS Style for the td element of a separator.
*
- * @JSFProperty
*/
+ @JSFProperty
public abstract String getSeparatorStyle();
}
Modified: myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/navmenu/AbstractUINavigationMenuItem.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/navmenu/AbstractUINavigationMenuItem.java?rev=690079&r1=690078&r2=690079&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/navmenu/AbstractUINavigationMenuItem.java (original)
+++ myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/navmenu/AbstractUINavigationMenuItem.java Thu Aug 28 19:58:51 2008
@@ -33,6 +33,8 @@
import javax.faces.event.ActionListener;
import javax.faces.event.FacesEvent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
import org.apache.myfaces.component.MethodBindingToMethodExpression;
import org.apache.myfaces.component.MethodExpressionToMethodBinding;
import org.apache.myfaces.component.UserRoleAware;
@@ -45,15 +47,14 @@
*
* Unless otherwise specified, all attributes accept static values or EL expressions.
*
- * @JSFComponent
- * name = "t:navigationMenuItem"
- * bodyContent = "JSP"
- * class = "org.apache.myfaces.custom.navmenu.UINavigationMenuItem"
- * tagClass = "org.apache.myfaces.custom.navmenu.HtmlNavigationMenuItemTag"
- *
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
+@JSFComponent(
+ name = "t:navigationMenuItem",
+ bodyContent = "JSP",
+ clazz = "org.apache.myfaces.custom.navmenu.UINavigationMenuItem",
+ tagClass = "org.apache.myfaces.custom.navmenu.HtmlNavigationMenuItemTag")
public abstract class AbstractUINavigationMenuItem extends UISelectItem implements
UserRoleAware, ActionSource {
private static final boolean DEFAULT_IMMEDIATE = true;
@@ -70,21 +71,21 @@
}
/**
- * @JSFProperty
+ *
*/
+ @JSFProperty
public abstract String getIcon();
/**
- * @JSFProperty
- * defaultValue="false"
+ *
*/
+ @JSFProperty(defaultValue="false")
public abstract boolean isSplit();
/**
- * @JSFProperty
- * defaultValue="false"
- * tagExcluded = "true"
+ *
*/
+ @JSFProperty(defaultValue="false",tagExcluded=true)
public abstract boolean isOpen();
public abstract void setOpen(boolean open);
@@ -92,23 +93,21 @@
public abstract void setActive(boolean active);
/**
- * @JSFProperty
- * defaultValue="false"
- * tagExcluded = "true"
+ *
*/
+ @JSFProperty(defaultValue="false",tagExcluded=true)
public abstract boolean isActive();
/**
- * @JSFProperty
- * defaultValue="true"
- * tagExcluded="true"
+ *
*/
+ @JSFProperty(defaultValue="true",tagExcluded=true)
public abstract boolean isImmediate();
/**
- * @JSFProperty
- * tagExcluded = "true"
+ *
*/
+ @JSFProperty(tagExcluded=true)
public abstract String getExternalLink();
// Action Source
@@ -125,12 +124,12 @@
* for the current view. This is functionally equivalent to a reference to
* an action method that returns the string literal.
*
- * @JSFProperty
- * stateHolder = "true"
- * literalOnly = "true"
- * returnSignature="java.lang.Object"
- * jspName = "action"
*/
+ @JSFProperty(
+ stateHolder = true,
+ literalOnly = true,
+ returnSignature = "java.lang.Object",
+ jspName = "action")
public abstract MethodExpression getActionExpression();
/**
@@ -176,12 +175,12 @@
* and returns void. The phase that this event is fired in can be controlled
* via the immediate attribute.
*
- * @JSFProperty
- * stateHolder = "true"
- * literalOnly = "true"
- * returnSignature="void"
- * methodSignature="javax.faces.event.ActionEvent"
*/
+ @JSFProperty(
+ stateHolder = true,
+ literalOnly = true,
+ returnSignature="void",
+ methodSignature="javax.faces.event.ActionEvent")
public abstract MethodBinding getActionListener();
public void addActionListener(ActionListener listener) {
@@ -200,24 +199,23 @@
/**
*
- * @JSFProperty
*/
+ @JSFProperty
public abstract String getTarget();
/**
* When set instead of a Hyperlink a span tag is rendered in
* the corresponding Component
- *
- * @JSFProperty
- * defaultValue="false"
+ *
*/
+ @JSFProperty(defaultValue="false")
public abstract boolean isDisabled();
/**
* CSS-Style Attribute to render when disabled is true
*
- * @JSFProperty
*/
+ @JSFProperty
public abstract String getDisabledStyle();
/**
@@ -258,15 +256,16 @@
/**
* CSS-Style Class to use when disabled is true
*
- * @JSFProperty
*/
+ @JSFProperty
public abstract String getDisabledStyleClass();
/**
- * @JSFProperty
- * localMethod="true"
- * tagExcluded = "true"
+ *
*/
+ @JSFProperty(
+ localMethod= true,
+ tagExcluded = true)
public abstract String getActiveOnViewIds();
protected abstract String getLocalActiveOnViewIds();
@@ -318,7 +317,7 @@
}
HtmlPanelNavigationMenu root = (HtmlPanelNavigationMenu) parent;
- for (Iterator it = root.getChildren().iterator(); it.hasNext();) {
+ for (Iterator<UIComponent> it = root.getChildren().iterator(); it.hasNext();) {
Object o = it.next();
if (o instanceof AbstractUINavigationMenuItem) {
AbstractUINavigationMenuItem navItem = (AbstractUINavigationMenuItem) o;
@@ -338,7 +337,7 @@
}
public void deactivateChildren() {
- for (Iterator it = this.getChildren().iterator(); it.hasNext();) {
+ for (Iterator<UIComponent> it = this.getChildren().iterator(); it.hasNext();) {
Object o = it.next();
if (o instanceof AbstractUINavigationMenuItem) {
AbstractUINavigationMenuItem current = (AbstractUINavigationMenuItem) o;
Modified: myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/savestate/UISaveState.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/savestate/UISaveState.java?rev=690079&r1=690078&r2=690079&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/savestate/UISaveState.java (original)
+++ myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/savestate/UISaveState.java Thu Aug 28 19:58:51 2008
@@ -22,6 +22,8 @@
import javax.faces.component.StateHolder;
import javax.faces.component.UIParameter;
import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
/**
* Provides the ability to store a model value inside the view's component tree.
@@ -61,13 +63,13 @@
* its lifetime.
* </p>
*
- * @JSFComponent
- * name = "t:saveState"
- * tagClass = "org.apache.myfaces.custom.savestate.SaveStateTag"
* @JSFJspProperty name = "name" returnType = "java.lang.String" tagExcluded = "true"
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- */
+ */
+@JSFComponent(
+ name = "t:saveState",
+ tagClass = "org.apache.myfaces.custom.savestate.SaveStateTag")
public class UISaveState extends UIParameter
{
Modified: myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java?rev=690079&r1=690078&r2=690079&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java (original)
+++ myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java Thu Aug 28 19:58:51 2008
@@ -33,6 +33,8 @@
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
import org.apache.myfaces.component.MethodBindingToMethodExpression;
import org.apache.myfaces.component.MethodExpressionToMethodBinding;
import org.apache.myfaces.custom.schedule.model.ScheduleDay;
@@ -42,11 +44,10 @@
* This class contains all 'interactive' stuff for the Schedule component, meaning
* actions and actionListeners.
*
- * @JSFComponent
- *
* @author Jurgen Lust
* @version $Revision$
*/
+@JSFComponent
public class UISchedule extends org.apache.myfaces.custom.schedule.UIScheduleBase implements
Serializable, ActionSource
{
@@ -207,11 +208,11 @@
* for the current view. This is functionally equivalent to a reference to
* an action method that returns the string literal.
*
- * @JSFProperty
- * returnSignature="java.lang.String"
- * jspName="action"
* @return the new actionExpression value
*/
+ @JSFProperty(
+ returnSignature="java.lang.String",
+ jspName="action")
public MethodExpression getActionExpression()
{
if (_actionExpression != null)
@@ -250,14 +251,14 @@
private MethodExpression _mouseListenerExpression;
/**
- * @JSFProperty
- * returnSignature="void"
- * methodSignature="org.apache.myfaces.custom.schedule.ScheduleMouseEvent"
- * stateHolder="true"
- * jspName="mouseListener"
*
* @return
*/
+ @JSFProperty(
+ returnSignature="void",
+ methodSignature="org.apache.myfaces.custom.schedule.ScheduleMouseEvent",
+ stateHolder=true,
+ jspName="mouseListener")
public MethodExpression getMouseListenerExpression()
{
if (_mouseListenerExpression != null)
@@ -284,10 +285,11 @@
}*/
/**
- * @JSFProperty
- * returnSignature="void"
- * methodSignature="javax.faces.event.ActionEvent"
+ *
*/
+ @JSFProperty(
+ returnSignature="void",
+ methodSignature="javax.faces.event.ActionEvent")
public MethodBinding getActionListener()
{
return _actionListener;
@@ -302,10 +304,9 @@
* The last date and time of day that was clicked. This is set when
* submitOnClick is true, and the schedule is clicked by the user.
*
- * @JSFProperty
- * tagExcluded = "true"
* @return the last clicked date and time
*/
+ @JSFProperty(tagExcluded = true)
public Date getLastClickedDateAndTime()
{
return _lastClickedDateAndTime;
Modified: myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/validator/ValidatorBase.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/validator/ValidatorBase.java?rev=690079&r1=690078&r2=690079&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/validator/ValidatorBase.java (original)
+++ myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/validator/ValidatorBase.java Thu Aug 28 19:58:51 2008
@@ -32,15 +32,17 @@
import javax.faces.context.FacesContext;
import javax.faces.validator.Validator;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
import org.apache.myfaces.shared_tomahawk.util.MessageUtils;
/**
* Base validator implementation for Apache MyFaces Commons Validators.
*
- * @JSFValidator
- * configExcluded = "true"
- * tagClass = "org.apache.myfaces.validator.ValidatorBaseTag"
*/
+@JSFValidator(
+ configExcluded = true,
+ tagClass = "org.apache.myfaces.validator.ValidatorBaseTag")
public abstract class ValidatorBase implements StateHolder, Validator {
private String _summaryMessage = null;
@@ -49,9 +51,10 @@
/**
*
- * @JSFProperty
+ *
* @return The summary message to be displayed
*/
+ @JSFProperty
public String getSummaryMessage()
{
if (_summaryMessage != null) return _summaryMessage;
@@ -69,10 +72,11 @@
/**
*
- * @JSFProperty
+ *
* @return The message.
* @deprecated Use getDetailMessage()
*/
+ @JSFProperty
public String getMessage() {
return getDetailMessage();
}
@@ -89,9 +93,10 @@
/**
*
- * @JSFProperty
+ *
* @return The detail message.
*/
+ @JSFProperty
public String getDetailMessage() {
if (_detailMessage != null) return _detailMessage;
ValueExpression vb = getValueExpression("detailMessage");