yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00
Code Issues Releases Wiki Activity

formatting

Browse source
This commit is contained in:
Nikolay Pultsin 2014-06-29 20:50:27 +01:00
parent 5b8dec9ffd
commit 2b125fbdeb
7 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/org/geometerplus/android/fbreader/api/Api.java
View file

@ -89,6 +89,6 @@ public interface Api {
String getTapActionByCoordinates(String name, int x, int y, int width, int height, String tap) throws ApiException; String getTapActionByCoordinates(String name, int x, int y, int width, int height, String tap) throws ApiException;
List<MenuNode> getMainMenuContent() throws ApiException; List<MenuNode> getMainMenuContent() throws ApiException;
String getResourceString(String ... keys) throws ApiException; String getResourceString(String ... keys) throws ApiException;
Bitmap getBitmap(int resourceId) throws ApiException; Bitmap getBitmap(int resourceId) throws ApiException;
} }

6
src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
View file

@ -1043,7 +1043,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
cursor.close(); cursor.close();
return links; return links;
} }
private SQLiteStatement mySaveProgessStatement; private SQLiteStatement mySaveProgessStatement;
@Override @Override
protected void saveBookProgress(long bookId, RationalNumber progress) { protected void saveBookProgress(long bookId, RationalNumber progress) {
@ -1489,7 +1489,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
myDatabase.execSQL("INSERT OR REPLACE INTO HighlightingStyle (style_id, name, bg_color) VALUES (2, '', 245*256*256 + 121*256 + 0)"); // #f57900 myDatabase.execSQL("INSERT OR REPLACE INTO HighlightingStyle (style_id, name, bg_color) VALUES (2, '', 245*256*256 + 121*256 + 0)"); // #f57900
myDatabase.execSQL("INSERT OR REPLACE INTO HighlightingStyle (style_id, name, bg_color) VALUES (3, '', 114*256*256 + 159*256 + 207)"); // #729fcf myDatabase.execSQL("INSERT OR REPLACE INTO HighlightingStyle (style_id, name, bg_color) VALUES (3, '', 114*256*256 + 159*256 + 207)"); // #729fcf
} }
private void updateTables25() { private void updateTables25() {
myDatabase.execSQL( myDatabase.execSQL(
"CREATE TABLE IF NOT EXISTS BookReadingProgress(" + "CREATE TABLE IF NOT EXISTS BookReadingProgress(" +
@ -1497,7 +1497,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
"numerator INTEGER NOT NULL," + "numerator INTEGER NOT NULL," +
"denominator INTEGER NOT NULL)"); "denominator INTEGER NOT NULL)");
} }
private void updateTables26() { private void updateTables26() {
myDatabase.execSQL( myDatabase.execSQL(
"CREATE TABLE IF NOT EXISTS BookSynchronizationInfo(" + "CREATE TABLE IF NOT EXISTS BookSynchronizationInfo(" +

10
src/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java
View file

@ -36,7 +36,7 @@ import org.geometerplus.fbreader.network.tree.NetworkItemsLoader;
public class RSSNetworkLink extends AbstractNetworkLink implements IPredefinedNetworkLink { public class RSSNetworkLink extends AbstractNetworkLink implements IPredefinedNetworkLink {
private final String myPredefinedId; private final String myPredefinedId;
private final Map<String,String> myExtraData = new HashMap<String,String>(); private final Map<String,String> myExtraData = new HashMap<String,String>();
public RSSNetworkLink( public RSSNetworkLink(
int id, String predefinedId, int id, String predefinedId,
String siteName, String title, String summary, String siteName, String title, String summary,
@ -45,12 +45,12 @@ public class RSSNetworkLink extends AbstractNetworkLink implements IPredefinedNe
super(id, siteName, title, summary, language, infos); super(id, siteName, title, summary, language, infos);
myPredefinedId = predefinedId; myPredefinedId = predefinedId;
} }
ZLNetworkRequest createNetworkData(String url, final RSSCatalogItem.State result) { ZLNetworkRequest createNetworkData(String url, final RSSCatalogItem.State result) {
if (url == null) { if (url == null) {
return null; return null;
} }
final NetworkLibrary library = NetworkLibrary.Instance(); final NetworkLibrary library = NetworkLibrary.Instance();
final NetworkCatalogItem catalogItem = result.Loader.getTree().Item; final NetworkCatalogItem catalogItem = result.Loader.getTree().Item;
library.startLoading(catalogItem); library.startLoading(catalogItem);
@ -64,7 +64,7 @@ public class RSSNetworkLink extends AbstractNetworkLink implements IPredefinedNe
} }
new RSSXMLReader(new RSSChannelHandler(getURL(), result), false).read(inputStream); new RSSXMLReader(new RSSChannelHandler(getURL(), result), false).read(inputStream);
if (result.Loader.confirmInterruption() && result.LastLoadedId != null) { if (result.Loader.confirmInterruption() && result.LastLoadedId != null) {
result.LastLoadedId = null; result.LastLoadedId = null;
} else { } else {
@ -83,7 +83,7 @@ public class RSSNetworkLink extends AbstractNetworkLink implements IPredefinedNe
public RSSCatalogItem.State createOperationData(NetworkItemsLoader loader) { public RSSCatalogItem.State createOperationData(NetworkItemsLoader loader) {
return new RSSCatalogItem.State(this, loader); return new RSSCatalogItem.State(this, loader);
} }
public final void setExtraData(Map<String,String> extraData) { public final void setExtraData(Map<String,String> extraData) {
myExtraData.clear(); myExtraData.clear();
myExtraData.putAll(extraData); myExtraData.putAll(extraData);

44
src/org/geometerplus/fbreader/network/rss/RSSXMLReader.java
View file

@ -27,12 +27,12 @@ import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter;
import org.geometerplus.fbreader.network.atom.*; import org.geometerplus.fbreader.network.atom.*;
public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType extends RSSItem> extends ZLXMLReaderAdapter { public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType extends RSSItem> extends ZLXMLReaderAdapter {
public RSSXMLReader(ATOMFeedHandler<MetadataType,EntryType> handler, boolean readEntryNotFeed) { public RSSXMLReader(ATOMFeedHandler<MetadataType,EntryType> handler, boolean readEntryNotFeed) {
myFeedHandler = handler; myFeedHandler = handler;
myState = START; myState = START;
} }
protected int myState; protected int myState;
private final ATOMFeedHandler<MetadataType,EntryType> myFeedHandler; private final ATOMFeedHandler<MetadataType,EntryType> myFeedHandler;
private Map<String,String> myNamespaceMap; private Map<String,String> myNamespaceMap;
@ -42,7 +42,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
private RSSAuthor myAuthor; private RSSAuthor myAuthor;
private RSSCategory myCategory; private RSSCategory myCategory;
private ATOMId myId; private ATOMId myId;
private static final int START = 0; private static final int START = 0;
protected static final int RSS = 1; protected static final int RSS = 1;
protected static final int CHANNEL = 2; protected static final int CHANNEL = 2;
@ -58,7 +58,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
protected static final int DESCRIPTION = 12; protected static final int DESCRIPTION = 12;
protected static final int CONTENT = 13; protected static final int CONTENT = 13;
protected static final int COMMENTS_RSS = 14; protected static final int COMMENTS_RSS = 14;
protected static final String TAG_RSS = "rss"; protected static final String TAG_RSS = "rss";
protected static final String TAG_CHANNEL = "channel"; protected static final String TAG_CHANNEL = "channel";
protected static final String TAG_ITEM = "item"; protected static final String TAG_ITEM = "item";
@ -68,7 +68,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
protected static final String TAG_GUID = "guid"; protected static final String TAG_GUID = "guid";
protected static final String TAG_DESCRIPTION = "description"; protected static final String TAG_DESCRIPTION = "description";
protected static final String TAG_PUBDATE = "pubDate"; protected static final String TAG_PUBDATE = "pubDate";
@Override @Override
public final boolean startElementHandler(String tag, ZLStringMap attributes) { public final boolean startElementHandler(String tag, ZLStringMap attributes) {
final int index = tag.indexOf(':'); final int index = tag.indexOf(':');
@ -80,7 +80,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
tagPrefix = ""; tagPrefix = "";
tag = tag.intern(); tag = tag.intern();
} }
return startElementHandler(getNamespace(tagPrefix), tag, attributes, extractBufferContent()); return startElementHandler(getNamespace(tagPrefix), tag, attributes, extractBufferContent());
} }
@ -97,12 +97,12 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
} }
return endElementHandler(getNamespace(tagPrefix), tag, extractBufferContent()); return endElementHandler(getNamespace(tagPrefix), tag, extractBufferContent());
} }
@Override @Override
public final void characterDataHandler(char[] data, int start, int length) { public final void characterDataHandler(char[] data, int start, int length) {
myBuffer.append(data, start, length); myBuffer.append(data, start, length);
} }
public boolean startElementHandler(String ns, String tag, ZLStringMap attributes, String bufferContent) { public boolean startElementHandler(String ns, String tag, ZLStringMap attributes, String bufferContent) {
switch (myState) { switch (myState) {
case START: case START:
@ -119,7 +119,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
if (testTag(TAG_TITLE, tag, ns, null)) { if (testTag(TAG_TITLE, tag, ns, null)) {
myState = C_TITLE; myState = C_TITLE;
} }
if (testTag(TAG_LINK, tag, ns, null)) { if (testTag(TAG_LINK, tag, ns, null)) {
myState = C_LINK; myState = C_LINK;
} }
if (testTag(TAG_ITEM, tag, ns, null)) { if (testTag(TAG_ITEM, tag, ns, null)) {
@ -151,7 +151,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
} }
return false; return false;
} }
public boolean endElementHandler(String ns, String tag, String bufferContent) { public boolean endElementHandler(String ns, String tag, String bufferContent) {
switch (myState) { switch (myState) {
case START: case START:
@ -172,7 +172,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
} }
break; break;
case C_LINK: case C_LINK:
if (testTag(TAG_LINK, tag, ns, null)) { if (testTag(TAG_LINK, tag, ns, null)) {
myState = CHANNEL; myState = CHANNEL;
} }
break; break;
@ -233,11 +233,11 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
} }
return false; return false;
} }
private void parseTitle(String bufferContent) { private void parseTitle(String bufferContent) {
String[] marks = {"~ by:", "By"}; String[] marks = {"~ by:", "By"};
boolean found = false; boolean found = false;
for (int i = 0; i < marks.length; i++) { for (int i = 0; i < marks.length; i++) {
int foundIndex = bufferContent.indexOf(marks[i]); int foundIndex = bufferContent.indexOf(marks[i]);
if (foundIndex >= 0) { if (foundIndex >= 0) {
@ -253,42 +253,42 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
break; break;
} }
} }
if (!found) { if (!found) {
myItem.Title = bufferContent; myItem.Title = bufferContent;
} }
} }
private String makeFormat(String buffer) { private String makeFormat(String buffer) {
//TODO: maybe need to make the text more readable? //TODO: maybe need to make the text more readable?
StringBuffer s1 = new StringBuffer(buffer); StringBuffer s1 = new StringBuffer(buffer);
int index; int index;
String[] marks = {"Author:", "Price:", "Rating:"}; String[] marks = {"Author:", "Price:", "Rating:"};
for (int i = 0; i < marks.length; i++) { for (int i = 0; i < marks.length; i++) {
index = s1.indexOf(marks[i]); index = s1.indexOf(marks[i]);
if (index >= 0) { if (index >= 0) {
s1.insert(index, "<br/>"); s1.insert(index, "<br/>");
} }
} }
return s1.toString(); return s1.toString();
} }
public boolean testTag(String name, String tag, String ns, String nsName) { public boolean testTag(String name, String tag, String ns, String nsName) {
return name == tag && ns == nsName; return name == tag && ns == nsName;
} }
@Override @Override
public final boolean processNamespaces() { public final boolean processNamespaces() {
return true; return true;
} }
@Override @Override
public final void namespaceMapChangedHandler(Map<String,String> namespaceMap) { public final void namespaceMapChangedHandler(Map<String,String> namespaceMap) {
myNamespaceMap = namespaceMap; myNamespaceMap = namespaceMap;
} }
protected final String getNamespace(String prefix) { protected final String getNamespace(String prefix) {
if (myNamespaceMap == null) { if (myNamespaceMap == null) {
return null; return null;
@ -296,7 +296,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
final String ns = myNamespaceMap.get(prefix); final String ns = myNamespaceMap.get(prefix);
return ns != null ? ns.intern() : null; return ns != null ? ns.intern() : null;
} }
private final String extractBufferContent() { private final String extractBufferContent() {
final char[] bufferContentArray = myBuffer.toString().toCharArray(); final char[] bufferContentArray = myBuffer.toString().toCharArray();
myBuffer.delete(0, myBuffer.length()); myBuffer.delete(0, myBuffer.length());

14
src/org/geometerplus/fbreader/sort/TitledEntity.java
View file

@ -29,11 +29,11 @@ import android.os.Build;
public abstract class TitledEntity { public abstract class TitledEntity {
private String myTitle; private String myTitle;
private String mySortKey; private String mySortKey;
public TitledEntity(String title) { public TitledEntity(String title) {
myTitle = title; myTitle = title;
} }
public String getTitle() { public String getTitle() {
return myTitle != null ? myTitle : ""; return myTitle != null ? myTitle : "";
} }
@ -50,9 +50,9 @@ public abstract class TitledEntity {
protected void resetSortKey() { protected void resetSortKey() {
mySortKey = null; mySortKey = null;
} }
public abstract String getLanguage(); public abstract String getLanguage();
public String getSortKey() { public String getSortKey() {
if (null == mySortKey) { if (null == mySortKey) {
try { try {
@ -63,7 +63,7 @@ public abstract class TitledEntity {
} }
return mySortKey; return mySortKey;
} }
private final static Map<String, String[]> ARTICLES = new HashMap<String, String[]>(); private final static Map<String, String[]> ARTICLES = new HashMap<String, String[]>();
// English articles // English articles
private final static String[] EN_ARTICLES = new String[] { private final static String[] EN_ARTICLES = new String[] {
@ -88,7 +88,7 @@ public abstract class TitledEntity {
private final static String[] SP_ARTICLES = new String[] { private final static String[] SP_ARTICLES = new String[] {
"el ", "la ", "los ", "las ", "un ", "unos ", "una ", "unas " "el ", "la ", "los ", "las ", "un ", "unos ", "una ", "unas "
}; };
static { static {
ARTICLES.put("en", EN_ARTICLES); ARTICLES.put("en", EN_ARTICLES);
ARTICLES.put("fr", FR_ARTICLES); ARTICLES.put("fr", FR_ARTICLES);
@ -148,7 +148,7 @@ public abstract class TitledEntity {
if (result.startsWith("a is")) { if (result.startsWith("a is")) {
return result; return result;
} }
if (null != ARTICLES.get(language)) { if (null != ARTICLES.get(language)) {
for (String a : ARTICLES.get(language)) { for (String a : ARTICLES.get(language)) {
if (result.startsWith(a)) { if (result.startsWith(a)) {

10
src/org/geometerplus/zlibrary/core/util/RationalNumber.java
View file

@ -29,7 +29,7 @@ public class RationalNumber {
public final long Numerator; public final long Numerator;
public final long Denominator; public final long Denominator;
private RationalNumber(long numerator, long denominator) { private RationalNumber(long numerator, long denominator) {
final long gcd = GCD(numerator, denominator); final long gcd = GCD(numerator, denominator);
if (gcd > 1) { if (gcd > 1) {
@ -43,11 +43,11 @@ public class RationalNumber {
Numerator = numerator; Numerator = numerator;
Denominator = denominator; Denominator = denominator;
} }
public float toFloat() { public float toFloat() {
return 1.0f * Numerator / Denominator; return 1.0f * Numerator / Denominator;
} }
private long GCD(long a, long b) { private long GCD(long a, long b) {
if (a < 0) { if (a < 0) {
a = -a; a = -a;
@ -64,7 +64,7 @@ public class RationalNumber {
} }
return a + b; return a + b;
} }
@Override @Override
public boolean equals(Object other) { public boolean equals(Object other) {
if (this == other) { if (this == other) {
@ -76,7 +76,7 @@ public class RationalNumber {
final RationalNumber otherNumber = (RationalNumber)other; final RationalNumber otherNumber = (RationalNumber)other;
return otherNumber.Numerator == Numerator && otherNumber.Denominator == Denominator; return otherNumber.Numerator == Numerator && otherNumber.Denominator == Denominator;
} }
@Override @Override
public int hashCode() { public int hashCode() {
return (int)(37 * Numerator + Denominator); return (int)(37 * Numerator + Denominator);

6
src/org/geometerplus/zlibrary/text/view/ZLTextView.java
View file

@ -924,8 +924,8 @@ public abstract class ZLTextView extends ZLTextViewBase {
context.drawLine(xStart, yEnd, xEnd, yEnd); context.drawLine(xStart, yEnd, xEnd, yEnd);
context.drawLine(xEnd, yEnd, xEnd, yStart); context.drawLine(xEnd, yEnd, xEnd, yStart);
context.drawLine(xEnd, yStart, xStart, yStart); context.drawLine(xEnd, yStart, xStart, yStart);
final int l = xStart + (xEnd - xStart) * 7 / 16; final int l = xStart + (xEnd - xStart) * 7 / 16;
final int r = xStart + (xEnd - xStart) * 10 / 16; final int r = xStart + (xEnd - xStart) * 10 / 16;
final int t = yStart + (yEnd - yStart) * 2 / 6; final int t = yStart + (yEnd - yStart) * 2 / 6;
final int b = yStart + (yEnd - yStart) * 4 / 6; final int b = yStart + (yEnd - yStart) * 4 / 6;
final int c = yStart + (yEnd - yStart) / 2; final int c = yStart + (yEnd - yStart) / 2;
@ -1537,7 +1537,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
private static class ParagraphSize { private static class ParagraphSize {
public int Height; public int Height;
public int TopMargin; public int TopMargin;
public int BottomMargin; public int BottomMargin;
} }
private ParagraphSize paragraphSize(ZLTextPage page, ZLTextWordCursor cursor, boolean beforeCurrentPosition, int unit) { private ParagraphSize paragraphSize(ZLTextPage page, ZLTextWordCursor cursor, boolean beforeCurrentPosition, int unit) {