yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

TitleTree: code unification

Browse source
This commit is contained in:
Nikolay Pultsin 2011-07-17 16:09:02 +01:00
parent f79aaeb132
commit 6f864809a5
2 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/org/geometerplus/fbreader/library/Library.java
View file

@ -300,31 +300,23 @@ public final class Library {
boolean doGroupTitlesByFirstLetter = false; boolean doGroupTitlesByFirstLetter = false;
if (myBooks.size() > 10) { if (myBooks.size() > 10) {
final HashSet<Character> letterSet = new HashSet<Character>(); final HashSet<String> letterSet = new HashSet<String>();
for (Book book : myBooks) { for (Book book : myBooks) {
String title = book.getTitle(); final String letter = TitleTree.firstTitleLetter(book);
if (title != null) { if (letter != null) {
title = title.trim(); letterSet.add(letter);
if (!"".equals(title)) {
letterSet.add(title.charAt(0));
}
} }
} }
doGroupTitlesByFirstLetter = myBooks.size() > letterSet.size() * 5 / 4; doGroupTitlesByFirstLetter = myBooks.size() > letterSet.size() * 5 / 4;
} }
if (doGroupTitlesByFirstLetter) { if (doGroupTitlesByFirstLetter) {
for (Book book : myBooks) { for (Book book : myBooks) {
String title = book.getTitle(); final String letter = TitleTree.firstTitleLetter(book);
if (title == null) { if (letter != null) {
continue; final TitleTree tree =
getFirstLevelTree(ROOT_BY_TITLE).getTitleSubTree(letter);
tree.getBookSubTree(book, true);
} }
title = title.trim();
if ("".equals(title)) {
continue;
}
Character c = title.charAt(0);
final TitleTree tree = getFirstLevelTree(ROOT_BY_TITLE).getTitleSubTree(c.toString());
tree.getBookSubTree(book, true);
} }
} else { } else {
for (Book book : myBooks) { for (Book book : myBooks) {

17
src/org/geometerplus/fbreader/library/TitleTree.java
View file

@ -20,6 +20,21 @@
package org.geometerplus.fbreader.library; package org.geometerplus.fbreader.library;
public final class TitleTree extends LibraryTree { public final class TitleTree extends LibraryTree {
static String firstTitleLetter(Book book) {
if (book == null) {
return null;
}
String title = book.getTitle();
if (title == null) {
return null;
}
title = title.trim();
if ("".equals(title)) {
return null;
}
return String.valueOf(Character.toUpperCase(title.charAt(0)));
}
public final String Title; public final String Title;
TitleTree(String title) { TitleTree(String title) {
@ -43,6 +58,6 @@ public final class TitleTree extends LibraryTree {
@Override @Override
public boolean containsBook(Book book) { public boolean containsBook(Book book) {
return book != null && book.getTitle() != null && book.getTitle().trim().startsWith(Title); return Title.equals(firstTitleLetter(book));
} }
} }