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

version number has been changed to 0.6.1

Browse source 
NPE in Author.hashCode has been fixed


git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1253 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
This commit is contained in:
Nikolay Pultsin 2010-04-19 19:13:38 +00:00
parent 730e13c4a5
commit 152fba73e3
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="600" android:versionName="0.6.0"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="601" android:versionName="0.6.1">
<uses-sdk android:minSdkVersion="3"/> <uses-sdk android:minSdkVersion="3"/>
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" /> <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />

2
VERSION
View file

@ -1 +1 @@
0.6.0 0.6.1

8
src/org/geometerplus/fbreader/library/Author.java
View file

@ -31,6 +31,14 @@ public final class Author {
SortKey = sortKey; SortKey = sortKey;
} }
public static boolean areEquals(Author author0, Author author1) {
return author0 == null ? author1 == null : author0.equals(author1);
}
public static int hashCode(Author author) {
return author == null ? 0 : author.hashCode();
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (o == this) { if (o == this) {

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

@ -165,11 +165,11 @@ public final class Library {
return false; return false;
} }
AuthorSeriesPair pair = (AuthorSeriesPair)object; AuthorSeriesPair pair = (AuthorSeriesPair)object;
return myAuthor.equals(pair.myAuthor) && mySeries.equals(pair.mySeries); return Author.areEquals(myAuthor, pair.myAuthor) && mySeries.equals(pair.mySeries);
} }
public int hashCode() { public int hashCode() {
return myAuthor.hashCode() + mySeries.hashCode(); return Author.hashCode(myAuthor) + mySeries.hashCode();
} }
} }