Repository: incubator-taverna-mobile Updated Branches: refs/heads/master a4d52e7b7 -> 419867410
fixed specific workflow run history bug. passing the correct id for a given workflow 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/132b1bd5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/132b1bd5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/132b1bd5 Branch: refs/heads/master Commit: 132b1bd53ff424d6be7183a030a7ade1eb2a2381 Parents: 313a541 Author: larrytech7 <larrya...@gmail.com> Authored: Mon Jun 15 11:49:14 2015 +0100 Committer: larrytech7 <larrya...@gmail.com> Committed: Mon Jun 15 11:49:14 2015 +0100 ---------------------------------------------------------------------- .../mobile/activities/WorkflowDetailActivity.java | 2 +- .../workflowdetails/WorkflowRunHistoryFragment.java | 12 ++++++------ .../workflowdetails/WorkflowdetailFragment.java | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/132b1bd5/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java index 5fffc27..98c80f8 100644 --- a/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java @@ -111,7 +111,7 @@ public class WorkflowDetailActivity extends ActionBarActivity { case 1: return WorkflowdetailFragment.newInstance(position + 1); case 2: - return WorkflowRunHistoryFragment.newInstance("",""); + return WorkflowRunHistoryFragment.newInstance("workflow",WorkflowdetailFragment.WORKFLO_ID); case 3: return WorkflowLicenceFragment.newInstance("",""); case 4: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/132b1bd5/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java index 8c0d9c9..6164a36 100644 --- a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java @@ -60,7 +60,7 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage // TODO: Rename and change types of parameters private String mParam1; - private String mParam2; + private static long workflowID; /** * Use this factory method to create a new instance of @@ -71,11 +71,11 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage * @return A new instance of fragment WorkflowRunHistoryFragment. */ // TODO: Rename and change types and number of parameters - public static WorkflowRunHistoryFragment newInstance(String param1, String param2) { + public static WorkflowRunHistoryFragment newInstance(String param1, long param2) { WorkflowRunHistoryFragment fragment = new WorkflowRunHistoryFragment(); Bundle args = new Bundle(); args.putString(ARG_PARAM1, param1); - args.putString(ARG_PARAM2, param2); + args.putLong(ARG_PARAM2, param2); fragment.setArguments(args); return fragment; } @@ -102,7 +102,7 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage runAdapter = new RunAdapter(getActivity(),runsList ); if (getArguments() != null) { mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); + workflowID = getArguments().getLong(ARG_PARAM2); } } @@ -114,7 +114,7 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage mRecyclerView = (RecyclerView) rootView.findViewById(android.R.id.list); mRecyclerView.setHasFixedSize(true); mRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); - getActivity().getLoaderManager().initLoader(1,null,this); + getActivity().getLoaderManager().initLoader(1,savedInstanceState,this); return rootView; } @@ -142,7 +142,7 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage progressDialog.show(); return new DetailsLoader(getActivity(), DetailsLoader.LOAD_TYPE.TYPE_RUN_HISTORY, - 1); + workflowID); } @Override http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/132b1bd5/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java index bb7e0df..2b23963 100644 --- a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java @@ -69,6 +69,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList private DownloadManager downloadManager; View rootView; private ProgressDialog progressDialog; + public static long WORKFLO_ID; /** * Returns a new instance of this fragment for the given section @@ -93,6 +94,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList progressDialog = new ProgressDialog(getActivity()); progressDialog.setMessage(getActivity().getResources().getString(R.string.loading)); progressDialog.setCancelable(true); + WORKFLO_ID = getActivity().getIntent().getLongExtra("workflowid", 0); Button download = (Button) rootView.findViewById(R.id.download_wk); download.setOnClickListener(this);
