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:59 UTC
[49/50] [abbrv] incubator-taverna-mobile git commit: remove
checkstyle and pmd error
remove checkstyle and 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/c8da89a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/c8da89a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/c8da89a8
Branch: refs/heads/master
Commit: c8da89a879ce3e584d7514f0bdf98a623aaec92e
Parents: b1a458a
Author: Sagar <ku...@gmail.com>
Authored: Thu Sep 29 23:17:38 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Thu Sep 29 23:17:38 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/DownloadingFragment.java | 7 +++----
.../FavouriteWorkflowDetailFragment.java | 9 +++++----
.../ui/workflowdetail/WorkflowDetailFragment.java | 3 ++-
.../mobile/ui/workflowrun/WorkflowRunActivity.java | 16 +++++++++-------
.../apache/taverna/mobile/utils/ActivityUtils.java | 6 +++---
.../org/apache/taverna/mobile/utils/Constants.java | 2 ++
6 files changed, 24 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c8da89a8/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
index 3a44fb3..11c1300 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
@@ -36,12 +36,11 @@ import butterknife.ButterKnife;
public class DownloadingFragment extends Fragment {
-
- private String message;
-
@BindView(R.id.tvMessage)
TextView tv_Message;
+ private String message;
+
public static DownloadingFragment newInstance(String message) {
Bundle args = new Bundle();
@@ -55,7 +54,7 @@ public class DownloadingFragment extends Fragment {
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- if(getArguments()!=null) {
+ if (getArguments() != null) {
message = getArguments().getString(Constants.ARGS_MESSAGE);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c8da89a8/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
index f217b6c..ae6fd1c 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
@@ -54,6 +54,7 @@ import org.apache.taverna.mobile.ui.imagezoom.ImageZoomActivity;
import org.apache.taverna.mobile.ui.imagezoom.ImageZoomFragment;
import org.apache.taverna.mobile.ui.workflowrun.WorkflowRunActivity;
import org.apache.taverna.mobile.utils.ConnectionInfo;
+import org.apache.taverna.mobile.utils.Constants;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -179,9 +180,9 @@ public class FavouriteWorkflowDetailFragment extends Fragment
@OnClick(R.id.fabRun)
void fabClickRunWorkflow(View v) {
- Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
- intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
- startActivity(intent);
+ Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
+ intent.putExtra(Constants.WORKFLOW_URL, mWorkflow.getContentUri());
+ startActivity(intent);
}
@OnClick(R.id.ivWorkflowImage)
@@ -261,7 +262,7 @@ public class FavouriteWorkflowDetailFragment extends Fragment
if (mWorkflow.getType().getContent().equals(getString(R.string.t2_workflow_type))) {
fabRun.setVisibility(View.VISIBLE);
- }else {
+ } else {
fabRun.setVisibility(View.GONE);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c8da89a8/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 094511e..f1f4a86 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
@@ -53,6 +53,7 @@ import org.apache.taverna.mobile.ui.imagezoom.ImageZoomActivity;
import org.apache.taverna.mobile.ui.imagezoom.ImageZoomFragment;
import org.apache.taverna.mobile.ui.workflowrun.WorkflowRunActivity;
import org.apache.taverna.mobile.utils.ConnectionInfo;
+import org.apache.taverna.mobile.utils.Constants;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -175,7 +176,7 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
void fabClickRunWorkflow(View v) {
Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
- intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
+ intent.putExtra(Constants.WORKFLOW_URL, mWorkflow.getContentUri());
startActivity(intent);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c8da89a8/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
index b96ce16..50febae 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
@@ -35,6 +35,7 @@ import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.data.local.PreferencesHelper;
import org.apache.taverna.mobile.ui.DownloadingFragment;
import org.apache.taverna.mobile.ui.playerlogin.PlayerLoginFragment;
+import org.apache.taverna.mobile.utils.Constants;
import org.apache.taverna.mobile.utils.NonSwipeableViewPager;
import org.apache.taverna.mobile.utils.WebViewGenerator;
@@ -46,9 +47,7 @@ import static com.raizlabs.android.dbflow.config.FlowManager.getContext;
public class WorkflowRunActivity extends FragmentActivity implements WorkflowRunMvpView,
PlayerLoginFragment.OnSuccessful {
- public static final String WORKFLOW_URL = "Workflow_url";
- private String[] labels;
@BindView(R.id.stepsView)
StepsView mStepsView;
@@ -58,6 +57,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
int position = 0;
+ private String[] labels;
private String workflowRunURL;
private DataManager dataManager;
@@ -80,7 +80,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
mWorkflowRunPresenter.attachView(this);
- labels=getResources().getStringArray(R.array.player_run_slider_view_labels);
+ labels = getResources().getStringArray(R.array.player_run_slider_view_labels);
mStepsView.setCompletedPosition(position % labels.length)
.setLabels(labels)
@@ -99,7 +99,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
mPager.setCurrentItem(++position);
mStepsView.setCompletedPosition(position % labels.length).drawView();
- mWorkflowRunPresenter.runWorkflow(getIntent().getStringExtra(WORKFLOW_URL));
+ mWorkflowRunPresenter.runWorkflow(getIntent().getStringExtra(Constants.WORKFLOW_URL));
}
}
@@ -116,7 +116,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
position = 1;
mPager.setCurrentItem(position);
mStepsView.setCompletedPosition(position % labels.length).drawView();
- mWorkflowRunPresenter.runWorkflow(getIntent().getStringExtra(WORKFLOW_URL));
+ mWorkflowRunPresenter.runWorkflow(getIntent().getStringExtra(Constants.WORKFLOW_URL));
}
@Override
@@ -165,9 +165,11 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
case 0:
return PlayerLoginFragment.newInstance();
case 1:
- return DownloadingFragment.newInstance(getString(R.string.downloading_workflow_lable));
+ return DownloadingFragment.newInstance(getString(R.string
+ .downloading_workflow_lable));
case 2:
- return DownloadingFragment.newInstance(getString(R.string.uploading_workflow_lable));
+ return DownloadingFragment.newInstance(getString(R.string
+ .uploading_workflow_lable));
default:
return WebViewGenerator.newInstance(workflowRunURL);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c8da89a8/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java b/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
index 6cbf7b9..c7907e8 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
@@ -25,10 +25,10 @@ import android.support.v4.app.FragmentTransaction;
public class ActivityUtils {
- public static void addFragmentToActivity (FragmentManager fragmentManager,
- Fragment fragment, int frameId) {
+ public static void addFragmentToActivity(FragmentManager fragmentManager, Fragment fragment,
+ int frameId) {
- for(int i = 0; i < fragmentManager.getBackStackEntryCount(); ++i) {
+ for (int i = 0; i < fragmentManager.getBackStackEntryCount(); ++i) {
fragmentManager.popBackStack();
}
FragmentTransaction transaction = fragmentManager.beginTransaction();
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c8da89a8/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java b/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
index bcbff27..17499c2 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
@@ -24,4 +24,6 @@ public class Constants {
public static final String ARGS_MESSAGE = "args_message";
public static final String ARGS_URL = "url";
+
+ public static final String WORKFLOW_URL = "Workflow_url";
}