From 2f398cfeb397ac2838c44a216d5fc04df02d6d9c Mon Sep 17 00:00:00 2001 From: David Huynh Date: Thu, 27 May 2010 21:22:27 +0000 Subject: [PATCH] Tabs to spaces. git-svn-id: http://google-refine.googlecode.com/svn/trunk@874 7d457c2a-affb-35e4-300a-418c747d4874 --- .../util/ExpressionBasedRowEvaluable.java | 32 ++++++------ .../util/ExpressionNominalValueGrouper.java | 20 ++++---- .../util/FilteredRecordsAsFilteredRows.java | 18 +++---- .../browsing/util/NumericBinIndex.java | 50 +++++++++---------- .../browsing/util/NumericBinRecordIndex.java | 30 +++++------ .../browsing/util/NumericBinRowIndex.java | 18 +++---- .../gridworks/browsing/util/RowEvaluable.java | 2 +- .../util/RowVisitorAsRecordVisitor.java | 32 ++++++------ 8 files changed, 101 insertions(+), 101 deletions(-) diff --git a/src/main/java/com/metaweb/gridworks/browsing/util/ExpressionBasedRowEvaluable.java b/src/main/java/com/metaweb/gridworks/browsing/util/ExpressionBasedRowEvaluable.java index e1931bef9..2e5fdeafa 100644 --- a/src/main/java/com/metaweb/gridworks/browsing/util/ExpressionBasedRowEvaluable.java +++ b/src/main/java/com/metaweb/gridworks/browsing/util/ExpressionBasedRowEvaluable.java @@ -9,26 +9,26 @@ import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; public class ExpressionBasedRowEvaluable implements RowEvaluable { - final protected String _columnName; - final protected int _cellIndex; - final protected Evaluable _eval; - - public ExpressionBasedRowEvaluable( - String columnName, int cellIndex, Evaluable eval) { - - _columnName = columnName; - _cellIndex = cellIndex; - _eval = eval; - } + final protected String _columnName; + final protected int _cellIndex; + final protected Evaluable _eval; + + public ExpressionBasedRowEvaluable( + String columnName, int cellIndex, Evaluable eval) { + + _columnName = columnName; + _cellIndex = cellIndex; + _eval = eval; + } - @Override - public Object eval( - Project project, int rowIndex, Row row, Properties bindings) { - + @Override + public Object eval( + Project project, int rowIndex, Row row, Properties bindings) { + Cell cell = row.getCell(_cellIndex); ExpressionUtils.bind(bindings, row, rowIndex, _columnName, cell); return _eval.evaluate(bindings); - } + } } diff --git a/src/main/java/com/metaweb/gridworks/browsing/util/ExpressionNominalValueGrouper.java b/src/main/java/com/metaweb/gridworks/browsing/util/ExpressionNominalValueGrouper.java index ed3fa821d..abf4bfced 100644 --- a/src/main/java/com/metaweb/gridworks/browsing/util/ExpressionNominalValueGrouper.java +++ b/src/main/java/com/metaweb/gridworks/browsing/util/ExpressionNominalValueGrouper.java @@ -198,14 +198,14 @@ public class ExpressionNominalValueGrouper implements RowVisitor, RecordVisitor return getChoiceValueCount(value); } - public Integer getChoiceValueCount(Object choiceValue) { - if (ExpressionUtils.isError(choiceValue)) { - return errorCount; - } else if (ExpressionUtils.isNonBlankData(choiceValue)) { - IndexedNominalFacetChoice choice = choices.get(choiceValue); - return choice != null ? choice.count : 0; - } else { - return blankCount; - } - } + public Integer getChoiceValueCount(Object choiceValue) { + if (ExpressionUtils.isError(choiceValue)) { + return errorCount; + } else if (ExpressionUtils.isNonBlankData(choiceValue)) { + IndexedNominalFacetChoice choice = choices.get(choiceValue); + return choice != null ? choice.count : 0; + } else { + return blankCount; + } + } } diff --git a/src/main/java/com/metaweb/gridworks/browsing/util/FilteredRecordsAsFilteredRows.java b/src/main/java/com/metaweb/gridworks/browsing/util/FilteredRecordsAsFilteredRows.java index 4704ec7ae..286a9fd97 100644 --- a/src/main/java/com/metaweb/gridworks/browsing/util/FilteredRecordsAsFilteredRows.java +++ b/src/main/java/com/metaweb/gridworks/browsing/util/FilteredRecordsAsFilteredRows.java @@ -6,15 +6,15 @@ import com.metaweb.gridworks.browsing.RowVisitor; import com.metaweb.gridworks.model.Project; public class FilteredRecordsAsFilteredRows implements FilteredRows { - final protected FilteredRecords _filteredRecords; - - public FilteredRecordsAsFilteredRows(FilteredRecords filteredRecords) { - _filteredRecords = filteredRecords; - } + final protected FilteredRecords _filteredRecords; + + public FilteredRecordsAsFilteredRows(FilteredRecords filteredRecords) { + _filteredRecords = filteredRecords; + } - @Override - public void accept(Project project, RowVisitor visitor) { - _filteredRecords.accept(project, new RowVisitorAsRecordVisitor(visitor)); - } + @Override + public void accept(Project project, RowVisitor visitor) { + _filteredRecords.accept(project, new RowVisitorAsRecordVisitor(visitor)); + } } diff --git a/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinIndex.java b/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinIndex.java index 793996954..97dd68b16 100644 --- a/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinIndex.java +++ b/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinIndex.java @@ -21,12 +21,12 @@ import com.metaweb.gridworks.model.Row; */ abstract public class NumericBinIndex { - protected int _totalValueCount; - protected int _numbericValueCount; - protected double _min; - protected double _max; - protected double _step; - protected int[] _bins; + protected int _totalValueCount; + protected int _numbericValueCount; + protected double _min; + protected double _max; + protected double _step; + protected int[] _bins; protected int _numericRowCount; protected int _nonNumericRowCount; @@ -130,14 +130,14 @@ abstract public class NumericBinIndex { return _errorRowCount; } - protected void processRow( - Project project, - RowEvaluable rowEvaluable, - List allValues, - int rowIndex, - Row row, - Properties bindings - ) { + protected void processRow( + Project project, + RowEvaluable rowEvaluable, + List allValues, + int rowIndex, + Row row, + Properties bindings + ) { Object value = rowEvaluable.eval(project, rowIndex, row, bindings); if (ExpressionUtils.isError(value)) { @@ -191,16 +191,16 @@ abstract public class NumericBinIndex { } else { _hasBlank = true; } - } - - protected void preprocessing() { - _hasBlank = false; - _hasError = false; - _hasNonNumeric = false; - _hasNumeric = false; - } - - protected void postprocessing() { + } + + protected void preprocessing() { + _hasBlank = false; + _hasError = false; + _hasNonNumeric = false; + _hasNumeric = false; + } + + protected void postprocessing() { if (_hasError) { _errorRowCount++; } @@ -213,7 +213,7 @@ abstract public class NumericBinIndex { if (_hasNonNumeric) { _nonNumericRowCount++; } - } + } protected void processValue(double v, List allValues) { if (!Double.isInfinite(v) && !Double.isNaN(v)) { diff --git a/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRecordIndex.java b/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRecordIndex.java index 565aba8bc..d6837e8de 100644 --- a/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRecordIndex.java +++ b/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRecordIndex.java @@ -9,30 +9,30 @@ import com.metaweb.gridworks.model.Record; import com.metaweb.gridworks.model.Row; public class NumericBinRecordIndex extends NumericBinIndex { - public NumericBinRecordIndex(Project project, RowEvaluable rowEvaluable) { - super(project, rowEvaluable); - } + public NumericBinRecordIndex(Project project, RowEvaluable rowEvaluable) { + super(project, rowEvaluable); + } - @Override - protected void iterate( - Project project, RowEvaluable rowEvaluable, List allValues) { - + @Override + protected void iterate( + Project project, RowEvaluable rowEvaluable, List allValues) { + Properties bindings = ExpressionUtils.createBindings(project); int count = project.recordModel.getRecordCount(); for (int r = 0; r < count; r++) { - Record record = project.recordModel.getRecord(r); - + Record record = project.recordModel.getRecord(r); + preprocessing(); - for (int i = record.fromRowIndex; i < record.toRowIndex; i++) { - Row row = project.rows.get(i); - - processRow(project, rowEvaluable, allValues, i, row, bindings); - } + for (int i = record.fromRowIndex; i < record.toRowIndex; i++) { + Row row = project.rows.get(i); + + processRow(project, rowEvaluable, allValues, i, row, bindings); + } postprocessing(); } - } + } } diff --git a/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRowIndex.java b/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRowIndex.java index c9538b93f..a7d60ef1f 100644 --- a/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRowIndex.java +++ b/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRowIndex.java @@ -8,15 +8,15 @@ import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; public class NumericBinRowIndex extends NumericBinIndex { - public NumericBinRowIndex(Project project, RowEvaluable rowEvaluable) { - - super(project, rowEvaluable); - } + public NumericBinRowIndex(Project project, RowEvaluable rowEvaluable) { + + super(project, rowEvaluable); + } - @Override - protected void iterate( - Project project, RowEvaluable rowEvaluable, List allValues) { - + @Override + protected void iterate( + Project project, RowEvaluable rowEvaluable, List allValues) { + Properties bindings = ExpressionUtils.createBindings(project); for (int i = 0; i < project.rows.size(); i++) { @@ -28,6 +28,6 @@ public class NumericBinRowIndex extends NumericBinIndex { postprocessing(); } - } + } } diff --git a/src/main/java/com/metaweb/gridworks/browsing/util/RowEvaluable.java b/src/main/java/com/metaweb/gridworks/browsing/util/RowEvaluable.java index 78e048d82..7770faed7 100644 --- a/src/main/java/com/metaweb/gridworks/browsing/util/RowEvaluable.java +++ b/src/main/java/com/metaweb/gridworks/browsing/util/RowEvaluable.java @@ -6,5 +6,5 @@ import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; public interface RowEvaluable { - public Object eval(Project project, int rowIndex, Row row, Properties bindings); + public Object eval(Project project, int rowIndex, Row row, Properties bindings); } diff --git a/src/main/java/com/metaweb/gridworks/browsing/util/RowVisitorAsRecordVisitor.java b/src/main/java/com/metaweb/gridworks/browsing/util/RowVisitorAsRecordVisitor.java index d67e10f20..476f732a5 100644 --- a/src/main/java/com/metaweb/gridworks/browsing/util/RowVisitorAsRecordVisitor.java +++ b/src/main/java/com/metaweb/gridworks/browsing/util/RowVisitorAsRecordVisitor.java @@ -6,29 +6,29 @@ import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Record; public class RowVisitorAsRecordVisitor implements RecordVisitor { - final protected RowVisitor _rowVisitor; - - public RowVisitorAsRecordVisitor(RowVisitor rowVisitor) { - _rowVisitor = rowVisitor; - } + final protected RowVisitor _rowVisitor; + + public RowVisitorAsRecordVisitor(RowVisitor rowVisitor) { + _rowVisitor = rowVisitor; + } @Override public void start(Project project) { - _rowVisitor.start(project); + _rowVisitor.start(project); } @Override public void end(Project project) { - _rowVisitor.end(project); + _rowVisitor.end(project); } - @Override - public boolean visit(Project project, Record record) { - for (int r = record.fromRowIndex; r < record.toRowIndex; r++) { - if (_rowVisitor.visit(project, r, project.rows.get(r))) { - return true; - } - } - return false; - } + @Override + public boolean visit(Project project, Record record) { + for (int r = record.fromRowIndex; r < record.toRowIndex; r++) { + if (_rowVisitor.visit(project, r, project.rows.get(r))) { + return true; + } + } + return false; + } }