http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/utils/HttpUtil.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/HttpUtil.java b/app/src/main/java/org/apache/taverna/mobile/utils/HttpUtil.java index 5c995a5..f043d93 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/HttpUtil.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/HttpUtil.java @@ -12,6 +12,8 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.util.EntityUtils; import org.apache.taverna.mobile.tavernamobile.User; +import android.util.Log; + import java.io.IOException; import java.net.CookieStore; import java.net.HttpURLConnection; @@ -44,7 +46,7 @@ import java.net.HttpURLConnection; * Created by Larry Akah on 6/18/15. */ public class HttpUtil { - + private static final String TAG = "HttpUtil"; public <T> Object doPostAuthenticate() { User muser = new User("", null); @@ -73,16 +75,16 @@ public class HttpUtil { } } } catch (InstantiationException e) { - e.printStackTrace(); + Log.e(TAG, "doGetRequestResponse: ", e); return e.getMessage(); } catch (IllegalAccessException e) { - e.printStackTrace(); + Log.e(TAG, "doGetRequestResponse: ", e); return e.getMessage(); } catch (ClientProtocolException e) { - e.printStackTrace(); + Log.e(TAG, "doGetRequestResponse: ", e); return e.getMessage(); } catch (IOException e) { - e.printStackTrace(); + Log.e(TAG, "doGetRequestResponse: ", e); return e.getMessage(); }
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/utils/RunTask.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/RunTask.java b/app/src/main/java/org/apache/taverna/mobile/utils/RunTask.java index e73bda0..3aa06fb 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/RunTask.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/RunTask.java @@ -23,6 +23,7 @@ import java.net.URL; */ public class RunTask extends AsyncTask<String, Void, String> { + private static final String TAG = "RunTask"; private Context context; private ProgressDialog progressDialog; @@ -43,7 +44,7 @@ public class RunTask extends AsyncTask<String, Void, String> { StringBuffer sb = new StringBuffer(); try { TavernaPlayerAPI tavernaPlayerAPI = new TavernaPlayerAPI(); - URL workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_RUN_URL); + URL workflowurl = new URL(new TavernaPlayerAPI(this.context).mPlayerRunUrl); HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection(); String userpass = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); @@ -79,7 +80,7 @@ public class RunTask extends AsyncTask<String, Void, String> { return sb.toString(); } catch (IOException ex) { - ex.printStackTrace(); + Log.e(TAG, "doInBackground: ", ex); } return sb.toString(); } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDB.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDB.java b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDB.java index d9db76c..6e62a01 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDB.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDB.java @@ -48,12 +48,11 @@ import java.util.UUID; */ public class WorkflowDB { - private final String LIBTAG = getClass().getName(); - private String ENTITY_KEY; + private static final String TAG = "WorkflowDB"; + private final String ENTITY_KEY; private Context context; private SharedPreferences msharedpreference; - private ArrayList<String> ITEM_IDS; - private JSONObject DBJSON; + private final ArrayList<String> ITEM_IDS; private JSONObject dataobj; //hold all entries for a given ENTITY_KEY /** @@ -65,9 +64,8 @@ public class WorkflowDB { public WorkflowDB(Context ctx, String entityKey) { context = ctx; ENTITY_KEY = entityKey; - DBJSON = new JSONObject(); ITEM_IDS = new ArrayList<String>(); - dataobj = DBJSON; + dataobj = new JSONObject(); } /** @@ -124,7 +122,7 @@ public class WorkflowDB { // data returned results.add(mlist); } catch (Exception e) { - e.printStackTrace(); + Log.e(TAG, "get: ", e); continue; } } @@ -148,14 +146,14 @@ public class WorkflowDB { } try { dataobj.put(itemId, jarray); //replace the current entry at the given ID. - Log.d(LIBTAG, "" + dataobj.toString(2)); + Log.d(TAG, "" + dataobj.toString(2)); operationSucceeded = true; } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "update: ", e); operationSucceeded = false; - } finally { - return operationSucceeded; } + return operationSucceeded; + } /** @@ -198,7 +196,7 @@ public class WorkflowDB { results.add(resultArray.getString(j)); } } catch (Exception e) { - e.printStackTrace(); + Log.e(TAG, "get: ", e); continue; } } @@ -215,18 +213,19 @@ public class WorkflowDB { public boolean save() { msharedpreference = PreferenceManager.getDefaultSharedPreferences(context); boolean saved = false; - if (dataobj != null) + if (dataobj != null) { try { saved = saveid(ITEM_IDS); if (saved) msharedpreference.edit().putString(ENTITY_KEY, dataobj.toString()).apply(); return saved; } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "save: ", e); return false; } - else + } else { return false; + } } /** @@ -238,14 +237,14 @@ public class WorkflowDB { try { JSONObject jsonObject = new JSONObject(msharedpreference.getString(ENTITY_KEY, "{" + ENTITY_KEY + ":{}}")); //main json db - System.out.println(jsonObject.toString(1)); + Log.d(TAG, jsonObject.toString(1)); JSONArray jsonArray; - if (jsonObject.has("ids")) + if (jsonObject.has("ids")) { jsonArray = jsonObject.optJSONArray("ids"); - else + } else { jsonArray = new JSONArray(); - + } String newItemId = item.get(0).toString(); //use the workflow id as an entity key for // the new entity @@ -264,10 +263,10 @@ public class WorkflowDB { jsonObject.put(newItemId, newEntity); msharedpreference.edit().putString(ENTITY_KEY, jsonObject.toString()).commit(); long end = System.currentTimeMillis(); - System.out.println("Insert benchmark length = " + (end - start)); + Log.d(TAG, "Insert benchmark length = " + (end - start)); return 1; } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "insert: ", e); } return 0; } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java index c98f0f5..64fee15 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java @@ -49,6 +49,7 @@ import java.util.List; */ public class WorkflowLoader extends AsyncTask<String, Object, Object> { //WorkflowLoaderMain { + private static final String TAG = "WorkflowLoader"; private Context ctx; private List<Workflow> userWorkflows; private SwipeRefreshLayout refreshLayout; @@ -86,13 +87,13 @@ public class WorkflowLoader extends AsyncTask<String, Object, Object> { //Workfl xmlParser.parse(dis, this.userWorkflows); } catch (MalformedURLException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } catch (ProtocolException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } catch (IOException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } catch (Exception ex) { - ex.printStackTrace(); + Log.e(TAG, "doInBackground: ", ex); } return this.userWorkflows; } @@ -100,6 +101,6 @@ public class WorkflowLoader extends AsyncTask<String, Object, Object> { //Workfl @Override protected void onPostExecute(Object o) { refreshLayout.setRefreshing(false); - System.out.println("Workflow Count: " + this.userWorkflows.size()); + Log.i(TAG, "Workflow Count: " + this.userWorkflows.size()); } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowOpen.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowOpen.java b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowOpen.java index b54124b..693190a 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowOpen.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowOpen.java @@ -37,6 +37,7 @@ import java.net.URL; */ public class WorkflowOpen extends AsyncTask<String, Void, String> { + private static final String TAG = "WorkflowOpen"; TavernaPlayerAPI tavernaPlayerAPI = new TavernaPlayerAPI(); private Context context; private ProgressDialog progressDialog; @@ -59,14 +60,14 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { */ @Override protected String doInBackground(String... params) { - StringBuffer sb = new StringBuffer(); + StringBuffer sb = new StringBuffer(55); String str = ""; try { //prepare connection requests File objectFile = new File(params[0]); //the resource xml file representing the // workflow to be uploaded to the player - String playerurl = new TavernaPlayerAPI(this.context).PLAYER_BASE_URL + "workflows" + + String playerurl = new TavernaPlayerAPI(this.context).getplayerBaseUrl() + "workflows" + ".json"; URL posturl = new URL(playerurl); HttpURLConnection connection = (HttpURLConnection) posturl.openConnection(); @@ -85,7 +86,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { } br.close(); } catch (IOException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } String data = "{\"document\":\"data:application/octet-stream;base64," + @@ -94,7 +95,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { String post = "{\"workflow\":" + data + "}"; //clear sb so that we can use it again to fetch results from this post request sb.delete(0, sb.length() - 1); - System.out.println("BODY=>" + post); + Log.i(TAG, "BODY=>" + post); connection.setRequestMethod("POST"); connection.setRequestProperty("Authorization", basicAuth); connection.setRequestProperty("Accept", "*/*"); @@ -114,13 +115,14 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { InputStream dis = connection.getInputStream(); BufferedReader br = new BufferedReader(new InputStreamReader(dis)); - while ((str = br.readLine()) != null) + while ((str = br.readLine()) != null) { sb.append(str); - System.out.println("Post Response Code: " + connection.getResponseCode()); - System.out.println("Post response message: " + connection.getResponseMessage()); + } + Log.i(TAG, "Post Response Code: " + connection.getResponseCode()); + Log.i(TAG, "Post response message: " + connection.getResponseMessage()); connection.disconnect(); } catch (IOException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); sb.append("Error reading remote workflow. Please try again later"); } @@ -138,14 +140,14 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { @Override protected void onPostExecute(String s) { progressDialog.dismiss(); - System.out.println(s); + Log.i(TAG, s); s = s.substring(1, s.length()); try { JSONObject workflowJson = new JSONObject(s); new WorkflowRunTask(this.context).execute(workflowJson.getString("id")); } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "onPostExecute: ", e); } } @@ -192,7 +194,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { try { URL workflowurl = new URL(new TavernaPlayerAPI(this.context) - .PLAYER_RUN_FRAMEWORK_URL + params[0]); + .mPlayerRunFrameworkUrl + params[0]); HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection(); String userpass = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); @@ -219,7 +221,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { return sb.toString(); } catch (IOException ex) { - ex.printStackTrace(); + Log.e(TAG, "doInBackground: ", ex); } return sb.toString(); } @@ -269,7 +271,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { // name/input json object } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "onClick: ", e); } } @@ -279,7 +281,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { //start a run task to execute the run. new RunTask(ctx).execute(json.toString()); } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "onClick: ", e); } } @@ -296,7 +298,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { runDialog = alertDialogBuilder.create(); } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "onPostExecute: ", e); } progressDialog.dismiss(); runDialog.show(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/MyExperimentXmlParserRules.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/MyExperimentXmlParserRules.java b/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/MyExperimentXmlParserRules.java index 8167968..a17ce71 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/MyExperimentXmlParserRules.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/MyExperimentXmlParserRules.java @@ -62,20 +62,20 @@ public class MyExperimentXmlParserRules { userObject) { switch (index) { case 0: //uri - mWorkflow.setWorkflow_details_url(value); - ((Workflow) userObject).setWorkflow_details_url(value); + mWorkflow.setWorkflowDetailsUrl(value); + ((Workflow) userObject).setWorkflowDetailsUrl(value); break; case 1: //resource - mWorkflow.setWorkflow_web_url(value); - ((Workflow) userObject).setWorkflow_web_url(value); + mWorkflow.setWorkflowWebUrl(value); + ((Workflow) userObject).setWorkflowWebUrl(value); break; case 2: //id mWorkflow.setId(Integer.parseInt(value)); ((Workflow) userObject).setId(Integer.parseInt(value)); break; case 3://version - mWorkflow.setWorkflow_versions(value); - ((Workflow) userObject).setWorkflow_versions(value); + mWorkflow.setWorkflowVersions(value); + ((Workflow) userObject).setWorkflowVersions(value); break; } } @@ -90,8 +90,8 @@ public class MyExperimentXmlParserRules { @Override public void handleParsedCharacters(XMLParser parser, String text, Object userObject) { - mWorkflow.setWorkflow_title(text); - ((Workflow) userObject).setWorkflow_title(text); + mWorkflow.setWorkflowTitle(text); + ((Workflow) userObject).setWorkflowTitle(text); } } @@ -105,8 +105,8 @@ public class MyExperimentXmlParserRules { @Override public void handleParsedCharacters(XMLParser parser, String text, Object userObject) { - mWorkflow.setWorkflow_description(String.valueOf(Html.fromHtml(text))); - ((Workflow) userObject).setWorkflow_description(String.valueOf(Html.fromHtml(text))); + mWorkflow.setWorkflowDescription(String.valueOf(Html.fromHtml(text))); + ((Workflow) userObject).setWorkflowDescription(String.valueOf(Html.fromHtml(text))); } } @@ -133,8 +133,8 @@ public class MyExperimentXmlParserRules { @Override public void handleParsedCharacters(XMLParser parser, String text, Object userObject) { - mWorkflow.setWorkflow_Type(text); - ((Workflow) userObject).setWorkflow_Type(text); + mWorkflow.setWorkflowType(text); + ((Workflow) userObject).setWorkflowType(text); } } @@ -159,9 +159,9 @@ public class MyExperimentXmlParserRules { } break; case 1: - muser.setDetails_uri(value); + muser.setDetailsUri(value); if ((userObject instanceof User)) { - ((User) userObject).setDetails_uri(value); + ((User) userObject).setDetailsUri(value); } break; case 2: @@ -199,10 +199,10 @@ public class MyExperimentXmlParserRules { userObject) { switch (index) { case 0: - ((User) userObject).setAvatar_url(value); + ((User) userObject).setAvatarUrl(value); break; case 1: - ((User) userObject).setDetails_uri(value); + ((User) userObject).setDetailsUri(value); break; case 2: ((User) userObject).setId(value); @@ -228,8 +228,8 @@ public class MyExperimentXmlParserRules { @Override public void handleParsedCharacters(XMLParser parser, String text, Object userObject) { - mWorkflow.setWorkflow_datecreated(text); - ((Workflow) userObject).setWorkflow_datecreated(text); + mWorkflow.setWorkflowDatecreated(text); + ((Workflow) userObject).setWorkflowDatecreated(text); } } @@ -243,8 +243,8 @@ public class MyExperimentXmlParserRules { @Override public void handleParsedCharacters(XMLParser parser, String text, Object userObject) { - mWorkflow.setWorkflow_preview(text); - ((Workflow) userObject).setWorkflow_preview(text); + mWorkflow.setWorkflowPreview(text); + ((Workflow) userObject).setWorkflowPreview(text); } } @@ -263,8 +263,8 @@ public class MyExperimentXmlParserRules { @Override public void handleParsedCharacters(XMLParser parser, String text, Object userObject) { - mWorkflow.setWorkflow_licence_type("Licence By " + text); - ((Workflow) userObject).setWorkflow_licence_type("Licence By " + text); + mWorkflow.setWorkflowLicenceType("Licence By " + text); + ((Workflow) userObject).setWorkflowLicenceType("Licence By " + text); } } @@ -278,8 +278,8 @@ public class MyExperimentXmlParserRules { @Override public void handleParsedCharacters(XMLParser parser, String text, Object userObject) { - mWorkflow.setWorkflow_remote_url(text); - ((Workflow) userObject).setWorkflow_remote_url(text); + mWorkflow.setWorkflowRemoteUrl(text); + ((Workflow) userObject).setWorkflowRemoteUrl(text); } } @@ -292,8 +292,8 @@ public class MyExperimentXmlParserRules { @Override public void handleParsedCharacters(XMLParser parser, String text, Object userObject) { - mWorkflow.setWorkflow_content_type(text); - ((Workflow) userObject).setWorkflow_content_type(text); + mWorkflow.setWorkflowContentType(text); + ((Workflow) userObject).setWorkflowContentType(text); } } @@ -312,9 +312,9 @@ public class MyExperimentXmlParserRules { @Override public void handleParsedCharacters(XMLParser parser, String text, Object userObject) { - mWorkflow.setWorkflow_tags(new ArrayList<String>() { + mWorkflow.setWorkflowTags(new ArrayList<String>() { }); - ((Workflow) userObject).setWorkflow_tags(new ArrayList<String>() { + ((Workflow) userObject).setWorkflowTags(new ArrayList<String>() { }); } @@ -367,9 +367,9 @@ public class MyExperimentXmlParserRules { workflowListObject) { //add the workflow to the workflow list this.workflow = new Workflow("", desc, id, url); - this.workflow.setWorkflow_details_url(uri); - this.workflow.setWorkflow_title(text); - this.workflow.setWorkflow_author(""); + this.workflow.setWorkflowDetailsUrl(uri); + this.workflow.setWorkflowTitle(text); + this.workflow.setWorkflowAuthor(""); wlist.add(this.workflow); //WorkflowLoader.loadedWorkflows.add(this.workflow); ((List<Workflow>) workflowListObject).add(this.workflow); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/WorkflowDetailParser.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/WorkflowDetailParser.java b/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/WorkflowDetailParser.java index 4c80085..9ec0bcd 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/WorkflowDetailParser.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/WorkflowDetailParser.java @@ -49,7 +49,8 @@ public class WorkflowDetailParser extends XMLParser { protected void doEndDocument(Object userObject) { if (userObject instanceof User) { WorkflowItemFragment.startLoadingAvatar((User) userObject); - } else + } else { WorkflowdetailFragment.setWorkflowDetails((Workflow) userObject); + } } }
