From 13bb8ca00e41c0ff95fbe5903cbf1267a0efaf49 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 19 Jan 2015 21:09:12 +0000 Subject: [PATCH] Clean up copyright code --- .../main/java/org/openlp/android2/OpenLP.java | 19 ++++++++++++++++++- .../activities/ConnectionActivity.java | 4 +--- .../android2/activities/SettingsActivity.java | 4 +--- .../java/org/openlp/android2/api/Api.java | 4 +--- .../openlp/android2/common/JsonHelpers.java | 3 +-- .../android2/common/NavigationOptions.java | 3 +-- .../openlp/android2/common/OpenLPDialog.java | 3 +-- .../android2/common/OpenLPFragment.java | 11 ++--------- .../android2/common/OpenLPHttpClient.java | 4 +--- .../android2/common/OpenLPHttpReturn.java | 3 +-- .../common/OpenLPSSLSocketFactory.java | 3 +-- .../android2/dialogs/AlertDisplayDialog.java | 3 +-- .../android2/dialogs/BlankDisplayDialog.java | 4 +--- .../android2/fragments/AboutFragment.java | 3 +-- .../android2/fragments/HomeFragment.java | 3 +-- .../android2/fragments/LiveListFragment.java | 5 +---- .../android2/fragments/LiveWebFragment.java | 3 +-- .../fragments/NavigationDrawerFragment.java | 19 ++++++++++++++++++- .../fragments/ServiceListFragment.java | 4 +--- .../android2/fragments/StageWebFragment.java | 3 +-- .../android2/fragments/WebFragment.java | 3 +-- 21 files changed, 56 insertions(+), 55 deletions(-) diff --git a/app/src/main/java/org/openlp/android2/OpenLP.java b/app/src/main/java/org/openlp/android2/OpenLP.java index 10afde4..76834d4 100644 --- a/app/src/main/java/org/openlp/android2/OpenLP.java +++ b/app/src/main/java/org/openlp/android2/OpenLP.java @@ -1,3 +1,21 @@ +/****************************************************************************** + * OpenLP - Open Source Lyrics Projection * + * --------------------------------------------------------------------------- * + * Copyright (c) 2011-2015 OpenLP Android Developers * + * --------------------------------------------------------------------------- * + * This program is free software; you can redistribute it and/or modify it * + * under the terms of the GNU General Public License as published by the Free * + * Software Foundation; version 2 of the License. * + * * + * This program is distributed in the hope that it will be useful, but WITHOUT * + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * + * more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with this program; if not, write to the Free Software Foundation, Inc., 59 * + * Temple Place, Suite 330, Boston, MA 02111-1307 USA * + *******************************************************************************/ package org.openlp.android2; import android.app.Activity; @@ -15,7 +33,6 @@ import android.view.View; import android.view.ViewGroup; import android.support.v4.widget.DrawerLayout; -import org.openlp.android2.activities.ConnectionActivity; import org.openlp.android2.activities.SettingsActivity; import org.openlp.android2.common.NavigationOptions; import org.openlp.android2.dialogs.AlertDisplayDialog; diff --git a/app/src/main/java/org/openlp/android2/activities/ConnectionActivity.java b/app/src/main/java/org/openlp/android2/activities/ConnectionActivity.java index 246e53f..38df396 100644 --- a/app/src/main/java/org/openlp/android2/activities/ConnectionActivity.java +++ b/app/src/main/java/org/openlp/android2/activities/ConnectionActivity.java @@ -1,9 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * - * * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java b/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java index 5e25aad..4751060 100644 --- a/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java +++ b/app/src/main/java/org/openlp/android2/activities/SettingsActivity.java @@ -1,9 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * - * * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/api/Api.java b/app/src/main/java/org/openlp/android2/api/Api.java index 726f5db..ca81188 100644 --- a/app/src/main/java/org/openlp/android2/api/Api.java +++ b/app/src/main/java/org/openlp/android2/api/Api.java @@ -1,9 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * - * * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/common/JsonHelpers.java b/app/src/main/java/org/openlp/android2/common/JsonHelpers.java index 7ef0c70..a46ac09 100644 --- a/app/src/main/java/org/openlp/android2/common/JsonHelpers.java +++ b/app/src/main/java/org/openlp/android2/common/JsonHelpers.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/common/NavigationOptions.java b/app/src/main/java/org/openlp/android2/common/NavigationOptions.java index 2bfd433..b231c3c 100644 --- a/app/src/main/java/org/openlp/android2/common/NavigationOptions.java +++ b/app/src/main/java/org/openlp/android2/common/NavigationOptions.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/common/OpenLPDialog.java b/app/src/main/java/org/openlp/android2/common/OpenLPDialog.java index 560a272..02f9d64 100644 --- a/app/src/main/java/org/openlp/android2/common/OpenLPDialog.java +++ b/app/src/main/java/org/openlp/android2/common/OpenLPDialog.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/common/OpenLPFragment.java b/app/src/main/java/org/openlp/android2/common/OpenLPFragment.java index e6ca40c..263a4c9 100644 --- a/app/src/main/java/org/openlp/android2/common/OpenLPFragment.java +++ b/app/src/main/java/org/openlp/android2/common/OpenLPFragment.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * @@ -22,21 +21,15 @@ package org.openlp.android2.common; import android.app.ListFragment; import android.content.Context; -import android.os.AsyncTask; import android.util.Log; import android.view.View; -import android.widget.AbsListView; + import android.widget.ListView; import android.widget.Toast; import com.loopj.android.http.AsyncHttpClient; import com.loopj.android.http.TextHttpResponseHandler; import org.apache.http.Header; import org.openlp.android2.R; -import org.openlp.android2.api.Api; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URISyntaxException; abstract public class OpenLPFragment extends ListFragment{ diff --git a/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java b/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java index 079880e..f2d2aa4 100644 --- a/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java +++ b/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * @@ -25,7 +24,6 @@ import java.util.*; import android.content.Context; import android.util.Log; import com.loopj.android.http.AsyncHttpClient; -import com.loopj.android.http.MySSLSocketFactory; import org.apache.http.auth.Credentials; import org.apache.http.auth.UsernamePasswordCredentials; import org.openlp.android2.R; diff --git a/app/src/main/java/org/openlp/android2/common/OpenLPHttpReturn.java b/app/src/main/java/org/openlp/android2/common/OpenLPHttpReturn.java index cfe5503..0f96c14 100644 --- a/app/src/main/java/org/openlp/android2/common/OpenLPHttpReturn.java +++ b/app/src/main/java/org/openlp/android2/common/OpenLPHttpReturn.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/common/OpenLPSSLSocketFactory.java b/app/src/main/java/org/openlp/android2/common/OpenLPSSLSocketFactory.java index 89dec57..a4f3ea3 100644 --- a/app/src/main/java/org/openlp/android2/common/OpenLPSSLSocketFactory.java +++ b/app/src/main/java/org/openlp/android2/common/OpenLPSSLSocketFactory.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/dialogs/AlertDisplayDialog.java b/app/src/main/java/org/openlp/android2/dialogs/AlertDisplayDialog.java index 5f55360..0a68677 100644 --- a/app/src/main/java/org/openlp/android2/dialogs/AlertDisplayDialog.java +++ b/app/src/main/java/org/openlp/android2/dialogs/AlertDisplayDialog.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java b/app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java index a86d12b..a44feef 100644 --- a/app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java +++ b/app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * @@ -28,7 +27,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; -import android.widget.Toast; import org.json.JSONException; import org.json.JSONObject; import org.openlp.android2.R; diff --git a/app/src/main/java/org/openlp/android2/fragments/AboutFragment.java b/app/src/main/java/org/openlp/android2/fragments/AboutFragment.java index aee7551..751fb36 100644 --- a/app/src/main/java/org/openlp/android2/fragments/AboutFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/AboutFragment.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/fragments/HomeFragment.java b/app/src/main/java/org/openlp/android2/fragments/HomeFragment.java index 0371fd9..6d8c9ab 100644 --- a/app/src/main/java/org/openlp/android2/fragments/HomeFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/HomeFragment.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java index 73278f7..708f0c7 100644 --- a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java @@ -1,9 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * - * * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * @@ -21,7 +19,6 @@ package org.openlp.android2.fragments; import android.content.Context; -import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.Typeface; import android.os.Bundle; diff --git a/app/src/main/java/org/openlp/android2/fragments/LiveWebFragment.java b/app/src/main/java/org/openlp/android2/fragments/LiveWebFragment.java index d1403a4..a080651 100644 --- a/app/src/main/java/org/openlp/android2/fragments/LiveWebFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/LiveWebFragment.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java b/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java index 0bb62ea..30a5d31 100644 --- a/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java @@ -1,3 +1,21 @@ +/****************************************************************************** + * OpenLP - Open Source Lyrics Projection * + * --------------------------------------------------------------------------- * + * Copyright (c) 2011-2015 OpenLP Android Developers * + * --------------------------------------------------------------------------- * + * This program is free software; you can redistribute it and/or modify it * + * under the terms of the GNU General Public License as published by the Free * + * Software Foundation; version 2 of the License. * + * * + * This program is distributed in the hope that it will be useful, but WITHOUT * + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * + * more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with this program; if not, write to the Free Software Foundation, Inc., 59 * + * Temple Place, Suite 330, Boston, MA 02111-1307 USA * + *******************************************************************************/ package org.openlp.android2.fragments; import android.support.v7.app.ActionBarActivity; @@ -18,7 +36,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; -import android.widget.ArrayAdapter; import android.widget.ListAdapter; import android.widget.ListView; import android.widget.SimpleAdapter; diff --git a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java index 64a8ae8..c4d5230 100644 --- a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java @@ -1,9 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * - * * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/fragments/StageWebFragment.java b/app/src/main/java/org/openlp/android2/fragments/StageWebFragment.java index 1fac747..afd1db3 100644 --- a/app/src/main/java/org/openlp/android2/fragments/StageWebFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/StageWebFragment.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free * diff --git a/app/src/main/java/org/openlp/android2/fragments/WebFragment.java b/app/src/main/java/org/openlp/android2/fragments/WebFragment.java index 0edee8f..fdffb41 100644 --- a/app/src/main/java/org/openlp/android2/fragments/WebFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/WebFragment.java @@ -1,8 +1,7 @@ /****************************************************************************** * OpenLP - Open Source Lyrics Projection * * --------------------------------------------------------------------------- * - * Copyright (c) 2011-2014 Raoul Snyman * - * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt * + * Copyright (c) 2011-2015 OpenLP Android Developers * * --------------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the Free *