adjusting workflow display
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/f3035032 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/f3035032 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/f3035032 Branch: refs/heads/master Commit: f3035032941468e7758f71b05a270aeac3c3b649 Parents: 6feace8 Author: larrytech7 <[email protected]> Authored: Fri Jul 24 20:07:05 2015 +0100 Committer: larrytech7 <[email protected]> Committed: Fri Jul 24 20:07:05 2015 +0100 ---------------------------------------------------------------------- .../mobile/adapters/WorkflowAdapter.java | 5 +- .../fragments/workflowdetails/RunFragment.java | 49 +++++++++++--------- .../taverna/mobile/utils/DetailsLoader.java | 11 +---- 3 files changed, 33 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f3035032/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java b/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java index 81239c5..8b36a66 100644 --- a/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java +++ b/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java @@ -124,9 +124,10 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo Linkify.addLinks(viewHolder.wk_description, Linkify.WEB_URLS); final String wkflow_url = workflow.get(j).getWorkflow_remote_url(); final Intent it = new Intent(); + System.out.println("Workflow_uri:"+uri); it.setClass(context, WorkflowDetailActivity.class); -// it.putExtra("workflowid", workflow.get(i).getId()); - it.putExtra("uri",uri); +// it.putExtra("workflowid", workflow.get(i).getId()); //workflow_url + it.putExtra("uri",uri);//uri it.putExtra("wtitle", title); //pass this workflow's title to the detail activity so the corresponding run can be fetched WorkflowdetailFragment.WORKFLO_ID = title;//workflow.get(i).getId(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f3035032/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java index 05d84ce..71e84e4 100644 --- a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java @@ -1,6 +1,7 @@ package org.apache.taverna.mobile.fragments.workflowdetails; +import android.app.Activity; import android.content.Context; import android.os.Bundle; import android.preference.PreferenceManager; @@ -105,12 +106,6 @@ public class RunFragment extends Fragment implements View.OnClickListener{ } @Override - public void onPause() { - super.onPause(); - getActivity().finish(); - } - - @Override public void onResume() { super.onResume(); String runresult = getActivity().getIntent().getStringExtra("runresult"); @@ -164,6 +159,7 @@ public class RunFragment extends Fragment implements View.OnClickListener{ } if(id == android.R.id.home){ getActivity().finish(); + return true; } return super.onOptionsItemSelected(item); @@ -171,7 +167,8 @@ public class RunFragment extends Fragment implements View.OnClickListener{ private void reloadRunResult(){ Timer t = new Timer(); - t.scheduleAtFixedRate(new RunTimerTask(getActivity(), run_id), 0, 5000); + // t.scheduleAtFixedRate(new RunTimerTask(getActivity(), run_id), 0, 5000); + t.schedule(new RunTimerTask(getActivity(),run_id),1); } @Override @@ -179,10 +176,15 @@ public class RunFragment extends Fragment implements View.OnClickListener{ switch(view.getId()){ case R.id.buttonWorkflowDownloadOutput: try { - new WorkflowDownloadManager(getActivity()).downloadWorkflow( - new File(PreferenceManager.getDefaultSharedPreferences(getActivity()).getString( - APP_DIRECTORY_NAME+"/Runoutput/outputs","/Runouput/outputs/")), - new TavernaPlayerAPI(getActivity()).PLAYER_RUN_URL+run_output_url.substring(0,5)); + System.out.println("output url: "+run_output_url); + if(run_output_url.isEmpty()){ + Toast.makeText(getActivity(), "No run logs available", Toast.LENGTH_LONG).show(); + }else { + new WorkflowDownloadManager(getActivity()).downloadWorkflow( + new File(PreferenceManager.getDefaultSharedPreferences(getActivity()).getString( + APP_DIRECTORY_NAME + "/Runoutput/outputs", "/TavernaMobile/Runouput/outputs/")), + new TavernaPlayerAPI(getActivity()).PLAYER_RUN_URL + run_output_url.substring(0, 5)); + } } catch (Exception e) { e.printStackTrace(); Toast.makeText(getActivity(), "Error downloading run output",Toast.LENGTH_LONG).show(); @@ -190,10 +192,15 @@ public class RunFragment extends Fragment implements View.OnClickListener{ break; case R.id.downloadRunLogs: try { - new WorkflowDownloadManager(getActivity()).downloadWorkflow( - new File(PreferenceManager.getDefaultSharedPreferences(getActivity()).getString( - APP_DIRECTORY_NAME+"/Runoutput/logs/","/Runoutput/logs")), - new TavernaPlayerAPI(getActivity()).PLAYER_RUN_URL+run_logs_url.substring(0,5)); + System.out.println("run logs: "+run_logs_url); + if(run_logs_url.isEmpty()){ + Toast.makeText(getActivity(), "No run logs available", Toast.LENGTH_LONG).show(); + }else { + new WorkflowDownloadManager(getActivity()).downloadWorkflow( + new File(PreferenceManager.getDefaultSharedPreferences(getActivity()).getString( + APP_DIRECTORY_NAME + "/Runoutput/logs/", "/TavernaMobile/Runoutput/logs")), + new TavernaPlayerAPI(getActivity()).PLAYER_RUN_URL + run_logs_url.substring(0, 5)); + } } catch (Exception e) { e.printStackTrace(); Toast.makeText(getActivity(), "Error downloading run logs",Toast.LENGTH_LONG).show(); @@ -202,9 +209,9 @@ public class RunFragment extends Fragment implements View.OnClickListener{ } } - public void updateRun(final JSONObject runInfo){ + public void updateRun(Context context, final JSONObject runInfo){ if(null != runInfo) - getActivity().runOnUiThread(new Runnable() { + ((Activity)context).runOnUiThread(new Runnable() { @Override public void run() { try { @@ -223,8 +230,8 @@ public class RunFragment extends Fragment implements View.OnClickListener{ else status.setImageResource(android.R.drawable.presence_invisible); - run_output_url = runInfo.getString("outputs_zip"); - run_logs_url = runInfo.getString("log"); + run_output_url = runInfo.has("outputs_zip")? runInfo.getString("outputs_zip"):""; + run_logs_url = runInfo.has("log")?runInfo.getString("log"):""; } catch (JSONException e) { e.printStackTrace(); } @@ -268,8 +275,8 @@ public class RunFragment extends Fragment implements View.OnClickListener{ connection.disconnect(); JSONObject runInfo = new JSONObject(sb.toString()); - // System.out.println(runInfo.toString(2)); - updateRun(runInfo); + System.out.println(runInfo.toString(2)); + updateRun(this.context, runInfo); }catch (IOException ex){ ex.printStackTrace(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f3035032/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java b/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java index 09fe1cf..013e826 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java @@ -90,8 +90,8 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { connection.setRequestMethod("GET"); connection.connect(); //send request - Log.i("RESPONSE CODE", "" + connection.getResponseCode()); - Log.i("RESPONSE Messsage", ""+connection.getResponseMessage()); + Log.i("Workflow Response Code", "" + connection.getResponseCode()); + Log.i("Workflow Response msg", ""+connection.getResponseMessage()); dis = connection.getInputStream(); break; case TYPE_RUN_HISTORY: @@ -111,9 +111,6 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { case TYPE_POLICY: workflowurl = new URL(new TavernaPlayerAPI(this.context).SERVER_BASE_URL); break; - case TYPE_ABOUT_WORKFLOW: - workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_WORKFLOW_URL); - break; default: workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_WORKFLOW_URL); break; @@ -189,10 +186,6 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { } return workflow; - case TYPE_ABOUT_WORKFLOW:{ - - } - return workflow; default: BufferedReader br = new BufferedReader(new InputStreamReader(dis)); StringBuffer sb = new StringBuffer();
