Author: mareshkau Date: 2010-05-12 09:07:52 -0400 (Wed, 12 May 2010) New Revision: 22033 Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeFacesContext.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templates-icefaces.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4710 Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-12 13:02:43 UTC (rev 22032) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-12 13:07:52 UTC (rev 22033) @@ -14,6 +14,7 @@ import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; @@ -36,6 +37,7 @@ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { try { + VpeFacesContext.getInstance().setResponseWriter(null); Renderer render = new com.icesoft.faces.renderkit.dom_html_basic.TextRenderer(); VpeUIComponent uiComponent = new VpeUIComponent( (Element) sourceNode); Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java (rev 0) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010-05-12 13:07:52 UTC (rev 22033) @@ -0,0 +1,60 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.icefaces.template; + +import javax.faces.render.Renderer; + +import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; +import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.template.VpeTemplateManager; +import org.jboss.tools.vpe.editor.util.VisualDomUtil; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * @author mareshkau + * + */ +public class IceFacesSelectBooleanCheckboxTemplate extends VpeAbstractTemplate { + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + try { + VpeFacesContext.getInstance().setResponseWriter(null); + Renderer render = new com.icesoft.faces.renderkit.dom_html_basic.CheckboxRenderer(); + VpeUIComponent uiComponent = new VpeUIComponent( + (Element) sourceNode); + Node result = VpeRendererUtil.processRenderer(render, uiComponent); + nsIDOMNode resultVisualNode = VpeRendererUtil.createVisualNode( + result, visualDocument); + if (resultVisualNode.getNodeType() == Node.TEXT_NODE) { + nsIDOMElement domElement = VisualDomUtil + .createBorderlessContainer(visualDocument); + domElement.appendChild(resultVisualNode); + resultVisualNode = domElement; + } + return new VpeCreationData(resultVisualNode); + } catch (Throwable th) { + IceFacesActivator.getDefault().logError(th); + } + return VpeTemplateManager.getInstance().getDefTemplate().create( + pageContext, sourceNode, visualDocument); + } + +} Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-12 13:02:43 UTC (rev 22032) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-12 13:07:52 UTC (rev 22033) @@ -12,10 +12,8 @@ import javax.faces.component.UIComponent; import javax.faces.render.Renderer; - - +import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; -import org.jboss.tools.vpe.VpePlugin; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -23,7 +21,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; - import com.icesoft.faces.context.DOMContext; /** @@ -36,11 +33,13 @@ public static Node processRenderer(final Renderer render, final UIComponent uiComponent){ + + try { render.encodeBegin(VpeFacesContext.getInstance(), uiComponent); render.encodeEnd(VpeFacesContext.getInstance(), uiComponent); } catch (Throwable e) { - VpePlugin.getPluginLog().logError(e); + IceFacesActivator.getDefault().logError(e); } DOMContext domContext = DOMContext.getDOMContext(VpeFacesContext.getInstance(), uiComponent); return domContext.getRootNode(); Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeFacesContext.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeFacesContext.java 2010-05-12 13:02:43 UTC (rev 22032) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeFacesContext.java 2010-05-12 13:07:52 UTC (rev 22033) @@ -15,56 +15,75 @@ import javax.faces.context.ExternalContext; import javax.faces.context.ResponseWriter; +import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.template.mock.abstr.VpeAbstractFacesContext; - /** - * Mock object for FacesContext. - * It's need for using real renders in vpe templates + * Mock object for FacesContext. It's need for using real renders in vpe + * templates * * @author mareshkau - * + * */ public class VpeFacesContext extends VpeAbstractFacesContext { private static VpeFacesContext instance; - - private static final VpeDOMResponseWriter vpeDOMResponseWriter = new VpeDOMResponseWriter(null, null, null, null, null, null); - - private VpeFacesContext() throws Exception{ - //singleton - super(VpeRequest.getInstance(),null,null,null, VpeConfiguration.getInstance(),null,null,null,null); + + private VpeDOMResponseWriter vpeDOMResponseWriter;// = new + // VpeDOMResponseWriter(null, + // null, null, null, + // null, null); + + private VpeFacesContext() throws Exception { + // singleton + super(VpeRequest.getInstance(), null, null, null, VpeConfiguration + .getInstance(), null, null, null, null); } - - public static VpeFacesContext getInstance(){ - if(instance==null) { + + public static VpeFacesContext getInstance() { + if (instance == null) { try { - FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY, VpeApplicationFactory.class.getName()); + FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY, + VpeApplicationFactory.class.getName()); instance = new VpeFacesContext(); } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + IceFacesActivator.getDefault().logError(e); } } return instance; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see javax.faces.context.FacesContext#getExternalContext() */ @Override public ExternalContext getExternalContext() { return VpeExternalContext.getInstance(); } - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see javax.faces.context.FacesContext#getResponseWriter() */ @Override - public ResponseWriter getResponseWriter() { + public ResponseWriter getResponseWriter() { + if (this.vpeDOMResponseWriter == null) { + this.vpeDOMResponseWriter = new VpeDOMResponseWriter(null, null, + null, null, null, null); + } return this.vpeDOMResponseWriter; } - /* (non-Javadoc) + public void setResponseWriter(VpeDOMResponseWriter responseWriter) { + this.vpeDOMResponseWriter = responseWriter; + } + + /* + * (non-Javadoc) + * * @see javax.faces.context.FacesContext#getViewRoot() */ @Override Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templates-icefaces.xml =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templates-icefaces.xml 2010-05-12 13:02:43 UTC (rev 22032) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templates-icefaces.xml 2010-05-12 13:07:52 UTC (rev 22033) @@ -24,4 +24,18 @@ </vpe:template> </vpe:tag> -</vpe:templates> \ No newline at end of file + <vpe:tag name="ice:selectBooleanCheckbox" case-sensitive="yes"> + <vpe:template children="yes" modify="yes" + class="org.jboss.tools.jsf.vpe.icefaces.template.IceFacesSelectBooleanCheckboxTemplate"> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + <vpe:drop container="no"></vpe:drop> + </vpe:dnd> + </vpe:template> + </vpe:tag> + +</vpe:templates>