[google-refine] r2172 committed - Convert tabs to spaces. No functional changes.
google...@googlecode.com
Author: tfmo...@gmail.com
Date: Tue Aug 2 13:26:32 2011
Log: Convert tabs to spaces. No functional changes.
http://code.google.com/p/google-refine/source/detail?r=2172
Modified:
/trunk/broker/appengine/src/com/google/refine/broker/AppEngineRefineBrokerImpl.java
/trunk/extensions/freebase/src/com/google/refine/freebase/ProtographTransposeExporter.java
/trunk/extensions/freebase/src/com/google/refine/freebase/model/changes/DataExtensionChange.java
/trunk/extensions/freebase/src/com/google/refine/freebase/model/recon/GuidBasedReconConfig.java
/trunk/extensions/freebase/src/com/google/refine/freebase/model/recon/IdBasedReconConfig.java
/trunk/extensions/freebase/src/com/google/refine/freebase/model/recon/KeyBasedReconConfig.java
/trunk/extensions/freebase/src/com/google/refine/freebase/model/recon/StrictReconConfig.java
/trunk/extensions/freebase/src/com/google/refine/freebase/operations/ExtendDataOperation.java
/trunk/extensions/freebase/src/com/google/refine/freebase/util/FreebaseUtils.java
/trunk/main/src/com/google/refine/browsing/Engine.java
/trunk/main/src/com/google/refine/browsing/RecordVisitor.java
/trunk/main/src/com/google/refine/browsing/RowVisitor.java
/trunk/main/src/com/google/refine/browsing/facets/ListFacet.java
/trunk/main/src/com/google/refine/browsing/facets/RangeFacet.java
/trunk/main/src/com/google/refine/browsing/facets/ScatterplotDrawingRowVisitor.java
/trunk/main/src/com/google/refine/browsing/facets/ScatterplotFacet.java
/trunk/main/src/com/google/refine/browsing/facets/TextSearchFacet.java
/trunk/main/src/com/google/refine/browsing/facets/TimeRangeFacet.java
/trunk/main/src/com/google/refine/browsing/filters/AllRowsRecordFilter.java
/trunk/main/src/com/google/refine/browsing/filters/AnyRowRecordFilter.java
/trunk/main/src/com/google/refine/browsing/filters/ExpressionNumberComparisonRowFilter.java
/trunk/main/src/com/google/refine/browsing/filters/ExpressionTimeComparisonRowFilter.java
/trunk/main/src/com/google/refine/browsing/util/ConjunctiveFilteredRecords.java
/trunk/main/src/com/google/refine/browsing/util/ConjunctiveFilteredRows.java
/trunk/main/src/com/google/refine/browsing/util/ExpressionNominalValueGrouper.java
/trunk/main/src/com/google/refine/browsing/util/ExpressionNumericValueBinner.java
/trunk/main/src/com/google/refine/browsing/util/ExpressionTimeValueBinner.java
/trunk/main/src/com/google/refine/browsing/util/TimeBinIndex.java
/trunk/main/src/com/google/refine/browsing/util/TimeBinRecordIndex.java
/trunk/main/src/com/google/refine/browsing/util/TimeBinRowIndex.java
/trunk/main/src/com/google/refine/clustering/binning/BinningClusterer.java
/trunk/main/src/com/google/refine/clustering/knn/kNNClusterer.java
/trunk/main/src/com/google/refine/commands/OpenWorkspaceDirCommand.java
/trunk/main/src/com/google/refine/commands/expr/GetExpressionHistoryCommand.java
/trunk/main/src/com/google/refine/commands/project/ExportRowsCommand.java
/trunk/main/src/com/google/refine/commands/row/ReorderRowsCommand.java
/trunk/main/src/com/google/refine/exporters/HtmlTableExporter.java
/trunk/main/src/com/google/refine/exporters/XlsExporter.java
/trunk/main/src/com/google/refine/expr/WrappedRow.java
/trunk/main/src/com/google/refine/expr/functions/FacetCount.java
/trunk/main/src/com/google/refine/expr/functions/Jsonize.java
/trunk/main/src/com/google/refine/expr/functions/arrays/ArgsToArray.java
/trunk/main/src/com/google/refine/grel/ControlFunctionRegistry.java
/trunk/main/src/com/google/refine/grel/Parser.java
/trunk/main/src/com/google/refine/grel/controls/Filter.java
/trunk/main/src/com/google/refine/grel/controls/ForEachIndex.java
/trunk/main/src/com/google/refine/grel/controls/ForRange.java
/trunk/main/src/com/google/refine/model/ModelException.java
/trunk/main/src/com/google/refine/model/Record.java
/trunk/main/src/com/google/refine/model/RecordModel.java
/trunk/main/src/com/google/refine/model/Row.java
/trunk/main/src/com/google/refine/model/changes/RowReorderChange.java
/trunk/main/src/com/google/refine/operations/cell/BlankDownOperation.java
/trunk/main/src/com/google/refine/operations/cell/FillDownOperation.java
/trunk/main/src/com/google/refine/operations/cell/MassEditOperation.java
/trunk/main/src/com/google/refine/operations/cell/TextTransformOperation.java
/trunk/main/src/com/google/refine/operations/column/ColumnAdditionOperation.java
/trunk/main/src/com/google/refine/operations/column/ColumnSplitOperation.java
/trunk/main/src/com/google/refine/operations/recon/ReconDiscardJudgmentsOperation.java
/trunk/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java
/trunk/main/src/com/google/refine/operations/recon/ReconMatchBestCandidatesOperation.java
/trunk/main/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperation.java
/trunk/main/src/com/google/refine/operations/recon/ReconOperation.java
/trunk/main/src/com/google/refine/operations/row/DenormalizeOperation.java
/trunk/main/src/com/google/refine/operations/row/RowFlagOperation.java
/trunk/main/src/com/google/refine/operations/row/RowRemovalOperation.java
/trunk/main/src/com/google/refine/operations/row/RowReorderOperation.java
/trunk/main/src/com/google/refine/operations/row/RowStarOperation.java
/trunk/main/src/com/google/refine/sorting/BaseSorter.java
/trunk/main/src/com/google/refine/sorting/SortingRecordVisitor.java
/trunk/main/src/com/google/refine/sorting/SortingRowVisitor.java
/trunk/main/src/com/google/refine/templating/DynamicFragment.java
/trunk/main/src/com/google/refine/templating/Parser.java
/trunk/main/src/com/google/refine/templating/StaticFragment.java
/trunk/main/src/com/google/refine/templating/Template.java
/trunk/main/tests/server/src/com/google/refine/tests/exporters/HtmlExporterTests.java
/trunk/main/tests/server/src/com/google/refine/tests/importers/JsonImporterTests.java
=======================================
---
/trunk/broker/appengine/src/com/google/refine/broker/AppEngineRefineBrokerImpl.java
Wed Oct 20 13:45:52 2010
+++
/trunk/broker/appengine/src/com/google/refine/broker/AppEngineRefineBrokerImpl.java
Tue Aug 2 13:26:32 2011
@@ -89,11 +89,11 @@
//
---------------------------------------------------------------------------------
protected void expire(HttpServletResponse response) throws Exception {
- // TODO: implement
+ // TODO: implement
}
protected void startProject(HttpServletResponse response, String pid,
String uid, String lock, byte[] data, String metadata, List<String>
transformations) throws Exception {
- // TODO: implement
+ // TODO: implement
}
protected void expireLocks(HttpServletResponse response) throws
Exception {
@@ -133,7 +133,7 @@
PersistenceManager pm = pmfInstance.getPersistenceManager();
try {
- // TODO: implement
+ // TODO: implement
respond(response, lockToJSON(getLock(pm,pid)));
} finally {
pm.close();
@@ -143,7 +143,7 @@
protected void obtainLock(HttpServletResponse response, String pid,
String uid, int locktype, String lockvalue) throws Exception {
PersistenceManager pm = pmfInstance.getPersistenceManager();
- // TODO: implement
+ // TODO: implement
try {
Lock lock = getLock(pm, pid);
=======================================
---
/trunk/extensions/freebase/src/com/google/refine/freebase/ProtographTransposeExporter.java
Tue Aug 2 12:30:23 2011
+++
/trunk/extensions/freebase/src/com/google/refine/freebase/ProtographTransposeExporter.java
Tue Aug 2 13:26:32 2011
@@ -48,12 +48,12 @@
import
com.google.refine.freebase.protograph.transpose.TripleLoaderTransposedNodeFactory;
abstract public class ProtographTransposeExporter implements
WriterExporter {
- final protected String _contentType;
-
- public ProtographTransposeExporter(String contentType) {
- _contentType = contentType;
- }
-
+ final protected String _contentType;
+
+ public ProtographTransposeExporter(String contentType) {
+ _contentType = contentType;
+ }
+
@Override
public String getContentType() {
return "application/x-unknown";
@@ -86,25 +86,25 @@
abstract protected TransposedNodeFactory createNodeFactory(Project
project, Writer writer);
static public class TripleLoaderExporter extends
ProtographTransposeExporter {
- public TripleLoaderExporter() {
- super("application/x-unknown");
- }
-
- @Override
- protected TransposedNodeFactory createNodeFactory(Project project,
Writer writer) {
- return new TripleLoaderTransposedNodeFactory(project, writer);
- }
+ public TripleLoaderExporter() {
+ super("application/x-unknown");
+ }
+
+ @Override
+ protected TransposedNodeFactory createNodeFactory(Project project,
Writer writer) {
+ return new TripleLoaderTransposedNodeFactory(project, writer);
+ }
}
static public class MqlwriteLikeExporter extends
ProtographTransposeExporter {
- public MqlwriteLikeExporter() {
- super("application/x-unknown");
- }
-
- @Override
- protected TransposedNodeFactory createNodeFactory(Project project,
Writer writer) {
- return new MqlwriteLikeTransposedNodeFactory(writer);
- }
+ public MqlwriteLikeExporter() {
+ super("application/x-unknown");
+ }
+
+ @Override
+ protected TransposedNodeFactory createNodeFactory(Project project,
Writer writer) {
+ return new MqlwriteLikeTransposedNodeFactory(writer);
+ }
}
}
=======================================
---
/trunk/extensions/freebase/src/com/google/refine/freebase/model/changes/DataExtensionChange.java
Tue Aug 2 12:30:23 2011
+++
/trunk/extensions/freebase/src/com/google/refine/freebase/model/changes/DataExtensionChange.java
Tue Aug 2 13:26:32 2011
@@ -208,13 +208,13 @@
column.setReconStats(ReconStats.create(project,
cellIndex));
try {
- project.columnModel.addColumn(_columnInsertIndex + i, column, true);
-
- // the column might have been renamed to avoid collision
- _columnNames.set(i, column.getName());
- } catch (ModelException e) {
- // won't get here since we set the avoid collision flag
- }
+ project.columnModel.addColumn(_columnInsertIndex + i,
column, true);
+
+ // the column might have been renamed to avoid
collision
+ _columnNames.set(i, column.getName());
+ } catch (ModelException e) {
+ // won't get here since we set the avoid collision flag
+ }
}
project.update();
=======================================
---
/trunk/extensions/freebase/src/com/google/refine/freebase/model/recon/GuidBasedReconConfig.java
Tue Aug 2 12:30:23 2011
+++
/trunk/extensions/freebase/src/com/google/refine/freebase/model/recon/GuidBasedReconConfig.java
Tue Aug 2 13:26:32 2011
@@ -137,7 +137,7 @@
jsonWriter.key("guid|=");
jsonWriter.array();
for (ReconJob job : jobs) {
- jsonWriter.value(((GuidBasedReconJob) job).guid);
+ jsonWriter.value(((GuidBasedReconJob) job).guid);
}
jsonWriter.endArray();
@@ -163,37 +163,37 @@
String s = ParsingUtilities.inputStreamToString(is);
JSONObject o =
ParsingUtilities.evaluateJsonStringToObject(s);
if (o.has("result")) {
- JSONArray results = o.getJSONArray("result");
- int count = results.length();
-
- for (int i = 0; i < count; i++) {
- JSONObject result = results.getJSONObject(i);
-
- String guid = result.getString("guid");
-
- JSONArray types = result.getJSONArray("type");
- String[] typeIDs = new String[types.length()];
- for (int j = 0; j < typeIDs.length; j++) {
- typeIDs[j] = types.getString(j);
- }
-
- ReconCandidate candidate = new ReconCandidate(
- result.getString("id"),
- result.getString("name"),
- typeIDs,
- 100
- );
-
- Recon recon = Recon.makeFreebaseRecon(historyEntryID);
- recon.addCandidate(candidate);
- recon.service = "mql";
- recon.judgment = Judgment.Matched;
- recon.judgmentAction = "auto";
- recon.match = candidate;
- recon.matchRank = 0;
-
- guidToRecon.put(guid, recon);
- }
+ JSONArray results = o.getJSONArray("result");
+ int count = results.length();
+
+ for (int i = 0; i < count; i++) {
+ JSONObject result = results.getJSONObject(i);
+
+ String guid = result.getString("guid");
+
+ JSONArray types = result.getJSONArray("type");
+ String[] typeIDs = new String[types.length()];
+ for (int j = 0; j < typeIDs.length; j++) {
+ typeIDs[j] = types.getString(j);
+ }
+
+ ReconCandidate candidate = new ReconCandidate(
+ result.getString("id"),
+ result.getString("name"),
+ typeIDs,
+ 100
+ );
+
+ Recon recon =
Recon.makeFreebaseRecon(historyEntryID);
+ recon.addCandidate(candidate);
+ recon.service = "mql";
+ recon.judgment = Judgment.Matched;
+ recon.judgmentAction = "auto";
+ recon.match = candidate;
+ recon.matchRank = 0;
+
+ guidToRecon.put(guid, recon);
+ }
}
} finally {
is.close();
@@ -206,7 +206,7 @@
String guid = ((GuidBasedReconJob) job).guid;
Recon recon = guidToRecon.get(guid);
if (recon == null) {
- recon = createNoMatchRecon(historyEntryID);
+ recon = createNoMatchRecon(historyEntryID);
}
recons.add(recon);
}
=======================================
---
/trunk/extensions/freebase/src/com/google/refine/freebase/model/recon/IdBasedReconConfig.java
Tue Aug 2 12:30:23 2011
+++
/trunk/extensions/freebase/src/com/google/refine/freebase/model/recon/IdBasedReconConfig.java
Tue Aug 2 13:26:32 2011
@@ -167,50 +167,50 @@
String s = ParsingUtilities.inputStreamToString(is);
JSONObject o =
ParsingUtilities.evaluateJsonStringToObject(s);
if (o.has("result")) {
- JSONArray results = o.getJSONArray("result");
- int count = results.length();
-
- for (int i = 0; i < count; i++) {
- JSONObject result = results.getJSONObject(i);
-
- String id = result.getString("id");
-
- JSONArray types = result.getJSONArray("type");
- String[] typeIDs = new String[types.length()];
- for (int j = 0; j < typeIDs.length; j++) {
- typeIDs[j] = types.getString(j);
- }
-
- ReconCandidate candidate = new ReconCandidate(
- id,
- result.getString("name"),
- typeIDs,
- 100
- );
-
- Recon recon = Recon.makeFreebaseRecon(historyEntryID);
- recon.addCandidate(candidate);
- recon.service = "mql";
- recon.judgment = Judgment.Matched;
- recon.judgmentAction = "auto";
- recon.match = candidate;
- recon.matchRank = 0;
-
- idToRecon.put(id, recon);
- }
+ JSONArray results = o.getJSONArray("result");
+ int count = results.length();
+
+ for (int i = 0; i < count; i++) {
+ JSONObject result = results.getJSONObject(i);
+
+ String id = result.getString("id");
+
+ JSONArray types = result.getJSONArray("type");
+ String[] typeIDs = new String[types.length()];
+ for (int j = 0; j < typeIDs.length; j++) {
+ typeIDs[j] = types.getString(j);
+ }
+
+ ReconCandidate candidate = new ReconCandidate(
+ id,
+ result.getString("name"),
+ typeIDs,
+ 100
+ );
+
+ Recon recon =
Recon.makeFreebaseRecon(historyEntryID);
+ recon.addCandidate(candidate);
+ recon.service = "mql";
+ recon.judgment = Judgment.Matched;
+ recon.judgmentAction = "auto";
+ recon.match = candidate;
+ recon.matchRank = 0;
+
+ idToRecon.put(id, recon);
+ }
}
} finally {
- is.close();
+ is.close();
}
} catch (Exception e) {
- e.printStackTrace();
- }
-
+ e.printStackTrace();
+ }
+
for (ReconJob job : jobs) {
String id = ((IdBasedReconJob) job).id;
Recon recon = idToRecon.get(id);
if (recon == null) {
- recon = createNoMatchRecon(historyEntryID);
+ recon = createNoMatchRecon(historyEntryID);
}
recons.add(recon);
}
=======================================
---
/trunk/extensions/freebase/src/com/google/refine/freebase/model/recon/KeyBasedReconConfig.java
Tue Aug 2 12:30:23 2011
+++
/trunk/extensions/freebase/src/com/google/refine/freebase/model/recon/KeyBasedReconConfig.java
Tue Aug 2 13:26:32 2011
@@ -181,37 +181,37 @@
String s = ParsingUtilities.inputStreamToString(is);
JSONObject o =
ParsingUtilities.evaluateJsonStringToObject(s);
if (o.has("result")) {
- JSONArray results = o.getJSONArray("result");
- int count = results.length();
-
- for (int i = 0; i < count; i++) {
- JSONObject result = results.getJSONObject(i);
-
- String key =
result.getJSONArray("key").getJSONObject(0).getString("value");
-
- JSONArray types = result.getJSONArray("type");
- String[] typeIDs = new String[types.length()];
- for (int j = 0; j < typeIDs.length; j++) {
- typeIDs[j] = types.getString(j);
- }
-
- ReconCandidate candidate = new ReconCandidate(
- result.getString("id"),
- result.getString("name"),
- typeIDs,
- 100
- );
-
- Recon recon = Recon.makeFreebaseRecon(historyEntryID);
- recon.addCandidate(candidate);
- recon.service = "mql";
- recon.judgment = Judgment.Matched;
- recon.judgmentAction = "auto";
- recon.match = candidate;
- recon.matchRank = 0;
-
- keyToRecon.put(key, recon);
- }
+ JSONArray results = o.getJSONArray("result");
+ int count = results.length();
+
+ for (int i = 0; i < count; i++) {
+ JSONObject result = results.getJSONObject(i);
+
+ String key =
result.getJSONArray("key").getJSONObject(0).getString("value");
+
+ JSONArray types = result.getJSONArray("type");
+ String[] typeIDs = new String[types.length()];
+ for (int j = 0; j < typeIDs.length; j++) {
+ typeIDs[j] = types.getString(j);
+ }
+
+ ReconCandidate candidate = new ReconCandidate(
+ result.getString("id"),
+ result.getString("name"),
+ typeIDs,
+ 100
+ );
+
+ Recon recon =
Recon.makeFreebaseRecon(historyEntryID);
+ recon.addCandidate(candidate);
+ recon.service = "mql";
+ recon.judgment = Judgment.Matched;
+ recon.judgmentAction = "auto";
+ recon.match = candidate;
+ recon.matchRank = 0;
+
+ keyToRecon.put(key, recon);
+ }
}
} finally {
is.close();
@@ -224,7 +224,7 @@
String key = ((KeyBasedReconJob) job).key;
Recon recon = keyToRecon.get(key);
if (recon == null) {
- recon = createNoMatchRecon(historyEntryID);
+ recon = createNoMatchRecon(historyEntryID);
}
recons.add(recon);
}
=======================================
---
/trunk/extensions/freebase/src/com/google/refine/freebase/model/recon/StrictReconConfig.java
Thu Feb 3 18:08:38 2011
+++
/trunk/extensions/freebase/src/com/google/refine/freebase/model/recon/StrictReconConfig.java
Tue Aug 2 13:26:32 2011
@@ -60,10 +60,10 @@
}
protected Recon createNoMatchRecon(long historyEntryID) {
- Recon recon = createNewRecon(historyEntryID);
- recon.service = "mql";
- recon.judgment = Judgment.None;
- recon.matchRank = -1;
- return recon;
+ Recon recon = createNewRecon(historyEntryID);
+ recon.service = "mql";
+ recon.judgment = Judgment.None;
+ recon.matchRank = -1;
+ return recon;
}
}
=======================================
---
/trunk/extensions/freebase/src/com/google/refine/freebase/operations/ExtendDataOperation.java
Tue Aug 2 12:30:23 2011
+++
/trunk/extensions/freebase/src/com/google/refine/freebase/operations/ExtendDataOperation.java
Tue Aug 2 13:26:32 2011
@@ -188,15 +188,15 @@
_rowIndices = rowIndices;
return this;
}
-
+
@Override
public void start(Project project) {
- // nothing to do
- }
-
+ // nothing to do
+ }
+
@Override
public void end(Project project) {
- // nothing to do
+ // nothing to do
}
@Override
=======================================
---
/trunk/extensions/freebase/src/com/google/refine/freebase/util/FreebaseUtils.java
Wed Oct 20 13:45:52 2010
+++
/trunk/extensions/freebase/src/com/google/refine/freebase/util/FreebaseUtils.java
Tue Aug 2 13:26:32 2011
@@ -266,7 +266,7 @@
}
static public String getFreeQUrl() {
- String url = (String)
ProjectManager.singleton.getPreferenceStore().get("freebase.freeq");
- return url != null ? url : FREEQ_URL;
+ String url = (String)
ProjectManager.singleton.getPreferenceStore().get("freebase.freeq");
+ return url != null ? url : FREEQ_URL;
}
}
=======================================
--- /trunk/main/src/com/google/refine/browsing/Engine.java Tue Aug 2
12:30:23 2011
+++ /trunk/main/src/com/google/refine/browsing/Engine.java Tue Aug 2
13:26:32 2011
@@ -1,4 +1,4 @@
-/*
+/**
Copyright 2010, Google Inc.
All rights reserved.
@@ -29,7 +29,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
package com.google.refine.browsing;
@@ -59,104 +59,104 @@
* Faceted browsing engine.
*/
public class Engine implements Jsonizable {
- static public enum Mode {
- RowBased,
- RecordBased
- }
-
+ static public enum Mode {
+ RowBased,
+ RecordBased
+ }
+
public final static String INCLUDE_DEPENDENT = "includeDependent";
public final static String MODE = "mode";
public final static String MODE_ROW_BASED = "row-based";
public final static String MODE_RECORD_BASED = "record-based";
-
- protected Project _project;
- protected List<Facet> _facets = new LinkedList<Facet>();
- protected Mode _mode = Mode.RowBased;
-
+
+ protected Project _project;
+ protected List<Facet> _facets = new LinkedList<Facet>();
+ protected Mode _mode = Mode.RowBased;
+
static public String modeToString(Mode mode) {
- return mode == Mode.RowBased ? MODE_ROW_BASED : MODE_RECORD_BASED;
+ return mode == Mode.RowBased ? MODE_ROW_BASED : MODE_RECORD_BASED;
}
static public Mode stringToMode(String s) {
- return MODE_ROW_BASED.equals(s) ? Mode.RowBased : Mode.RecordBased;
- }
-
+ return MODE_ROW_BASED.equals(s) ? Mode.RowBased : Mode.RecordBased;
+ }
+
public Engine(Project project) {
_project = project;
}
-
+
public Mode getMode() {
- return _mode;
+ return _mode;
}
public void setMode(Mode mode) {
- _mode = mode;
- }
-
+ _mode = mode;
+ }
+
public FilteredRows getAllRows() {
return new FilteredRows() {
- @Override
- public void accept(Project project, RowVisitor visitor) {
- try {
- visitor.start(project);
-
- int c = project.rows.size();
- for (int rowIndex = 0; rowIndex < c; rowIndex++) {
- Row row = project.rows.get(rowIndex);
- visitor.visit(project, rowIndex, row);
- }
- } finally {
- visitor.end(project);
- }
- }
+ @Override
+ public void accept(Project project, RowVisitor visitor) {
+ try {
+ visitor.start(project);
+
+ int c = project.rows.size();
+ for (int rowIndex = 0; rowIndex < c; rowIndex++) {
+ Row row = project.rows.get(rowIndex);
+ visitor.visit(project, rowIndex, row);
+ }
+ } finally {
+ visitor.end(project);
+ }
+ }
};
}
-
+
public FilteredRows getAllFilteredRows() {
return getFilteredRows(null);
}
public FilteredRows getFilteredRows(Facet except) {
- if (_mode == Mode.RecordBased) {
- return new FilteredRecordsAsFilteredRows(getFilteredRecords(except));
- } else if (_mode == Mode.RowBased) {
- ConjunctiveFilteredRows cfr = new ConjunctiveFilteredRows();
- for (Facet facet : _facets) {
- if (facet != except) {
- RowFilter rowFilter = facet.getRowFilter(_project);
- if (rowFilter != null) {
- cfr.add(rowFilter);
- }
- }
- }
- return cfr;
- }
- throw new InternalError("Unknown mode.");
- }
-
+ if (_mode == Mode.RecordBased) {
+ return new
FilteredRecordsAsFilteredRows(getFilteredRecords(except));
+ } else if (_mode == Mode.RowBased) {
+ ConjunctiveFilteredRows cfr = new ConjunctiveFilteredRows();
+ for (Facet facet : _facets) {
+ if (facet != except) {
+ RowFilter rowFilter = facet.getRowFilter(_project);
+ if (rowFilter != null) {
+ cfr.add(rowFilter);
+ }
+ }
+ }
+ return cfr;
+ }
+ throw new InternalError("Unknown mode.");
+ }
+
public FilteredRecords getAllRecords() {
return new FilteredRecords() {
- @Override
- public void accept(Project project, RecordVisitor visitor) {
- try {
- visitor.start(project);
-
- int c = project.recordModel.getRecordCount();
- for (int r = 0; r < c; r++) {
- visitor.visit(project, project.recordModel.getRecord(r));
- }
- } finally {
- visitor.end(project);
- }
- }
+ @Override
+ public void accept(Project project, RecordVisitor visitor) {
+ try {
+ visitor.start(project);
+
+ int c = project.recordModel.getRecordCount();
+ for (int r = 0; r < c; r++) {
+ visitor.visit(project,
project.recordModel.getRecord(r));
+ }
+ } finally {
+ visitor.end(project);
+ }
+ }
};
}
-
+
public FilteredRecords getFilteredRecords() {
- return getFilteredRecords(null);
- }
-
+ return getFilteredRecords(null);
+ }
+
public FilteredRecords getFilteredRecords(Facet except) {
- if (_mode == Mode.RecordBased) {
- ConjunctiveFilteredRecords cfr = new ConjunctiveFilteredRecords();
+ if (_mode == Mode.RecordBased) {
+ ConjunctiveFilteredRecords cfr = new
ConjunctiveFilteredRecords();
for (Facet facet : _facets) {
if (facet != except) {
RecordFilter recordFilter =
facet.getRecordFilter(_project);
@@ -166,23 +166,23 @@
}
}
return cfr;
- }
- throw new InternalError("This method should not be called when the
engine is not in record mode.");
- }
-
+ }
+ throw new InternalError("This method should not be called when the
engine is not in record mode.");
+ }
+
public void initializeFromJSON(JSONObject o) throws Exception {
if (o == null) {
return;
}
-
+
if (o.has("facets") && !o.isNull("facets")) {
JSONArray a = o.getJSONArray("facets");
int length = a.length();
-
+
for (int i = 0; i < length; i++) {
JSONObject fo = a.getJSONObject(i);
String type = fo.has("type") ?
fo.getString("type") : "list";
-
+
Facet facet = null;
if ("list".equals(type)) {
facet = new ListFacet();
@@ -195,53 +195,53 @@
} else if ("text".equals(type)) {
facet = new TextSearchFacet();
}
-
+
if (facet != null) {
facet.initializeFromJSON(_project, fo);
_facets.add(facet);
}
}
}
-
+
// for backward compatibility
if (o.has(INCLUDE_DEPENDENT) && !o.isNull(INCLUDE_DEPENDENT)) {
_mode = o.getBoolean(INCLUDE_DEPENDENT) ? Mode.RecordBased :
Mode.RowBased;
}
-
+
if (o.has(MODE) && !o.isNull(MODE)) {
- _mode = MODE_ROW_BASED.equals(o.getString(MODE)) ?
Mode.RowBased : Mode.RecordBased;
+ _mode = MODE_ROW_BASED.equals(o.getString(MODE)) ?
Mode.RowBased : Mode.RecordBased;
}
}
-
+
public void computeFacets() throws JSONException {
- if (_mode == Mode.RowBased) {
- for (Facet facet : _facets) {
- FilteredRows filteredRows = getFilteredRows(facet);
-
- facet.computeChoices(_project, filteredRows);
- }
- } else if (_mode == Mode.RecordBased) {
- for (Facet facet : _facets) {
- FilteredRecords filteredRecords = getFilteredRecords(facet);
-
- facet.computeChoices(_project, filteredRecords);
- }
- } else {
- throw new InternalError("Unknown mode.");
- }
- }
-
+ if (_mode == Mode.RowBased) {
+ for (Facet facet : _facets) {
+ FilteredRows filteredRows = getFilteredRows(facet);
+
+ facet.computeChoices(_project, filteredRows);
+ }
+ } else if (_mode == Mode.RecordBased) {
+ for (Facet facet : _facets) {
+ FilteredRecords filteredRecords =
getFilteredRecords(facet);
+
+ facet.computeChoices(_project, filteredRecords);
+ }
+ } else {
+ throw new InternalError("Unknown mode.");
+ }
+ }
+
@Override
public void write(JSONWriter writer, Properties options)
- throws JSONException {
-
+ throws JSONException {
+
writer.object();
writer.key("facets");
- writer.array();
- for (Facet facet : _facets) {
- facet.write(writer, options);
- }
- writer.endArray();
+ writer.array();
+ for (Facet facet : _facets) {
+ facet.write(writer, options);
+ }
+ writer.endArray();
writer.key(MODE); writer.value(_mode == Mode.RowBased ?
MODE_ROW_BASED : MODE_RECORD_BASED);
writer.endObject();
}
=======================================
--- /trunk/main/src/com/google/refine/browsing/RecordVisitor.java Wed Oct
20 13:45:52 2010
+++ /trunk/main/src/com/google/refine/browsing/RecordVisitor.java Tue Aug
2 13:26:32 2011
@@ -41,12 +41,12 @@
* particular criteria, such as facets' constraints.
*/
public interface RecordVisitor {
- public void start(Project project); // called before any visit() call
-
+ public void start(Project project); // called before any visit() call
+
public boolean visit(
- Project project,
- Record record
+ Project project,
+ Record record
);
-
- public void end(Project project); // called after all visit() calls
-}
+
+ public void end(Project project); // called after all visit() calls
+}
=======================================
--- /trunk/main/src/com/google/refine/browsing/RowVisitor.java Wed Oct 20
13:45:52 2010
+++ /trunk/main/src/com/google/refine/browsing/RowVisitor.java Tue Aug 2
13:26:32 2011
@@ -41,13 +41,13 @@
* particular criteria, such as facets' constraints.
*/
public interface RowVisitor {
- public void start(Project project); // called before any visit() call
-
+ public void start(Project project); // called before any visit() call
+
public boolean visit(
- Project project,
- int rowIndex, // zero-based row index
- Row row
+ Project project,
+ int rowIndex, // zero-based row index
+ Row row
);
-
- public void end(Project project); // called after all visit() calls
-}
+
+ public void end(Project project); // called after all visit() calls
+}
=======================================
--- /trunk/main/src/com/google/refine/browsing/facets/ListFacet.java Wed
Oct 20 13:45:52 2010
+++ /trunk/main/src/com/google/refine/browsing/facets/ListFacet.java Tue
Aug 2 13:26:32 2011
@@ -218,11 +218,11 @@
@Override
public RecordFilter getRecordFilter(Project project) {
- RowFilter rowFilter = getRowFilter(project);
- return rowFilter == null ? null :
- (_invert ?
- new AllRowsRecordFilter(rowFilter) :
- new AnyRowRecordFilter(rowFilter));
+ RowFilter rowFilter = getRowFilter(project);
+ return rowFilter == null ? null :
+ (_invert ?
+ new AllRowsRecordFilter(rowFilter) :
+ new AnyRowRecordFilter(rowFilter));
}
@Override
=======================================
--- /trunk/main/src/com/google/refine/browsing/facets/RangeFacet.java Mon
Jun 6 15:35:01 2011
+++ /trunk/main/src/com/google/refine/browsing/facets/RangeFacet.java Tue
Aug 2 13:26:32 2011
@@ -201,8 +201,8 @@
public RowFilter getRowFilter(Project project) {
if (_eval != null && _errorMessage == null && _selected) {
return new ExpressionNumberComparisonRowFilter(
- getRowEvaluable(project), _selectNumeric, _selectNonNumeric,
_selectBlank, _selectError) {
-
+ getRowEvaluable(project), _selectNumeric,
_selectNonNumeric, _selectBlank, _selectError) {
+
@Override
protected boolean checkValue(double d) {
return d >= _from && d < _to;
@@ -215,8 +215,8 @@
@Override
public RecordFilter getRecordFilter(Project project) {
- RowFilter rowFilter = getRowFilter(project);
- return rowFilter == null ? null : new AnyRowRecordFilter(rowFilter);
+ RowFilter rowFilter = getRowFilter(project);
+ return rowFilter == null ? null : new
AnyRowRecordFilter(rowFilter);
}
@Override
@@ -267,7 +267,7 @@
}
protected RowEvaluable getRowEvaluable(Project project) {
- return new ExpressionBasedRowEvaluable(_columnName, _cellIndex,
_eval);
+ return new ExpressionBasedRowEvaluable(_columnName, _cellIndex,
_eval);
}
protected void retrieveDataFromBaseBinIndex(NumericBinIndex index) {
=======================================
---
/trunk/main/src/com/google/refine/browsing/facets/ScatterplotDrawingRowVisitor.java
Wed Oct 20 13:45:52 2010
+++
/trunk/main/src/com/google/refine/browsing/facets/ScatterplotDrawingRowVisitor.java
Tue Aug 2 13:26:32 2011
@@ -122,12 +122,12 @@
@Override
public void start(Project project) {
- // nothing to do
- }
-
+ // nothing to do
+ }
+
@Override
public void end(Project project) {
- // nothing to do
+ // nothing to do
}
@Override
@@ -153,10 +153,10 @@
@Override
public boolean visit(Project project, Record record) {
- for (int r = record.fromRowIndex; r < record.toRowIndex; r++) {
- visit(project, r, project.rows.get(r));
- }
- return false;
+ for (int r = record.fromRowIndex; r < record.toRowIndex; r++) {
+ visit(project, r, project.rows.get(r));
+ }
+ return false;
}
public RenderedImage getImage() {
=======================================
--- /trunk/main/src/com/google/refine/browsing/facets/ScatterplotFacet.java
Mon Jun 6 15:35:01 2011
+++ /trunk/main/src/com/google/refine/browsing/facets/ScatterplotFacet.java
Tue Aug 2 13:26:32 2011
@@ -315,8 +315,8 @@
@Override
public RecordFilter getRecordFilter(Project project) {
- RowFilter rowFilter = getRowFilter(project);
- return rowFilter == null ? null : new AnyRowRecordFilter(rowFilter);
+ RowFilter rowFilter = getRowFilter(project);
+ return rowFilter == null ? null : new
AnyRowRecordFilter(rowFilter);
}
@Override
@@ -414,7 +414,7 @@
}
public static NumericBinIndex getBinIndex(Project project, Column
column, Evaluable eval, String expression) {
- return getBinIndex(project, column, eval, expression, "row-based");
+ return getBinIndex(project, column, eval, expression, "row-based");
}
public static NumericBinIndex getBinIndex(Project project, Column
column, Evaluable eval, String expression, String mode) {
@@ -429,10 +429,10 @@
NumericBinIndex index = (NumericBinIndex)
column.getPrecompute(key);
if (index == null) {
index = "row-based".equals(mode) ?
- new NumericBinRowIndex(project, new
ExpressionBasedRowEvaluable(column.getName(), column.getCellIndex(),
eval)) :
- new NumericBinRecordIndex(project, new
ExpressionBasedRowEvaluable(column.getName(), column.getCellIndex(), eval));
-
- column.setPrecompute(key, index);
+ new NumericBinRowIndex(project, new
ExpressionBasedRowEvaluable(column.getName(), column.getCellIndex(),
eval)) :
+ new NumericBinRecordIndex(project, new
ExpressionBasedRowEvaluable(column.getName(), column.getCellIndex(), eval));
+
+ column.setPrecompute(key, index);
}
return index;
}
=======================================
--- /trunk/main/src/com/google/refine/browsing/facets/TextSearchFacet.java
Mon Jun 6 15:35:01 2011
+++ /trunk/main/src/com/google/refine/browsing/facets/TextSearchFacet.java
Tue Aug 2 13:26:32 2011
@@ -101,13 +101,13 @@
if ("regex".equals(_mode)) {
try {
_pattern = Pattern.compile(
- _query,
- _caseSensitive ? 0 : Pattern.CASE_INSENSITIVE);
+ _query,
+ _caseSensitive ? 0 : Pattern.CASE_INSENSITIVE);
} catch (java.util.regex.PatternSyntaxException e) {
e.printStackTrace();
}
} else if (!_caseSensitive) {
- _query = _query.toLowerCase();
+ _query = _query.toLowerCase();
}
}
}
@@ -141,17 +141,17 @@
@Override
public RecordFilter getRecordFilter(Project project) {
- RowFilter rowFilter = getRowFilter(project);
- return rowFilter == null ? null : new AnyRowRecordFilter(rowFilter);
+ RowFilter rowFilter = getRowFilter(project);
+ return rowFilter == null ? null : new
AnyRowRecordFilter(rowFilter);
}
@Override
public void computeChoices(Project project, FilteredRows filteredRows)
{
// nothing to do
}
-
+
@Override
public void computeChoices(Project project, FilteredRecords
filteredRecords) {
- // nothing to do
+ // nothing to do
}
}
=======================================
--- /trunk/main/src/com/google/refine/browsing/facets/TimeRangeFacet.java
Mon Jun 6 15:35:01 2011
+++ /trunk/main/src/com/google/refine/browsing/facets/TimeRangeFacet.java
Tue Aug 2 13:26:32 2011
@@ -55,7 +55,7 @@
import com.google.refine.util.JSONUtilities;
public class TimeRangeFacet extends RangeFacet {
-
+
protected boolean _selectTime; // whether the time selection
applies, default true
protected boolean _selectNonTime;
@@ -153,7 +153,7 @@
public RowFilter getRowFilter(Project project) {
if (_eval != null && _errorMessage == null && _selected) {
return new ExpressionTimeComparisonRowFilter(
- getRowEvaluable(project), _selectTime, _selectNonTime,
_selectBlank, _selectError) {
+ getRowEvaluable(project), _selectTime, _selectNonTime,
_selectBlank, _selectError) {
@Override
protected boolean checkValue(long t) {
=======================================
---
/trunk/main/src/com/google/refine/browsing/filters/AllRowsRecordFilter.java
Wed Oct 20 13:45:52 2010
+++
/trunk/main/src/com/google/refine/browsing/filters/AllRowsRecordFilter.java
Tue Aug 2 13:26:32 2011
@@ -39,19 +39,19 @@
import com.google.refine.model.Record;
public class AllRowsRecordFilter implements RecordFilter {
- final protected RowFilter _rowFilter;
-
- public AllRowsRecordFilter(RowFilter rowFilter) {
- _rowFilter = rowFilter;
- }
-
- @Override
- public boolean filterRecord(Project project, Record record) {
- for (int r = record.fromRowIndex; r < record.toRowIndex; r++) {
- if (!_rowFilter.filterRow(project, r, project.rows.get(r))) {
- return false;
- }
- }
- return true;
- }
-}
+ final protected RowFilter _rowFilter;
+
+ public AllRowsRecordFilter(RowFilter rowFilter) {
+ _rowFilter = rowFilter;
+ }
+
+ @Override
+ public boolean filterRecord(Project project, Record record) {
+ for (int r = record.fromRowIndex; r < record.toRowIndex; r++) {
+ if (!_rowFilter.filterRow(project, r, project.rows.get(r))) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
=======================================
---
/trunk/main/src/com/google/refine/browsing/filters/AnyRowRecordFilter.java
Wed Oct 20 13:45:52 2010
+++
/trunk/main/src/com/google/refine/browsing/filters/AnyRowRecordFilter.java
Tue Aug 2 13:26:32 2011
@@ -7,13 +7,13 @@
modification, are permitted provided that the following conditions are
met:
- * Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
+ * Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
- * Neither the name of Google Inc. nor the names of its
+ * Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
@@ -29,7 +29,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
package com.google.refine.browsing.filters;
@@ -39,19 +39,19 @@
import com.google.refine.model.Record;
public class AnyRowRecordFilter implements RecordFilter {
- final protected RowFilter _rowFilter;
-
- public AnyRowRecordFilter(RowFilter rowFilter) {
- _rowFilter = rowFilter;
- }
-
- @Override
- public boolean filterRecord(Project project, Record record) {
- for (int r = record.fromRowIndex; r < record.toRowIndex; r++) {
- if (_rowFilter.filterRow(project, r, project.rows.get(r))) {
- return true;
- }
- }
- return false;
- }
-}
+ final protected RowFilter _rowFilter;
+
+ public AnyRowRecordFilter(RowFilter rowFilter) {
+ _rowFilter = rowFilter;
+ }
+
+ @Override
+ public boolean filterRecord(Project project, Record record) {
+ for (int r = record.fromRowIndex; r < record.toRowIndex; r++) {
+ if (_rowFilter.filterRow(project, r, project.rows.get(r))) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
=======================================
---
/trunk/main/src/com/google/refine/browsing/filters/ExpressionNumberComparisonRowFilter.java
Mon Jun 6 15:35:01 2011
+++
/trunk/main/src/com/google/refine/browsing/filters/ExpressionNumberComparisonRowFilter.java
Tue Aug 2 13:26:32 2011
@@ -52,20 +52,20 @@
* values.
*/
abstract public class ExpressionNumberComparisonRowFilter implements
RowFilter {
- final protected RowEvaluable _rowEvaluable;
- final protected boolean _selectNumeric;
- final protected boolean _selectNonNumeric;
- final protected boolean _selectBlank;
- final protected boolean _selectError;
-
+ final protected RowEvaluable _rowEvaluable;
+ final protected boolean _selectNumeric;
+ final protected boolean _selectNonNumeric;
+ final protected boolean _selectBlank;
+ final protected boolean _selectError;
+
public ExpressionNumberComparisonRowFilter(
- RowEvaluable rowEvaluable,
- boolean selectNumeric,
- boolean selectNonNumeric,
- boolean selectBlank,
- boolean selectError
+ RowEvaluable rowEvaluable,
+ boolean selectNumeric,
+ boolean selectNonNumeric,
+ boolean selectBlank,
+ boolean selectError
) {
- _rowEvaluable = rowEvaluable;
+ _rowEvaluable = rowEvaluable;
_selectNumeric = selectNumeric;
_selectNonNumeric = selectNonNumeric;
_selectBlank = selectBlank;
=======================================
---
/trunk/main/src/com/google/refine/browsing/filters/ExpressionTimeComparisonRowFilter.java
Mon Jun 6 15:35:01 2011
+++
/trunk/main/src/com/google/refine/browsing/filters/ExpressionTimeComparisonRowFilter.java
Tue Aug 2 13:26:32 2011
@@ -46,21 +46,21 @@
*/
abstract public class ExpressionTimeComparisonRowFilter extends
ExpressionNumberComparisonRowFilter {
- final protected boolean _selectTime;
- final protected boolean _selectNonTime;
+ final protected boolean _selectTime;
+ final protected boolean _selectNonTime;
public ExpressionTimeComparisonRowFilter(
- RowEvaluable rowEvaluable,
- boolean selectTime,
- boolean selectNonTime,
- boolean selectBlank,
- boolean selectError
+ RowEvaluable rowEvaluable,
+ boolean selectTime,
+ boolean selectNonTime,
+ boolean selectBlank,
+ boolean selectError
) {
- super(rowEvaluable, selectTime, selectNonTime, selectBlank,
selectError);
- _selectTime = selectTime;
- _selectNonTime = selectNonTime;
- }
-
+ super(rowEvaluable, selectTime, selectNonTime, selectBlank,
selectError);
+ _selectTime = selectTime;
+ _selectNonTime = selectNonTime;
+ }
+
@Override
protected boolean checkValue(Object v) {
if (ExpressionUtils.isError(v)) {
@@ -80,7 +80,7 @@
// not really needed for operation, just to make extending the
abstract class possible
@Override
protected boolean checkValue(double d) {
- return false;
+ return false;
}
abstract protected boolean checkValue(long d);
=======================================
---
/trunk/main/src/com/google/refine/browsing/util/ConjunctiveFilteredRecords.java
Wed Oct 20 13:45:52 2010
+++
/trunk/main/src/com/google/refine/browsing/util/ConjunctiveFilteredRecords.java
Tue Aug 2 13:26:32 2011
@@ -54,21 +54,21 @@
@Override
public void accept(Project project, RecordVisitor visitor) {
- try {
- visitor.start(project);
-
- int c = project.recordModel.getRecordCount();
- for (int r = 0; r < c; r++) {
- Record record = project.recordModel.getRecord(r);
- if (matchRecord(project, record)) {
- if (visitor.visit(project, record)) {
- return;
- }
- }
- }
- } finally {
- visitor.end(project);
- }
+ try {
+ visitor.start(project);
+
+ int c = project.recordModel.getRecordCount();
+ for (int r = 0; r < c; r++) {
+ Record record = project.recordModel.getRecord(r);
+ if (matchRecord(project, record)) {
+ if (visitor.visit(project, record)) {
+ return;
+ }
+ }
+ }
+ } finally {
+ visitor.end(project);
+ }
}
protected boolean matchRecord(Project project, Record record) {
=======================================
---
/trunk/main/src/com/google/refine/browsing/util/ConjunctiveFilteredRows.java
Mon Jun 6 15:35:01 2011
+++
/trunk/main/src/com/google/refine/browsing/util/ConjunctiveFilteredRows.java
Tue Aug 2 13:26:32 2011
@@ -55,19 +55,19 @@
@Override
public void accept(Project project, RowVisitor visitor) {
- try {
- visitor.start(project);
-
- int c = project.rows.size();
- for (int rowIndex = 0; rowIndex < c; rowIndex++) {
- Row row = project.rows.get(rowIndex);
- if (matchRow(project, rowIndex, row)) {
- visitRow(project, visitor, rowIndex, row);
- }
- }
- } finally {
- visitor.end(project);
- }
+ try {
+ visitor.start(project);
+
+ int c = project.rows.size();
+ for (int rowIndex = 0; rowIndex < c; rowIndex++) {
+ Row row = project.rows.get(rowIndex);
+ if (matchRow(project, rowIndex, row)) {
+ visitRow(project, visitor, rowIndex, row);
+ }
+ }
+ } finally {
+ visitor.end(project);
+ }
}
protected void visitRow(Project project, RowVisitor visitor, int
rowIndex, Row row) {
=======================================
---
/trunk/main/src/com/google/refine/browsing/util/ExpressionNominalValueGrouper.java
Mon Jun 6 15:35:01 2011
+++
/trunk/main/src/com/google/refine/browsing/util/ExpressionNominalValueGrouper.java
Tue Aug 2 13:26:32 2011
@@ -7,13 +7,13 @@
modification, are permitted provided that the following conditions are
met:
- * Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
+ * Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
- * Neither the name of Google Inc. nor the names of its
+ * Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
@@ -29,7 +29,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
package com.google.refine.browsing.util;
@@ -56,94 +56,94 @@
* from a given expression.
*/
public class ExpressionNominalValueGrouper implements RowVisitor,
RecordVisitor {
- static public class IndexedNominalFacetChoice extends NominalFacetChoice {
- int _latestIndex;
-
- public IndexedNominalFacetChoice(DecoratedValue decoratedValue, int
latestIndex) {
- super(decoratedValue);
- _latestIndex = latestIndex;
- }
- }
-
+ static public class IndexedNominalFacetChoice extends
NominalFacetChoice {
+ int _latestIndex;
+
+ public IndexedNominalFacetChoice(DecoratedValue decoratedValue,
int latestIndex) {
+ super(decoratedValue);
+ _latestIndex = latestIndex;
+ }
+ }
+
/*
* Configuration
*/
final protected Evaluable _evaluable;
final protected String _columnName;
final protected int _cellIndex;
-
+
/*
* Computed results
*/
final public Map<Object, IndexedNominalFacetChoice> choices = new
HashMap<Object, IndexedNominalFacetChoice>();
public int blankCount = 0;
public int errorCount = 0;
-
+
/*
* Scratch pad variables
*/
protected boolean hasBlank;
protected boolean hasError;
-
+
public ExpressionNominalValueGrouper(Evaluable evaluable, String
columnName, int cellIndex) {
_evaluable = evaluable;
_columnName = columnName;
_cellIndex = cellIndex;
}
-
+
@Override
public void start(Project project) {
- // nothing to do
- }
-
+ // nothing to do
+ }
+
@Override
public void end(Project project) {
- // nothing to do
- }
-
+ // nothing to do
+ }
+
@Override
public boolean visit(Project project, int rowIndex, Row row) {
- hasError = false;
- hasBlank = false;
-
+ hasError = false;
+ hasBlank = false;
+
Properties bindings = ExpressionUtils.createBindings(project);
-
+
visitRow(project, rowIndex, row, bindings, rowIndex);
-
+
if (hasError) {
- errorCount++;
+ errorCount++;
}
if (hasBlank) {
- blankCount++;
- }
-
+ blankCount++;
+ }
+
return false;
}
-
+
@Override
public boolean visit(Project project, Record record) {
- hasError = false;
- hasBlank = false;
-
+ hasError = false;
+ hasBlank = false;
+
Properties bindings = ExpressionUtils.createBindings(project);
-
+
for (int r = record.fromRowIndex; r < record.toRowIndex; r++) {
- Row row = project.rows.get(r);
+ Row row = project.rows.get(r);
visitRow(project, r, row, bindings, record.recordIndex);
}
-
+
if (hasError) {
- errorCount++;
+ errorCount++;
}
if (hasBlank) {
- blankCount++;
- }
-
+ blankCount++;
+ }
+
return false;
}
-
+
protected void visitRow(Project project, int rowIndex, Row row,
Properties bindings, int index) {
- Object value = evalRow(project, rowIndex, row, bindings);
+ Object value = evalRow(project, rowIndex, row, bindings);
if (value != null) {
if (value.getClass().isArray()) {
Object[] a = (Object[]) value;
@@ -155,83 +155,83 @@
processValue(v, rowIndex);
}
} else {
- processValue(value, rowIndex);
+ processValue(value, rowIndex);
}
} else {
- processValue(value, rowIndex);
+ processValue(value, rowIndex);
}
}
-
+
protected Object evalRow(Project project, int rowIndex, Row row,
Properties bindings) {
- Cell cell = _cellIndex < 0 ? null : row.getCell(_cellIndex);
-
- ExpressionUtils.bind(bindings, row, rowIndex, _columnName, cell);
-
- return _evaluable.evaluate(bindings);
- }
-
+ Cell cell = _cellIndex < 0 ? null : row.getCell(_cellIndex);
+
+ ExpressionUtils.bind(bindings, row, rowIndex, _columnName, cell);
+
+ return _evaluable.evaluate(bindings);
+ }
+
protected void processValue(Object value, int index) {
if (ExpressionUtils.isError(value)) {
hasError = true;
} else if (ExpressionUtils.isNonBlankData(value)) {
String valueString = value.toString();
IndexedNominalFacetChoice facetChoice =
choices.get(valueString);
-
+
if (facetChoice != null) {
- if (facetChoice._latestIndex < index) {
- facetChoice._latestIndex = index;
- facetChoice.count++;
- }
+ if (facetChoice._latestIndex < index) {
+ facetChoice._latestIndex = index;
+ facetChoice.count++;
+ }
} else {
- String label = value.toString();
- DecoratedValue dValue = new DecoratedValue(value, label);
- IndexedNominalFacetChoice choice =
- new IndexedNominalFacetChoice(dValue, index);
-
+ String label = value.toString();
+ DecoratedValue dValue = new DecoratedValue(value, label);
+ IndexedNominalFacetChoice choice =
+ new IndexedNominalFacetChoice(dValue, index);
+
choice.count = 1;
choices.put(valueString, choice);
}
} else {
- hasBlank = true;
+ hasBlank = true;
}
}
-
+
public RowEvaluable getChoiceCountRowEvaluable() {
- return new RowEvaluable() {
- @Override
- public Object eval(Project project, int rowIndex, Row row, Properties
bindings) {
- Object value = evalRow(project, rowIndex, row, bindings);
- return getChoiceValueCountMultiple(value);
- }
-
- };
- }
-
+ return new RowEvaluable() {
+ @Override
+ public Object eval(Project project, int rowIndex, Row row,
Properties bindings) {
+ Object value = evalRow(project, rowIndex, row, bindings);
+ return getChoiceValueCountMultiple(value);
+ }
+
+ };
+ }
+
public Object getChoiceValueCountMultiple(Object value) {
if (value != null) {
- if (value.getClass().isArray()) {
+ if (value.getClass().isArray()) {
Object[] choiceValues = (Object[]) value;
List<Integer> counts = new
ArrayList<Integer>(choiceValues.length);
-
+
for (int i = 0; i < choiceValues.length; i++) {
- counts.add(getChoiceValueCount(choiceValues[i]));
+ counts.add(getChoiceValueCount(choiceValues[i]));
}
return counts;
} else if (value instanceof Collection<?>) {
- List<Object> choiceValues =
ExpressionUtils.toObjectList(value);
+ List<Object> choiceValues =
ExpressionUtils.toObjectList(value);
List<Integer> counts = new
ArrayList<Integer>(choiceValues.size());
-
- int count = choiceValues.size();
+
+ int count = choiceValues.size();
for (int i = 0; i < count; i++) {
- counts.add(getChoiceValueCount(choiceValues.get(i)));
+ counts.add(getChoiceValueCount(choiceValues.get(i)));
}
return counts;
}
}
-
+
return getChoiceValueCount(value);
}
-
+
public Integer getChoiceValueCount(Object choiceValue) {
if (ExpressionUtils.isError(choiceValue)) {
return errorCount;
=======================================
---
/trunk/main/src/com/google/refine/browsing/util/ExpressionNumericValueBinner.java
Wed Oct 20 13:45:52 2010
+++
/trunk/main/src/com/google/refine/browsing/util/ExpressionNumericValueBinner.java
Tue Aug 2 13:26:32 2011
@@ -51,9 +51,9 @@
/*
* Configuration
*/
- final protected RowEvaluable _rowEvaluable;
- final protected NumericBinIndex _index; // base bins
-
+ final protected RowEvaluable _rowEvaluable;
+ final protected NumericBinIndex _index; // base bins
+
/*
* Computed results
*/
@@ -72,19 +72,19 @@
protected boolean hasNonNumeric;
public ExpressionNumericValueBinner(RowEvaluable rowEvaluable,
NumericBinIndex index) {
- _rowEvaluable = rowEvaluable;
+ _rowEvaluable = rowEvaluable;
_index = index;
bins = new int[_index.getBins().length];
}
@Override
public void start(Project project) {
- // nothing to do
+ // nothing to do
}
@Override
public void end(Project project) {
- // nothing to do
+ // nothing to do
}
@Override
@@ -105,7 +105,7 @@
Properties bindings = ExpressionUtils.createBindings(project);
for (int r = record.fromRowIndex; r < record.toRowIndex; r++) {
- processRow(project, r, project.rows.get(r), bindings);
+ processRow(project, r, project.rows.get(r), bindings);
}
updateCounts();
=======================================
---
/trunk/main/src/com/google/refine/browsing/util/ExpressionTimeValueBinner.java
Tue Oct 26 14:06:16 2010
+++
/trunk/main/src/com/google/refine/browsing/util/ExpressionTimeValueBinner.java
Tue Aug 2 13:26:32 2011
@@ -50,13 +50,13 @@
* from a given expression.
*/
public class ExpressionTimeValueBinner implements RowVisitor,
RecordVisitor {
-
+
/*
* Configuration
*/
- final protected RowEvaluable _rowEvaluable;
- final protected TimeBinIndex _index; // base bins
-
+ final protected RowEvaluable _rowEvaluable;
+ final protected TimeBinIndex _index; // base bins
+
/*
* Computed results
*/
@@ -75,19 +75,19 @@
protected boolean hasNonTime;
public ExpressionTimeValueBinner(RowEvaluable rowEvaluable,
TimeBinIndex index) {
- _rowEvaluable = rowEvaluable;
+ _rowEvaluable = rowEvaluable;
_index = index;
bins = new int[_index.getBins().length];
}
-
+
@Override
public void start(Project project) {
- // nothing to do
- }
-
+ // nothing to do
+ }
+
@Override
public void end(Project project) {
- // nothing to do
+ // nothing to do
}
@Override
@@ -108,7 +108,7 @@
Properties bindings = ExpressionUtils.createBindings(project);
for (int r = record.fromRowIndex; r < record.toRowIndex; r++) {
- processRow(project, r, project.rows.get(r), bindings);
+ processRow(project, r, project.rows.get(r), bindings);
}
updateCounts();
=======================================
--- /trunk/main/src/com/google/refine/browsing/util/TimeBinIndex.java Wed
Oct 20 13:45:52 2010
+++ /trunk/main/src/com/google/refine/browsing/util/TimeBinIndex.java Tue
Aug 2 13:26:32 2011
@@ -74,17 +74,17 @@
protected boolean _hasBlank = false;
protected long[] steps = {
- 1, // msec
- 1000, // sec
- 1000*60, // min
- 1000*60*60, // hour
- 1000*60*60*24, // day
- 1000*60*60*24*7, // week
- 1000l*2629746l, // month (average Gregorian year / 12)
- 1000l*31556952l, // year (average Gregorian year)
- 1000l*31556952l*10l, // decade
- 1000l*31556952l*100l, // century
- 1000l*31556952l*1000l, // millennium
+ 1, // msec
+ 1000, // sec
+ 1000*60, // min
+ 1000*60*60, // hour
+ 1000*60*60*24, // day
+ 1000*60*60*24*7, // week
+ 1000l*2629746l, // month (average Gregorian year / 12)
+ 1000l*31556952l, // year (average Gregorian year)
+ 1000l*31556952l*10l, // decade
+ 1000l*31556952l*100l, // century
+ 1000l*31556952l*1000l, // millennium
};
abstract protected void iterate(Project project, RowEvaluable
rowEvaluable, List<Long> allValues);
@@ -110,10 +110,10 @@
long diff = _max - _min;
- for (int i = 0; i < steps.length; i++) {
- _step = steps[i];
- if (diff / _step <= 100) break;
- }
+ for (int i = 0; i < steps.length; i++) {
+ _step = steps[i];
+ if (diff / _step <= 100) break;
+ }
_bins = new int[(int) (diff / _step) + 1];
for (long d : allValues) {
@@ -180,7 +180,7 @@
_hasError = true;
} else if (ExpressionUtils.isNonBlankData(v)) {
if (v instanceof Calendar) {
- v = ((Calendar) v).getTime();
+ v = ((Calendar) v).getTime();
}
if (v instanceof Date) {
@@ -201,7 +201,7 @@
_hasError = true;
} else if (ExpressionUtils.isNonBlankData(v)) {
if (v instanceof Calendar) {
- v = ((Calendar) v).getTime();
+ v = ((Calendar) v).getTime();
}
if (v instanceof Date) {
@@ -218,7 +218,7 @@
_totalValueCount++;
if (value instanceof Calendar) {
- value = ((Calendar) value).getTime();
+ value = ((Calendar) value).getTime();
}
if (value instanceof Date) {
=======================================
--- /trunk/main/src/com/google/refine/browsing/util/TimeBinRecordIndex.java
Wed Oct 20 13:45:52 2010
+++ /trunk/main/src/com/google/refine/browsing/util/TimeBinRecordIndex.java
Tue Aug 2 13:26:32 2011
@@ -42,7 +42,7 @@
import com.google.refine.model.Row;
public class TimeBinRecordIndex extends TimeBinIndex {
-
+
public TimeBinRecordIndex(Project project, RowEvaluable rowEvaluable) {
super(project, rowEvaluable);
}
=======================================
--- /trunk/main/src/com/google/refine/browsing/util/TimeBinRowIndex.java
Wed Oct 20 13:45:52 2010
+++ /trunk/main/src/com/google/refine/browsing/util/TimeBinRowIndex.java
Tue Aug 2 13:26:32 2011
@@ -42,7 +42,7 @@
public class TimeBinRowIndex extends TimeBinIndex {
- public TimeBinRowIndex(Project project, RowEvaluable rowEvaluable) {
+ public TimeBinRowIndex(Project project, RowEvaluable rowEvaluable) {
super(project, rowEvaluable);
}
=======================================
---
/trunk/main/src/com/google/refine/clustering/binning/BinningClusterer.java
Thu Jun 9 12:42:05 2011
+++
/trunk/main/src/com/google/refine/clustering/binning/BinningClusterer.java
Tue Aug 2 13:26:32 2011
@@ -103,12 +103,12 @@
@Override
public void start(Project project) {
- // nothing to do
- }
-
+ // nothing to do
+ }
+
@Override
public void end(Project project) {
- // nothing to do
+ // nothing to do
}
@Override
=======================================
--- /trunk/main/src/com/google/refine/clustering/knn/kNNClusterer.java Tue
Aug 2 12:30:23 2011
+++ /trunk/main/src/com/google/refine/clustering/knn/kNNClusterer.java Tue
Aug 2 13:26:32 2011
@@ -115,12 +115,12 @@
@Override
public void start(Project project) {
- // nothing to do
- }
-
+ // nothing to do
+ }
+
@Override
public void end(Project project) {
- // nothing to do
+ // nothing to do
}
@Override
@@ -167,12 +167,12 @@
@Override
public void start(Project project) {
- // nothing to do
- }
-
+ // nothing to do
+ }
+
@Override
public void end(Project project) {
- // nothing to do
+ // nothing to do
}
@Override
=======================================
--- /trunk/main/src/com/google/refine/commands/OpenWorkspaceDirCommand.java
Wed Oct 20 13:45:52 2010
+++ /trunk/main/src/com/google/refine/commands/OpenWorkspaceDirCommand.java
Tue Aug 2 13:26:32 2011
@@ -57,14 +57,14 @@
File dir = ((FileProjectManager)
ProjectManager.singleton).getWorkspaceDir();
if (Desktop.isDesktopSupported()) {
- Desktop desktop = Desktop.getDesktop();
- desktop.open(dir);
+ Desktop desktop = Desktop.getDesktop();
+ desktop.open(dir);
} else /* if Mac */ {
- Runtime.getRuntime().exec(
- "open .",
- new String[] {},
- dir
- );
+ Runtime.getRuntime().exec(
+ "open .",
+ new String[] {},
+ dir
+ );
}
respond(response, "{ \"code\" : \"ok\" }");
=======================================
---
/trunk/main/src/com/google/refine/commands/expr/GetExpressionHistoryCommand.java
Mon Jun 6 11:49:36 2011
+++
/trunk/main/src/com/google/refine/commands/expr/GetExpressionHistoryCommand.java
Tue Aug 2 13:26:32 2011
@@ -51,10 +51,10 @@
import com.google.refine.preference.TopList;
public class GetExpressionHistoryCommand extends Command {
-
- static protected List<String> toExpressionList(Object o) {
+
+ static protected List<String> toExpressionList(Object o) {
return o == null ? new ArrayList<String>() : ((TopList)
o).getList();
- }
+ }
@Override
public void doGet(HttpServletRequest request, HttpServletResponse
response)
=======================================
---
/trunk/main/src/com/google/refine/commands/project/ExportRowsCommand.java
Tue Jun 7 16:52:23 2011
+++
/trunk/main/src/com/google/refine/commands/project/ExportRowsCommand.java
Tue Aug 2 13:26:32 2011
@@ -56,15 +56,15 @@
public class ExportRowsCommand extends Command {
@SuppressWarnings("unchecked")
- static public Properties getRequestParameters(HttpServletRequest request)
{
+ static public Properties getRequestParameters(HttpServletRequest
request) {
Properties options = new Properties();
-
+
Enumeration<String> en = request.getParameterNames();
while (en.hasMoreElements()) {
- String name = en.nextElement();
- options.put(name, request.getParameter(name));
- }
- return options;
+ String name = en.nextElement();
+ options.put(name, request.getParameter(name));
+ }
+ return options;
}
@Override
=======================================
--- /trunk/main/src/com/google/refine/commands/row/ReorderRowsCommand.java
Wed Oct 20 13:45:52 2010
+++ /trunk/main/src/com/google/refine/commands/row/ReorderRowsCommand.java
Tue Aug 2 13:26:32 2011
@@ -50,16 +50,16 @@
@Override
protected AbstractOperation createOperation(Project project,
HttpServletRequest request, JSONObject engineConfig) throws
Exception {
-
- String mode = request.getParameter("mode");
- JSONObject sorting = null;
-
+
+ String mode = request.getParameter("mode");
+ JSONObject sorting = null;
+
try{
String json = request.getParameter("sorting");
-
+
sorting = (json == null) ? null :
ParsingUtilities.evaluateJsonStringToObject(json);
} catch (JSONException e) {
- // ignore
+ // ignore
}
return new RowReorderOperation(Engine.stringToMode(mode), sorting);
=======================================
--- /trunk/main/src/com/google/refine/exporters/HtmlTableExporter.java Tue
Aug 2 12:30:23 2011
+++ /trunk/main/src/com/google/refine/exporters/HtmlTableExporter.java Tue
Aug 2 13:26:32 2011
@@ -48,7 +48,7 @@
public class HtmlTableExporter implements WriterExporter {
- @Override
+ @Override
public String getContentType() {
return "text/html";
}
@@ -84,12 +84,12 @@
@Override
public void start(Project project) {
- // nothing to do
+ // nothing to do
}
@Override
public void end(Project project) {
- // nothing to do
+ // nothing to do
}
@Override
=======================================
--- /trunk/main/src/com/google/refine/exporters/XlsExporter.java Tue Jun 7
16:55:00 2011
+++ /trunk/main/src/com/google/refine/exporters/XlsExporter.java Tue Aug 2
13:26:32 2011
@@ -97,12 +97,12 @@
@Override
public void start(Project project) {
- // nothing to do
- }
-
+ // nothing to do
+ }
+
@Override
public void end(Project project) {
- // nothing to do
+ // nothing to do
}
@Override
=======================================
--- /trunk/main/src/com/google/refine/expr/WrappedRow.java Thu Jun 23
21:01:47 2011
+++ /trunk/main/src/com/google/refine/expr/WrappedRow.java Tue Aug 2
13:26:32 2011
@@ -77,10 +77,10 @@
}
protected class WrappedRecord implements HasFields {
- final Record _record;
-
+ final Record _record;
+
protected WrappedRecord(Record record) {
- _record = record;
+ _record = record;
}
@Override
=======================================
--- /trunk/main/src/com/google/refine/expr/functions/FacetCount.java Tue
Aug 2 12:30:23 2011
+++ /trunk/main/src/com/google/refine/expr/functions/FacetCount.java Tue
Aug 2 13:26:32 2011
@@ -54,36 +54,36 @@
@Override
public Object call(Properties bindings, Object[] args) {
if (args.length == 3 && args[1] instanceof String && args[2]
instanceof String) {
- Object choiceValue = args[0]; // choice value to look up
- String facetExpression = (String) args[1];
- String columnName = (String) args[2];
-
- Project project = (Project) bindings.get("project");
+ Object choiceValue = args[0]; // choice value to look up
+ String facetExpression = (String) args[1];
+ String columnName = (String) args[2];
+
+ Project project = (Project) bindings.get("project");
Column column =
project.columnModel.getColumnByName(columnName);
if (column == null) {
return new EvalError("No such column named " + columnName);
}
-
+
String key = "nominal-bin:" + facetExpression;
ExpressionNominalValueGrouper grouper =
(ExpressionNominalValueGrouper) column.getPrecompute(key);
if (grouper == null) {
- try {
- Evaluable eval = MetaParser.parse(facetExpression);
- Engine engine = new Engine(project);
-
- grouper = new ExpressionNominalValueGrouper(eval,
columnName, column.getCellIndex());
- engine.getAllRows().accept(project, grouper);
-
- column.setPrecompute(key, grouper);
- } catch (ParsingException e) {
- return new EvalError("Error parsing facet expression " +
facetExpression);
- }
- }
-
+ try {
+ Evaluable eval = MetaParser.parse(facetExpression);
+ Engine engine = new Engine(project);
+
+ grouper = new ExpressionNominalValueGrouper(eval,
columnName, column.getCellIndex());
+ engine.getAllRows().accept(project, grouper);
+
+ column.setPrecompute(key, grouper);
+ } catch (ParsingException e) {
+ return new EvalError("Error parsing facet expression "
+ facetExpression);
+ }
+ }
+
return grouper.getChoiceValueCountMultiple(choiceValue);
}
return new EvalError(ControlFunctionRegistry.getFunctionName(this)
+
- " expects a choice value, an expression as a string, and a column
name");
+ " expects a choice value, an expression as a string, and a
column name");
}
@Override
=======================================
--- /trunk/main/src/com/google/refine/expr/functions/Jsonize.java Tue Aug
2 12:30:23 2011
+++ /trunk/main/src/com/google/refine/expr/functions/Jsonize.java Tue Aug
2 13:26:32 2011
@@ -49,15 +49,15 @@
@Override
public Object call(Properties bindings, Object[] args) {
if (args.length >= 1) {
- try {
- Object o1 = args[0];
- if (o1 == null) {
- return "null";
- } else if (o1 instanceof Number) {
- return JSONObject.numberToString((Number) o1);
- } else if (o1 instanceof Boolean) {
- return o1.toString();
- } else if (o1 instanceof JSONObject) {
+ try {
+ Object o1 = args[0];
+ if (o1 == null) {
+ return "null";
+ } else if (o1 instanceof Number) {
+ return JSONObject.numberToString((Number) o1);
+ } else if (o1 instanceof Boolean) {
+ return o1.toString();
+ } else if (o1 instanceof JSONObject) {
return ((JSONObject) o1).toString();
} else if (o1 instanceof JSONArray) {
return ((JSONArray) o1).toString();
@@ -67,12 +67,12 @@
return new JSONArray((Collection<?>) o1).toString();
} else if (o1.getClass().isArray()) {
return new JSONArray(o1).toString();
- } else {
- return JSONObject.quote(o1.toString());
- }
- } catch (JSONException e) {
- throw new RuntimeException(e);
- }
+ } else {
+ return JSONObject.quote(o1.toString());
+ }
+ } catch (JSONException e) {
+ throw new RuntimeException(e);
+ }
}
return null;
}
=======================================
---
/trunk/main/src/com/google/refine/expr/functions/arrays/ArgsToArray.java
Tue Aug 2 12:30:23 2011
+++
/trunk/main/src/com/google/refine/expr/functions/arrays/ArgsToArray.java
Tue Aug 2 13:26:32 2011
@@ -44,7 +44,7 @@
@Override
public Object call(Properties bindings, Object[] args) {
- return args;
+ return args;
}
@Override
=======================================
--- /trunk/main/src/com/google/refine/grel/ControlFunctionRegistry.java Wed
Feb 23 11:40:35 2011
+++ /trunk/main/src/com/google/refine/grel/ControlFunctionRegistry.java Tue
Aug 2 13:26:32 2011
@@ -232,7 +232,7 @@
registerFunction("htmlAttr", new HtmlAttr());
registerFunction("htmlText", new HtmlText());
registerFunction("innerHtml", new InnerHtml());
- registerFunction("ownText", new OwnText());
+ registerFunction("ownText", new OwnText());
registerFunction("indexOf", new IndexOf());
registerFunction("lastIndexOf", new LastIndexOf());
=======================================
--- /trunk/main/src/com/google/refine/grel/Parser.java Thu Jun 23 16:42:12
2011
+++ /trunk/main/src/com/google/refine/grel/Parser.java Tue Aug 2 13:26:32
2011
@@ -238,7 +238,7 @@
throw makeException("Missing )");
}
} else if (_token.type == TokenType.Delimiter &&
_token.text.equals("[")) { // [ ... ] array
- next(true); // swallow [
+ next(true); // swallow [
List<Evaluable> args = parseExpressionList("]");
=======================================
--- /trunk/main/src/com/google/refine/grel/controls/Filter.java Tue Aug 2
12:30:23 2011
+++ /trunk/main/src/com/google/refine/grel/controls/Filter.java Tue Aug 2
13:26:32 2011
@@ -117,7 +117,7 @@
Object r = args[2].evaluate(bindings);
if (r instanceof Boolean && ((Boolean)
r).booleanValue()) {
- results.add(v);
+ results.add(v);
}
}
}
=======================================
--- /trunk/main/src/com/google/refine/grel/controls/ForEachIndex.java Tue
Aug 2 12:30:23 2011
+++ /trunk/main/src/com/google/refine/grel/controls/ForEachIndex.java Tue
Aug 2 13:26:32 2011
@@ -120,9 +120,9 @@
results = new ArrayList<Object>(list.size());
for (int i = 0; i < list.size(); i++) {
- Object v = list.get(i);
-
- bindings.put(indexName, i);
+ Object v = list.get(i);
+
+ bindings.put(indexName, i);
bindings.put(elementName, v);
Object r = args[3].evaluate(bindings);
=======================================
--- /trunk/main/src/com/google/refine/grel/controls/ForRange.java Tue Aug
2 12:30:23 2011
+++ /trunk/main/src/com/google/refine/grel/controls/ForRange.java Tue Aug
2 13:26:32 2011
@@ -87,7 +87,7 @@
double to = ((Number) toO).doubleValue();
while (from < to) {
- bindings.put(indexName, from);
+ bindings.put(indexName, from);
Object r = args[4].evaluate(bindings);
@@ -101,7 +101,7 @@
double to = ((Number) toO).doubleValue();
while (from < to) {
- bindings.put(indexName, from);
+ bindings.put(indexName, from);
Object r = args[4].evaluate(bindings);
@@ -124,13 +124,13 @@
}
static private boolean isIntegral(Number o) {
- if (o instanceof Integer || o instanceof Long) {
- return true;
- } else {
- return (o.doubleValue() - o.longValue()) == 0;
- }
- }
-
+ if (o instanceof Integer || o instanceof Long) {
+ return true;
+ } else {
+ return (o.doubleValue() - o.longValue()) == 0;
+ }
+ }
+
@Override
public void write(JSONWriter writer, Properties options)
throws JSONException {
=======================================
--- /trunk/main/src/com/google/refine/model/ModelException.java Wed Oct 20
13:45:52 2010
+++ /trunk/main/src/com/google/refine/model/ModelException.java Tue Aug 2
13:26:32 2011
@@ -34,25 +34,25 @@
package com.google.refine.model;
public class ModelException extends Exception {
- private static final long serialVersionUID = -168448967638065467L;
-
- public ModelException() {
- // TODO Auto-generated constructor stub
- }
-
- public ModelException(String message) {
- super(message);
- // TODO Auto-generated constructor stub
- }
-
- public ModelException(Throwable cause) {
- super(cause);
- // TODO Auto-generated constructor stub
- }
-
- public ModelException(String message, Throwable cause) {
- super(message, cause);
- // TODO Auto-generated constructor stub
- }
+ private static final long serialVersionUID = -168448967638065467L;
+
+ public ModelException() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public ModelException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ public ModelException(Throwable cause) {
+ super(cause);
+ // TODO Auto-generated constructor stub
+ }
+
+ public ModelException(String message, Throwable cause) {
+ super(message, cause);
+ // TODO Auto-generated constructor stub
+ }
}
=======================================
--- /trunk/main/src/com/google/refine/model/Record.java Wed Oct 20 13:45:52
2010
+++ /trunk/main/src/com/google/refine/model/Record.java Tue Aug 2 13:26:32
2011
@@ -34,17 +34,17 @@
package com.google.refine.model;
public class Record {
- final public int fromRowIndex;
- final public int toRowIndex;
- final public int recordIndex;
-
- public Record(
- int fromRowIndex,
- int toRowIndex,
- int recordIndex
- ) {
- this.fromRowIndex = fromRowIndex;
- this.toRowIndex = toRowIndex;
- this.recordIndex = recordIndex;
- }
-}
+ final public int fromRowIndex;
+ final public int toRowIndex;
+ final public int recordIndex;
+
+ public Record(
+ int fromRowIndex,
+ int toRowIndex,
+ int recordIndex
+ ) {
+ this.fromRowIndex = fromRowIndex;
+ this.toRowIndex = toRowIndex;
+ this.recordIndex = recordIndex;
+ }
+}
=======================================
--- /trunk/main/src/com/google/refine/model/RecordModel.java Tue Aug 2
12:30:23 2011
+++ /trunk/main/src/com/google/refine/model/RecordModel.java Tue Aug 2
13:26:32 2011
@@ -55,7 +55,7 @@
this.cellIndex = cellIndex;
}
}
-
+
final static public class RowDependency {
public int recordIndex;
public CellDependency[] cellDependencies;
=======================================
***Additional files exist in this changeset.***