Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add null-check for empty cells #53

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −4
Open

Add null-check for empty cells #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/groovy/pl/droidsonroids/gradle/localization/SourceInfo.groovy
View file
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ class SourceInfo {
reservedColumns.addAll(config.ignorableColumns)

header.eachWithIndex { columnName, i ->
if (!(columnName in reservedColumns) && i != mNameIdx) {
if (!(columnName in reservedColumns) && i != mNameIdx && !columnName.isEmpty()) {
mBuilders[i] = new XMLBuilder(columnName, config, resDir, outputFileName)
}
}
8 changes: 5 additions & 3 deletions src/main/groovy/pl/droidsonroids/gradle/localization/Utils.groovy
View file
Original file line number Diff line number Diff line change
@@ -29,9 +29,11 @@ class Utils {
if (!shouldIgnoreEmptyHeaderCell) {
def emptyHeaderIndices = headerLine.findIndexValues { it.empty }
allCells.eachWithIndex { String[] row, int rowIndex ->
emptyHeaderIndices.forEach { i ->
if (i < row.length && !row[i.intValue()].empty) {
throw new IllegalArgumentException("Not ignored column #$i contains empty header but non-empty cell at row #$rowIndex")
if (row != null) {
emptyHeaderIndices.forEach { i ->
if (i < row.length && !row[i.intValue()].empty) {
throw new IllegalArgumentException("Not ignored column #$i contains empty header but non-empty cell at row #$rowIndex")
}
}
}
}