add licence header
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/2c68a32e Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/2c68a32e Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/2c68a32e Branch: refs/heads/master Commit: 2c68a32eb0ef61c7abf4f2bbd1d657a8cf801845 Parents: 709ddca Author: Sagar <[email protected]> Authored: Tue Aug 2 23:48:58 2016 +0530 Committer: Sagar <[email protected]> Committed: Tue Aug 2 23:48:58 2016 +0530 ---------------------------------------------------------------------- .../taverna/mobile/activities/RunResult.java | 24 ++++++++-- .../mobile/activities/SettingsActivity.java | 23 ++++----- .../activities/WorkflowDetailActivity.java | 32 ++++++------- .../mobile/data/local/PreferencesHelper.java | 18 +++++++ .../taverna/mobile/ui/FlashScreenActivity.java | 18 +++++++ .../taverna/mobile/ui/login/LoginActivity.java | 49 +++++++++----------- .../taverna/mobile/ui/login/LoginFragment.java | 18 +++++++ .../taverna/mobile/ui/login/LoginMvpView.java | 18 +++++++ .../taverna/mobile/ui/login/LoginPresenter.java | 18 +++++++ app/src/main/res/layout/activity_login.xml | 38 ++++++++------- app/src/main/res/layout/fragment_login.xml | 31 ++++++------- 11 files changed, 190 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2c68a32e/app/src/main/java/org/apache/taverna/mobile/activities/RunResult.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/RunResult.java b/app/src/main/java/org/apache/taverna/mobile/activities/RunResult.java index c6caf60..8034706 100644 --- a/app/src/main/java/org/apache/taverna/mobile/activities/RunResult.java +++ b/app/src/main/java/org/apache/taverna/mobile/activities/RunResult.java @@ -1,13 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.taverna.mobile.activities; -import org.apache.taverna.mobile.R; -import org.apache.taverna.mobile.fragments.workflowdetails.RunFragment; - import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; +import org.apache.taverna.mobile.R; +import org.apache.taverna.mobile.fragments.workflowdetails.RunFragment; + public class RunResult extends AppCompatActivity { @Override http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2c68a32e/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 1aca5ae..7c9638c 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 @@ -1,30 +1,23 @@ -package org.apache.taverna.mobile.activities; -/** - * Apache Taverna Mobile - * Copyright 2015 The Apache Software Foundation - * - * This product includes software developed at - * The Apache Software Foundation (http://www.apache.org/). - * +/* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ +package org.apache.taverna.mobile.activities; -import org.apache.taverna.mobile.R; import android.annotation.TargetApi; import android.content.Context; @@ -39,6 +32,8 @@ import android.preference.PreferenceManager; import android.support.v4.app.NavUtils; import android.view.MenuItem; +import org.apache.taverna.mobile.R; + import java.util.List; /** http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2c68a32e/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java index eae1fc5..2ee4384 100644 --- a/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java @@ -1,35 +1,23 @@ -package org.apache.taverna.mobile.activities; - -/** - * Apache Taverna Mobile - * Copyright 2015 The Apache Software Foundation - * - * This product includes software developed at - * The Apache Software Foundation (http://www.apache.org/). - * +/* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ +package org.apache.taverna.mobile.activities; -import org.apache.taverna.mobile.R; -import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowAboutFragment; -import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowLicenceFragment; -import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowRunHistoryFragment; -import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowdetailFragment; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -40,6 +28,12 @@ import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; +import org.apache.taverna.mobile.R; +import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowAboutFragment; +import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowLicenceFragment; +import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowRunHistoryFragment; +import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowdetailFragment; + import java.util.Locale; public class WorkflowDetailActivity extends AppCompatActivity { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2c68a32e/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 cfe8338..0ba4900 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 @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.taverna.mobile.data.local; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2c68a32e/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java index c494a62..12a261e 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.taverna.mobile.ui; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2c68a32e/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java index 7246a0d..aed4f36 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java @@ -1,29 +1,22 @@ -package org.apache.taverna.mobile.ui.login; - /* -* Apache Taverna Mobile -* Copyright 2015 The Apache Software Foundation - -* This product includes software developed at -* The Apache Software Foundation (http://www.apache.org/). - -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.taverna.mobile.ui.login; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; @@ -31,6 +24,7 @@ import android.view.Menu; import android.view.MenuItem; import org.apache.taverna.mobile.R; +import org.apache.taverna.mobile.utils.ActivityUtils; public class LoginActivity extends AppCompatActivity { @@ -42,9 +36,8 @@ public class LoginActivity extends AppCompatActivity { setContentView(R.layout.activity_login); if (savedInstanceState == null) { - getSupportFragmentManager().beginTransaction() - .add(R.id.container, new LoginFragment()) - .commit(); + ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),new LoginFragment(),R + .id.container); } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2c68a32e/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java index 1f99a0d..14357b5 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.taverna.mobile.ui.login; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2c68a32e/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginMvpView.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginMvpView.java index c27aadf..ba0734b 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginMvpView.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginMvpView.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.taverna.mobile.ui.login; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2c68a32e/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java index 3979a98..f9733ef 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.taverna.mobile.ui.login; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2c68a32e/app/src/main/res/layout/activity_login.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index ae7a333..fcc1eb3 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,18 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> <!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to You under the Apache License, Version 2.0 -(the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"; - xmlns:tools="http://schemas.android.com/tools"; android:id="@+id/container" - android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".LoginActivity" tools:ignore="MergeRootFrame" /> +<FrameLayout android:id="@+id/container" + xmlns:android="http://schemas.android.com/apk/res/android"; + xmlns:tools="http://schemas.android.com/tools"; + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".ui.login.LoginActivity" + tools:ignore="MergeRootFrame"/> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2c68a32e/app/src/main/res/layout/fragment_login.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index cc55980..df0319a 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -1,22 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -Apache Taverna Mobile -Copyright 2015 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to You under the Apache License, Version 2.0 -(the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android";
