From 799a03dc5cec33e2bc52fdd21c300bf8009a52a0 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sun, 15 Sep 2013 20:32:07 +0300 Subject: [PATCH] code simplification --- .../fbreader/network/AllCatalogsActivity.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java b/src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java index f16350d3d..d4f6dfe7f 100644 --- a/src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java +++ b/src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java @@ -61,7 +61,7 @@ public class AllCatalogsActivity extends Activity { myAllItems.clear(); if (myIds.size() > 0) { - myAllItems.add(new SectionItem(getLabelByKey("active"))); + myAllItems.add(new SectionItem("active")); final TreeSet cItems = new TreeSet(); for (String id : myIds) { cItems.add(new CatalogItem(id, true, myLibrary.getCatalogTreeByUrlAll(id))); @@ -70,7 +70,7 @@ public class AllCatalogsActivity extends Activity { } if (myInactiveIds.size() > 0) { - myAllItems.add(new SectionItem(getLabelByKey("inactive"))); + myAllItems.add(new SectionItem("inactive")); final TreeSet cItems = new TreeSet(); for (String id : myInactiveIds) { cItems.add(new CatalogItem(id, false, myLibrary.getCatalogTreeByUrlAll(id))); @@ -82,10 +82,6 @@ public class AllCatalogsActivity extends Activity { selectedList.setAdapter(new CatalogsListAdapter()); } - private String getLabelByKey(String keyName) { - return NetworkLibrary.resource().getResource("allCatalogs").getResource(keyName).getValue(); - } - @Override protected void onResume() { super.onResume(); @@ -120,8 +116,8 @@ public class AllCatalogsActivity extends Activity { private static class SectionItem implements Item { private final String Title; - public SectionItem(String title) { - Title = title; + public SectionItem(String key) { + Title = NetworkLibrary.resource().getResource("allCatalogs").getResource(key).getValue(); } } @@ -165,7 +161,7 @@ public class AllCatalogsActivity extends Activity { if (convertView != null && item.getClass().equals(convertView.getTag())) { view = convertView; } else { - view = LayoutInflater.from(getContext()).inflate( + view = getLayoutInflater().inflate( item instanceof SectionItem ? R.layout.checkbox_section : R.layout.checkbox_item, null