[jboss-svn-commits] JBL Code SVN: r9365 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client: rulelist and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 6 00:21:32 EST 2007
Author: michael.neale at jboss.com
Date: 2007-02-06 00:21:32 -0500 (Tue, 06 Feb 2007)
New Revision: 9365
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/table/SortableTable.java
Log:
JBRULES-623
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java 2007-02-06 04:01:27 UTC (rev 9364)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java 2007-02-06 05:21:32 UTC (rev 9365)
@@ -102,8 +102,7 @@
String[] header = new String[] {"Version number", "Comment", "Date Modified", "Status"};
- final SortableTable tableWidget = populateTableData( rows,
- header );
+ final SortableTable tableWidget = SortableTable.createTableWidget( rows, header, 0 );
tableWidget.setWidth( "100%" );
@@ -154,35 +153,8 @@
- /**
- * This will return a sortable table ready to go.
- * @param rows The data.
- * @param header Headers.
- * @return
- */
- private SortableTable populateTableData(TableDataRow[] rows,
- String[] header) {
- SortableTable tableWidget = new SortableTable(rows.length + 1, rows[0].values.length + 1);
-
- tableWidget.setColumnHeader( "", 0 );
-
- for ( int i = 0; i < header.length; i++ ) {
- tableWidget.setColumnHeader( header[i], i + 1 );
- }
-
-
- tableWidget.setHiddenColumn( 0 );
- for ( int i = 0; i < rows.length; i++ ) {
- String[] cols = rows[i].values;
-
- tableWidget.setValue( i + 1, 0, rows[i].id );
- for ( int j = 0; j < cols.length; j++ ) {
- tableWidget.setValue( i + 1, j + 1, cols[j] );
- }
- }
- return tableWidget;
- }
+
private void showStaticIcon() {
refresh.setUrl( "images/refresh.gif" );
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java 2007-02-06 04:01:27 UTC (rev 9364)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java 2007-02-06 05:21:32 UTC (rev 9365)
@@ -113,30 +113,36 @@
//if no data, just fill it out
if ( data == null || data.data.length == 0) {
- table = new SortableTable( FILLER_ROWS,
- this.tableConfig.headers.length + 1 );
- table.setValue( 1,
- 1,
- "" );
+
+
+ table = SortableTable.createTableWidget( new TableDataRow[0], tableConfig.headers, FILLER_ROWS );
+
+// table = new SortableTable( FILLER_ROWS,
+// this.tableConfig.headers.length + 1 );
+//
+// table.setValue( 1,
+// 1,
+// "" );
} else {
- int maxRows = data.data.length;
- if (maxRows < FILLER_ROWS) {
- maxRows = FILLER_ROWS;
- }
- table = new SortableTable( maxRows,
- this.tableConfig.headers.length + 1 );
- for ( int i = 0; i < data.data.length; i++ ) {
- TableDataRow row = data.data[i];
- table.setValue( i + 1,
- 0,
- row.getKeyValue() ); //this is the key
- for ( int j = 0; j < row.values.length; j++ ) {
- String val = row.values[j];
- table.setValue( i + 1,
- j + 1,
- val );
- }
- }
+// int maxRows = data.data.length;
+// if (maxRows < FILLER_ROWS) {
+// maxRows = FILLER_ROWS;
+// }
+ table = SortableTable.createTableWidget( data.data, this.tableConfig.headers, FILLER_ROWS );
+// table = new SortableTable( maxRows,
+// this.tableConfig.headers.length + 1 );
+// for ( int i = 0; i < data.data.length; i++ ) {
+// TableDataRow row = data.data[i];
+// table.setValue( i + 1,
+// 0,
+// row.getKeyValue() ); //this is the key
+// for ( int j = 0; j < row.values.length; j++ ) {
+// String val = row.values[j];
+// table.setValue( i + 1,
+// j + 1,
+// val );
+// }
+// }
//now the refresh icon and the number of rows.
refreshIcon = new Image("images/refresh.gif");
@@ -157,17 +163,17 @@
panel);
}
- //setup the "key" column
- table.setHiddenColumn( 0 );
- table.setColumnHeader( "",
- 0 );
+// //setup the "key" column
+// table.setHiddenColumn( 0 );
+// table.setColumnHeader( "",
+// 0 );
table.setWidth( "100%" );
- //add the headers
- for ( int i = 0; i < this.tableConfig.headers.length; i++ ) {
- table.setColumnHeader( this.tableConfig.headers[i],
- i + 1 );
- }
+// //add the headers
+// for ( int i = 0; i < this.tableConfig.headers.length; i++ ) {
+// table.setColumnHeader( this.tableConfig.headers[i],
+// i + 1 );
+// }
outer.setWidget( 1,
0,
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/table/SortableTable.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/table/SortableTable.java 2007-02-06 04:01:27 UTC (rev 9364)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/table/SortableTable.java 2007-02-06 05:21:32 UTC (rev 9365)
@@ -5,7 +5,8 @@
import java.util.Iterator;
import java.util.List;
-import com.google.gwt.user.client.ui.ClickListener;
+import org.drools.brms.client.rpc.TableDataRow;
+
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.SourcesTableEvents;
import com.google.gwt.user.client.ui.TableListener;
@@ -58,11 +59,46 @@
setStyleName( styleList );
}
+
+ /**
+ * This will return a sortable table ready to go.
+ * @param rows The data.
+ * @param header Headers.
+ * @param fillRows The number of rows to pad out, if needed
+ * @return A SortableTable ready to go !
+ */
+ public static SortableTable createTableWidget(TableDataRow[] rows, String[] header, int fillRows) {
+ SortableTable tableWidget = null;
+ if (fillRows > rows.length) {
+ tableWidget = new SortableTable(fillRows, header.length + 1);
+ tableWidget.setValue( 1, 1, "" );
+ } else {
+ tableWidget = new SortableTable(rows.length + 1, header.length + 1);
+ }
+
+ tableWidget.setColumnHeader( "", 0 );
+
+ for ( int i = 0; i < header.length; i++ ) {
+ tableWidget.setColumnHeader( header[i], i + 1 );
+ }
+
+
+ tableWidget.setHiddenColumn( 0 );
+ for ( int i = 0; i < rows.length; i++ ) {
+ String[] cols = rows[i].values;
+
+ tableWidget.setValue( i + 1, 0, rows[i].id );
+ for ( int j = 0; j < cols.length; j++ ) {
+ tableWidget.setValue( i + 1, j + 1, cols[j] );
+ }
+ }
+ return tableWidget;
+ }
/**
* Adds a header, which will be at the zero index in the table.
*/
- public void setColumnHeader(String name, int index){
+ private void setColumnHeader(String name, int index){
tableHeader.add(index, name);
this.renderTableHeader(name, index);
}
@@ -74,7 +110,7 @@
* You would use this to allow a "key" column to be stored with the data.
* For example, a UUID for a rule.
*/
- public void setHiddenColumn(int colIndex) {
+ private void setHiddenColumn(int colIndex) {
this.hideColumnIndex = colIndex;
this.getCellFormatter().setVisible( 0, colIndex, false );
}
@@ -82,30 +118,26 @@
/**
* This will store the value in the x,y position.
* Values must be comparable for sorting to work of course.
+ * Start with a row index of 1 otherwise as zero means header.
*/
- public void setValue(int rowIndex, int colIndex, Comparable value){
- // The rowIndex should begin with 1 as rowIndex 0 is for the Header
- // Any row with index == 0 will not be displayed.
+ private void setValue(int row, int col, Comparable val){
- if(rowIndex == 0){
- return;
- }
+ if(row == 0)return;
- //and do the zebra striping
- resetStyle( rowIndex,
- colIndex );
+ //for alternate for highlighting.
+ resetStyle( row, col );
- if((rowIndex-1) >= this.tableRows.size() || null == tableRows.get(rowIndex-1)){
- tableRows.add(rowIndex-1, new RowData());
+ if((row-1) >= this.tableRows.size() || null == tableRows.get(row-1)){
+ tableRows.add(row-1, new RowData());
}
- RowData rowData = (RowData)this.tableRows.get(rowIndex-1);
- rowData.addColumnValue(colIndex, value);
- this.setText(rowIndex, colIndex, "" + value.toString()+ "");
+ RowData rowData = (RowData)this.tableRows.get(row-1);
+ rowData.addColumnValue(col, val);
+ this.setText(row, col, "" + val.toString()+ "");
//and hiding the required column
- if (colIndex == hideColumnIndex) {
- getCellFormatter().setVisible( rowIndex, colIndex, false );
+ if (col == hideColumnIndex) {
+ getCellFormatter().setVisible( row, col, false );
}
}
@@ -360,4 +392,6 @@
getRowFormatter().setStyleName( 0, styleListHeader );
}
+
+
}
More information about the jboss-svn-commits
mailing list