11:37 a.m.
Author: jguglielmin
Date: 2008-05-01 12:37:41 -0400 (Thu, 01 May 2008)
New Revision: 8096
Modified:
trunk/seam-gen/icefaces/src/TimerBeanImpl.java
trunk/seam-gen/icefaces/view/edit.xhtml.ftl
trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl
trunk/seam-gen/icefaces/view/list.xhtml
trunk/seam-gen/icefaces/view/list.xhtml.ftl
trunk/seam-gen/icefaces/view/view.xhtml.ftl
Log:
ICE-2694. Minor fixes for ICEfaces templates and adding resizable columns to
ice:dataTables
Modified: trunk/seam-gen/icefaces/src/TimerBeanImpl.java
===================================================================
--- trunk/seam-gen/icefaces/src/TimerBeanImpl.java 2008-05-01 15:27:18 UTC (rev 8095)
+++ trunk/seam-gen/icefaces/src/TimerBeanImpl.java 2008-05-01 16:37:41 UTC (rev 8096)
@@ -53,7 +53,6 @@
import com.icesoft.faces.async.render.RenderManager;
import com.icesoft.faces.async.render.IntervalRenderer;
import com.icesoft.faces.async.render.Renderable;
-import com.icesoft.faces.context.ViewListener;
import com.icesoft.faces.context.effects.Effect;
import com.icesoft.faces.context.effects.BlindDown;
@@ -69,7 +68,7 @@
@Name("timer")
@Scope(ScopeType.PAGE)
-public class TimerBeanImpl implements Renderable, ViewListener, Serializable {
+public class TimerBeanImpl implements Renderable, Serializable {
// expand/contract effects to take place of panelCollapsible
private Effect currentEffect=new BlindUp();
@@ -175,7 +174,6 @@
log.trace("*** new TimerBean renderable... " + myId );
}
- state.addViewListener(this );
FacesContext fc = FacesContext.getCurrentInstance();
synchronous = (String) fc.getExternalContext().getInitParameterMap().
get( "com.icesoft.faces.synchronousUpdate" );
@@ -222,16 +220,7 @@
cleanup();
}
- public void viewCreated() {
- }
- public void viewDisposed() {
- if(log.isTraceEnabled() ) {
- log.trace("*** View disposed: " + myId );
- }
- cleanup();
- }
-
private void cleanup() {
if (ir != null) {
ir.remove(this);
Modified: trunk/seam-gen/icefaces/view/edit.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2008-05-01 15:27:18 UTC (rev 8095)
+++ trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2008-05-01 16:37:41 UTC (rev 8096)
@@ -109,7 +109,7 @@
<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty)
&& parentProperty != parentPojo.versionProperty!>
<#if parentPojo.isComponent(parentProperty)>
<#foreach componentProperty in parentProperty.value.propertyIterator>
- <ice:column id="$editColumn${componentProperty.name}Id">
+ <ice:column id="editColumn${componentProperty.name}Id">
<f:facet
name="header">${componentProperty.name}</f:facet>
${'#'}{${parentName}.${parentProperty.name}.${componentProperty.name}}
</ice:column>
Modified: trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl 2008-05-01 15:27:18 UTC (rev
8095)
+++ trunk/seam-gen/icefaces/view/editproperty.xhtml.ftl 2008-05-01 16:37:41 UTC (rev
8096)
@@ -101,8 +101,8 @@
</#if>
size="${size}"
maxlength="${column.length}"
+ partialSubmit="true"
value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- partialSubmit="true"
</ice:inputText>
</#if>
<#else>
@@ -112,9 +112,9 @@
</#if>
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
-</#if>
-
value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- partialSubmit="true"
+</#if>
+ partialSubmit="true"
+
value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
</ice:inputText>
</#if>
</s:decorate>
Modified: trunk/seam-gen/icefaces/view/list.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/list.xhtml 2008-05-01 15:27:18 UTC (rev 8095)
+++ trunk/seam-gen/icefaces/view/list.xhtml 2008-05-01 16:37:41 UTC (rev 8096)
@@ -27,6 +27,7 @@
rendered="#{empty @listName@.resultList}"/>
<ice:dataTable id="@listName@TableId" var="@componentName@"
value="#{@listName@.resultList}"
+ resizable="true"
columnClasses="allCols"
rendered="#{not empty @listName@.resultList}">
<ice:column id="list@componentName@.id">
Modified: trunk/seam-gen/icefaces/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/list.xhtml.ftl 2008-05-01 15:27:18 UTC (rev 8095)
+++ trunk/seam-gen/icefaces/view/list.xhtml.ftl 2008-05-01 16:37:41 UTC (rev 8096)
@@ -81,6 +81,7 @@
<ice:dataTable id="${listName}TableId"
var="${componentName}"
value="${'#'}{${listName}.resultList}"
+ resizable="true"
columnClasses="allCols"
rendered="${'#'}{not empty ${listName}.resultList}">
<#foreach property in pojo.allPropertiesIterator>
@@ -110,7 +111,7 @@
<#assign parentPojo =
c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if parentPojo.isComponent(parentPojo.identifierProperty)>
<#foreach componentProperty in
parentPojo.identifierProperty.value.propertyIterator>
- <ice:column id="listColumn${propertyName}${listName}Id">
+ <ice:column id="listColumn${componentProperty}${listName}Id">
<f:facet name="header">
<#assign propertyPath = property.name + '.' +
parentPojo.identifierProperty.name + '.' + componentProperty.name>
<s:link styleClass="columnHeader"
Modified: trunk/seam-gen/icefaces/view/view.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/view.xhtml.ftl 2008-05-01 15:27:18 UTC (rev 8095)
+++ trunk/seam-gen/icefaces/view/view.xhtml.ftl 2008-05-01 16:37:41 UTC (rev 8096)
@@ -107,7 +107,7 @@
</ice:column>
</#foreach>
<#else>
- <ice:column
id="view$${parentParentPojo.identifierProperty.name}ColumnName">
+ <ice:column
id="view${parentParentPojo.identifierProperty.name}ColumnName">
<f:facet name="header">${parentProperty.name}
${parentParentPojo.identifierProperty.name}</f:facet>
${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
</ice:column>