8:11 a.m.
Author: mvitenkov
Date: 2008-05-14 09:11:57 -0400 (Wed, 14 May 2008)
New Revision: 8572
Modified:
trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java
trunk/test-applications/jsp/src/main/java/util/data/Data.java
trunk/test-applications/jsp/src/main/resources/org/richfaces/renderkit/fileUpload.properties
trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp
Log:
add column to scrollableDataTable with data of Date type.
Modified:
trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java
===================================================================
---
trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-05-14
12:04:29 UTC (rev 8571)
+++
trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-05-14
13:11:57 UTC (rev 8572)
@@ -1,13 +1,13 @@
package scrollableDataTable;
import java.util.ArrayList;
+import java.util.GregorianCalendar;
import org.ajax4jsf.model.DataComponentState;
import org.richfaces.model.selection.Selection;
import util.data.Data;
-
/**
* @author AYanul
*
@@ -34,7 +34,16 @@
private String activeRowKey;
private Selection selection;
private boolean ajaxSingle;
+ private GregorianCalendar date;
+ public GregorianCalendar getDate() {
+ return date;
+ }
+
+ public void setDate(GregorianCalendar date) {
+ this.date = date;
+ }
+
public ScrollableDataTable() {
sortMode = "single";
width = "400px";
@@ -50,6 +59,7 @@
bypassUpdates = false;
ignoreDupResponses = false;
ajaxSingle = false;
+ date = new GregorianCalendar();
addNewItem();
}
@@ -161,14 +171,16 @@
this.hideWhenScrolling = hideWhenScrolling;
}
- public void addNewItem() {
+ public void addNewItem() {
if(dataLength < 0) dataLength = 0;
if(data.size() > dataLength)
- for(int i = dataLength; i < data.size(); )
+ for(int i = dataLength; i < data.size();i--)
data.remove(i);
else
- for(int i = data.size() + 1; i <= dataLength; i++)
- data.add(new Data(i, "Text " + i, "Link " + i, "select"
+(i % 5), Data.statusIcon[i % 5]));
+ for(int i = data.size() + 1; i <= dataLength; i++){
+ date.set(2008, 5, 14, 3, i);
+ data.add(new Data(i, "Text " + i, "Link " + i, "select"
+(i % 5), Data.statusIcon[i % 5], date.getTime()));
+ }
}
public ArrayList<Data> getData() {
Modified: trunk/test-applications/jsp/src/main/java/util/data/Data.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/data/Data.java 2008-05-14 12:04:29 UTC
(rev 8571)
+++ trunk/test-applications/jsp/src/main/java/util/data/Data.java 2008-05-14 13:11:57 UTC
(rev 8572)
@@ -1,5 +1,6 @@
package util.data;
+import java.util.Date;
import java.util.Random;
public class Data {
@@ -29,7 +30,34 @@
private boolean bool1;
private boolean bool2;
private boolean bool3;
+ private float float0;
+ private double double0;
+ private Date date0;
+ public Date getDate0() {
+ return date0;
+ }
+
+ public void setDate0(Date date0) {
+ this.date0 = date0;
+ }
+
+ public double getDouble0() {
+ return double0;
+ }
+
+ public void setDouble0(double double0) {
+ this.double0 = double0;
+ }
+
+ public float getFloat0() {
+ return float0;
+ }
+
+ public void setFloat0(float float0) {
+ this.float0 = float0;
+ }
+
public Data() {
this.str0 = "";
this.str1 = "";
@@ -43,6 +71,9 @@
this.bool1 = false;
this.bool2 = false;
this.bool3 = false;
+ this.float0 = 0.0f;
+ this.double0 = 0.0;
+ this.date0 = new Date();
}
public Data(int int0, int int1, String str0, int int2, String str1, int int3, String
str2, String str3, boolean bool0) {
@@ -56,7 +87,28 @@
this.int3 = int3;
this.bool0 = bool0;
}
-
+ public Data(int int0, int int1, String str0, float float0, String str1, int int3, String
str2, String str3, boolean bool0) {
+ this.str0 = str0;
+ this.str1 = str1;
+ this.str2 = str2;
+ this.str3 = str3;
+ this.int0 = int0;
+ this.int1 = int1;
+ this.float0 = float0;
+ this.int3 = int3;
+ this.bool0 = bool0;
+ }
+ public Data(int int0, int int1, String str0, double double0, String str1, int int3,
String str2, String str3, boolean bool0) {
+ this.str0 = str0;
+ this.str1 = str1;
+ this.str2 = str2;
+ this.str3 = str3;
+ this.int0 = int0;
+ this.int1 = int1;
+ this.double0 = double0;
+ this.int3 = int3;
+ this.bool0 = bool0;
+ }
public Data(String str0, String str1, String str2, String str3, int int0,
int int1, int int2, int int3, boolean bool0, boolean bool1,
boolean bool2, boolean bool3) {
@@ -88,7 +140,15 @@
this.str2 = str2;
this.str3 = str3;
}
-
+ //for scrollableDataTable component
+ public Data(int int0, String str0, String str1, String str2, String str3, Date date0){
+ this.int0 = int0;
+ this.str0 = str0;
+ this.str1 = str1;
+ this.str2 = str2;
+ this.str3 = str3;
+ this.date0 = date0;
+ }
public Data(int int0, String str0, String str1, String str2, boolean bool0){
this.int0 = int0;
this.str0 = str0;
Modified:
trunk/test-applications/jsp/src/main/resources/org/richfaces/renderkit/fileUpload.properties
===================================================================
---
trunk/test-applications/jsp/src/main/resources/org/richfaces/renderkit/fileUpload.properties 2008-05-14
12:04:29 UTC (rev 8571)
+++
trunk/test-applications/jsp/src/main/resources/org/richfaces/renderkit/fileUpload.properties 2008-05-14
13:11:57 UTC (rev 8572)
@@ -2,6 +2,8 @@
RICH_FILE_UPLOAD_STOP_LABEL=\u0441\u0442\u043E\u043F
RICH_FILE_UPLOAD_PROGRESS_LABEL=\u043F\u0440\u043E\u0433\u0440\u0435\u0441\u0441...
RICH_FILE_UPLOAD_CLEAR_LABEL=\u043E\u0447\u0438\u0441\u0442\u0438\u0442\u044C
+RICH_FILE_UPLOAD_ENTRY_STOP_LABEL=\u0441\u0442\u043E\u043F
+RICH_FILE_UPLOAD_ENTRY_CLEAR_LABEL=\u043E\u0447\u0438\u0441\u0442\u0438\u0442\u044C
RICH_FILE_UPLOAD_CLEAR_ALL_LABEL=\u043E\u0447\u0438\u0441\u0442\u0438\u0442\u044C
\u0432\u0441\u0451
RICH_FILE_UPLOAD_ENTRY_CANCEL_LABEL=\u043E\u0442\u043C\u0435\u043D\u0430
RICH_FILE_UPLOAD_ADD_LABEL=\u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C
\u0444\u0430\u0439\u043B
Modified:
trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp
===================================================================
---
trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2008-05-14
12:04:29 UTC (rev 8571)
+++
trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2008-05-14
13:11:57 UTC (rev 8572)
@@ -34,28 +34,22 @@
</h:panelGrid>
</h:panelGrid>
<rich:scrollableDataTable id="sdt" var="sdt"
rowKeyVar="key"
- onRowDblClick="alert('row:#{key}')"
-
- rowKeyConverter="#{dataConverter}" value="#{scrollableDT.data}"
- rows="#{scrollableDT.rows}" width="#{scrollableDT.width}"
- height="#{scrollableDT.height}"
+ onRowDblClick="alert('row:#{key}')"
rowKeyConverter="#{dataConverter}"
+ value="#{scrollableDT.data}" rows="#{scrollableDT.rows}"
+ width="#{scrollableDT.width}" height="#{scrollableDT.height}"
hideWhenScrolling="#{scrollableDT.hideWhenScrolling}"
reRender="inputID" frozenColCount="#{scrollableDT.frozenColCount}"
first="#{scrollableDT.first}"
ignoreDupResponses="#{scrollableDT.ignoreDupResponses}"
bypassUpdates="#{scrollableDT.bypassUpdates}"
- rendered="#{scrollableDT.rendered}"
-
- timeout="#{scrollableDT.timeout}"
sortMode="#{scrollableDT.sortMode}"
+ rendered="#{scrollableDT.rendered}"
timeout="#{scrollableDT.timeout}"
+ sortMode="#{scrollableDT.sortMode}"
selection="#{scrollableDT.selection}" eventsQueue="myEventsQueue"
-
columnClasses="#{style.columnClasses}"
footerClass="#{style.footerClass}"
headerClass="#{style.headerClass}"
rowClasses="#{style.rowClasses}"
activeClass="#{style.activeClass}"
styleClass="#{style.styleClass}" style="#{style.style}"
- selectedClass="#{style.selectedClass}"
- onbeforedomupdate="#{event.onbeforedomupdate}"
- oncomplete="#{event.oncomplete}" onRowClick="#{event.onRowClick}"
+ selectedClass="#{style.selectedClass}"
onRowMouseDown="#{event.onRowMouseDown}"
onRowMouseUp="#{event.onRowMouseUp}"
onselectionchange="#{event.onselectionchange}">
@@ -73,9 +67,16 @@
</rich:column>
<rich:column sortExpression="#{sdt.str0}" sortable="false">
- <f:facet name="header"><h:outputText
value="Text"></h:outputText> </f:facet>
- <h:outputText value="#{sdt.str0}"></h:outputText>
- <f:facet name="footer"><h:outputText
value="Text"></h:outputText> </f:facet>
+ <f:facet name="header">
+ <h:outputText value="Text"></h:outputText>
+ </f:facet>
+ <rich:comboBox width="10">
+ <f:selectItem itemValue="item_1" />
+ <f:selectItem itemValue="item_2" />
+ </rich:comboBox>
+ <f:facet name="footer">
+ <h:outputText value="Text"></h:outputText>
+ </f:facet>
</rich:column>
<rich:column sortExpression="#{sdt.str0}" sortable="false">
@@ -135,7 +136,17 @@
<h:outputText value="Link"></h:outputText>
</f:facet>
</rich:column>
-
+
+ <rich:column sortExpression="#{sdt.date0}" sortable="true">
+ <f:facet name="header">
+ <h:outputText value="#" />
+ </f:facet>
+ <h:outputText value="#{sdt.date0}"></h:outputText>
+ <f:facet name="footer">
+ <h:outputText value="#" />
+ </f:facet>
+ </rich:column>
+
<f:facet name="footer">
<h:outputText value="facet footer"></h:outputText>
</f:facet>