Skip to content

Commit a0a5c44

Browse files
committed
fixes after first lib test
1 parent 970e2ba commit a0a5c44

2 files changed

Lines changed: 4 additions & 11 deletions

File tree

DataTable/src/main/java/com/isolpro/library/datatable/DataTable.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ private void remeasureBodyWithRowHeader() {
110110
TableRow trBody = (TableRow) tlBody.getChildAt(0);
111111
TableRow trRowHeader = (TableRow) tlRowHeader.getChildAt(0);
112112

113+
if (trBody == null || trRowHeader == null) return;
114+
113115
for (int i = 0; i < trBody.getChildCount(); i++) {
114116
View cellBody = trBody.getChildAt(i);
115117
View cellRowHeader = trRowHeader.getChildAt(i);
@@ -221,5 +223,4 @@ public void setColumnHeaderBackgroundColor(int color) {
221223
}
222224

223225

224-
225226
}

DataTable/src/main/java/com/isolpro/library/datatable/DataTableAdapter.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,11 @@
1010
public abstract class DataTableAdapter {
1111

1212
protected final Context context;
13-
protected String cornerText;
14-
protected List<String> rowHeaderTexts, columnHeaderTexts;
15-
protected List<List<String>> bodyTextsList;
1613
private OnDatasetChangeListener onDatasetChangeListener;
1714

1815
public DataTableAdapter(Context context) {
1916
this.context = context;
2017

21-
cornerText = onPopulateCornerView();
22-
rowHeaderTexts = onPopulateRowHeaderView();
23-
columnHeaderTexts = onPopulateColumnHeaderView();
24-
bodyTextsList = onPopulateBodyView();
25-
2618
notifyDatasetChange();
2719
}
2820

@@ -48,14 +40,14 @@ public DataTableAdapter(Context context) {
4840

4941
public final void notifyDatasetChange() {
5042
if (onDatasetChangeListener != null)
51-
onDatasetChangeListener.exec(cornerText, rowHeaderTexts, columnHeaderTexts,bodyTextsList);
43+
onDatasetChangeListener.exec(onPopulateCornerView(), onPopulateRowHeaderView(), onPopulateColumnHeaderView(), onPopulateBodyView());
5244
}
5345

5446
final void setOnDatasetChangeListener(OnDatasetChangeListener onDatasetChangeListener) {
5547
this.onDatasetChangeListener = onDatasetChangeListener;
5648
}
5749

5850
interface OnDatasetChangeListener {
59-
void exec(String cornerText, List<String> rowHeaderTexts, List<String> columnHeaderTexts,List<List<String>> bodyTextsList);
51+
void exec(String cornerText, List<String> rowHeaderTexts, List<String> columnHeaderTexts, List<List<String>> bodyTextsList);
6052
}
6153
}

0 commit comments

Comments
 (0)