Revision 2851
tmp/org.txm.utils/src/org/txm/utils/TableReader.java (revision 2851) | ||
---|---|---|
49 | 49 |
return tsvReader.readHeaders(); |
50 | 50 |
} else if (excelReader != null) { |
51 | 51 |
return excelReader.readHeaders(); |
52 |
} else if (odsReader != null) { |
|
53 |
return odsReader.readHeaders(); |
|
52 | 54 |
} |
53 | 55 |
|
54 | 56 |
return false; |
... | ... | |
75 | 77 |
} else { |
76 | 78 |
return false; |
77 | 79 |
} |
80 |
} else if (odsReader != null) { |
|
81 |
if (odsReader.readRecord()) { |
|
82 |
record = odsReader.getRecord(); |
|
83 |
return true; |
|
84 |
} else { |
|
85 |
return false; |
|
86 |
} |
|
78 | 87 |
} |
79 | 88 |
|
80 | 89 |
return false; |
... | ... | |
89 | 98 |
return tsvReader.getHeaders(); |
90 | 99 |
} else if (excelReader != null) { |
91 | 100 |
return excelReader.getHeaders(); |
101 |
} else if (odsReader != null) { |
|
102 |
return odsReader.getHeaders(); |
|
92 | 103 |
} |
93 | 104 |
|
94 | 105 |
return null; |
... | ... | |
109 | 120 |
tsvReader.close(); |
110 | 121 |
} else if (excelReader != null) { |
111 | 122 |
excelReader.close(); |
123 |
} else if (odsReader != null) { |
|
124 |
odsReader.close(); |
|
112 | 125 |
} |
113 | 126 |
} |
114 | 127 |
|
Also available in: Unified diff