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/06/05 00:26:06 UTC
svn commit: r663391 - in
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom:
collapsiblepanel/ jslistener/ panelstack/ schedule/ stylesheet/
Author: lu4242
Date: Wed Jun 4 15:26:06 2008
New Revision: 663391
URL: http://svn.apache.org/viewvc?rev=663391&view=rev
Log:
TOMAHAWK-1265 Avoid usage of @JSFComponent parent="org......", correcting the hierarchy of components
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/AbstractHtmlCollapsiblePanel.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/jslistener/AbstractJsValueChangeListener.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/panelstack/AbstractHtmlPanelStack.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/AbstractStylesheet.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/AbstractHtmlCollapsiblePanel.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/AbstractHtmlCollapsiblePanel.java?rev=663391&r1=663390&r2=663391&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/AbstractHtmlCollapsiblePanel.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/AbstractHtmlCollapsiblePanel.java Wed Jun 4 15:26:06 2008
@@ -24,6 +24,7 @@
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
+import javax.faces.el.MethodBinding;
import org.apache.myfaces.component.EventAware;
import org.apache.myfaces.component.StyleAware;
@@ -40,7 +41,6 @@
* @JSFComponent
* name = "t:collapsiblePanel"
* class = "org.apache.myfaces.custom.collapsiblepanel.HtmlCollapsiblePanel"
- * parent = "javax.faces.component.UIOutput"
* superClass = "org.apache.myfaces.custom.collapsiblepanel.AbstractHtmlCollapsiblePanel"
* tagClass = "org.apache.myfaces.custom.collapsiblepanel.HtmlCollapsiblePanelTag"
*
@@ -229,5 +229,35 @@
*/
public abstract String getTitleVar();
+ /**
+ * @JSFProperty tagExcluded = "true"
+ */
+ public MethodBinding getValidator(){
+ return super.getValidator();
+ }
+
+ /**
+ * @JSFProperty tagExcluded = "true"
+ */
+ public MethodBinding getValueChangeListener()
+ {
+ return super.getValueChangeListener();
+ }
+
+ /**
+ * @JSFProperty tagExcluded = "true"
+ */
+ public boolean isImmediate()
+ {
+ return super.isImmediate();
+ }
+
+ /**
+ * @JSFProperty tagExcluded = "true"
+ */
+ public boolean isRequired()
+ {
+ return super.isRequired();
+ }
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/jslistener/AbstractJsValueChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/jslistener/AbstractJsValueChangeListener.java?rev=663391&r1=663390&r2=663391&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/jslistener/AbstractJsValueChangeListener.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/jslistener/AbstractJsValueChangeListener.java Wed Jun 4 15:26:06 2008
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.custom.jslistener;
+import javax.faces.component.UIComponentBase;
import javax.faces.component.UIOutput;
/**
@@ -28,14 +29,17 @@
* @JSFComponent
* name = "t:jsValueChangeListener"
* class = "org.apache.myfaces.custom.jslistener.JsValueChangeListener"
- * parent = "javax.faces.component.UIComponent"
* superClass = "org.apache.myfaces.custom.jslistener.AbstractJsValueChangeListener"
* tagClass = "org.apache.myfaces.custom.jslistener.JsValueChangeListenerTag"
*
+ * @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 Martin Marinschek (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public abstract class AbstractJsValueChangeListener extends UIOutput
+public abstract class AbstractJsValueChangeListener extends UIComponentBase
{
public static final String COMPONENT_TYPE = "org.apache.myfaces.JsValueChangeListener";
public static final String COMPONENT_FAMILY = "javax.faces.Output";
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/panelstack/AbstractHtmlPanelStack.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/panelstack/AbstractHtmlPanelStack.java?rev=663391&r1=663390&r2=663391&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/panelstack/AbstractHtmlPanelStack.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/panelstack/AbstractHtmlPanelStack.java Wed Jun 4 15:26:06 2008
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.custom.panelstack;
-import javax.faces.component.html.HtmlPanelGroup;
+import javax.faces.component.UIPanel;
/**
@@ -33,14 +33,13 @@
* @JSFComponent
* name = "t:panelStack"
* class = "org.apache.myfaces.custom.panelstack.HtmlPanelStack"
- * parent = "javax.faces.component.UIPanel"
* superClass = "org.apache.myfaces.custom.panelstack.AbstractHtmlPanelStack"
* tagClass = "org.apache.myfaces.custom.panelstack.PanelStackTag"
*
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
* @version $Revision$ $Date$
*/
-public abstract class AbstractHtmlPanelStack extends HtmlPanelGroup
+public abstract class AbstractHtmlPanelStack extends UIPanel
{
public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlPanelStack";
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java?rev=663391&r1=663390&r2=663391&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java Wed Jun 4 15:26:06 2008
@@ -39,12 +39,11 @@
* actions and actionListeners.
*
* @JSFComponent
- * parent = "org.apache.myfaces.custom.schedule.UIScheduleBase"
*
* @author Jurgen Lust
* @version $Revision$
*/
-public class UISchedule extends UIScheduleBase implements
+public class UISchedule extends org.apache.myfaces.custom.schedule.UIScheduleBase implements
Serializable, ActionSource
{
public static final String COMPONENT_TYPE = "org.apache.myfaces.UISchedule";
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/AbstractStylesheet.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/AbstractStylesheet.java?rev=663391&r1=663390&r2=663391&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/AbstractStylesheet.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/stylesheet/AbstractStylesheet.java Wed Jun 4 15:26:06 2008
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.custom.stylesheet;
-import javax.faces.component.UIOutput;
+import javax.faces.component.UIComponentBase;
import org.apache.myfaces.component.UserRoleAware;
import org.apache.myfaces.component.UserRoleUtils;
@@ -30,14 +30,13 @@
* @JSFComponent
* name = "t:stylesheet"
* class = "org.apache.myfaces.custom.stylesheet.Stylesheet"
- * parent = "javax.faces.component.UIComponentBase"
* superClass = "org.apache.myfaces.custom.stylesheet.AbstractStylesheet"
* tagClass = "org.apache.myfaces.custom.stylesheet.StylesheetTag"
*
* @author mwessendorf (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public abstract class AbstractStylesheet extends UIOutput
+public abstract class AbstractStylesheet extends UIComponentBase
implements UserRoleAware
{
public static final String COMPONENT_TYPE = "org.apache.myfaces.Stylesheet";