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:42 UTC
[32/50] [abbrv] incubator-taverna-mobile git commit: remove
checkstyle error
remove checkstyle 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/6168a6eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/6168a6eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/6168a6eb
Branch: refs/heads/master
Commit: 6168a6eb3e820ffd4a476ed70cc89638d22a2569
Parents: 18cbcf3
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 15:08:49 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 15:08:49 2016 +0530
----------------------------------------------------------------------
.../apache/taverna/mobile/data/DataManager.java | 4 +-
.../mobile/data/local/PreferencesHelper.java | 2 +-
.../mobile/data/remote/BaseApiManager.java | 10 +++--
.../data/remote/TavernaPlayerService.java | 4 +-
.../ui/playerlogin/PlayerLoginFragment.java | 43 ++++++++------------
.../ui/playerlogin/PlayerLoginMvpView.java | 2 +-
.../ui/playerlogin/PlayerLoginPresenter.java | 4 +-
.../ui/workflowrun/WorkflowRunActivity.java | 35 ++++++----------
.../ui/workflowrun/WorkflowRunPresenter.java | 10 ++---
.../apache/taverna/mobile/utils/WebViewGen.java | 4 +-
10 files changed, 53 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
index 7bf8011..5444976 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
@@ -178,7 +178,7 @@ public class DataManager {
}
/**
- * @param body is body of upload workflow's detail
+ * @param body is body of upload workflow's detail
* @param baseAuth is base64 encoded credential
* @return Workflow's ID
*/
@@ -205,7 +205,7 @@ public class DataManager {
}
- public Observable<PlayerWorkflowDetail> getWorkflowDetail(int id){
+ public Observable<PlayerWorkflowDetail> getWorkflowDetail(int id) {
return mBaseApiManager.getTavernaPlayerApi().getWorkflowDetail(id);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index e98a494..5dd1f9a 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -184,7 +184,7 @@ public class PreferencesHelper {
}
public String getUserPlayerCredential() {
- return mPref.getString(PREF_KEY_PLAYER_CREDENTIAL," ");
+ return mPref.getString(PREF_KEY_PLAYER_CREDENTIAL, " ");
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/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 f6550ea..ff22ceb 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
@@ -31,7 +31,9 @@ public class BaseApiManager {
public static final String TAVERNA_PLAYER_END_POINT = "http://139.59.28.12:3000/";
- /******** Helper class that sets up a new services with simplexml converter factory *******/
+ /********
+ * Helper class that sets up a new services with simplexml converter factory
+ *******/
private <T> T createSimpleXMLApi(Class<T> clazz, String ENDPOINT) {
@@ -45,7 +47,9 @@ public class BaseApiManager {
return retrofit.create(clazz);
}
- /******** Helper class that sets up a new services with gson converter factory *******/
+ /********
+ * Helper class that sets up a new services with gson converter factory
+ *******/
private <T> T createJsonApi(Class<T> clazz, String ENDPOINT) {
@@ -63,7 +67,7 @@ public class BaseApiManager {
return createSimpleXMLApi(TavernaService.class, MY_EXPERIMENT_END_POINT);
}
- public TavernaPlayerService getTavernaPlayerApi(){
+ public TavernaPlayerService getTavernaPlayerApi() {
return createJsonApi(TavernaPlayerService.class, TAVERNA_PLAYER_END_POINT);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
index 3ad89dd..a1d475a 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
@@ -21,8 +21,8 @@ public interface TavernaPlayerService {
APIEndPoint.JSON_CONTENT_HEADER,
APIEndPoint.JSON_ACCEPT_HEADER,
APIEndPoint.UTF_CONTENT_ENCODING_HEADER})
- Observable<PlayerWorkflow> uploadWorkflow(@Body RequestBody body, @Header("Authorization") String
- authorization);
+ Observable<PlayerWorkflow> uploadWorkflow(@Body RequestBody body, @Header("Authorization")
+ String authorization);
@POST("/users/sign_in")
@Headers({
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
index 35ebedc..4387870 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
@@ -43,15 +43,10 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
@BindView(R.id.cbRemember)
CheckBox mCheckBoxRemember;
-
-
+ OnSuccessful mCallback;
private DataManager dataManager;
-
private PlayerLoginPresenter mPlayerLoginPresenter;
- OnSuccessful mCallback;
-
-
public static PlayerLoginFragment newInstance() {
Bundle args = new Bundle();
@@ -98,7 +93,6 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
//mPlayerLoginPresenter.PlayerLogin("kumarsagar15795@gmail.com", "Sagarishere", true);
-
}
@@ -204,6 +198,23 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
}
}
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+
+ try {
+ mCallback = (OnSuccessful) getActivity();
+ } catch (ClassCastException e) {
+ throw new ClassCastException(getActivity().toString()
+ + " must implement OnSuccessful");
+ }
+ }
+
+
+ public interface OnSuccessful {
+ void onSuccessfulLogin();
+ }
+
private class CustomTextWatcher implements TextWatcher {
private View view;
@@ -231,22 +242,4 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
}
}
}
-
-
- public interface OnSuccessful {
- void onSuccessfulLogin();
- }
-
-
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
-
- try {
- mCallback = (OnSuccessful) getActivity();
- } catch (ClassCastException e) {
- throw new ClassCastException(getActivity().toString()
- + " must implement OnSuccessful");
- }
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
index 9e0f9e6..93f6e53 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
@@ -3,7 +3,7 @@ package org.apache.taverna.mobile.ui.playerlogin;
import org.apache.taverna.mobile.ui.base.MvpView;
-public interface PlayerLoginMvpView extends MvpView{
+public interface PlayerLoginMvpView extends MvpView {
void showError(String string);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
index 411eca2..dcd0bc6 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
@@ -39,7 +39,7 @@ public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
if (mSubscriptions != null) mSubscriptions.unsubscribe();
mSubscriptions = mDataManager.authPlayerUserLoginDetail(getEncodedCredential(username,
- password),loginFlag)
+ password), loginFlag)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(new Observer<ResponseBody>() {
@@ -57,7 +57,7 @@ public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
} else if (((HttpException) e).code() == 406) {
getMvpView().validCredential();
mDataManager.getPreferencesHelper().setUserPlayerLoggedInFlag
- (loginFlag,getEncodedCredential(username, password));
+ (loginFlag, getEncodedCredential(username, password));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/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 82038cd..bfb6138 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
@@ -47,26 +47,16 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
PlayerLoginFragment.OnSuccessful {
public static final String WORKFLOW_URL = "Workflow_url";
-
-
- private DataManager dataManager;
-
- private WorkflowRunPresenter mWorkflowRunPresenter;
-
+ private final String[] labels = {"Player\nLogin", "Download", "Upload", "Inputs &\n Run"};
@BindView(R.id.stepsView)
StepsView mStepsView;
-
@BindView(R.id.viewpager)
NonSwipeableViewPager mPager;
-
- private PagerAdapter mPagerAdapter;
-
- private final String[] labels = {"Player\nLogin","Download", "Upload", "Inputs &\n Run"};
- int position =0;
-
+ int position = 0;
String workflowRunURL;
-
-
+ private DataManager dataManager;
+ private WorkflowRunPresenter mWorkflowRunPresenter;
+ private PagerAdapter mPagerAdapter;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -87,7 +77,8 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
.setLabels(labels)
.setBarColorIndicator(
getContext().getResources().getColor(R.color.material_blue_grey_800))
- .setProgressColorIndicator(getContext().getResources().getColor(R.color.colorPrimary))
+ .setProgressColorIndicator(getContext().getResources().getColor(R.color
+ .colorPrimary))
.setLabelColorIndicator(getContext().getResources().getColor(R.color.colorPrimary))
.drawView();
@@ -95,7 +86,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
mPager.setAdapter(mPagerAdapter);
- if(dataManager.getPreferencesHelper().isUserPlayerLoggedInFlag()){
+ if (dataManager.getPreferencesHelper().isUserPlayerLoggedInFlag()) {
mPager.setCurrentItem(++position);
mStepsView.setCompletedPosition(position % labels.length).drawView();
@@ -113,7 +104,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public void onSuccessfulLogin() {
- position =1;
+ position = 1;
mPager.setCurrentItem(position);
mStepsView.setCompletedPosition(position % labels.length).drawView();
mWorkflowRunPresenter.runWorkflow(getIntent().getStringExtra(WORKFLOW_URL));
@@ -121,14 +112,14 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public void movetoUploadWorkflow() {
- position =2;
+ position = 2;
mPager.setCurrentItem(position);
mStepsView.setCompletedPosition(position % labels.length).drawView();
}
@Override
public void movetoInputs() {
- position =3;
+ position = 3;
mStepsView.setCompletedPosition(position % labels.length).drawView();
mPager.setCurrentItem(position);
@@ -137,7 +128,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public void setInputsAttribute(int id) {
- workflowRunURL = "http://139.59.28.12:3000/workflows/"+id+"/runs/new";
+ workflowRunURL = "http://139.59.28.12:3000/workflows/" + id + "/runs/new";
mPager.getAdapter().notifyDataSetChanged();
}
@@ -156,7 +147,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public Fragment getItem(int position) {
- switch (position){
+ switch (position) {
case 0:
return PlayerLoginFragment.newInstance();
case 1:
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/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 ef5686d..72b1fd1 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
@@ -77,7 +77,8 @@ public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
StringBuffer sb = new StringBuffer();
String post = "";
- String basicAuth = mDataManager.getPreferencesHelper().getUserPlayerCredential();
+ String basicAuth = mDataManager.getPreferencesHelper()
+ .getUserPlayerCredential();
boolean flag = false;
try {
@@ -130,17 +131,16 @@ public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
@Override
public void onError(Throwable e) {
- getMvpView().showError();
+ getMvpView().showError();
}
@Override
public void onNext(PlayerWorkflowDetail playerWorkflowDetail) {
- getMvpView().setInputsAttribute(playerWorkflowDetail.getRun().getWorkflowId());
+ getMvpView().setInputsAttribute(playerWorkflowDetail.getRun()
+ .getWorkflowId());
}
});
}
-
-
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/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 abb52d2..2dd4bc3 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
@@ -47,7 +47,7 @@ public class WebViewGen extends Fragment {
progressBar = (ProgressBar) layout.findViewById(R.id.progressBar);
- web.setWebViewClient(new myWebClient());
+ web.setWebViewClient(new WebClient());
web.getSettings().setJavaScriptEnabled(true);
web.getSettings().setBuiltInZoomControls(true);
web.loadUrl(URL);
@@ -61,7 +61,7 @@ public class WebViewGen extends Fragment {
}
- public class myWebClient extends WebViewClient {
+ public class WebClient extends WebViewClient {
@Override