You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/08/01 01:22:28 UTC
svn commit: r427399 - in
/incubator/adffaces/branches/matzew-component-renaming/trinidad:
trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/
trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/tr...
Author: matzew
Date: Mon Jul 31 18:22:28 2006
New Revision: 427399
URL: http://svn.apache.org/viewvc?rev=427399&view=rev
Log:
changed render-type of panelForm/panelGroup + refactoring...
Modified:
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelFormLayout.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelGroupLayout.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/renderertype-localname.properties
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml?rev=427399&r1=427398&r2=427399&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml Mon Jul 31 18:22:28 2006
@@ -101,7 +101,7 @@
<component-extension>
<mfp:component-supertype>org.apache.myfaces.trinidad.Panel</mfp:component-supertype>
- <mfp:renderer-type>org.apache.myfaces.trinidad.Form</mfp:renderer-type>
+ <mfp:renderer-type>org.apache.myfaces.trinidad.FormLayout</mfp:renderer-type>
<mfp:tag-name>tr:panelFormLayout</mfp:tag-name>
<mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.layout.CorePanelFormLayoutTag</mfp:tag-class>
<mfp:long-description><![CDATA[<html:p>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml?rev=427399&r1=427398&r2=427399&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml Mon Jul 31 18:22:28 2006
@@ -47,7 +47,7 @@
<component-extension>
<mfp:component-supertype>org.apache.myfaces.trinidad.Panel</mfp:component-supertype>
- <mfp:renderer-type>org.apache.myfaces.trinidad.Group</mfp:renderer-type>
+ <mfp:renderer-type>org.apache.myfaces.trinidad.GroupLayout</mfp:renderer-type>
<mfp:tag-name>tr:panelGroupLayout</mfp:tag-name>
<mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.layout.CorePanelGroupLayoutTag</mfp:tag-class>
<mfp:long-description><![CDATA[The panelGroupLayout control is a layout element that
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelFormLayout.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelFormLayout.xml?rev=427399&r1=427398&r2=427399&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelFormLayout.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelFormLayout.xml Mon Jul 31 18:22:28 2006
@@ -20,7 +20,7 @@
<render-kit-id>org.apache.myfaces.trinidadinternal.core</render-kit-id>
<renderer>
<component-family>org.apache.myfaces.trinidad.Panel</component-family>
- <renderer-type>org.apache.myfaces.trinidad.Form</renderer-type>
+ <renderer-type>org.apache.myfaces.trinidad.FormLayout</renderer-type>
<renderer-class>org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PanelFormLayoutRenderer</renderer-class>
<renderer-extension>
<mfp:component-type>org.apache.myfaces.trinidad.CorePanelFormLayout</mfp:component-type>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelGroupLayout.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelGroupLayout.xml?rev=427399&r1=427398&r2=427399&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelGroupLayout.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelGroupLayout.xml Mon Jul 31 18:22:28 2006
@@ -20,7 +20,7 @@
<render-kit-id>org.apache.myfaces.trinidadinternal.core</render-kit-id>
<renderer>
<component-family>org.apache.myfaces.trinidad.Panel</component-family>
- <renderer-type>org.apache.myfaces.trinidad.Group</renderer-type>
+ <renderer-type>org.apache.myfaces.trinidad.GroupLayout</renderer-type>
<renderer-class>org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PanelGroupLayoutRenderer</renderer-class>
<renderer-extension>
<mfp:component-type>org.apache.myfaces.trinidad.CorePanelGroupLayout</mfp:component-type>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java?rev=427399&r1=427398&r2=427399&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java Mon Jul 31 18:22:28 2006
@@ -85,8 +85,7 @@
if (UIXPanel.COMPONENT_FAMILY.equals(family))
{
String rendererType = parent.getRendererType();
- if ("org.apache.myfaces.trinidad.Form".equals(rendererType) ||
- "org.apache.myfaces.trinidad.rich.Form".equals(rendererType))
+ if (_isFormRenderType(rendererType))
return false;
}
else if (HtmlTableLayout.COMPONENT_FAMILY.equals(family))
@@ -121,12 +120,12 @@
if (UIXPanel.COMPONENT_FAMILY.equals(family))
{
String rendererType = parentComponent.getRendererType();
- if ("org.apache.myfaces.trinidad.Form".equals(rendererType) ||
- "org.apache.myfaces.trinidad.rich.Form".equals(rendererType))
+ if (_isFormRenderType(rendererType))
return true;
}
return false;
}
+
// put the outer style class here, like af_selectManyRadio, styleClass,
// inlineStyle, 'state' styles like p_AFDisabled, etc.
protected void renderRootDomElementStyles(
@@ -699,6 +698,14 @@
(String) keyMap.get(styleClass) :
null;
}
+
+ private boolean _isFormRenderType(String rendererType)
+ {
+ return "org.apache.myfaces.trinidad.Form".equals(rendererType) ||
+ "org.apache.myfaces.trinidad.FormLayout".equals(rendererType) ||
+ "org.apache.myfaces.trinidad.rich.Form".equals(rendererType);
+ }
+
// THESE VALUES MUST MATCH THOSE IN INLINEMESSAGERENDERER
// (at least for as long as both classes exist)
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties?rev=427399&r1=427398&r2=427399&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties Mon Jul 31 18:22:28 2006
@@ -33,8 +33,8 @@
org.apache.myfaces.trinidad.component.core.CoreStyleSheet=org.apache.myfaces.trinidadinternal.bean.UIXFacesBeanImpl
org.apache.myfaces.trinidad.component.UIXDocument=org.apache.myfaces.trinidadinternal.bean.UIXFacesBeanImpl
org.apache.myfaces.trinidad.component.UIXMessage|org.apache.myfaces.trinidad.Message=org.apache.myfaces.trinidadinternal.bean.UIXFacesBeanImpl
-org.apache.myfaces.trinidad.component.UIXPanel|org.apache.myfaces.trinidad.Form=org.apache.myfaces.trinidadinternal.bean.UIXFacesBeanImpl
-org.apache.myfaces.trinidad.component.UIXPanel|org.apache.myfaces.trinidad.Group=org.apache.myfaces.trinidadinternal.bean.UIXFacesBeanImpl
+org.apache.myfaces.trinidad.component.UIXPanel|org.apache.myfaces.trinidad.FormLayout=org.apache.myfaces.trinidadinternal.bean.UIXFacesBeanImpl
+org.apache.myfaces.trinidad.component.UIXPanel|org.apache.myfaces.trinidad.GroupLayout=org.apache.myfaces.trinidadinternal.bean.UIXFacesBeanImpl
org.apache.myfaces.trinidad.component.UIXPanel|org.apache.myfaces.trinidad.LabelAndMessage=org.apache.myfaces.trinidadinternal.bean.UIXFacesBeanImpl
org.apache.myfaces.trinidad.component.UIXShowDetail=org.apache.myfaces.trinidadinternal.bean.UIXFacesBeanImpl
org.apache.myfaces.trinidad.component.UIXForm=org.apache.myfaces.trinidadinternal.bean.UIXFacesBeanImpl
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/renderertype-localname.properties
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/renderertype-localname.properties?rev=427399&r1=427398&r2=427399&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/renderertype-localname.properties (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/resources/META-INF/renderertype-localname.properties Mon Jul 31 18:22:28 2006
@@ -50,7 +50,7 @@
org.apache.myfaces.trinidad.Panel|org.apache.myfaces.trinidad.Box=contentContainer
org.apache.myfaces.trinidad.Panel|org.apache.myfaces.trinidad.ButtonBar=pageButtonBar
org.apache.myfaces.trinidad.Panel|org.apache.myfaces.trinidad.Form=messageComponentLayout
-org.apache.myfaces.trinidad.Panel|org.apache.myfaces.trinidad.Group=panelGroup
+org.apache.myfaces.trinidad.Panel|org.apache.myfaces.trinidad.GroupLayout=panelGroupLayout
org.apache.myfaces.trinidad.Panel|org.apache.myfaces.trinidad.Header=header
org.apache.myfaces.trinidad.Panel|org.apache.myfaces.trinidad.HorizontalLayout=panelHorizontalLayout
org.apache.myfaces.trinidad.Panel|org.apache.myfaces.trinidad.LabelAndMessage=messageLayout