Author: mareshkau Date: 2010-05-11 10:37:20 -0400 (Tue, 11 May 2010) New Revision: 22012 Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/resources/commons-logging-1.0.4.jar Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/META-INF/MANIFEST.MF workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/build.properties workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/IceFacesActivator.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java Log: JBIDE-4710 Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/META-INF/MANIFEST.MF =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/META-INF/MANIFEST.MF 2010-05-11 14:30:47 UTC (rev 22011) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/META-INF/MANIFEST.MF 2010-05-11 14:37:20 UTC (rev 22012) @@ -20,4 +20,5 @@ resources/jsf-api.jar, resources/jsp-api.jar, resources/el-api.jar, - resources/servlet-api.jar + resources/servlet-api.jar, + resources/commons-logging-1.0.4.jar Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/build.properties =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/build.properties 2010-05-11 14:30:47 UTC (rev 22011) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/build.properties 2010-05-11 14:37:20 UTC (rev 22012) @@ -11,5 +11,6 @@ resources/jsf-api.jar,\ resources/jsp-api.jar,\ resources/el-api.jar,\ - resources/servlet-api.jar + resources/servlet-api.jar,\ + resources/commons-logging-1.0.4.jar Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/resources/commons-logging-1.0.4.jar =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/resources/commons-logging-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/IceFacesActivator.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/IceFacesActivator.java 2010-05-11 14:30:47 UTC (rev 22011) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/IceFacesActivator.java 2010-05-11 14:37:20 UTC (rev 22012) @@ -24,16 +24,11 @@ // The shared instance private static IceFacesActivator plugin; - /** - * The constructor - */ - public IceFacesActivator() { - } - /* * (non-Javadoc) * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; @@ -43,6 +38,7 @@ * (non-Javadoc) * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); 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-11 14:30:47 UTC (rev 22011) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-11 14:37:20 UTC (rev 22012) @@ -12,11 +12,13 @@ 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.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; @@ -24,21 +26,34 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; +/** + * + * @author mareshkau + * + */ public class IceFacesOutputTextTemplate extends VpeAbstractTemplate { - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - Renderer render = new com.icesoft.faces.renderkit.dom_html_basic.TextRenderer(); - 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; + try { + Renderer render = new com.icesoft.faces.renderkit.dom_html_basic.TextRenderer(); + 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 new VpeCreationData(resultVisualNode); + return VpeTemplateManager.getInstance().getDefTemplate().create( + pageContext, sourceNode, visualDocument); } }