s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1191 from adieyal/SourceColumn

Browse Source 
Fixes #1181
This commit is contained in:
Jacky 2017-05-07 20:13:07 -04:00 committed by GitHub
commit d660397179
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/com/google/refine/importers/ImportingParserBase.java
View File

@ -164,16 +164,20 @@ abstract public class ImportingParserBase implements ImportingParser {
protected static int addFilenameColumn(Project project) { protected static int addFilenameColumn(Project project) {
String fileNameColumnName = "File"; String fileNameColumnName = "File";
assert project.columnModel.getColumnByName(fileNameColumnName) == null; if (project.columnModel.getColumnByName(fileNameColumnName) == null) {
try { try {
project.columnModel.addColumn( project.columnModel.addColumn(
0, new Column(project.columnModel.allocateNewCellIndex(), fileNameColumnName), false); 0, new Column(project.columnModel.allocateNewCellIndex(), fileNameColumnName), false);
return 0; return 0;
} catch (ModelException e) { } catch (ModelException e) {
// Shouldn't happen: We already checked for duplicate name. // Shouldn't happen: We already checked for duplicate name.
logger.error("ModelException adding Filename column",e); logger.error("ModelException adding Filename column",e);
} }
return -1; return -1;
} else {
return 0;
}
} }
} }