Clean up copyright code

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;

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
- *                                                                             *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
- *                                                                             *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
- *                                                                             *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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{
 

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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;

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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;

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
- *                                                                             *
  * --------------------------------------------------------------------------- *
  * 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;

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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  *

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;

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
- *                                                                             *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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  *

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                                        *
+ * Copyright (c) 2011-2015 OpenLP Android Developers                           *
- * Portions copyright (c) 2011-2014 Tim Bentley, Johan Mynhardt                *
  * --------------------------------------------------------------------------- *
  * 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  *