Author: mareshkau
Date: 2010-05-18 08:57:26 -0400 (Tue, 18 May 2010)
New Revision: 22169
Added:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IcePanelGridTemplate.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeHtmlPanelGrid.java
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java
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/IceFacesSelectBooleanCheckboxTemplate.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputSecretTemplate.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.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/VpeUIComponent.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templates-icefaces.xml
Log:
Working under processing complex jsf elements,
https://jira.jboss.org/browse/JBIDE-4710
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java
===================================================================
---
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-18
12:17:44 UTC (rev 22168)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-18
12:57:26 UTC (rev 22169)
@@ -34,7 +34,7 @@
Renderer render = new com.icesoft.faces.component.ext.renderkit.ButtonRenderer();
VpeUICommand uiComponent = new VpeUICommand(
(Element) sourceNode);
- return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument,
render, uiComponent);
+ return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, visualDocument,
render, uiComponent);
}
}
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-18
12:17:44 UTC (rev 22168)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-18
12:57:26 UTC (rev 22169)
@@ -35,7 +35,7 @@
Renderer render = new com.icesoft.faces.renderkit.dom_html_basic.TextRenderer();
VpeUIComponent uiComponent = new VpeUIComponent(
(Element) sourceNode);
- return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument,
render, uiComponent);
+ return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, visualDocument,
render, uiComponent);
}
}
Modified:
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 2010-05-18
12:17:44 UTC (rev 22168)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010-05-18
12:57:26 UTC (rev 22169)
@@ -34,7 +34,7 @@
Renderer render = new com.icesoft.faces.renderkit.dom_html_basic.CheckboxRenderer();
VpeUIComponent uiComponent = new VpeUIComponent(
(Element) sourceNode);
- return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument,
render, uiComponent);
+ return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, visualDocument,
render, uiComponent);
}
}
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputSecretTemplate.java
===================================================================
---
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputSecretTemplate.java 2010-05-18
12:17:44 UTC (rev 22168)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputSecretTemplate.java 2010-05-18
12:57:26 UTC (rev 22169)
@@ -15,7 +15,6 @@
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.VpeHtmlInputSecret;
-import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlInputText;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
@@ -35,7 +34,7 @@
Renderer render = new com.icesoft.faces.component.ext.renderkit.SecretRenderer();
VpeHtmlInputSecret uiComponent = new VpeHtmlInputSecret(
(Element) sourceNode);
- return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument,
render, uiComponent);
+ return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, visualDocument,
render, uiComponent);
}
}
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java
===================================================================
---
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-18
12:17:44 UTC (rev 22168)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-18
12:57:26 UTC (rev 22169)
@@ -34,7 +34,7 @@
Renderer render = new com.icesoft.faces.component.ext.renderkit.InputTextRenderer();
VpeHtmlInputText uiComponent = new VpeHtmlInputText(
(Element) sourceNode);
- return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument,
render, uiComponent);
+ return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, visualDocument,
render, uiComponent);
}
}
Added:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IcePanelGridTemplate.java
===================================================================
---
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IcePanelGridTemplate.java
(rev 0)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IcePanelGridTemplate.java 2010-05-18
12:57:26 UTC (rev 22169)
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * 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.utill.VpeRendererUtil;
+import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext;
+import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlPanelGrid;
+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.mozilla.interfaces.nsIDOMDocument;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * @author mareshkau
+ *
+ */
+public class IcePanelGridTemplate extends VpeAbstractTemplate{
+
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+ VpeFacesContext.getInstance().setResponseWriter(null);
+ Renderer render = new com.icesoft.faces.component.ext.renderkit.GridRenderer();
+ VpeHtmlPanelGrid uiComponent = new VpeHtmlPanelGrid(
+ (Element) sourceNode);
+ return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, visualDocument,
render, uiComponent);
+ }
+
+}
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-18
12:17:44 UTC (rev 22168)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-18
12:57:26 UTC (rev 22169)
@@ -37,7 +37,7 @@
*/
public class VpeRendererUtil {
- public static final VpeCreationData createVisualEditorDate(
+ public static final VpeCreationData createVisualEditorData(
VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument, final Renderer render,
final UIComponent uiComponent) {
@@ -69,6 +69,7 @@
try {
render.encodeBegin(VpeFacesContext.getInstance(), uiComponent);
+ render.encodeChildren(VpeFacesContext.getInstance(), uiComponent);
render.encodeEnd(VpeFacesContext.getInstance(), uiComponent);
} catch (Throwable e) {
IceFacesActivator.getDefault().logError(e);
Added:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeHtmlPanelGrid.java
===================================================================
---
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeHtmlPanelGrid.java
(rev 0)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeHtmlPanelGrid.java 2010-05-18
12:57:26 UTC (rev 22169)
@@ -0,0 +1,149 @@
+/*******************************************************************************
+ * 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.template.mock.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.el.ELContext;
+import javax.el.ELException;
+import javax.el.PropertyNotWritableException;
+import javax.el.ValueExpression;
+import javax.faces.component.html.HtmlPanelGrid;
+import javax.faces.context.FacesContext;
+import javax.el.PropertyNotFoundException;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+/**
+ * @author mareshkau
+ *
+ */
+public class VpeHtmlPanelGrid extends HtmlPanelGrid {
+
+ private Map<String,String> attributesMap;
+
+ private Element sourceElement;
+
+ public VpeHtmlPanelGrid(Element sourceElement) {
+ this.attributesMap = new HashMap<String,String>();
+ NamedNodeMap attributes = sourceElement.getAttributes();
+ for(int i=0;i<attributes.getLength();i++){
+ Node item = attributes.item(i);
+ this.attributesMap.put(item.getNodeName(), item.getNodeValue());
+ }
+ setSourceElement(sourceElement);
+ }
+
+ @Override
+ public int getChildCount() {
+ return getSourceElement().getChildNodes().getLength();
+ }
+ /* (non-Javadoc)
+ * @see javax.faces.component.UIComponent#getClientId(javax.faces.context.FacesContext)
+ */
+ @Override
+ public String getClientId(FacesContext arg0) {
+ return (String) getAttributes().get("id"); //$NON-NLS-1$
+ }
+ /* (non-Javadoc)
+ * @see javax.faces.component.UIComponent#getAttributes()
+ */
+ @Override
+ public Map getAttributes() {
+ return this.attributesMap;
+ }
+ /* (non-Javadoc)
+ * @see javax.faces.component.UIComponent#getValueExpression(java.lang.String)
+ */
+ @Override
+ public ValueExpression getValueExpression(final String name) {
+ return new ValueExpression(){
+
+ @Override
+ public Class<?> getExpectedType() {
+ // TODO Auto-generated method stub
+ return String.class;
+ }
+
+ @Override
+ public Class<?> getType(ELContext arg0)
+ throws NullPointerException, PropertyNotFoundException,
+ ELException {
+ // TODO Auto-generated method stub
+ return String.class;
+ }
+
+ @Override
+ public Object getValue(ELContext arg0) throws NullPointerException,
+ PropertyNotFoundException, ELException {
+ return getAttributes().get(name);
+ }
+
+ @Override
+ public boolean isReadOnly(ELContext arg0)
+ throws NullPointerException, PropertyNotFoundException,
+ ELException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void setValue(ELContext arg0, Object arg1)
+ throws NullPointerException, PropertyNotFoundException,
+ PropertyNotWritableException, ELException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public boolean equals(Object arg0) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public String getExpressionString() {
+ // TODO Auto-generated method stub
+ return (String) getAttributes().get(name);
+ }
+
+ @Override
+ public int hashCode() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public boolean isLiteralText() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ };
+ }
+
+ /**
+ * @param sourceElement the sourceElement to set
+ */
+ private void setSourceElement(Element sourceElement) {
+ this.sourceElement = sourceElement;
+ }
+
+ /**
+ * @return the sourceElement
+ */
+ private Element getSourceElement() {
+ return this.sourceElement;
+ }
+}
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeUIComponent.java
===================================================================
---
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeUIComponent.java 2010-05-18
12:17:44 UTC (rev 22168)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeUIComponent.java 2010-05-18
12:57:26 UTC (rev 22169)
@@ -18,9 +18,7 @@
import javax.el.PropertyNotWritableException;
import javax.el.ValueExpression;
import javax.faces.context.FacesContext;
-import javax.faces.el.EvaluationException;
import javax.faces.el.PropertyNotFoundException;
-import javax.faces.el.ValueBinding;
import org.jboss.tools.jsf.vpe.template.mock.abstr.VpeAbstractUIComponent;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
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-18
12:17:44 UTC (rev 22168)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templates-icefaces.xml 2010-05-18
12:57:26 UTC (rev 22169)
@@ -70,4 +70,17 @@
</vpe:dnd>
</vpe:template>
</vpe:tag>
+ <vpe:tag name="ice:panelGrid" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.icefaces.template.IcePanelGridTemplate">
+ <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>