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 2006/11/27 00:10:12 UTC
svn commit: r479450 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/context/
core/src/main/java/org/apache/myfaces/tobago/util/
example/demo/src/main/webapp/overview/
Author: bommel
Date: Sun Nov 26 15:10:11 2006
New Revision: 479450
URL: http://svn.apache.org/viewvc?view=rev&rev=479450
Log:
some cleanup
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/RenderersConfigImpl.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/themes.jsp
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/RenderersConfigImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/RenderersConfigImpl.java?view=diff&rev=479450&r1=479449&r2=479450
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/RenderersConfigImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/RenderersConfigImpl.java Sun Nov 26 15:10:11 2006
@@ -61,13 +61,13 @@
public boolean isMarkupSupported(String rendererName, String markup) {
if (LOG.isDebugEnabled()) {
- LOG.debug("calling isMarkupSupported" + rendererName + " " +markup);
+ LOG.debug("calling isMarkupSupported " + rendererName + " " +markup);
}
RendererConfig rendererConfig = renderer.get(rendererName);
if (rendererConfig != null) {
return rendererConfig.contains(markup);
} else {
- LOG.error("Calling isMarkupSupported" + rendererName + " " +markup + "but no configuration found.");
+ LOG.error("Calling isMarkupSupported " + rendererName + " " +markup + " but no configuration found.");
return false;
}
}
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=479450&r1=479449&r2=479450
==============================================================================
--- 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 Sun Nov 26 15:10:11 2006
@@ -120,38 +120,29 @@
public static int getLabelWidth(UIComponent component) {
- int width = 0;
-
if (component != null) {
UIComponent label = component.getFacet(FACET_LABEL);
if (label != null) {
- String labelWidth = (String) label.getAttributes().get(
- ATTR_WIDTH);
+ String labelWidth = (String) label.getAttributes().get(ATTR_WIDTH);
if (labelWidth != null) {
try {
- width = Integer.parseInt(labelWidth.replaceAll("\\D", ""));
+ return Integer.parseInt(labelWidth.replaceAll("\\D", ""));
} catch (NumberFormatException e) {
LOG.warn("Can't parse label width, using default value", e);
}
}
}
}
- return width;
+ return 0;
}
-
-
-
-
//TODO Change this to DimensionUtils.getWidth?
public static Integer getLayoutWidth(UIComponent component) {
- return getLayoutSpace(component, ATTR_WIDTH,
- ATTR_LAYOUT_WIDTH);
+ return getLayoutSpace(component, ATTR_WIDTH, ATTR_LAYOUT_WIDTH);
}
//TODO Change this to DimensionUtils.getHeight?
public static Integer getLayoutHeight(UIComponent component) {
- return getLayoutSpace(component, ATTR_HEIGHT,
- ATTR_LAYOUT_HEIGHT);
+ return getLayoutSpace(component, ATTR_HEIGHT, ATTR_LAYOUT_HEIGHT);
}
public static Integer getLayoutSpace(UIComponent component,
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp?view=diff&rev=479450&r1=479449&r2=479450
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp Sun Nov 26 15:10:11 2006
@@ -33,7 +33,7 @@
<tc:out escape="false" value="#{overviewBundle.basic_text_input}" />
<%-- row --%>
- <tc:box label="#{overviewBundle.basicControls_sampleInputTitle}" markup="deleted">
+ <tc:box label="#{overviewBundle.basicControls_sampleInputTitle}">
<f:facet name="layout">
<tc:gridLayout columns="1*;1*" border="0" />
</f:facet>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/themes.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/themes.jsp?view=diff&rev=479450&r1=479449&r2=479450
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/themes.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/themes.jsp Sun Nov 26 15:10:11 2006
@@ -23,7 +23,7 @@
<jsp:body>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="90px;150px;1* " />
+ <tc:gridLayout rows="120px;150px;1* " />
</f:facet>
<tc:out escape="false" value="#{overviewBundle.theme_text}" />