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/12 00:25:26 UTC
svn commit: r684964 - in
/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component:
UICommand.java UIData.java UIGraphic.java UIInput.java UIViewRoot.java
Author: lu4242
Date: Mon Aug 11 15:25:26 2008
New Revision: 684964
URL: http://svn.apache.org/viewvc?rev=684964&view=rev
Log:
fix errors introduced on revision 684592 that makes tomahawk core12 fail (and mvn clirr:check too!)
Modified:
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UICommand.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIGraphic.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIInput.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UICommand.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UICommand.java?rev=684964&r1=684963&r2=684964&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UICommand.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UICommand.java Mon Aug 11 15:25:26 2008
@@ -54,8 +54,8 @@
@JSFComponent(defaultRendererType = "javax.faces.Button")
public class UICommand extends UIComponentBase implements ActionSource2
{
- static final String COMPONENT_TYPE = "javax.faces.Command";
- private static final String COMPONENT_FAMILY = "javax.faces.Command";
+ public static final String COMPONENT_TYPE = "javax.faces.Command";
+ public static final String COMPONENT_FAMILY = "javax.faces.Command";
private boolean _immediate;
private boolean _immediateSet;
@@ -87,7 +87,6 @@
* @deprecated Use getActionExpression() instead.
*/
@Deprecated
- @JSFProperty(returnSignature="java.lang.String")
public MethodBinding getAction()
{
MethodExpression actionExpression = getActionExpression();
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java?rev=684964&r1=684963&r2=684964&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java Mon Aug 11 15:25:26 2008
@@ -109,7 +109,7 @@
implements NamingContainer
{
public static final String COMPONENT_FAMILY = "javax.faces.Data";
- static final String COMPONENT_TYPE = "javax.faces.Data"; // for unit tests
+ public static final String COMPONENT_TYPE = "javax.faces.Data"; // for unit tests
private static final String FOOTER_FACET_NAME = "footer";
private static final String HEADER_FACET_NAME = "header";
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIGraphic.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIGraphic.java?rev=684964&r1=684963&r2=684964&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIGraphic.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIGraphic.java Mon Aug 11 15:25:26 2008
@@ -34,8 +34,8 @@
@JSFComponent(defaultRendererType = "javax.faces.Image")
public class UIGraphic extends UIComponentBase
{
- static final String COMPONENT_TYPE = "javax.faces.Graphic";
- private static final String COMPONENT_FAMILY = "javax.faces.Graphic";
+ public static final String COMPONENT_TYPE = "javax.faces.Graphic";
+ public static final String COMPONENT_FAMILY = "javax.faces.Graphic";
private static final String URL_PROPERTY = "url";
private static final String VALUE_PROPERTY = "value";
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIInput.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIInput.java?rev=684964&r1=684963&r2=684964&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIInput.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIInput.java Mon Aug 11 15:25:26 2008
@@ -62,7 +62,7 @@
@JSFComponent(defaultRendererType = "javax.faces.Text")
public class UIInput extends UIOutput implements EditableValueHolder
{
- static final String COMPONENT_TYPE = "javax.faces.Input";
+ public static final String COMPONENT_TYPE = "javax.faces.Input";
public static final String COMPONENT_FAMILY = "javax.faces.Input";
public static final String CONVERSION_MESSAGE_ID = "javax.faces.component.UIInput.CONVERSION";
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java?rev=684964&r1=684963&r2=684964&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java Mon Aug 11 15:25:26 2008
@@ -60,7 +60,7 @@
public class UIViewRoot extends UIComponentBase
{
public static final String COMPONENT_TYPE = "javax.faces.ViewRoot";
- private static final String COMPONENT_FAMILY = "javax.faces.ViewRoot";
+ public static final String COMPONENT_FAMILY = "javax.faces.ViewRoot";
public static final String UNIQUE_ID_PREFIX = "j_id";
private static final int ANY_PHASE_ORDINAL = PhaseId.ANY_PHASE.getOrdinal();
Re: svn commit: r684964 - in /myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component:
UICommand.java UIData.java UIGraphic.java UIInput.java UIViewRoot.java
Posted by Simon Kitching <sk...@apache.org>.
lu4242@apache.org schrieb:
> Author: lu4242
> Date: Mon Aug 11 15:25:26 2008
> New Revision: 684964
>
> URL: http://svn.apache.org/viewvc?rev=684964&view=rev
> Log:
> fix errors introduced on revision 684592 that makes tomahawk core12 fail (and mvn clirr:check too!)
>
- static final String COMPONENT_TYPE = "javax.faces.Command";
- private static final String COMPONENT_FAMILY = "javax.faces.Command";
+ public static final String COMPONENT_TYPE = "javax.faces.Command";
+ public static final String COMPONENT_FAMILY = "javax.faces.Command";
Oops. Didn't realize that the spec actually declares these to be public
constants. Sorry about that.