You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/04/24 22:43:25 UTC
svn commit: r532073 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/renderkit/
core/src/main/java/org/apache/myfaces/tobago/util/
theme/scarborough/src/main/java/org/apach...
Author: bommel
Date: Tue Apr 24 13:43:24 2007
New Revision: 532073
URL: http://svn.apache.org/viewvc?view=rev&rev=532073
Log:
minor cleanup
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java?view=diff&rev=532073&r1=532072&r2=532073
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java Tue Apr 24 13:43:24 2007
@@ -61,6 +61,7 @@
private String marginLeft;
private String columns;
private String rows;
+ private boolean ignoreFree;
private List<Row> layoutRows;
@@ -242,8 +243,6 @@
public String getFamily() {
return COMPONENT_FAMILY;
}
-
- private boolean ignoreFree;
@Override
public boolean getRendersChildren() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java?view=diff&rev=532073&r1=532072&r2=532073
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java Tue Apr 24 13:43:24 2007
@@ -57,10 +57,13 @@
Renderer renderer = null;
FacesContext facesContext = FacesContext.getCurrentInstance();
if ("facelets".equals(family)) {
- RenderKitFactory rkFactory = (RenderKitFactory)
- FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- RenderKit renderKit = rkFactory.getRenderKit(facesContext, RenderKitFactory.HTML_BASIC_RENDER_KIT);
- return new RendererBaseWrapper(renderKit.getRenderer(family, rendererType));
+ RenderKitFactory rkFactory = (RenderKitFactory)
+ FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
+ RenderKit renderKit = rkFactory.getRenderKit(facesContext, RenderKitFactory.HTML_BASIC_RENDER_KIT);
+ renderer = renderKit.getRenderer(family, rendererType);
+ if (renderer != null) {
+ return new RendererBaseWrapper(renderer);
+ }
} else {
if (rendererType != null) {
if (resources == null) {
@@ -68,11 +71,12 @@
}
renderer = resources.getRenderer(facesContext.getViewRoot(), rendererType);
}
+ if (renderer == null) {
+ LOG.error("The class which was found by the ResourceManager cannot be "
+ + "found or instantiated: classname='" + rendererType + "'");
+ }
}
- if (renderer == null) {
- LOG.error("The class which was found by the ResourceManager cannot be "
- + "found or instantiated: classname='" + rendererType + "'");
- }
+
return renderer;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java?view=diff&rev=532073&r1=532072&r2=532073
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java Tue Apr 24 13:43:24 2007
@@ -183,8 +183,9 @@
&& component.getRendererType() == null) {
return true;
}
+ // TODO find a better way
if ("facelets".equals(component.getFamily())) {
- return true;
+ return !"com.sun.facelets.tag.UIDebug".equals(component.getClass().getName());
}
/* TODO disable layouting of facelet stuff
if (component.getClass().getPackage().getName().equals("com.sun.facelets.compiler")) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java?view=diff&rev=532073&r1=532072&r2=532073
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java Tue Apr 24 13:43:24 2007
@@ -353,7 +353,7 @@
writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute(cellClasses);
writer.writeAttribute(HtmlAttributes.STYLE, cellStyle, null);
-
+ writer.flush();
RenderUtil.encode(facesContext, cell);
writer.endElement(HtmlConstants.DIV);