Refactoring of empty header system. Manage null headerItem

DayS · Sep 23, 2012 · 63b1fd8 · 63b1fd8
1 parent 948ac20
commit 63b1fd8
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/fr/days/android/uitableview/adapter/UITableViewAdapterInternal.java b/src/fr/days/android/uitableview/adapter/UITableViewAdapterInternal.java
@@ -68,14 +68,19 @@ public int getCount() {
 	public Object getItem(int position) {
 		IndexPath indexPath = retrieveIndexPathByPosition(position);
 		if (indexPath == null) {
-			return null;
+			throw new NullPointerException("Unable to retrieve index path for position " + position);
 		} else if (indexPath.isHeader()) {
-			return tableViewAdapter.headerItemForGroup(context, indexPath);
+			return getHeaderItem(indexPath);
 		} else {
 			return tableViewAdapter.cellItemForRow(context, indexPath);
 		}
 	}
 
+	public UITableHeaderItem getHeaderItem(IndexPath indexPath) {
+		UITableHeaderItem headerItem = tableViewAdapter.headerItemForGroup(context, indexPath);
+		return headerItem != null ? headerItem : new UITableHeaderItem();
+	}
+
 	@Override
 	public long getItemId(int position) {
 		return position;
@@ -86,7 +91,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		IndexPath indexPath = retrieveIndexPathByPosition(position);
 
 		if (indexPath == null) {
-			return null;
+			throw new NullPointerException("Unable to retrieve index path for position " + position);
 		} else if (indexPath.isHeader()) {
 			if (!(convertView instanceof UITableHeaderView)) {
 				convertView = null;
@@ -95,7 +100,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 				UITableHeaderView tableHeaderView = (UITableHeaderView) convertView;
 				tableHeaderView.setIndexPath(indexPath);
 			}
-			UITableHeaderItem headerItem = tableViewAdapter.headerItemForGroup(context, indexPath);
+			UITableHeaderItem headerItem = getHeaderItem(indexPath);
 			UITableHeaderView headerView = tableViewAdapter.headerViewForGroup(context, indexPath, headerItem, (UITableHeaderView) convertView);
 			return headerView;
 		} else {