Author: artdaw Date: 2011-02-09 13:56:07 -0500 (Wed, 09 Feb 2011) New Revision: 21578 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java Log: RF-10475: NPE is fixed Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-02-09 18:18:17 UTC (rev 21577) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-02-09 18:56:07 UTC (rev 21578) @@ -23,32 +23,32 @@ package org.richfaces.renderkit.html; -import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; -import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; -import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; -import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption; -import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.PartialResponseWriter; -import javax.faces.context.ResponseWriter; - import org.ajax4jsf.javascript.JSObject; import org.richfaces.TooltipMode; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractTooltip; +import org.richfaces.component.Positioning; import org.richfaces.context.ExtendedPartialViewContext; import org.richfaces.renderkit.HtmlConstants; import org.richfaces.renderkit.MetaComponentRenderer; import org.richfaces.renderkit.util.RendererUtils; +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.PartialResponseWriter; +import javax.faces.context.ResponseWriter; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; +import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; +import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption; +import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; + /** * @author amarkhel * @since 2010-10-24 @@ -177,8 +177,8 @@ Map<String, Object> options = new HashMap<String, Object>(); options.put("ajax", getAjaxOptions(context, tooltip)); - options.put("jointPoint", tooltip.getJointPoint().getValue()); - options.put("direction", tooltip.getDirection().getValue()); + options.put("jointPoint", tooltip.getJointPoint() != null ? tooltip.getJointPoint().getValue() : Positioning.DEFAULT); + options.put("direction", tooltip.getDirection() != null ? tooltip.getDirection().getValue() : Positioning.DEFAULT); options.put("attached", tooltip.isAttached()); options.put("offset", getOffset(tooltip)); options.put("mode", tooltip.getMode());