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

refactoring: int -> enum

Browse source
This commit is contained in:
Nikolay Pultsin 2011-04-15 19:27:45 +01:00
parent 399845e223
commit 9cb85dc4e0
8 changed files with 85 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/org/geometerplus/fbreader/network/NetworkBookItem.java
View file

@ -113,7 +113,7 @@ public final class NetworkBookItem extends NetworkItem {
myReferences = new LinkedList<BookReference>(references);
}
public BookReference reference(int type) {
public BookReference reference(BookReference.Type type) {
BookReference reference = null;
for (BookReference ref: myReferences) {
if (ref.ReferenceType == type &&
@ -122,8 +122,8 @@ public final class NetworkBookItem extends NetworkItem {
}
}
if (reference == null && type == BookReference.Type.DOWNLOAD_FULL) {
reference = this.reference(BookReference.Type.DOWNLOAD_FULL_CONDITIONAL);
if (reference == null && type == BookReference.Type.Book) {
reference = this.reference(BookReference.Type.BookConditional);
if (reference != null) {
NetworkAuthenticationManager authManager = Link.authenticationManager();
if (authManager == null || authManager.needPurchase(this)) {
@ -134,17 +134,17 @@ public final class NetworkBookItem extends NetworkItem {
}
if (reference == null &&
type == BookReference.Type.DOWNLOAD_FULL &&
this.reference(BookReference.Type.BUY) == null &&
this.reference(BookReference.Type.BUY_IN_BROWSER) == null) {
reference = this.reference(BookReference.Type.DOWNLOAD_FULL_OR_DEMO);
type == BookReference.Type.Book &&
this.reference(BookReference.Type.BookBuy) == null &&
this.reference(BookReference.Type.BookBuyInBrowser) == null) {
reference = this.reference(BookReference.Type.BookFullOrDemo);
}
if (reference == null &&
type == BookReference.Type.DOWNLOAD_DEMO &&
(this.reference(BookReference.Type.BUY) != null ||
this.reference(BookReference.Type.BUY_IN_BROWSER) != null)) {
reference = this.reference(BookReference.Type.DOWNLOAD_FULL_OR_DEMO);
type == BookReference.Type.BookDemo &&
(this.reference(BookReference.Type.BookBuy) != null ||
this.reference(BookReference.Type.BookBuyInBrowser) != null)) {
reference = this.reference(BookReference.Type.BookFullOrDemo);
}
return reference;
@ -152,17 +152,17 @@ public final class NetworkBookItem extends NetworkItem {
public String localCopyFileName() {
final boolean hasBuyReference =
this.reference(BookReference.Type.BUY) != null ||
this.reference(BookReference.Type.BUY_IN_BROWSER) != null;
this.reference(BookReference.Type.BookBuy) != null ||
this.reference(BookReference.Type.BookBuyInBrowser) != null;
BookReference reference = null;
String fileName = null;
for (BookReference ref: myReferences) {
final int type = ref.ReferenceType;
if ((type == BookReference.Type.DOWNLOAD_FULL ||
type == BookReference.Type.DOWNLOAD_FULL_CONDITIONAL ||
(!hasBuyReference && type == BookReference.Type.DOWNLOAD_FULL_OR_DEMO)) &&
final BookReference.Type type = ref.ReferenceType;
if ((type == BookReference.Type.Book ||
type == BookReference.Type.BookConditional ||
(!hasBuyReference && type == BookReference.Type.BookFullOrDemo)) &&
(reference == null || ref.BookFormat > reference.BookFormat)) {
String name = ref.localCopyFileName(BookReference.Type.DOWNLOAD_FULL);
String name = ref.localCopyFileName(BookReference.Type.Book);
if (name != null) {
reference = ref;
fileName = name;
@ -174,14 +174,14 @@ public final class NetworkBookItem extends NetworkItem {
public void removeLocalFiles() {
final boolean hasBuyReference =
this.reference(BookReference.Type.BUY) != null ||
this.reference(BookReference.Type.BUY_IN_BROWSER) != null;
this.reference(BookReference.Type.BookBuy) != null ||
this.reference(BookReference.Type.BookBuyInBrowser) != null;
for (BookReference ref: myReferences) {
final int type = ref.ReferenceType;
if (type == BookReference.Type.DOWNLOAD_FULL ||
type == BookReference.Type.DOWNLOAD_FULL_CONDITIONAL ||
(!hasBuyReference && type == BookReference.Type.DOWNLOAD_FULL_OR_DEMO)) {
String fileName = ref.localCopyFileName(BookReference.Type.DOWNLOAD_FULL);
final BookReference.Type type = ref.ReferenceType;
if (type == BookReference.Type.Book ||
type == BookReference.Type.BookConditional ||
(!hasBuyReference && type == BookReference.Type.BookFullOrDemo)) {
String fileName = ref.localCopyFileName(BookReference.Type.Book);
if (fileName != null) {
// TODO: remove a book from the library
// TODO: remove a record from the database