From 6939b325edc5f60ac1352cccca6f36734a0cafaa Mon Sep 17 00:00:00 2001 From: David Mason Date: Tue, 29 May 2012 15:25:38 +1000 Subject: [PATCH] resurrect checkbox column on search results page --- .../client/ui/SearchResultsDocumentTable.java | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java index c8a3bc725d..811dadbddb 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java @@ -33,6 +33,7 @@ import com.google.common.collect.Collections2; import com.google.gwt.cell.client.AbstractCell; import com.google.gwt.cell.client.ActionCell; +import com.google.gwt.cell.client.CheckboxCell; import com.google.gwt.cell.client.ValueUpdater; import com.google.gwt.cell.client.ActionCell.Delegate; import com.google.gwt.cell.client.Cell.Context; @@ -64,8 +65,8 @@ */ public class SearchResultsDocumentTable extends CellTable { - private static final int PREVIEW_COLUMN_INDEX = 3; - private static final int REPLACE_COLUMN_INDEX = 4; + private static final int PREVIEW_COLUMN_INDEX = 4; + private static final int REPLACE_COLUMN_INDEX = 5; private static CellTableResources cellTableResources; private WebTransMessages messages; @@ -76,6 +77,7 @@ public class SearchResultsDocumentTable extends CellTable private static String highlightString = null; private static boolean requirePreview = true; + private CheckColumn checkboxColumn; private TextColumn rowIndexColumn; private Column> sourceColumn; private Column targetColumn; @@ -108,6 +110,8 @@ public SearchResultsDocumentTable(Delegate previewDelegate { spinner = new ImageResourceRenderer().render(resources.spinner()); } + + checkboxColumn = new CheckColumn(selectionModel); rowIndexColumn = buildRowIndexColumn(); sourceColumn = buildSourceColumn(); targetColumn = buildTargetColumn(); @@ -116,6 +120,7 @@ public SearchResultsDocumentTable(Delegate previewDelegate setWidth("100%", true); + addColumn(checkboxColumn, ""); addColumn(rowIndexColumn, messages.rowIndex()); addColumn(sourceColumn, messages.source()); addColumn(targetColumn, messages.target()); @@ -123,6 +128,7 @@ public SearchResultsDocumentTable(Delegate previewDelegate // allowing preview header to refer to this also addColumn(replaceButtonColumn); + setColumnWidth(checkboxColumn, 50.0, Unit.PX); setColumnWidth(rowIndexColumn, 70.0, Unit.PX); setColumnWidth(sourceColumn, 50.0, Unit.PCT); setColumnWidth(targetColumn, 50.0, Unit.PCT); @@ -249,6 +255,24 @@ else if (info.getTransUnit().getStatus() == ContentState.NeedReview) }; } + private class CheckColumn extends Column + { + + private SelectionModel selectionModel; + + public CheckColumn(SelectionModel selectionModel) + { + super(new CheckboxCell(true, false)); + this.selectionModel = selectionModel; + } + + @Override + public Boolean getValue(TransUnitReplaceInfo info) + { + return selectionModel.isSelected(info); + } + + } private class ActionColumn extends Column {