From 038a8a32275875e93ff9ebef226695f2a57e89d2 Mon Sep 17 00:00:00 2001 From: Dmitry Yuranov Date: Thu, 20 Jun 2013 20:24:13 +0400 Subject: [PATCH] Copyrights have been added --- TODO.catalogs | 4 +- .../fbreader/network/AllCatalogsActivity.java | 48 +++++++++++-------- .../network/action/AllCatalogsAction.java | 29 +++++++++-- 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/TODO.catalogs b/TODO.catalogs index 522044d6e..5446b52a0 100644 --- a/TODO.catalogs +++ b/TODO.catalogs @@ -5,12 +5,12 @@ + add catalog icons + order catalogs alphabetically + extract litres API to a separate branch -** add RSS catalog + + add RSS catalog + hardcoded strings ("Active/Inactive catalogs", may be some else?) => en.xml + "Library filter" => "All catalogs" + NetworkLibraryFilterActivity => AllCatalogsActivity ** make a separate branch for catalogs + master -** copyrights in all files + + copyrights in all files * MID-TERM ** litres catalog use litres-api diff --git a/src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java b/src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java index 2c511227a..c41d57e05 100644 --- a/src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java +++ b/src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java @@ -1,29 +1,39 @@ +/* + * Copyright (C) 2010-2013 Geometer Plus + * + * 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; either version 2 of the License, or + * (at your option) any later version. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + package org.geometerplus.android.fbreader.network; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.TreeSet; - -import org.geometerplus.android.fbreader.covers.CoverManager; -import org.geometerplus.fbreader.network.INetworkLink; -import org.geometerplus.fbreader.network.NetworkLibrary; -import org.geometerplus.fbreader.network.NetworkTree; -import org.geometerplus.fbreader.network.tree.NetworkCatalogRootTree; -import org.geometerplus.zlibrary.ui.android.R; +import java.util.*; import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.CheckBox; -import android.widget.ImageView; -import android.widget.ListView; -import android.widget.TextView; +import android.view.*; +import android.widget.*; + +import org.geometerplus.zlibrary.ui.android.R; +import org.geometerplus.fbreader.network.*; +import org.geometerplus.fbreader.network.tree.NetworkCatalogRootTree; +import org.geometerplus.android.fbreader.covers.CoverManager; + + public class AllCatalogsActivity extends Activity { final NetworkLibrary library = NetworkLibrary.Instance(); diff --git a/src/org/geometerplus/android/fbreader/network/action/AllCatalogsAction.java b/src/org/geometerplus/android/fbreader/network/action/AllCatalogsAction.java index 80ab6b53a..a40e07c23 100644 --- a/src/org/geometerplus/android/fbreader/network/action/AllCatalogsAction.java +++ b/src/org/geometerplus/android/fbreader/network/action/AllCatalogsAction.java @@ -1,16 +1,35 @@ +/* + * Copyright (C) 2010-2013 Geometer Plus + * + * 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; either version 2 of the License, or + * (at your option) any later version. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + package org.geometerplus.android.fbreader.network.action; import java.util.ArrayList; import java.util.List; -import org.geometerplus.android.fbreader.OrientationUtil; -import org.geometerplus.android.fbreader.network.AllCatalogsActivity; -import org.geometerplus.fbreader.network.NetworkLibrary; -import org.geometerplus.fbreader.network.NetworkTree; - import android.app.Activity; import android.content.Intent; +import org.geometerplus.fbreader.network.NetworkTree; +import org.geometerplus.fbreader.network.NetworkLibrary; +import org.geometerplus.android.fbreader.OrientationUtil; +import org.geometerplus.android.fbreader.network.AllCatalogsActivity; + public class AllCatalogsAction extends RootAction { public AllCatalogsAction(Activity activity) {