Commit d21b7ddc authored by igoshin's avatar igoshin
Browse files

Merge branch 'master' into upstream-master

Conflicts:
	anno-gui/src/main/java/org/genesys2/anno/gui/DwcaBuilder.java
parents 8fab901d cd9b34d5
/target
/bin
/.idea
*.iml
\ No newline at end of file
......@@ -254,6 +254,17 @@ public class DwcaBuilder extends AbstractModelObject {
sourceSheet.updateData(rows);
List<Column> loadedColumns = sourceSheet.getColumns();
List<Object[]> rows=null;
try {
rows = dataSourceLoader.loadRows(sourceSheet, 200);
} catch (UnsupportedDataFormatException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
sourceSheet.updateData(rows);
List<Column> loadedColumns = sourceSheet.getColumns();
for (int x = 0; x < columns.length(); x++) {
JSONObject column = columns.getJSONObject(x);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment