[jboss-svn-commits] JBL Code SVN: r12853 - 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 Jun 26 02:25:23 EDT 2007
Author: fmeyer
Date: 2007-06-26 02:25:22 -0400 (Tue, 26 Jun 2007)
New Revision: 12853
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/AssetItemListViewer.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/table/SortableTable.java
Log:
JBRULES-897 - corrected a bug in version history icons
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-06-26 05:52:41 UTC (rev 12852)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java 2007-06-26 06:25:22 UTC (rev 12853)
@@ -1,4 +1,5 @@
package org.drools.brms.client.ruleeditor;
+
/*
* Copyright 2005 JBoss Inc
*
@@ -15,8 +16,6 @@
* limitations under the License.
*/
-
-
import org.drools.brms.client.common.GenericCallback;
import org.drools.brms.client.common.ImageButton;
import org.drools.brms.client.rpc.MetaData;
@@ -46,45 +45,54 @@
*/
public class VersionBrowser extends Composite {
- private Image refresh;
+ private Image refresh;
private FlexTable layout;
- private String uuid;
- private MetaData metaData;
- private Command refreshCommand;
+ private String uuid;
+ private MetaData metaData;
+ private Command refreshCommand;
- public VersionBrowser(String uuid, MetaData data, Command ref) {
-
+ public VersionBrowser(String uuid,
+ MetaData data,
+ Command ref) {
+
this.uuid = uuid;
this.metaData = data;
this.refreshCommand = ref;
-
+
this.uuid = uuid;
HorizontalPanel wrapper = new HorizontalPanel();
-
+
layout = new FlexTable();
- layout.setWidget( 0, 0, new Label("Version history") );
+ layout.setWidget( 0,
+ 0,
+ new Label( "Version history" ) );
FlexCellFormatter formatter = layout.getFlexCellFormatter();
- formatter.setHorizontalAlignment( 0, 0, HasHorizontalAlignment.ALIGN_LEFT);
-
- refresh = new ImageButton("images/refresh.gif");
-
+ formatter.setHorizontalAlignment( 0,
+ 0,
+ HasHorizontalAlignment.ALIGN_LEFT );
+
+ refresh = new ImageButton( "images/refresh.gif" );
+
refresh.addClickListener( new ClickListener() {
public void onClick(Widget w) {
- clickLoadHistory();
- }
- });
-
- layout.setWidget( 0, 1, refresh );
- formatter.setHorizontalAlignment( 0, 1, HasHorizontalAlignment.ALIGN_RIGHT);
+ clickLoadHistory();
+ }
+ } );
-
+ layout.setWidget( 0,
+ 1,
+ refresh );
+ formatter.setHorizontalAlignment( 0,
+ 1,
+ HasHorizontalAlignment.ALIGN_RIGHT );
+
wrapper.setStyleName( "version-browser-Border" );
-
+
wrapper.add( layout );
-
+
layout.setWidth( "100%" );
wrapper.setWidth( "100%" );
-
+
initWidget( wrapper );
}
@@ -92,10 +100,10 @@
showBusyIcon();
DeferredCommand.add( new Command() {
public void execute() {
- loadHistoryData();
- }
- });
-
+ loadHistoryData();
+ }
+ } );
+
}
private void showBusyIcon() {
@@ -106,76 +114,86 @@
* Actually load the history data, as demanded.
*/
protected void loadHistoryData() {
-
- RepositoryServiceFactory.getService().loadAssetHistory( this.uuid, new GenericCallback() {
- public void onSuccess(Object data) {
- if (data == null) {
- layout.setWidget( 1, 0, new Label("No history.") );
- showStaticIcon();
- return;
- }
- TableDataResult table = (TableDataResult) data;
- final TableDataRow[] rows = table.data;
-
- String[] header = new String[] {"Version number", "Comment", "Date Modified", "Status"};
-
- DataModel mdl = getTableDataModel( rows );
-
- final SortableTable tableWidget = SortableTable.createTableWidget( mdl, header, 0 );
-
- tableWidget.setWidth( "100%" );
-
- layout.setWidget( 1, 0, tableWidget );
- FlexCellFormatter formatter = layout.getFlexCellFormatter();
-
- formatter.setColSpan( 1, 0, 2 );
-
- Button open = new Button("View selected version");
-
- open.addClickListener( new ClickListener() {
- public void onClick(Widget w) {
- if (tableWidget.getSelectedRow() == 0) return;
- showVersion(tableWidget.getSelectedKey());
- }
+ RepositoryServiceFactory.getService().loadAssetHistory( this.uuid,
+ new GenericCallback() {
- });
-
- layout.setWidget( 2, 1, open );
- formatter.setColSpan( 2, 1, 3 );
- formatter.setHorizontalAlignment( 2, 1, HasHorizontalAlignment.ALIGN_CENTER );
-
- showStaticIcon();
+ public void onSuccess(Object data) {
+ if ( data == null ) {
+ layout.setWidget( 1,
+ 0,
+ new Label( "No history." ) );
+ showStaticIcon();
+ return;
+ }
+ TableDataResult table = (TableDataResult) data;
+ final TableDataRow[] rows = table.data;
- }
+ String[] header = new String[]{"Version number", "Comment", "Date Modified", "Status"};
+ DataModel mdl = getTableDataModel( rows );
- });
-
-
+ final SortableTable tableWidget = SortableTable.createTableWidget( mdl,
+ header,
+ 0,
+ false);
+
+ tableWidget.setWidth( "100%" );
+
+ layout.setWidget( 1,
+ 0,
+ tableWidget );
+ FlexCellFormatter formatter = layout.getFlexCellFormatter();
+
+ formatter.setColSpan( 1,
+ 0,
+ 2 );
+
+ Button open = new Button( "View selected version" );
+
+ open.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ if ( tableWidget.getSelectedRow() == 0 ) return;
+ showVersion( tableWidget.getSelectedKey() );
+ }
+
+ } );
+
+ layout.setWidget( 2,
+ 1,
+ open );
+ formatter.setColSpan( 2,
+ 1,
+ 3 );
+ formatter.setHorizontalAlignment( 2,
+ 1,
+ HasHorizontalAlignment.ALIGN_CENTER );
+
+ showStaticIcon();
+
+ }
+
+ } );
+
}
-
+
/**
* This should popup a view of the chosen historical version.
* @param selectedUUID
*/
private void showVersion(String selectedUUID) {
-
-
- VersionViewer viewer = new VersionViewer(this.metaData, selectedUUID, uuid, refreshCommand);
- viewer.setPopupPosition( 100, 100 );
-
-
- viewer.show();
-
- }
+ VersionViewer viewer = new VersionViewer( this.metaData,
+ selectedUUID,
+ uuid,
+ refreshCommand );
+ viewer.setPopupPosition( 100,
+ 100 );
+ viewer.show();
+ }
-
-
-
private void showStaticIcon() {
refresh.setUrl( "images/refresh.gif" );
}
@@ -191,16 +209,17 @@
return rows[row].id;
}
- public Comparable getValue(int row, int col) {
+ public Comparable getValue(int row,
+ int col) {
return rows[row].values[col];
}
- public Widget getWidget(int row, int col) {
+ public Widget getWidget(int row,
+ int col) {
return null;
}
-
+
};
}
-
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/AssetItemListViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/AssetItemListViewer.java 2007-06-26 05:52:41 UTC (rev 12852)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/AssetItemListViewer.java 2007-06-26 06:25:22 UTC (rev 12853)
@@ -174,7 +174,7 @@
};
- table = SortableTable.createTableWidget( nil, tableConfig.headers, FILLER_ROWS );
+ table = SortableTable.createTableWidget( nil, tableConfig.headers, FILLER_ROWS, true );
itemCounter.setVisible( false );
} else {
final TableDataRow[] rows = data.data;
@@ -227,7 +227,7 @@
//
// };
- table = SortableTable.createTableWidget( mdl, this.tableConfig.headers, FILLER_ROWS );
+ table = SortableTable.createTableWidget( mdl, this.tableConfig.headers, FILLER_ROWS, true );
HorizontalPanel panel = new HorizontalPanel();
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-06-26 05:52:41 UTC (rev 12852)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/table/SortableTable.java 2007-06-26 06:25:22 UTC (rev 12853)
@@ -66,6 +66,7 @@
private int hideColumnIndex;
private int selectedRow;
private int RowNumbers;
+ private boolean hasIcons = true;
/**
@@ -85,10 +86,12 @@
* @param rows The data.
* @param header Headers.
* @param fillRows The number of rows to pad out, if needed
+ * @param hasIcons
* @return A SortableTable ready to go !
*/
- public static SortableTable createTableWidget(DataModel data, String[] header, int fillRows) {
+ public static SortableTable createTableWidget(DataModel data, String[] header, int fillRows, boolean hasIcons) {
SortableTable tableWidget = null;
+
if (fillRows > data.getNumberOfRows()) {
tableWidget = new SortableTable(fillRows, header.length + 1);
tableWidget.setValue( 1, 1, "", null );
@@ -111,10 +114,17 @@
tableWidget.setValue( i + 1, j + 1, data.getValue( i, j ), data.getWidget( i, j ) );
}
}
+
+ tableWidget.setHasIcons(hasIcons);
+
return tableWidget;
}
- /**
+ private void setHasIcons(boolean hasIcons) {
+ this.hasIcons = hasIcons;
+ }
+
+ /**
* Adds a header, which will be at the zero index in the table.
*/
public void setColumnHeader(String name, int index){
@@ -377,7 +387,7 @@
private void setCell(int rowNum, int colIndex, String value) {
if(null != value){
- if (colIndex == 1 )
+ if (colIndex == 1 && hasIcons )
this.setWidget( rowNum, colIndex, new Image("images/" + EditorLauncher.getAssetFormatIcon( value.toString() ) ) );
else
this.setText(rowNum, colIndex, value.toString());
More information about the jboss-svn-commits
mailing list