From a68b92d7373b582f30e59e7df14cef644701bd75 Mon Sep 17 00:00:00 2001
From: Vasiliy Bout <bout.vasiliy@gmail.com>
Date: Thu, 2 Sep 2010 19:46:50 +0000
Subject: [PATCH] Log.w cleanup

git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1688 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
---
 .../fbreader/network/NetworkLibrary.java      | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/org/geometerplus/fbreader/network/NetworkLibrary.java b/src/org/geometerplus/fbreader/network/NetworkLibrary.java
index 9d881d2f2..6632b2ed8 100644
--- a/src/org/geometerplus/fbreader/network/NetworkLibrary.java
+++ b/src/org/geometerplus/fbreader/network/NetworkLibrary.java
@@ -21,8 +21,6 @@ package org.geometerplus.fbreader.network;
 
 import java.util.*;
 
-import android.util.Log;
-
 import org.geometerplus.zlibrary.core.util.ZLNetworkUtil;
 import org.geometerplus.zlibrary.core.options.ZLStringOption;
 import org.geometerplus.zlibrary.core.network.ZLNetworkRequest;
@@ -380,7 +378,6 @@ public class NetworkLibrary {
 	}
 
 	private void makeUpToDate() {
-		Log.w("FBREADER", "makeUpToDate...");
 		final LinkedList<FBTree> toRemove = new LinkedList<FBTree>();
 
 		ListIterator<FBTree> nodeIterator = myRootTree.subTrees().listIterator();
@@ -407,10 +404,8 @@ public class NetworkLibrary {
 					final INetworkLink nodeLink = ((NetworkCatalogTree) currentNode).Item.Link;
 					if (linksEqual(link, nodeLink)) {
 						if (linkIsInvalid(link, nodeLink)) {
-							Log.w("FBREADER", "invalid link: " + link.getSiteName() + " /// " + link.getTitle());
 							toRemove.add(currentNode);
 						} else {
-							Log.w("FBREADER", "link is ok: " + link.getSiteName() + " /// " + link.getTitle());
 							processed = true;
 						}
 						currentNode = null;
@@ -426,27 +421,16 @@ public class NetworkLibrary {
 								break;
 							}
 						}
-						if (newNodeLink == null) {
-							Log.w("FBREADER", "nodeLink not found: " + nodeLink.getSiteName() + " /// " + nodeLink.getTitle());
+						if (newNodeLink == null || linkIsInvalid(newNodeLink, nodeLink)) {
 							toRemove.add(currentNode);
 							currentNode = null;
 							++nodeCount;
 						} else {
-							if (linkIsInvalid(newNodeLink, nodeLink)) {
-								Log.w("FBREADER", "move nodeLink: " + nodeLink.getSiteName() + " /// " + nodeLink.getTitle());
-								Log.w("FBREADER", "new link will be: " + newNodeLink.getSiteName() + " /// " + newNodeLink.getTitle());
-								toRemove.add(currentNode);
-								currentNode = null;
-								++nodeCount;
-							} else {
-								Log.w("FBREADER", "need node for link: " + link.getSiteName() + " /// " + link.getTitle());
-								break;
-							}
+							break;
 						}
 					}
 				}
 				if (!processed) {
-					Log.w("FBREADER", "create node for link: " + link.getSiteName() + " /// " + link.getTitle());
 					makeValid(link);
 					final int nextIndex = nodeIterator.nextIndex();
 					new NetworkCatalogRootTree(myRootTree, link, nodeCount++).Item.onDisplayItem();
@@ -460,7 +444,6 @@ public class NetworkLibrary {
 				currentNode = nodeIterator.next();
 			}
 			if (currentNode instanceof NetworkCatalogTree) {
-				Log.w("FBREADER", "remove node: " + currentNode.getName());
 				toRemove.add(currentNode);
 			}
 			currentNode = null;