summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f99d677)
for (int col = 1; col < currentRow.length; col++) {
subKeys.add(getCellValue(currentRow[col]));
}
for (int col = 1; col < currentRow.length; col++) {
subKeys.add(getCellValue(currentRow[col]));
}
+ if (log.isTraceEnabled())
+ log.trace(" subKeys=" + subKeys);
row++;
String firstColContents = firstColumn[row].getContents();
mapRows: for (; row < firstColumn.length; row++) {
row++;
String firstColContents = firstColumn[row].getContents();
mapRows: for (; row < firstColumn.length; row++) {
Object key = firstColContents;
Map<Object, Object> subMap = new HashMap<Object, Object>();
Object key = firstColContents;
Map<Object, Object> subMap = new HashMap<Object, Object>();
- for (int col = 0; col < currentRow.length
- && col < subKeys.size(); col++) {
- Object subKey = subKeys.get(col);
+ for (int col = 1; col < currentRow.length
+ && col < subKeys.size() + 1; col++) {
+ Object subKey = subKeys.get(col - 1);
Cell cell = currentRow[col];
if (log.isTraceEnabled())
log.trace(" row=" + row
Cell cell = currentRow[col];
if (log.isTraceEnabled())
log.trace(" row=" + row
if (bw.isWritableProperty(firstColContents)
|| firstColContents.trim().equals("")
|| row == firstColumn.length - 1) {
if (bw.isWritableProperty(firstColContents)
|| firstColContents.trim().equals("")
|| row == firstColumn.length - 1) {
bw.setPropertyValue(propertyName, map);
if (log.isTraceEnabled())
log.trace(" set map " + propertyName
bw.setPropertyValue(propertyName, map);
if (log.isTraceEnabled())
log.trace(" set map " + propertyName