refactor code using pmd
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/e25d011a Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e25d011a Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e25d011a Branch: refs/heads/master Commit: e25d011a8ef6782ab895967a1acfe59a7874f89f Parents: 6128a61 Author: Sagar <[email protected]> Authored: Mon Jun 13 14:46:39 2016 +0530 Committer: Sagar <[email protected]> Committed: Mon Jun 13 14:46:39 2016 +0530 ---------------------------------------------------------------------- .../activities/DashboardMainActivity.java | 30 +++--- .../mobile/activities/LoginActivity.java | 25 +++-- .../adapters/FavoriteWorkflowAdapter.java | 7 +- .../taverna/mobile/adapters/RunAdapter.java | 8 +- .../mobile/adapters/WorkflowAdapter.java | 34 ++++--- .../customviews/WorkflowPreviewImageView.java | 35 ++++--- .../mobile/data/remote/BaseApiManager.java | 2 +- .../mobile/fragments/FavoriteFragment.java | 7 +- .../mobile/fragments/WorkflowItemFragment.java | 45 ++++---- .../fragments/workflowdetails/RunFragment.java | 47 +++++---- .../WorkflowRunHistoryFragment.java | 9 +- .../workflowdetails/WorkflowdetailFragment.java | 102 ++++++++++--------- .../taverna/mobile/tavernamobile/Runs.java | 31 +++--- .../mobile/tavernamobile/TavernaPlayerAPI.java | 40 ++++---- .../taverna/mobile/tavernamobile/User.java | 14 +-- .../taverna/mobile/tavernamobile/Workflow.java | 80 +++++++-------- .../EndlessRecyclerOnScrollListener.java | 12 +-- .../ui/anouncements/AnnouncementFragment.java | 3 +- .../taverna/mobile/utils/AvatarLoader.java | 6 +- .../taverna/mobile/utils/ConnectionInfo.java | 7 +- .../taverna/mobile/utils/DetailsLoader.java | 36 +++---- .../apache/taverna/mobile/utils/HttpUtil.java | 12 ++- .../apache/taverna/mobile/utils/RunTask.java | 5 +- .../apache/taverna/mobile/utils/WorkflowDB.java | 41 ++++---- .../taverna/mobile/utils/WorkflowLoader.java | 11 +- .../taverna/mobile/utils/WorkflowOpen.java | 32 +++--- .../xmlparsers/MyExperimentXmlParserRules.java | 62 +++++------ .../utils/xmlparsers/WorkflowDetailParser.java | 3 +- 28 files changed, 391 insertions(+), 355 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java index 17b1337..22abada 100644 --- a/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java @@ -143,15 +143,15 @@ public class DashboardMainActivity extends AppCompatActivity { Intent workflowSelectIntent = new Intent(Intent.ACTION_GET_CONTENT) - .setDataAndTypeAndNormalize(Uri.parse(String - .format("%s%s%s", + .setDataAndTypeAndNormalize( + Uri.parse(String.format("%s%s%s", Environment.getExternalStorageDirectory(), File.separator, APP_DIRECTORY_NAME)), "application/vnd.taverna.t2flow+xml"); Intent loadWorkflowIntent = Intent.createChooser (workflowSelectIntent, - "Choose Workflow (t2flow or xml)"); + "Choose Workflow (t2flow or xml)"); startActivityForResult(loadWorkflowIntent, SELECT_WORKFLOW); menuItem.setChecked(true); mDrawerLayout.closeDrawers(); @@ -208,20 +208,18 @@ public class DashboardMainActivity extends AppCompatActivity { @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (resultCode == RESULT_OK) { - if (requestCode == SELECT_WORKFLOW) { - String workflowPath = data.getData().getPath(); - // Toast.makeText(getBaseContext(), "Path: "+workflowPath, Toast.LENGTH_LONG) - // .show(); - String type = getMimeType(data.getData().getPath()); - if (type == "text/xml" || type == "application/vnd.taverna.t2flow+xml") { - - new WorkflowOpen(this).execute(workflowPath); - } else { - Toast.makeText(getBaseContext(), "Invalid worklow. Please try again", Toast - .LENGTH_LONG).show(); + if (resultCode == RESULT_OK && requestCode == SELECT_WORKFLOW) { + String workflowPath = data.getData().getPath(); + // Toast.makeText(getBaseContext(), "Path: "+workflowPath, Toast.LENGTH_LONG) + // .show(); + String type = getMimeType(data.getData().getPath()); + if (type.equals("text/xml") || type.equals("application/vnd.taverna.t2flow+xml")) { + + new WorkflowOpen(this).execute(workflowPath); + } else { + Toast.makeText(getBaseContext(), "Invalid worklow. Please try again", Toast + .LENGTH_LONG).show(); - } } } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java index 11ed303..d7b46f9 100644 --- a/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java @@ -36,6 +36,7 @@ import android.preference.PreferenceManager; import android.support.v4.app.Fragment; import android.support.v7.app.ActionBarActivity; import android.util.Base64; +import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -55,6 +56,7 @@ import java.net.URL; public class LoginActivity extends ActionBarActivity { + private static final String TAG = "LoginActivity"; @Override protected void onCreate(Bundle savedInstanceState) { @@ -172,15 +174,16 @@ public class LoginActivity extends ActionBarActivity { con.connect(); int status = con.getResponseCode(); response = String.valueOf(status); - if (status != HttpURLConnection.HTTP_OK) { - if (status == HttpURLConnection.HTTP_MOVED_PERM || - status == HttpURLConnection.HTTP_MOVED_TEMP || - status == HttpURLConnection.HTTP_SEE_OTHER || status == 307) { - redirect = true; - } + if (status != HttpURLConnection.HTTP_OK + && (status == HttpURLConnection.HTTP_MOVED_PERM || + status == HttpURLConnection.HTTP_MOVED_TEMP || + status == HttpURLConnection.HTTP_SEE_OTHER || status == 307)) { + redirect = true; } - System.out.println("Status code: " + status); + + + Log.d(TAG, "Status code: " + status); if (redirect) { // get redirect url from "location" header field String newUrl = con.getHeaderField("Location"); @@ -191,7 +194,7 @@ public class LoginActivity extends ActionBarActivity { // open the new connection again con = (HttpURLConnection) new URL(newUrl).openConnection(); con.setRequestProperty("Cookie", cookies); - System.out.println("Redirect to URL : " + newUrl); + Log.d(TAG, "Redirect to URL : " + newUrl); con.connect(); } BufferedReader br = new BufferedReader(new InputStreamReader(con @@ -202,16 +205,16 @@ public class LoginActivity extends ActionBarActivity { sb.append(s); } br.close(); - System.out.println("data: " + sb.toString()); + Log.d(TAG, "data: " + sb.toString()); con.disconnect(); return response; } catch (MalformedURLException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } catch (IOException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } return response; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java b/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java index bfe292a..0feb3ce 100644 --- a/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java +++ b/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java @@ -35,6 +35,7 @@ import android.graphics.Color; import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; import android.support.v7.widget.RecyclerView; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -51,7 +52,7 @@ import java.util.List; */ public class FavoriteWorkflowAdapter extends RecyclerView.Adapter<FavoriteWorkflowAdapter .FViewHolder> { - + private static final String TAG = "FavoriteWorkflowAdapter"; public WorkflowDB favDB; private Context context; private List<ArrayList<Object>> dataSet; @@ -126,9 +127,9 @@ public class FavoriteWorkflowAdapter extends RecyclerView.Adapter<FavoriteWorkfl favDB.delete(String.valueOf(data.get(0))); notifyDataSetChanged(); } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "onClick: ", e); } catch (Exception ex) { - ex.printStackTrace(); + Log.e(TAG, "onClick: ", ex); } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/adapters/RunAdapter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/adapters/RunAdapter.java b/app/src/main/java/org/apache/taverna/mobile/adapters/RunAdapter.java index 4a55423..b6a0e23 100644 --- a/app/src/main/java/org/apache/taverna/mobile/adapters/RunAdapter.java +++ b/app/src/main/java/org/apache/taverna/mobile/adapters/RunAdapter.java @@ -101,10 +101,10 @@ public class RunAdapter extends RecyclerView.Adapter<RunAdapter.RunHolder> { @Override public void onBindViewHolder(RunHolder holder, int position) { Runs lRun = runList.get(position); - holder.runtitle.setText(lRun.getRun_name()); - holder.runstarted.setText(lRun.getRun_started_date()); - holder.runfinished.setText(lRun.getRun_ended_date()); - holder.runAuthor.setText("Author->" + lRun.getRun_author()); + holder.runtitle.setText(lRun.getRunName()); + holder.runstarted.setText(lRun.getRunStartedDate()); + holder.runfinished.setText(lRun.getRunEndedDate()); + holder.runAuthor.setText("Author->" + lRun.getRunAuthor()); switch (lRun.getState()) { case RUNNING: holder.runStatus.setImageResource(android.R.drawable.presence_busy); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/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 19ee4f3..b9c4e86 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 @@ -43,6 +43,7 @@ import android.preference.PreferenceManager; import android.support.v7.widget.RecyclerView; import android.text.Html; import android.text.util.Linkify; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -66,6 +67,7 @@ import java.util.List; * Created by Larry Akah on 6/8/15. */ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHolder> { + private static final String TAG = "WorkflowAdapter"; public static final String WORKFLOW_FAVORITE_KEY = "WORKFLOW_FAVORITES"; //workflow key used // to save workflows when marked as favorites public static final String FAVORITE_LIST_DB = "FAVORITE_LIST"; @@ -109,12 +111,12 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo * "something changed"} event if more specific data is not available.</p> * <p/> * <p>Components registering observers with an adapter are responsible for - * {@link #unregisterAdapterDataObserver(android.support.v7.widget.RecyclerView + * {@link #registerAdapterDataObserver(android.support.v7.widget.RecyclerView * .AdapterDataObserver) * unregistering} those observers when finished.</p> * * @param observer Observer to register - * @see #unregisterAdapterDataObserver(android.support.v7.widget.RecyclerView + * @see #registerAdapterDataObserver(android.support.v7.widget.RecyclerView * .AdapterDataObserver) */ @Override @@ -154,11 +156,11 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo public void onBindViewHolder(final ViewHolder viewHolder, int i) { final long wid = workflowList.get(i).getId(); - final String author = workflowList.get(i).getWorkflow_author(); + final String author = workflowList.get(i).getWorkflowAuthor(); // final String author = workflowList.get(i).getUploader().getName(); - final String title = workflowList.get(i).getWorkflow_title(); - String description = workflowList.get(i).getWorkflow_description(); - final String uri = workflowList.get(i).getWorkflow_details_url(); + final String title = workflowList.get(i).getWorkflowTitle(); + String description = workflowList.get(i).getWorkflowDescription(); + final String uri = workflowList.get(i).getWorkflowDetailsUrl(); final String desc_full = description; if (description.length() > 80) description = description.substring(0, 79) + " ..."; @@ -168,26 +170,27 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo Linkify.addLinks(viewHolder.wk_description, Linkify.WEB_URLS); final Intent it = new Intent(); - System.out.println("Workflow_uri:" + uri); + Log.d(TAG, "Workflow_uri:" + uri); it.setClass(context, WorkflowDetailActivity.class); // 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 it.putExtra("wid", wid); - WorkflowdetailFragment.WORKFLO_ID = title; //workflow.get(i).getId(); + WorkflowdetailFragment.mWorkfloId = title; //workflow.get(i).getId(); //determine whether to mark button as favorited or not final String favs = PreferenceManager.getDefaultSharedPreferences(context).getString (FAVORITE_LIST_DB, ""); String[] ids = favs.split(","); if (ids.length > 0) { - for (String id : ids) + for (String id : ids) { if (id.equalsIgnoreCase("" + wid)) { viewHolder.btn_mark_workflow.setBackgroundResource(R.drawable .abc_list_selector_disabled_holo_light); break; } + } } viewHolder.btn_view_workflow.setOnClickListener(new View.OnClickListener() { @@ -234,9 +237,9 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo } else if (saved == -1) { Toast.makeText(context, "Sorry! This workflow has already been marked as a " + "favourite", Toast.LENGTH_SHORT).show(); - } else + } else { Toast.makeText(context, "Error! Please try again", Toast.LENGTH_SHORT).show(); - + } } }); viewHolder.wk_showmore.setText(Html.fromHtml(context.getResources().getString(R.string @@ -244,10 +247,11 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo viewHolder.wk_showmore.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (viewHolder.infolayout.getVisibility() == View.GONE) + if (viewHolder.infolayout.getVisibility() == View.GONE) { viewHolder.infolayout.setVisibility(View.VISIBLE); - else + } else { viewHolder.infolayout.setVisibility(View.GONE); + } } }); @@ -333,9 +337,9 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo detailMinParser.parse(input, new User(strings[1], this.mViewHolder)); } catch (MalformedURLException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } catch (IOException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } return null; } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/customviews/WorkflowPreviewImageView.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/customviews/WorkflowPreviewImageView.java b/app/src/main/java/org/apache/taverna/mobile/customviews/WorkflowPreviewImageView.java index fb0b497..32a9389 100644 --- a/app/src/main/java/org/apache/taverna/mobile/customviews/WorkflowPreviewImageView.java +++ b/app/src/main/java/org/apache/taverna/mobile/customviews/WorkflowPreviewImageView.java @@ -128,17 +128,18 @@ public class WorkflowPreviewImageView extends ImageView { deltaX = -(x + right); } } else { - //if the image doesnt fit in the width or height - //limit both up and down and left and right - if (x + deltaX > 0) + //if the image doesnt fit in the width or height + //limit both up and down and left and right + if (x + deltaX > 0) { deltaX = -x; - else if (x + deltaX < -right) + } else if (x + deltaX < -right) { deltaX = -(x + right); - - if (y + deltaY > 0) + } + if (y + deltaY > 0) { deltaY = -y; - else if (y + deltaY < -bottom) + } else if (y + deltaY < -bottom) { deltaY = -(y + bottom); + } } //move the image with the matrix matrix.postTranslate(deltaX, deltaY); @@ -237,15 +238,17 @@ public class WorkflowPreviewImageView extends ImageView { float y = m[Matrix.MTRANS_Y]; if (mScaleFactor < 1) { if (Math.round(origWidth * saveScale) < width) { - if (y < -bottom) + if (y < -bottom) { matrix.postTranslate(0, -(y + bottom)); - else if (y > 0) + } else if (y > 0) { matrix.postTranslate(0, -y); + } } else { - if (x < -right) + if (x < -right) { matrix.postTranslate(-(x + right), 0); - else if (x > 0) + } else if (x > 0) { matrix.postTranslate(-x, 0); + } } } } @@ -256,14 +259,16 @@ public class WorkflowPreviewImageView extends ImageView { float x = m[Matrix.MTRANS_X]; float y = m[Matrix.MTRANS_Y]; if (mScaleFactor < 1) { - if (x < -right) + if (x < -right) { matrix.postTranslate(-(x + right), 0); - else if (x > 0) + } else if (x > 0) { matrix.postTranslate(-x, 0); - if (y < -bottom) + } + if (y < -bottom) { matrix.postTranslate(0, -(y + bottom)); - else if (y > 0) + } else if (y > 0) { matrix.postTranslate(0, -y); + } } } return true; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java index 4fa690b..5a384e4 100644 --- a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java @@ -11,7 +11,7 @@ public class BaseApiManager { public TavernaService mTavernaService; - String ENDPOINT = "http://www.myexperiment.org/";; + final String ENDPOINT = "http://www.myexperiment.org/";; public BaseApiManager() { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java index 86278a8..3cca379 100644 --- a/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java @@ -35,6 +35,7 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.util.Log; import android.view.ContextMenu; import android.view.LayoutInflater; import android.view.MenuItem; @@ -55,6 +56,7 @@ public class FavoriteFragment extends Fragment implements RecyclerView.OnCreateC * The fragment argument representing the section number for this * fragment. */ + private static final String TAG = "FavoriteFragment"; private static final String ARG_SECTION_NUMBER = "SECTION_NUMBER"; public FavoriteWorkflowAdapter favoriteAdapter; public WorkflowDB myWorkflowDb; @@ -114,7 +116,7 @@ public class FavoriteFragment extends Fragment implements RecyclerView.OnCreateC favoriteAdapter = new FavoriteWorkflowAdapter(getActivity(), mfavorites); favoriteAdapter.registerAdapterDataObserver(dataObserver); } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "setUpFavoriteData: ", e); favoriteAdapter = new FavoriteWorkflowAdapter(getActivity(), Collections .<ArrayList<Object>>emptyList()); favoriteAdapter.registerAdapterDataObserver(dataObserver); @@ -182,8 +184,9 @@ public class FavoriteFragment extends Fragment implements RecyclerView.OnCreateC } else if (title.equals("Remove")) { Toast.makeText(getActivity(), "Removing", Toast.LENGTH_SHORT).show(); return true; - } else + } else { return super.onContextItemSelected(item); + } } /** http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java index 98523a1..53649a0 100644 --- a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java @@ -47,6 +47,7 @@ import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.SearchView; import android.text.TextUtils; +import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -76,6 +77,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout .OnRefreshListener, SearchView.OnQueryTextListener { // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String TAG = "WorkflowItemFragment"; private static final String ARG_PARAM1 = "param1"; private static final String ARG_PARAM2 = "param2"; public static Context cx; @@ -87,7 +89,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout */ private static RecyclerView mListView; private static View rootView; - private static boolean STATE_ON = false; + private static boolean stateOn = false; private static TextView noDataText; private static LruCache<String, Bitmap> avatarCache; private static WorkflowAdapter workflowAdapter; @@ -133,9 +135,9 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout isLoadMoreData = false; isRefreshData = false; ((WorkflowAdapter) mListView.getAdapter()).addItems(data, previousTotal); - } else + } else { mListView.swapAdapter(workflowAdapter, false); - + } if (WorkflowItemFragment.workflowAdapter.getItemCount() == 0) { mListView.setVisibility(View.GONE); noDataText.setVisibility(View.VISIBLE); @@ -160,16 +162,16 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout // .getName()); //check whether avatar is already in the cache before trying to download it // from remote resource - if (avatarCache.get(author.getDetails_uri()) == null) + if (avatarCache.get(author.getDetailsUri()) == null) { new AvatarLoader(author.getUserViewHolder()).execute(author - .getDetails_uri(), author.getRow_id()); - else { + .getDetailsUri(), author.getRowId()); + } else { author.getUserViewHolder().author_profile.setImageBitmap(avatarCache.get - (author.getDetails_uri())); + (author.getDetailsUri())); // ((ImageView) rootView.findViewById(R.id.author_profile_image)) -// .setImageBitmap(avatarCache.get(author.getDetails_uri())); +// .setImageBitmap(avatarCache.get(author.getDetailsUri())); } - System.out.println("Author cached ID " + author.getDetails_uri() + "\n Name: " + + Log.d(TAG, "Author cached ID " + author.getDetailsUri() + "\n Name: " + "" + author.getName()); } } @@ -177,7 +179,8 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout } /** - * Called when avatar xml has finished parsing. fetches the avatar remotely and updates the item + * Called when avatar xml has finished parsing. fetches the avatar remotely and updates the + * item * in the list view * * @param author the author avatar to load @@ -188,9 +191,9 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout @Override public void run() { // new LoadAuthorAvatar((ImageView) rootView.findViewById(R.id - // .author_profile_image),author.getDetails_uri()).execute(author.getAvatar_url()); + // .author_profile_image),author.getDetailsUri()).execute(author.getAvatarUrl()); new LoadAuthorAvatar(author.getUserViewHolder().author_profile, author - .getDetails_uri()).execute(author.getAvatar_url()); + .getDetailsUri()).execute(author.getAvatarUrl()); } }); } @@ -284,7 +287,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout @Override public void onResume() { super.onResume(); - if (!STATE_ON) { + if (!stateOn) { new WorkflowLoader(getActivity(), swipeRefreshLayout).execute("" + currentPage); if (mListView.getAdapter().getItemCount() == 0) { @@ -303,7 +306,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - STATE_ON = true; + stateOn = true; } @Override @@ -352,7 +355,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout if (null != wk) for (int i = 0; i < wk.getItemCount(); i++) { Workflow workflow = wk.getItem(i); - if (workflow.getWorkflow_title().toLowerCase().contains(search.toLowerCase())) { + if (workflow.getWorkflowTitle().toLowerCase().contains(search.toLowerCase())) { ladapter.addWorkflow(workflow); } } @@ -417,7 +420,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout input.close(); } catch (IOException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } return myBitmap; } @@ -453,11 +456,9 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout visibleItemCount = mListView.getChildCount(); totalItemCount = mLinearLayoutManager.getItemCount(); firstVisibleItem = mLinearLayoutManager.findFirstVisibleItemPosition(); - if (loading) { - if (totalItemCount > previousTotal) { - loading = false; - previousTotal = totalItemCount; - } + if (loading && totalItemCount > previousTotal) { + loading = false; + previousTotal = totalItemCount; } if (!loading && (totalItemCount - visibleItemCount) <= (firstVisibleItem + visibleThreshold)) { @@ -466,7 +467,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout isLoadMoreData = true; currentPage++; new WorkflowLoader(getActivity(), swipeRefreshLayout).execute("" + currentPage); - System.out.println(currentPage); + Log.d(TAG, currentPage + ""); loading = true; } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/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 c3eb276..400eaaf 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 @@ -13,6 +13,7 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.Fragment; import android.text.method.ScrollingMovementMethod; +import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -43,6 +44,7 @@ import static org.apache.taverna.mobile.activities.DashboardMainActivity.APP_DIR */ public class RunFragment extends Fragment implements View.OnClickListener { + private static final String TAG = "RunFragment"; private View rootView; private TextView runIdTextView, runNameTextView; private ImageButton status; @@ -116,16 +118,17 @@ public class RunFragment extends Fragment implements View.OnClickListener { runIdTextView.setText(runId); runNameTextView.setText(runName); - if (runState.contains("Pending")) + if (runState.contains("Pending")) { status.setImageResource(android.R.drawable.presence_busy); - else if (runState.contains("Running")) + } else if (runState.contains("Running")) { status.setImageResource(android.R.drawable.presence_away); - else if (runState.contains("Finished")) + } else if (runState.contains("Finished")) { status.setImageResource(android.R.drawable.presence_online); - else if (runState.contains("Failed")) + } else if (runState.contains("Failed")) { status.setImageResource(android.R.drawable.presence_offline); - else + } else { status.setImageResource(android.R.drawable.presence_invisible); + } runStateTextView.setText(runState); runStartTime.setHint(runStarted); @@ -137,7 +140,7 @@ public class RunFragment extends Fragment implements View.OnClickListener { downloadLogs.setOnClickListener(this); reloadRunResult(); } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "onResume: ", e); } } @@ -169,7 +172,7 @@ public class RunFragment extends Fragment implements View.OnClickListener { switch (view.getId()) { case R.id.buttonWorkflowDownloadOutput: try { - System.out.println("output url: " + run_output_url); + Log.d(TAG, "output url: " + run_output_url); if (run_output_url.isEmpty()) { Toast.makeText(getActivity(), "No run logs available", Toast.LENGTH_LONG) .show(); @@ -179,18 +182,18 @@ public class RunFragment extends Fragment implements View.OnClickListener { (getActivity()).getString( APP_DIRECTORY_NAME + "/Runoutput/outputs", "/TavernaMobile/Runouput/outputs/")), - new TavernaPlayerAPI(getActivity()).PLAYER_RUN_URL + + new TavernaPlayerAPI(getActivity()).mPlayerRunUrl + run_output_url.substring(0, 5)); } } catch (Exception e) { - e.printStackTrace(); + Log.e(TAG, "onClick: ", e); Toast.makeText(getActivity(), "Error downloading run output", Toast .LENGTH_LONG).show(); } break; case R.id.downloadRunLogs: try { - System.out.println("run logs: " + run_logs_url); + Log.d(TAG, "run logs: " + run_logs_url); if (run_logs_url.isEmpty()) { Toast.makeText(getActivity(), "No run logs available", Toast.LENGTH_LONG) .show(); @@ -200,11 +203,11 @@ public class RunFragment extends Fragment implements View.OnClickListener { (getActivity()).getString( APP_DIRECTORY_NAME + "/Runoutput/logs/", "/TavernaMobile/Runoutput/logs")), - new TavernaPlayerAPI(getActivity()).PLAYER_RUN_URL + run_logs_url + new TavernaPlayerAPI(getActivity()).mPlayerRunUrl + run_logs_url .substring(0, 5)); } } catch (Exception e) { - e.printStackTrace(); + Log.e(TAG, "onClick: ", e); Toast.makeText(getActivity(), "Error downloading run logs", Toast .LENGTH_LONG).show(); } @@ -222,22 +225,22 @@ public class RunFragment extends Fragment implements View.OnClickListener { runEndTime.setHint(runInfo.getString("finish_time")); runStateTextView.setText(runInfo.getString("status_message")); - if (runInfo.getString("status_message").contains("Pending")) + if (runInfo.getString("status_message").contains("Pending")) { status.setImageResource(android.R.drawable.presence_busy); - else if (runInfo.getString("status_message").contains("Running")) + } else if (runInfo.getString("status_message").contains("Running")) { status.setImageResource(android.R.drawable.presence_away); - else if (runInfo.getString("status_message").contains("Finished")) + } else if (runInfo.getString("status_message").contains("Finished")) { status.setImageResource(android.R.drawable.presence_online); - else if (runInfo.getString("status_message").contains("Failed")) + } else if (runInfo.getString("status_message").contains("Failed")) { status.setImageResource(android.R.drawable.presence_offline); - else + } else { status.setImageResource(android.R.drawable.presence_invisible); - + } 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(); + Log.e(TAG, "run: ", e); } } }); @@ -260,7 +263,7 @@ public class RunFragment extends Fragment implements View.OnClickListener { StringBuffer sb = new StringBuffer(); try { - URL workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_RUN_URL + + URL workflowurl = new URL(new TavernaPlayerAPI(this.context).mPlayerRunUrl + this.runid); HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection(); @@ -284,9 +287,9 @@ public class RunFragment extends Fragment implements View.OnClickListener { updateRun(this.context, runInfo); } catch (IOException ex) { - ex.printStackTrace(); + Log.e(TAG, "run: ", ex); } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "run: ", e); } } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/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 edc67f9..70481f3 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 @@ -37,6 +37,7 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -52,7 +53,7 @@ import java.util.List; */ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManager .LoaderCallbacks<Workflow> { - + private static final String TAG = "WorkflowRunHistoryFragment"; // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER private static final String ARG_PARAM2 = "param2"; private static String workflowID; //represents a run name that matches the given workflow @@ -146,9 +147,9 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage public void onLoadFinished(Loader<Workflow> workflowLoader, Workflow workflow) { try { - if (workflow.getWorkflow_runs() != null | workflow.getWorkflow_runs().size() != 0) { + if (workflow.getWorkflowRuns() != null | workflow.getWorkflowRuns().size() != 0) { - runAdapter.setRunList(workflow.getWorkflow_runs()); + runAdapter.setRunList(workflow.getWorkflowRuns()); mRecyclerView.setAdapter(runAdapter); mRecyclerView.setVisibility(View.VISIBLE); emptyRunHistoryTextView.setVisibility(View.GONE); @@ -158,7 +159,7 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage emptyRunHistoryTextView.setVisibility(View.VISIBLE); } } catch (NullPointerException np) { - np.printStackTrace(); + Log.e(TAG, "onLoadFinished: ", np); } // progressDialog.dismiss(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/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 9f45d7f..c5f0cae 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 @@ -99,10 +99,11 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList * The fragment argument representing the section number for this * fragment. */ + private static final String TAG = "WorkflowdetailFragment"; private static final String ARG_SECTION_NUMBER = "section_number"; private static final String BOX_APP_KEY = "doicbvkfyzligh2"; private static final String BOX_APP_SECRET = "3uuuw36mm7jkflc"; - public static String WORKFLO_ID = ""; + public static String mWorkfloId = ""; public static Context cont; public static String workflow_uri; static View rootView; @@ -111,8 +112,8 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList static Workflow currentWorkflow = null; private static ProgressDialog progressDialog; private static String download_url; - private static boolean LOAD_STATE = false; - private static boolean DROPUPLOAD = false; + private static boolean mLoadState = false; + private static boolean mDropupload = false; public AlertDialog runDialog; public AlertDialog.Builder alertDialogBuilder; public boolean isZoomIn; @@ -150,7 +151,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList final TextView desc = (TextView) rootView.findViewById(R.id.wdescription); final TextView createdat = (TextView) rootView.findViewById(R.id.wcreatedat); final ImageView preview = (ImageView) rootView.findViewById(R.id.wkf_image); - WORKFLO_ID = wk.getWorkflow_title(); + //mWorkfloId = wk.getWorkflowTitle(); ((Activity) cont).runOnUiThread(new Runnable() { @Override public void run() { @@ -163,24 +164,24 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList //String uploaderText = String.format(resources.getString(R.string // .workflow_author), uploader != null ? uploader.getName():"Unknown"); author.setText((uploader != null) ? uploader.getName() : "Unknown"); - title.setText(wk.getWorkflow_title()); - if (wk.getWorkflow_description() != null) { - desc.setText(wk.getWorkflow_description()); + title.setText(wk.getWorkflowTitle()); + if (wk.getWorkflowDescription() != null) { + desc.setText(wk.getWorkflowDescription()); } else { //desc.setVisibility(View.INVISIBLE); //Not sure I trust this! Needs // investigating. } String createdAtText = String.format(resources.getString(R.string.created), wk - .getWorkflow_datecreated()); + .getWorkflowDatecreated()); createdat.setText(createdAtText); //updated.setText("Workflow Description"); String typeText = String.format(resources.getString(R.string.workflow_type_text), - wk.getWorkflow_Type()); + wk.getWorkflowType()); type.setText(typeText); - //preview.setImageURI(Uri.parse(wk.getWorkflow_preview())); - new LoadImageThread(preview, wk.getWorkflow_preview()).execute(); - download_url = wk.getWorkflow_remote_url(); + //preview.setImageURI(Uri.parse(wk.getWorkflowPreview())); + new LoadImageThread(preview, wk.getWorkflowPreview()).execute(); + download_url = wk.getWorkflowRemoteUrl(); zoomin.setAnimationListener(new Animation.AnimationListener() { @Override @@ -239,7 +240,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList progressDialog = new ProgressDialog(getActivity()); progressDialog.setMessage(getActivity().getResources().getString(R.string.loading)); progressDialog.setCancelable(false); - // WORKFLO_ID = workflowid; + // mWorkfloId = workflowid; zoomin = AnimationUtils.loadAnimation(getActivity(), R.anim.zoomin); zoomout = AnimationUtils.loadAnimation(getActivity(), R.anim.zoomout); @@ -255,12 +256,13 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList final String favs = sharedPreferences.getString(WorkflowAdapter.FAVORITE_LIST_DB, ""); String[] ids = favs.split(","); if (ids.length > 0) { - for (String id : ids) + for (String id : ids) { if (id.equalsIgnoreCase("" + wid)) { mark_workflow.setBackgroundResource(R.drawable .abc_list_selector_disabled_holo_light); break; } + } } rootView.findViewById(R.id.saveToDropboxButton).setOnClickListener(this); rootView.findViewById(R.id.saveToGoogleDriveButton).setOnClickListener(this); @@ -297,11 +299,12 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList switch (view.getId()) { case R.id.run_wk: if (((TextView) rootView.findViewById(R.id.wtype)).getText().toString().contains - ("Taverna 2")) + ("Taverna 2")) { new WorkflowProcessTask(getActivity()).execute(download_url); - else + } else { Toast.makeText(getActivity(), "Sorry! Only Taverna 2 workflows can be run.", Toast.LENGTH_LONG).show(); + } break; case R.id.download_wk: // start the android Download manager to start downloading a remote workflow file @@ -313,7 +316,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList DashboardMainActivity.APP_DIRECTORY_NAME, "/")), download_url); } catch (Exception e) { - e.printStackTrace(); + Log.e(TAG, "onClick: ", e); } break; @@ -323,11 +326,11 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList String favs = sharedPreferences.getString(WorkflowAdapter.FAVORITE_LIST_DB, ""); //save current workflow as favorite mfav.add(currentWorkflow.getId()); - mfav.add(currentWorkflow.getWorkflow_author()); - mfav.add(currentWorkflow.getWorkflow_title()); - mfav.add(currentWorkflow.getWorkflow_description()); + mfav.add(currentWorkflow.getWorkflowAuthor()); + mfav.add(currentWorkflow.getWorkflowTitle()); + mfav.add(currentWorkflow.getWorkflowDescription()); mfav.add(SimpleDateFormat.getDateTimeInstance().format(new Date()).toString()); - mfav.add(currentWorkflow.getWorkflow_details_url()); + mfav.add(currentWorkflow.getWorkflowDetailsUrl()); mfav.add(((TextView) rootView.findViewById(R.id.wkf_author)).getText()); int result = new WorkflowDB(getActivity(), WorkflowAdapter .WORKFLOW_FAVORITE_KEY).insert(mfav); @@ -341,16 +344,17 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList } else if (result == -1) { Toast.makeText(getActivity(), "Sorry! This workflow has already been marked " + "as a favourite", Toast.LENGTH_SHORT).show(); - } else + } else { Toast.makeText(getActivity(), "Error!, please try again", Toast.LENGTH_SHORT) .show(); + } break; case R.id.saveToDropboxButton: String authToken = PreferenceManager.getDefaultSharedPreferences(getActivity()) .getString("dropboxauth", ""); - if (authToken.isEmpty()) + if (authToken.isEmpty()) { mDBApi.getSession().startOAuth2Authentication(getActivity()); - else { + } else { mDBApi.getSession().setOAuth2AccessToken(authToken); new WorkflowDriveUpload().execute(download_url); } @@ -369,12 +373,12 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList @Override public void onResume() { super.onResume(); - if (!LOAD_STATE) + if (!mLoadState) workflow_uri = getActivity().getIntent().getStringExtra("uri"); getActivity().getLoaderManager().initLoader(1, null, this).forceLoad(); - if (mDBApi.getSession().authenticationSuccessful() && !DROPUPLOAD) { + if (mDBApi.getSession().authenticationSuccessful() && !mDropupload) { try { // Required to complete auth, sets the access token on the session mDBApi.getSession().finishAuthentication(); @@ -391,7 +395,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - LOAD_STATE = true; + mLoadState = true; } @Override @@ -453,7 +457,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList myBitmap = BitmapFactory.decodeStream(input); // imageView.setImageBitmap(myBitmap); } catch (IOException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } return myBitmap; } @@ -487,7 +491,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList 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); @@ -516,7 +520,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList return sb.toString(); } catch (IOException ex) { - ex.printStackTrace(); + Log.e(TAG, "doInBackground: ", ex); } return sb.toString(); } @@ -566,7 +570,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList // name/input json object } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "onClick: ", e); } } @@ -576,9 +580,9 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList //start a run task to execute the run. new RunTask(ctx).execute(json.toString()); } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "onClick: ", e); } catch (Exception ex) { - ex.printStackTrace(); + Log.e(TAG, "onClick: ", ex); } } @@ -595,7 +599,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList runDialog = alertDialogBuilder.create(); } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "onPostExecute: ", e); } progressDialog.dismiss(); @@ -633,12 +637,12 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList @Override protected String doInBackground(String... params) { - StringBuffer sb = new StringBuffer(); + StringBuffer sb = new StringBuffer(53); try { //prepare connection requests URL workflowurl = new URL(params[0]); //the resource xml file representing the // workflow to be uploaded to the player - String playerurl = new TavernaPlayerAPI(this.context).PLAYER_BASE_URL + + String playerurl = new TavernaPlayerAPI(this.context).mPlayerBaseUrl + "workflows.json"; TavernaPlayerAPI tavernaPlayerAPI = new TavernaPlayerAPI(); @@ -658,10 +662,11 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(wconn .getInputStream())); String str = ""; - while ((str = bufferedReader.readLine()) != null) + while ((str = bufferedReader.readLine()) != null) { sb.append(str); //in this string builder we have read the workflow( as - // .t2flow or .xml) workflow from remote resource. Now we need to post that to - // the player. + // .t2flow or .xml) workflow from remote resource. Now we need to post that to + // the player. + } bufferedReader.close(); wconn.disconnect(); @@ -671,7 +676,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList 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.d(TAG, "BODY=>" + post); connection.setRequestMethod("POST"); connection.setRequestProperty("Authorization", basicAuth); connection.setRequestProperty("Accept", "*/*"); @@ -691,11 +696,12 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList InputStream dis = connection.getInputStream(); BufferedReader br = new BufferedReader(new InputStreamReader(dis)); - while ((str = br.readLine()) != null) + while ((str = br.readLine()) != null) { sb.append(str); + } connection.disconnect(); } catch (IOException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); sb.append("Error reading remote workflow. Please try again later"); } @@ -719,7 +725,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList new WorkflowRunTask(getActivity()).execute(workflowJson.getString("id")); } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "onPostExecute: ", e); } } @@ -764,13 +770,13 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList // metaDataEntry = mDBApi.metadata("/"+Uri.parse(files[0]).getLastPathSegment(), // 1, null, false, null); } catch (FileNotFoundException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } catch (DropboxException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } catch (MalformedURLException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } catch (IOException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } return response.rev; @@ -781,7 +787,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList if (null != s) { Toast.makeText(getActivity(), "File Saved to dropbox. Reference: " + s, Toast .LENGTH_LONG).show(); - DROPUPLOAD = true; + mDropupload = true; } else { Toast.makeText(getActivity(), "Failed to save to dropbox " + s, Toast .LENGTH_LONG).show(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Runs.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Runs.java b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Runs.java index f2755a3..1604206 100644 --- a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Runs.java +++ b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Runs.java @@ -22,64 +22,65 @@ public class Runs { ; - public long getRun_id() { + public long getRunId() { return run_id; } - public void setRun_id(long run_id) { + public void setrunId(long run_id) { this.run_id = run_id; } - public long getRun_workflow_id() { + public long getRunWorkflowId() { return run_workflow_id; } - public void setRun_workflow_id(long run_workflow_id) { + public void setRunWorkflowId(long run_workflow_id) { this.run_workflow_id = run_workflow_id; } public RunState getState() { - if (state.equalsIgnoreCase("finished")) + if (state.equalsIgnoreCase("finished")) { return RunState.FINISHED; - else if (state.equalsIgnoreCase("failed")) + } else if (state.equalsIgnoreCase("failed")) { return RunState.FAILED; - else + } else { return RunState.RUNNING; + } } public void setState(String state) { this.state = state; } - public String getRun_name() { + public String getRunName() { return run_name; } - public void setRun_name(String run_name) { + public void setRunName(String run_name) { this.run_name = run_name; } - public String getRun_started_date() { + public String getRunStartedDate() { return run_started_date; } - public void setRun_started_date(String run_started_date) { + public void setRunStartedDate(String run_started_date) { this.run_started_date = run_started_date; } - public String getRun_author() { + public String getRunAuthor() { return run_author; } - public void setRun_author(String run_author) { + public void setRunAuthor(String run_author) { this.run_author = run_author; } - public String getRun_ended_date() { + public String getRunEndedDate() { return run_ended_date; } - public void setRun_ended_date(String run_ended_date) { + public void setRunEndedDate(String run_ended_date) { this.run_ended_date = run_ended_date; } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java index 41f392a..6e6bcc1 100644 --- a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java +++ b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java @@ -34,11 +34,11 @@ import java.net.PasswordAuthentication; */ public class TavernaPlayerAPI { - public static String PLAYER_BASE_URL = "http://heater.cs.man.ac.uk:3000/";; - public static String SERVER_BASE_URL = "http://heater.cs.man.ac.uk:8090/taverna-2.5.4/";; - public static String PLAYER_WORKFLOW_URL = PLAYER_BASE_URL + "workflows/"; - public static String PLAYER_RUN_URL = PLAYER_BASE_URL + "runs/"; - public static String PLAYER_RUN_FRAMEWORK_URL = PLAYER_RUN_URL + "new?workflow_id="; + public static String mPlayerBaseUrl = "http://heater.cs.man.ac.uk:3000/";; + public static String mServerBaseUrl = "http://heater.cs.man.ac.uk:8090/taverna-2.5.4/";; + public static String mPlayerWorkFlowUrl = mPlayerBaseUrl + "workflows/"; + public static String mPlayerRunUrl = mPlayerBaseUrl + "runs/"; + public static String mPlayerRunFrameworkUrl = mPlayerRunUrl + "new?workflow_id="; //returns a json 'framework' used for creating runs for the given workflow public TavernaPlayerAPI(Context context) { @@ -50,35 +50,35 @@ public class TavernaPlayerAPI { ("pref_player_url", "/"); String password = PreferenceManager.getDefaultSharedPreferences(context).getString ("pref_player_url", "/"); - PLAYER_BASE_URL = player; - SERVER_BASE_URL = server; - PLAYER_WORKFLOW_URL = PLAYER_BASE_URL + "workflows/"; - PLAYER_RUN_URL = PLAYER_BASE_URL + "runs/"; - PLAYER_RUN_FRAMEWORK_URL = PLAYER_RUN_URL + "new?workflow_id="; + mPlayerBaseUrl = player; + mServerBaseUrl = server; + mPlayerWorkFlowUrl = mPlayerBaseUrl + "workflows/"; + mPlayerRunUrl = mPlayerBaseUrl + "runs/"; + mPlayerRunFrameworkUrl = mPlayerRunUrl + "new?workflow_id="; } public TavernaPlayerAPI() { } - public static String getPLAYER_BASE_URL() { - return PLAYER_BASE_URL; + public static String getplayerBaseUrl() { + return mPlayerBaseUrl; } - public static String getSERVER_BASE_URL() { - return SERVER_BASE_URL; + public static String getserverBaseUrl() { + return mServerBaseUrl; } - public static String getPLAYER_WORKFLOW_URL() { - return PLAYER_WORKFLOW_URL; + public static String getplayerWorkflowUrl() { + return mPlayerWorkFlowUrl; } - public static String getPLAYER_RUN_URL(Context ctx) { - return PLAYER_RUN_URL; + public static String getplayerRunUrl(Context ctx) { + return mPlayerRunUrl; } - public static String getPLAYER_RUN_FRAMEWORK_URL(Context ctx) { - return PLAYER_RUN_FRAMEWORK_URL; + public static String getplayerRunFrameworkUrl(Context ctx) { + return mPlayerRunFrameworkUrl; } public String getPlayerUserName(Context c) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/User.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/User.java b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/User.java index 9d85682..4c30739 100644 --- a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/User.java +++ b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/User.java @@ -76,7 +76,7 @@ public class User { this.userViewHolder = userViewHolder; } - public String getRow_id() { + public String getRowId() { return this.row_id; } @@ -84,27 +84,27 @@ public class User { this.id = id; } - public String getCreated_at() { + public String getCreatedAt() { return created_at; } - public void setCreated_at(String created_at) { + public void setCreatedAt(String created_at) { this.created_at = created_at; } - public String getDetails_uri() { + public String getDetailsUri() { return this.details_uri; } - public void setDetails_uri(String details_uri) { + public void setDetailsUri(String details_uri) { this.details_uri = details_uri; } - public String getAvatar_url() { + public String getAvatarUrl() { return this.avatar_url; } - public void setAvatar_url(String avatar_url) { + public void setAvatarUrl(String avatar_url) { this.avatar_url = avatar_url; } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Workflow.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Workflow.java b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Workflow.java index 195775e..be92a9c 100644 --- a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Workflow.java +++ b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Workflow.java @@ -108,27 +108,27 @@ public class Workflow { this.id = id; } - public String getWorkflow_datecreated() { + public String getWorkflowDatecreated() { return this.workflow_datecreated; } - public void setWorkflow_datecreated(String workflow_datecreated) { + public void setWorkflowDatecreated(String workflow_datecreated) { this.workflow_datecreated = workflow_datecreated; } - public String getWorkflow_remote_url() { + public String getWorkflowRemoteUrl() { return this.workflow_remote_url; } - public void setWorkflow_remote_url(String workflow_remote_url) { + public void setWorkflowRemoteUrl(String workflow_remote_url) { this.workflow_remote_url = workflow_remote_url; } - public String getWorkflow_details_url() { + public String getWorkflowDetailsUrl() { return this.workflow_details_url; } - public void setWorkflow_details_url(String workflow_details_url) { + public void setWorkflowDetailsUrl(String workflow_details_url) { this.workflow_details_url = workflow_details_url; } @@ -156,19 +156,19 @@ public class Workflow { this.about = about; } - public String getWorkflow_datemodified() { + public String getWorkflowDatemodified() { return this.workflow_datemodified; } - public void setWorkflow_datemodified(String workflow_datemodified) { + public void setWorkflowDatemodified(String workflow_datemodified) { this.workflow_datemodified = workflow_datemodified; } - public List<Runs> getWorkflow_runs() { + public List<Runs> getWorkflowRuns() { return this.workflow_runs; } - public void setWorkflow_runs(List<Runs> workflow_runs) { + public void setWorkflowRuns(List<Runs> workflow_runs) { this.workflow_runs = workflow_runs; } @@ -176,11 +176,11 @@ public class Workflow { this.workflow_runs.add(runs); } - public int getWorkflow_input() { + public int getWorkflowInput() { return this.workflow_input; } - public void setWorkflow_input(int workflow_input) { + public void setWorkflowInput(int workflow_input) { this.workflow_input = workflow_input; } @@ -188,35 +188,35 @@ public class Workflow { return WorkflowInputType.TYPE_INT; } - public String getWorkflow_author() { + public String getWorkflowAuthor() { return this.workflow_author; } - public void setWorkflow_author(String workflow_author) { + public void setWorkflowAuthor(String workflow_author) { this.workflow_author = workflow_author; } - public String getWorkflow_description() { + public String getWorkflowDescription() { return this.workflow_description; } - public void setWorkflow_description(String workflow_description) { + public void setWorkflowDescription(String workflow_description) { this.workflow_description = workflow_description; } - public String getWorkflow_title() { + public String getWorkflowTitle() { return this.workflow_title; } - public void setWorkflow_title(String workflow_title) { + public void setWorkflowTitle(String workflow_title) { this.workflow_title = workflow_title; } - public Bitmap getWorkflow_author_bitmap() { + public Bitmap getWorkflowAuthorBitmap() { return this.workflow_author_bitmap; } - public void setWorkflow_author_bitmap(Bitmap workflow_author_bitmap) { + public void setWorkflowAuthorBitmap(Bitmap workflow_author_bitmap) { this.workflow_author_bitmap = workflow_author_bitmap; } @@ -228,83 +228,83 @@ public class Workflow { this.workflowComponent = workflowComponent; } - public String getWorkflow_web_url() { + public String getWorkflowWebUrl() { return workflow_web_url; } - public void setWorkflow_web_url(String workflow_web_url) { + public void setWorkflowWebUrl(String workflow_web_url) { this.workflow_web_url = workflow_web_url; } - public String getWorkflow_uploader() { + public String getWorkflowUploader() { return workflow_uploader; } - public void setWorkflow_uploader(String workflow_uploader) { + public void setWorkflowUploader(String workflow_uploader) { this.workflow_uploader = workflow_uploader; } - public String getWorkflow_Type() { + public String getWorkflowType() { return workflow_Type; } - public void setWorkflow_Type(String workflow_Type) { + public void setWorkflowType(String workflow_Type) { this.workflow_Type = workflow_Type; } - public String getWorkflow_preview() { + public String getWorkflowPreview() { return workflow_preview; } - public void setWorkflow_preview(String workflow_preview) { + public void setWorkflowPreview(String workflow_preview) { this.workflow_preview = workflow_preview; } - public String getWorkflow_thumb_big() { + public String getWorkflowThumbBig() { return workflow_thumb_big; } - public void setWorkflow_thumb_big(String workflow_thumb_big) { + public void setWorkflowThumbBig(String workflow_thumb_big) { this.workflow_thumb_big = workflow_thumb_big; } - public String getWorkflow_licence_type() { + public String getWorkflowLicenceType() { return workflow_licence_type; } - public void setWorkflow_licence_type(String workflow_licence_type) { + public void setWorkflowLicenceType(String workflow_licence_type) { this.workflow_licence_type = workflow_licence_type; } - public String getWorkflow_content_type() { + public String getWorkflowContentType() { return workflow_content_type; } - public void setWorkflow_content_type(String workflow_content_type) { + public void setWorkflowContentType(String workflow_content_type) { this.workflow_content_type = workflow_content_type; } - public List<String> getWorkflow_tags() { + public List<String> getWorkflowTags() { return workflow_tags; } - public void setWorkflow_tags(List<String> workflow_tags) { + public void setWorkflowTags(List<String> workflow_tags) { this.workflow_tags = workflow_tags; } - public String getWorkflow_versions() { + public String getWorkflowVersions() { return workflow_versions; } - public void setWorkflow_versions(String workflow_versions) { + public void setWorkflowVersions(String workflow_versions) { this.workflow_versions = workflow_versions; } - public List<String> getWorkflow_credits() { + public List<String> getWorkflowCredits() { return workflow_credits; } - public void setWorkflow_credits(List<String> workflow_credits) { + public void setWorkflowCredits(List<String> workflow_credits) { this.workflow_credits = workflow_credits; } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/EndlessRecyclerOnScrollListener.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/EndlessRecyclerOnScrollListener.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/EndlessRecyclerOnScrollListener.java index 24bc319..dd26de4 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/EndlessRecyclerOnScrollListener.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/EndlessRecyclerOnScrollListener.java @@ -23,7 +23,7 @@ import android.support.v7.widget.RecyclerView; public abstract class EndlessRecyclerOnScrollListener extends RecyclerView.OnScrollListener { - public static String TAG = EndlessRecyclerOnScrollListener.class.getSimpleName(); + public static final String TAG = EndlessRecyclerOnScrollListener.class.getSimpleName(); int firstVisibleItem, visibleItemCount, totalItemCount; private int previousTotal = 0; // The total number of items in the dataset after the last load private boolean loading = true; // True if we are still waiting for the last set of data to @@ -46,11 +46,11 @@ public abstract class EndlessRecyclerOnScrollListener extends RecyclerView.OnScr totalItemCount = mLinearLayoutManager.getItemCount(); firstVisibleItem = mLinearLayoutManager.findFirstVisibleItemPosition(); - if (loading) { - if (totalItemCount > previousTotal + 1) { - loading = false; - previousTotal = totalItemCount; - } + if (loading && totalItemCount > previousTotal + 1) { + + loading = false; + previousTotal = totalItemCount; + } if (!loading && (totalItemCount - visibleItemCount) <= (firstVisibleItem + visibleThreshold)) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java index 6143df4..a066da7 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java @@ -206,8 +206,9 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL public void showProgressbar(boolean status) { if (status) { mProgressBar.setVisibility(View.VISIBLE); - } else + } else { mProgressBar.setVisibility(View.GONE); + } } @Override http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/utils/AvatarLoader.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/AvatarLoader.java b/app/src/main/java/org/apache/taverna/mobile/utils/AvatarLoader.java index e724bfa..984f41b 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/AvatarLoader.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/AvatarLoader.java @@ -32,6 +32,7 @@ import org.apache.taverna.mobile.utils.xmlparsers.AvatarXMLParser; import org.apache.taverna.mobile.utils.xmlparsers.MyExperimentXmlParserRules; import android.os.AsyncTask; +import android.util.Log; import java.io.IOException; import java.io.InputStream; @@ -45,6 +46,7 @@ import java.net.URL; * Created by Larry AKah on 6/29/15. */ public class AvatarLoader extends AsyncTask<String, Void, Void> { + private static final String TAG = "AvatarLoader"; WorkflowAdapter.ViewHolder vh; public AvatarLoader(WorkflowAdapter.ViewHolder userViewHolder) { @@ -72,9 +74,9 @@ public class AvatarLoader extends AsyncTask<String, Void, Void> { avatarXMLParser.parse(input, new User(strings[1], this.vh)); } catch (MalformedURLException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } catch (IOException e) { - e.printStackTrace(); + Log.e(TAG, "doInBackground: ", e); } return null; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/app/src/main/java/org/apache/taverna/mobile/utils/ConnectionInfo.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/ConnectionInfo.java b/app/src/main/java/org/apache/taverna/mobile/utils/ConnectionInfo.java index 8704071..3dba53d 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/ConnectionInfo.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/ConnectionInfo.java @@ -25,11 +25,11 @@ import android.util.Log; public class ConnectionInfo { - private static String TAG; + private static final String TAG = "ConnectionInfo"; private static Context context; public ConnectionInfo(Context context) { - TAG = this.getClass().getName(); + Log.i(TAG, "Utils: "); ConnectionInfo.context = context; } @@ -41,10 +41,11 @@ public class ConnectionInfo { if (connectivity != null) { NetworkInfo[] info = connectivity.getAllNetworkInfo(); if (info != null) - for (int i = 0; i < info.length; i++) + for (int i = 0; i < info.length; i++) { if (info[i].getState() == NetworkInfo.State.CONNECTED) { return true; } + } } return false; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e25d011a/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 9152b97..1313e13 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 @@ -57,9 +57,8 @@ import java.net.URL; */ public class DetailsLoader extends AsyncTaskLoader<Workflow> { + private static final String TAG = "DetailsLoader"; private LoadType lt; - - ; private String uri; private Workflow workflow; private Context context; @@ -97,7 +96,7 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { dis = connection.getInputStream(); break; case TYPE_RUN_HISTORY: - workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_RUN_URL); + workflowurl = new URL(new TavernaPlayerAPI(this.context).mPlayerRunUrl); connection = (HttpURLConnection) workflowurl.openConnection(); String userpass = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); @@ -113,10 +112,10 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { dis = connection.getInputStream(); break; case TYPE_POLICY: - workflowurl = new URL(new TavernaPlayerAPI(this.context).SERVER_BASE_URL); + workflowurl = new URL(new TavernaPlayerAPI(this.context).mServerBaseUrl); break; default: - workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_WORKFLOW_URL); + workflowurl = new URL(new TavernaPlayerAPI(this.context).mPlayerWorkFlowUrl); break; } @@ -159,14 +158,14 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { title, description, type, attrlicetype, attrType, uploader, attrUploader, date, preview, licetype, contenturi, contentType, tags, attrTags}); - // System.out.println(sb.toString()); + // Log.e(TAG, sb.toString()); parser.parse(dis, this.workflow); } dis.close(); //br.close(); return workflow; case TYPE_RUN_HISTORY: { - System.out.println("Downloading run history"); + Log.e(TAG, "Downloading run history"); BufferedReader br = new BufferedReader(new InputStreamReader(dis)); StringBuffer sb = new StringBuffer(); String jsonData = ""; @@ -187,16 +186,17 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { JSONObject userobj = jsonObject.getJSONObject("user"); String username = userobj.getString("name"); StringBuffer nm = new StringBuffer(), ur = new StringBuffer(); - for (String n : name.toLowerCase().split(" ")) + for (String n : name.toLowerCase().split(" ")) { nm.append(n); - for (String p : uri.toLowerCase().split(" ")) + } + for (String p : uri.toLowerCase().split(" ")) { ur.append(p); - + } if (nm.toString().equals(ur.toString())) { Runs mrun = new Runs(name, started, ended, state); - mrun.setRun_id(id); - mrun.setRun_workflow_id(workflow_id); - mrun.setRun_author(username); + mrun.setrunId(id); + mrun.setRunWorkflowId(workflow_id); + mrun.setRunAuthor(username); workflow.addWorkflowRun(mrun); } @@ -220,11 +220,11 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { } } catch (MalformedURLException e) { - e.printStackTrace(); + Log.e(TAG, "loadInBackground: ", e); } catch (IOException e) { - e.printStackTrace(); + Log.e(TAG, "loadInBackground: ", e); } catch (JSONException e) { - e.printStackTrace(); + Log.e(TAG, "loadInBackground: ", e); } return workflow; } @@ -273,6 +273,6 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { * js.getString("description"), * js.getInt("id"), * js.getString("url")); - * workflow.setWorkflow_datecreated(created_at); - * workflow.setWorkflow_datemodified(updated_at); + * workflow.setWorkflowDatecreated(created_at); + * workflow.setWorkflowDatemodified(updated_at); **/ \ No newline at end of file
