You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ct...@apache.org on 2008/04/07 23:44:01 UTC
svn commit: r645705 - in
/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal:
renderkit/core/xhtml/BreadCrumbsRenderer.java
renderkit/core/xhtml/TreeRenderer.java skin/SkinImpl.java
Author: ctoth
Date: Mon Apr 7 14:44:00 2008
New Revision: 645705
URL: http://svn.apache.org/viewvc?rev=645705&view=rev
Log:
- specified in SkinImpl the types of some skinning properties of Tree and Breadcrumbs
- simplified their renderers accordingly
Modified:
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BreadCrumbsRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BreadCrumbsRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BreadCrumbsRenderer.java?rev=645705&r1=645704&r2=645705&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BreadCrumbsRenderer.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BreadCrumbsRenderer.java Mon Apr 7 14:44:00 2008
@@ -411,7 +411,7 @@
{
Object propValue = arc.getSkin().getProperty(
SkinProperties.AF_BREAD_CRUMBS_SEPARATOR_ON_NEW_LINE);
- return Boolean.TRUE.equals(propValue) || "true".equals(propValue);
+ return Boolean.TRUE.equals(propValue);
}
protected int getNumberOfIndentSpaces(
@@ -422,16 +422,9 @@
SkinProperties.AF_BREAD_CRUMBS_INDENT_SPACES);
int intValue = _INDENT_SPACES;
- if (propValue != null) {
- if (propValue instanceof String) {
- try
- {
- intValue = Integer.valueOf((String) propValue);
- }
- catch (Exception e) {}
- }
- if (propValue instanceof Integer)
- intValue = (Integer) propValue;
+ if (propValue != null && propValue instanceof Integer)
+ {
+ intValue = (Integer) propValue;
if (intValue < 0)
intValue = _INDENT_SPACES;
}
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java?rev=645705&r1=645704&r2=645705&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java Mon Apr 7 14:44:00 2008
@@ -262,6 +262,17 @@
}
/**
+ * Returns true if the tree connecting lines should be rendered
+ * @param rc the RenderingContext
+ * @return the value of the AF_TREE_SHOW_LINES skin property
+ */
+ protected boolean isShowLines( RenderingContext rc)
+ {
+ Object showLines = rc.getSkin().getProperty(SkinProperties.AF_TREE_SHOW_LINES);
+ return showLines == null || showLines.equals(Boolean.TRUE);
+ }
+
+ /**
* Returns the URI of the vertical line icon
*
* @param context the FacesContext
@@ -277,11 +288,7 @@
boolean leftToRight
)
{
- if (!isLine)
- return null;
- Object showLines = rc.getSkin().getProperty(SkinProperties.AF_TREE_SHOW_LINES);
- if (showLines == null ||
- !(showLines.equals(Boolean.TRUE) || showLines.equals("true")))
+ if (!isLine || !isShowLines(rc))
return null;
Icon icon = rc.getIcon(SkinSelectors.AF_TREE_LINE_ICON);
return (icon == null) ? null : icon.getImageURI(context, rc).toString();
@@ -304,8 +311,7 @@
)
{
Object showLines = rc.getSkin().getProperty(SkinProperties.AF_TREE_SHOW_LINES);
- if (showLines == null ||
- !(showLines.equals(Boolean.TRUE) || showLines.equals("true")))
+ if (!isShowLines(rc))
return null;
Icon nodeBackgroundIcon = rc.getIcon(isLastSibling
? SkinSelectors.AF_TREE_LINE_LAST_ICON : SkinSelectors.AF_TREE_LINE_MIDDLE_ICON);
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java?rev=645705&r1=645704&r2=645705&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java Mon Apr 7 14:44:00 2008
@@ -1209,6 +1209,12 @@
SkinProperties.AF_TABLE_SELECTION_BAR_IN_TABLE, Boolean.class);
_PROPERTY_CLASS_TYPE_MAP.put(
SkinProperties.AF_TABLE_REPEAT_CONTROL_BAR, Boolean.class);
+ _PROPERTY_CLASS_TYPE_MAP.put(
+ SkinProperties.AF_TREE_SHOW_LINES, Boolean.class);
+ _PROPERTY_CLASS_TYPE_MAP.put(
+ SkinProperties.AF_BREAD_CRUMBS_SEPARATOR_ON_NEW_LINE, Boolean.class);
+ _PROPERTY_CLASS_TYPE_MAP.put(
+ SkinProperties.AF_BREAD_CRUMBS_INDENT_SPACES, Integer.class);
}
private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(SkinImpl.class);