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:53 UTC
[43/50] [abbrv] incubator-taverna-mobile git commit: remove
checkstyle and findbug error
remove checkstyle and findbug 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/fc036a7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/fc036a7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/fc036a7b
Branch: refs/heads/master
Commit: fc036a7bff22af3b747a28f5d874e4d178197bf0
Parents: a932d6d
Author: Sagar <ku...@gmail.com>
Authored: Tue Sep 27 15:26:00 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Sep 27 15:26:00 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/taverna/mobile/TavernaApplication.java | 5 +++--
.../apache/taverna/mobile/activities/SettingsActivity.java | 2 +-
.../apache/taverna/mobile/data/remote/BaseApiManager.java | 4 ++--
.../taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java | 5 +++--
.../taverna/mobile/ui/workflowrun/WorkflowRunActivity.java | 8 ++++----
5 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fc036a7b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
index 13d8280..100a3b0 100644
--- a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
+++ b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
@@ -37,8 +37,9 @@ public class TavernaApplication extends Application {
@Override
public void onCreate() {
super.onCreate();
-
- instance = this;
+ if (instance == null) {
+ instance = this;
+ }
FlowManager.init(new FlowConfig.Builder(this).build());
Stetho.initializeWithDefaults(this);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fc036a7b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
index 95f3f87..c56e481 100644
--- a/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
@@ -75,7 +75,7 @@ public class SettingsActivity extends PreferenceActivity {
} else {
// For all other preferences, set the summary to the value's
// simple string representation.
- if(preference.getKey().equals(PreferencesHelper.PREF_KEY_PLAYER_URL)){
+ if (preference.getKey().equals(PreferencesHelper.PREF_KEY_PLAYER_URL)) {
new PreferencesHelper(TavernaApplication.getContext())
.setUserPlayerLoggedInFlag(false);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fc036a7b/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 d276566..c3747e8 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
@@ -70,7 +70,7 @@ public class BaseApiManager {
}
public TavernaPlayerService getTavernaPlayerApi() {
- return createJsonApi(TavernaPlayerService.class, new PreferencesHelper
- (TavernaApplication.getContext()).getPlayerURL());
+ return createJsonApi(TavernaPlayerService.class,
+ new PreferencesHelper(TavernaApplication.getContext()).getPlayerURL());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fc036a7b/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 170432d..25c8fea 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
@@ -76,8 +76,9 @@ public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
getMvpView().showCredentialError();
} else if (((HttpException) e).code() == 406) {
getMvpView().validCredential();
- mDataManager.getPreferencesHelper().setUserPlayerLoggedInFlagAndCredential
- (loginFlag, getEncodedCredential(username, password));
+ mDataManager.getPreferencesHelper()
+ .setUserPlayerLoggedInFlagAndCredential(loginFlag,
+ getEncodedCredential(username, password));
} else {
getMvpView().showError("Server Error");
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fc036a7b/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 3022449..1a40847 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
@@ -127,12 +127,12 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public void setInputsAttribute(int id) {
- String playerURL=dataManager.getPreferencesHelper().getPlayerURL();
+ String playerURL = dataManager.getPreferencesHelper().getPlayerURL();
- if (playerURL.trim().endsWith("/")){
- playerURL=playerURL.substring(0,playerURL.length()-1);
+ if (playerURL.trim().endsWith("/")) {
+ playerURL = playerURL.substring(0, playerURL.length() - 1);
}
- workflowRunURL = playerURL+"/workflows/" + id +
+ workflowRunURL = playerURL + "/workflows/" + id +
"/runs/new";
mPager.getAdapter().notifyDataSetChanged();
}