You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2016/10/03 14:49:43 UTC
[33/50] [abbrv] incubator-taverna-mobile git commit: remove PMD error
remove PMD error
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/0ccd37c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/0ccd37c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/0ccd37c7
Branch: refs/heads/master
Commit: 0ccd37c74ace34d1522556ab4678014d32f4669e
Parents: 6168a6e
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 15:19:23 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 15:19:23 2016 +0530
----------------------------------------------------------------------
.../mobile/ui/workflowdetail/WorkflowDetailFragment.java | 2 +-
.../taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java | 8 +++++---
.../apache/taverna/mobile/utils/NonSwipeableViewPager.java | 4 +++-
.../java/org/apache/taverna/mobile/utils/WebViewGen.java | 8 ++++----
4 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0ccd37c7/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
index d2970e7..aa90f3e 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
@@ -170,7 +170,7 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
@OnClick(R.id.fabRun)
void fabRunClick(View v) {
- if (mWorkflow.getType().getContent().toUpperCase().equals("Taverna 2".toUpperCase())) {
+ if (mWorkflow.getType().getContent().equals("Taverna 2")) {
Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
startActivity(intent);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0ccd37c7/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
index 72b1fd1..afb8761 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
@@ -20,6 +20,7 @@ package org.apache.taverna.mobile.ui.workflowrun;
import android.util.Base64;
+import android.util.Log;
import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.data.model.PlayerWorkflow;
@@ -42,7 +43,7 @@ import rx.schedulers.Schedulers;
public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
-
+ private static final String TAG = WorkflowRunPresenter.class.getSimpleName();
private final DataManager mDataManager;
private Subscription mSubscriptions;
@@ -87,8 +88,9 @@ public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
String str = "";
- while ((str = bufferedReader.readLine()) != null)
+ while ((str = bufferedReader.readLine()) != null) {
sb.append(str);
+ }
bufferedReader.close();
@@ -99,7 +101,7 @@ public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
post = "{\"workflow\":" + data + "}";
flag = true;
} catch (IOException e) {
- e.printStackTrace();
+ Log.e(TAG, "call: ", e);
}
if (flag) {
RequestBody body =
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0ccd37c7/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java b/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
index 9d721b5..e5be099 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
@@ -3,6 +3,7 @@ package org.apache.taverna.mobile.utils;
import android.content.Context;
import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
+import android.util.Log;
import android.view.MotionEvent;
import android.view.animation.DecelerateInterpolator;
import android.widget.Scroller;
@@ -11,6 +12,7 @@ import java.lang.reflect.Field;
public class NonSwipeableViewPager extends ViewPager {
+ private static final String TAG = NonSwipeableViewPager.class.getSimpleName();
public NonSwipeableViewPager(Context context) {
super(context);
setMyScroller();
@@ -42,7 +44,7 @@ public class NonSwipeableViewPager extends ViewPager {
scroller.setAccessible(true);
scroller.set(this, new MyScroller(getContext()));
} catch (Exception e) {
- e.printStackTrace();
+ Log.e(TAG, "setMyScroller: ", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0ccd37c7/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
index 2dd4bc3..d0900ed 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
@@ -14,11 +14,11 @@ import android.widget.ProgressBar;
import org.apache.taverna.mobile.R;
public class WebViewGen extends Fragment {
- private static final String PARAM1 = "URL";
+ private static final String PARAM1 = "url";
private int flag;
private ProgressBar progressBar;
private WebView web;
- private String URL;
+ private String url;
public static WebViewGen newInstance(String URL) {
@@ -33,7 +33,7 @@ public class WebViewGen extends Fragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
- URL = getArguments().getString(PARAM1);
+ url = getArguments().getString(PARAM1);
}
}
@@ -50,7 +50,7 @@ public class WebViewGen extends Fragment {
web.setWebViewClient(new WebClient());
web.getSettings().setJavaScriptEnabled(true);
web.getSettings().setBuiltInZoomControls(true);
- web.loadUrl(URL);
+ web.loadUrl(url);
web.canGoBack();
return layout;