synchronization with library-service branch

src/org/geometerplus/android/fbreader/libraryService/LibraryService.java

@@ -70,13 +70,11 @@ public class LibraryService extends Service implements Library.ChangeListener {
 		System.err.println("LibraryService.onCreate()");
 		super.onCreate();
 		myLibrary = new LibraryImplementation();
-		myLibrary.myBaseLibrary.addChangeListener(this);
 	}
 
 	@Override
 	public void onDestroy() {
 		System.err.println("LibraryService.onDestroy()");
-		myLibrary.myBaseLibrary.removeChangeListener(this);
 		myLibrary = null;
 		super.onDestroy();
 	}

src/org/geometerplus/fbreader/library/AbstractLibrary.java

@@ -22,36 +22,6 @@ package org.geometerplus.fbreader.library;
 import java.util.*;
 
 public abstract class AbstractLibrary {
-	private final List<ChangeListener> myListeners = Collections.synchronizedList(new LinkedList<ChangeListener>());
-
-	public interface ChangeListener {
-		public enum Code {
-			BookAdded,
-			BookRemoved,
-			StatusChanged,
-			Found,
-			NotFound
-		}
-
-		void onLibraryChanged(Code code);
-	}
-
-	public void addChangeListener(ChangeListener listener) {
-		myListeners.add(listener);
-	}
-
-	public void removeChangeListener(ChangeListener listener) {
-		myListeners.remove(listener);
-	}
-
-	protected void fireModelChangedEvent(ChangeListener.Code code) {
-		synchronized (myListeners) {
-			for (ChangeListener l : myListeners) {
-				l.onLibraryChanged(code);
-			}
-		}
-	}
-
 	public abstract boolean isUpToDate();
 
 	public static final int REMOVE_DONT_REMOVE = 0x00;

src/org/geometerplus/fbreader/library/Library.java

@@ -52,6 +52,36 @@ public final class Library extends AbstractLibrary {
 		return ourInstance;
 	}
 
+	private final List<ChangeListener> myListeners = Collections.synchronizedList(new LinkedList<ChangeListener>());
+
+	public interface ChangeListener {
+		public enum Code {
+			BookAdded,
+			BookRemoved,
+			StatusChanged,
+			Found,
+			NotFound
+		}
+
+		void onLibraryChanged(Code code);
+	}
+
+	public void addChangeListener(ChangeListener listener) {
+		myListeners.add(listener);
+	}
+
+	public void removeChangeListener(ChangeListener listener) {
+		myListeners.remove(listener);
+	}
+
+	protected void fireModelChangedEvent(ChangeListener.Code code) {
+		synchronized (myListeners) {
+			for (ChangeListener l : myListeners) {
+				l.onLibraryChanged(code);
+			}
+		}
+	}
+
 	private final BooksDatabase myDatabase;
 
 	private final Map<ZLFile,Book> myBooks =