From a0c80f4d74e8f707ebbcd3122b51b01e9de43ebf Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sat, 13 Oct 2012 13:59:44 +0400 Subject: [PATCH] compilation issues --- .../android/fbreader/api/Api.java | 4 ++-- .../fbreader/api/ApiClientImplementation.java | 6 +++--- .../android/fbreader/api/ApiMethods.java | 2 +- .../android/fbreader/api/ApiObject.java | 4 ++-- .../fbreader/api/ApiServerImplementation.java | 20 +++++++++---------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/org/geometerplus/android/fbreader/api/Api.java b/src/org/geometerplus/android/fbreader/api/Api.java index de6277eb1..45bf4ff76 100644 --- a/src/org/geometerplus/android/fbreader/api/Api.java +++ b/src/org/geometerplus/android/fbreader/api/Api.java @@ -44,8 +44,8 @@ public interface Api { int getParagraphsNumber() throws ApiException; int getParagraphElementsCount(int paragraphIndex) throws ApiException; String getParagraphText(int paragraphIndex) throws ApiException; - int getParagraphWordsCount(int paragraphIndex) throws ApiException; - String getParagraphWordIndices(int paragraphIndex) throws ApiException; + List getParagraphWords(int paragraphIndex) throws ApiException; + List getParagraphWordIndices(int paragraphIndex) throws ApiException; // page information TextPosition getPageStart() throws ApiException; diff --git a/src/org/geometerplus/android/fbreader/api/ApiClientImplementation.java b/src/org/geometerplus/android/fbreader/api/ApiClientImplementation.java index c478638e0..bf5cb5b70 100644 --- a/src/org/geometerplus/android/fbreader/api/ApiClientImplementation.java +++ b/src/org/geometerplus/android/fbreader/api/ApiClientImplementation.java @@ -318,11 +318,11 @@ public class ApiClientImplementation implements ServiceConnection, Api, ApiMetho return requestInt(GET_PARAGRAPH_ELEMENTS_COUNT, envelope(paragraphIndex)); } - public List getParagraphWordsCount(int paragraphIndex) throws ApiException { - return requestStringList(GET_PARAGRAPH_WORDS_COUNT, envelope(paragraphIndex)); + public List getParagraphWords(int paragraphIndex) throws ApiException { + return requestStringList(GET_PARAGRAPH_WORDS, envelope(paragraphIndex)); } - public ArrayList getParagraphWordIndices(int paragraphIndex) throws ApiException { + public List getParagraphWordIndices(int paragraphIndex) throws ApiException { return requestIntegerList(GET_PARAGRAPH_WORD_INDICES, envelope(paragraphIndex)); } diff --git a/src/org/geometerplus/android/fbreader/api/ApiMethods.java b/src/org/geometerplus/android/fbreader/api/ApiMethods.java index 91c47e785..d358c4e6d 100644 --- a/src/org/geometerplus/android/fbreader/api/ApiMethods.java +++ b/src/org/geometerplus/android/fbreader/api/ApiMethods.java @@ -34,7 +34,7 @@ interface ApiMethods { int GET_PARAGRAPHS_NUMBER = 601; int GET_PARAGRAPH_ELEMENTS_COUNT = 602; int GET_PARAGRAPH_TEXT = 603; - int GET_PARAGRAPH_WORDS_COUNT = 604; + int GET_PARAGRAPH_WORDS = 604; int GET_PARAGRAPH_WORD_INDICES = 605; // page information diff --git a/src/org/geometerplus/android/fbreader/api/ApiObject.java b/src/org/geometerplus/android/fbreader/api/ApiObject.java index 772d29958..0d927cc44 100644 --- a/src/org/geometerplus/android/fbreader/api/ApiObject.java +++ b/src/org/geometerplus/android/fbreader/api/ApiObject.java @@ -168,7 +168,7 @@ public abstract class ApiObject implements Parcelable { return new Date(value); } - static List envelope(List values) { + static List envelopeStringList(List values) { final ArrayList objects = new ArrayList(values.size()); for (java.lang.String v : values) { objects.add(new String(v)); @@ -176,7 +176,7 @@ public abstract class ApiObject implements Parcelable { return objects; } - static List envelope(List values) { + static List envelopeIntegerList(List values) { final ArrayList objects = new ArrayList(values.size()); for (java.lang.Integer v : values) { objects.add(new Integer(v)); diff --git a/src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java b/src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java index 922bbec6d..4dcba187f 100644 --- a/src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java +++ b/src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java @@ -214,31 +214,31 @@ public class ApiServerImplementation extends ApiInterface.Stub implements Api, A try { switch (method) { case LIST_OPTION_GROUPS: - return ApiObject.envelope(getOptionGroups()); + return ApiObject.envelopeStringList(getOptionGroups()); case LIST_OPTION_NAMES: - return ApiObject.envelope(getOptionNames( + return ApiObject.envelopeStringList(getOptionNames( ((ApiObject.String)parameters[0]).Value )); case LIST_BOOK_TAGS: - return ApiObject.envelope(getBookTags()); + return ApiObject.envelopeStringList(getBookTags()); case LIST_ACTIONS: - return ApiObject.envelope(listActions()); + return ApiObject.envelopeStringList(listActions()); case LIST_ACTION_NAMES: { final ArrayList actions = new ArrayList(parameters.length); for (ApiObject o : parameters) { actions.add(((ApiObject.String)o).Value); } - return ApiObject.envelope(listActionNames(actions)); + return ApiObject.envelopeStringList(listActionNames(actions)); } case LIST_ZONEMAPS: - return ApiObject.envelope(listZoneMaps()); - case GET_PARAGRAPH_WORDS_COUNT: - return ApiObject.envelope(getParagraphWordsCount( + return ApiObject.envelopeStringList(listZoneMaps()); + case GET_PARAGRAPH_WORDS: + return ApiObject.envelopeStringList(getParagraphWords( ((ApiObject.Integer)parameters[0]).Value )); case GET_PARAGRAPH_WORD_INDICES: - return ApiObject.envelope(getParagraphWordIndices( + return ApiObject.envelopeIntegerList(getParagraphWordIndices( ((ApiObject.Integer)parameters[0]).Value )); default: @@ -462,7 +462,7 @@ public class ApiServerImplementation extends ApiInterface.Stub implements Api, A return sb.toString(); } - public List getParagraphWordsCount(int paragraphIndex) { + public List getParagraphWords(int paragraphIndex) { final ArrayList words = new ArrayList(); final ZLTextWordCursor cursor = new ZLTextWordCursor(myReader.getTextView().getStartCursor()); cursor.moveToParagraph(paragraphIndex);