From 3c7b4e63e8a36f95e5131f053071fbf2534283e3 Mon Sep 17 00:00:00 2001 From: kenstir Date: Sat, 5 Dec 2015 23:57:21 -0500 Subject: [PATCH] little bit better now --- .../searchCatalog/SearchCatalogListView.java | 11 --------- .../evergreen_ils/views/VolleyWranglerTest.java | 25 +++----------------- .../src/org/opensrf/util/GatewayResponse.java | 27 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 33 deletions(-) create mode 100644 Open-ILS/src/Android/opensrf/src/org/opensrf/util/GatewayResponse.java diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java index 1b14104dac..c61185fea7 100644 --- a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java +++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java @@ -149,7 +149,6 @@ public class SearchCatalogListView extends ActionBarActivity { adapter = new SearchArrayAdapter(getApplicationContext(), R.layout.search_result_item, recordList); - //searchOptionsMenu = findViewById(R.id.search_preference_options); searchClassSpinner = (Spinner) findViewById(R.id.search_qtype_spinner); searchFormatSpinner = (Spinner) findViewById(R.id.search_format_spinner); searchResultsNumber = (TextView) findViewById(R.id.search_result_number); @@ -185,7 +184,6 @@ public class SearchCatalogListView extends ActionBarActivity { InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(searchText.getWindowToken(), 0); - //searchOptionsMenu.setVisibility(View.GONE); searchResultsNumber.setVisibility(View.VISIBLE); progressDialog = ProgressDialog.show( @@ -299,10 +297,7 @@ public class SearchCatalogListView extends ActionBarActivity { searchThreadwithOffset.start(); } else { - // start activity with book details - Intent intent = new Intent(getBaseContext(), SampleUnderlinesNoFade.class); - // serialize object and pass it to next activity intent.putExtra("recordInfo", info); intent.putExtra("orgID", search.selectedOrganization.id); intent.putExtra("depth", search.selectedOrganization.level); @@ -324,12 +319,6 @@ public class SearchCatalogListView extends ActionBarActivity { int visibleItemCount, int totalItemCount) { if (!loadingElements) { - - /* - Log.d(TAG, " Scroll adapter " + totalItemCount + " " - + visibleItemCount + " " + firstVisibleItem + " " - + adapter.getCount() + " " + search.visible); - */ if (totalItemCount > 0 && (((totalItemCount - visibleItemCount) <= (firstVisibleItem)) && adapter .getCount() < search.visible)) { diff --git a/Open-ILS/src/Android/core/src/org/open_ils/test/org/evergreen_ils/views/VolleyWranglerTest.java b/Open-ILS/src/Android/core/src/org/open_ils/test/org/evergreen_ils/views/VolleyWranglerTest.java index e8c1c3ab8a..6282862f82 100644 --- a/Open-ILS/src/Android/core/src/org/open_ils/test/org/evergreen_ils/views/VolleyWranglerTest.java +++ b/Open-ILS/src/Android/core/src/org/open_ils/test/org/evergreen_ils/views/VolleyWranglerTest.java @@ -12,11 +12,8 @@ import com.android.volley.toolbox.StringRequest; import org.evergreen_ils.net.VolleyWrangler; import org.json.JSONArray; import org.json.JSONObject; -import org.opensrf.util.JSONException; -import org.opensrf.util.JSONReader; +import org.opensrf.util.GatewayResponse; -import java.util.List; -import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; @@ -155,22 +152,6 @@ public class VolleyWranglerTest assertNotNull(version); } - public class OSRFResponse { - List responseList = null; - public Map map = null; - public Exception ex = null; - private OSRFResponse() { - } - public void parse(String json) { - try { - map = (Map) new JSONReader(json).readObject(); - responseList = (List) map.get("payload"); - } catch (JSONException e) { - ex = e; - } - } - } - public void testVolley_osrf() throws Exception { String url = "http://bark.cwmars.org/osrf-gateway-v1?service=open-ils.actor&method=opensrf.open-ils.system.ils_version"; StringRequest request = new StringRequest(Request.Method.GET, url, @@ -184,8 +165,8 @@ public class VolleyWranglerTest assertNotNull(mStringResponse); - OSRFResponse response = new OSRFResponse(); - response.parse(mStringResponse); + GatewayResponse response = GatewayResponse.create(mStringResponse); + assertNull(response.ex); assertNotNull(response.map); diff --git a/Open-ILS/src/Android/opensrf/src/org/opensrf/util/GatewayResponse.java b/Open-ILS/src/Android/opensrf/src/org/opensrf/util/GatewayResponse.java new file mode 100644 index 0000000000..3413fc331d --- /dev/null +++ b/Open-ILS/src/Android/opensrf/src/org/opensrf/util/GatewayResponse.java @@ -0,0 +1,27 @@ +package org.opensrf.util; + +import java.util.List; +import java.util.Map; + +/** + * Created by kenstir on 12/5/2015. + */ +public class GatewayResponse { + public List responseList = null; + public Map map = null; + public Exception ex = null; + + private GatewayResponse() { + } + + public static GatewayResponse create(String json) { + GatewayResponse resp = new GatewayResponse(); + try { + resp.map = (Map) new JSONReader(json).readObject(); + resp.responseList = (List) resp.map.get("payload"); + } catch (JSONException e) { + resp.ex = e; + } + return resp; + } +} -- 2.11.0