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

synchronyzation with Greg's branch + code style

Browse source
This commit is contained in:
Nikolay Pultsin 2012-10-13 13:08:57 +04:00
parent 33f47b668a
commit cbd74279ac
5 changed files with 186 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

106
src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java
View file

@ -104,8 +104,8 @@ public class ApiServerImplementation extends ApiInterface.Stub implements Api, A
}
case GET_PARAGRAPHS_NUMBER:
return ApiObject.envelope(getParagraphsNumber());
case GET_ELEMENTS_NUMBER:
return ApiObject.envelope(getElementsNumber(
case GET_PARAGRAPH_ELEMENTS_COUNT:
return ApiObject.envelope(getParagraphElementsCount(
((ApiObject.Integer)parameters[0]).Value
));
case GET_PARAGRAPH_TEXT:
@ -131,6 +131,26 @@ public class ApiServerImplementation extends ApiInterface.Stub implements Api, A
case CLEAR_HIGHLIGHTING:
clearHighlighting();
return ApiObject.Void.Instance;
case GET_BOTTOM_MARGIN:
return ApiObject.envelope(getBottomMargin());
case SET_BOTTOM_MARGIN:
setBottomMargin(((ApiObject.Integer)parameters[0]).Value);
return ApiObject.Void.Instance;
case GET_TOP_MARGIN:
return ApiObject.envelope(getTopMargin());
case SET_TOP_MARGIN:
setTopMargin(((ApiObject.Integer)parameters[0]).Value);
return ApiObject.Void.Instance;
case GET_LEFT_MARGIN:
return ApiObject.envelope(getLeftMargin());
case SET_LEFT_MARGIN:
setLeftMargin(((ApiObject.Integer)parameters[0]).Value);
return ApiObject.Void.Instance;
case GET_RIGHT_MARGIN:
return ApiObject.envelope(getRightMargin());
case SET_RIGHT_MARGIN:
setRightMargin(((ApiObject.Integer)parameters[0]).Value);
return ApiObject.Void.Instance;
case GET_KEY_ACTION:
return ApiObject.envelope(getKeyAction(
((ApiObject.Integer)parameters[0]).Value,
@ -144,9 +164,9 @@ public class ApiServerImplementation extends ApiInterface.Stub implements Api, A
);
return ApiObject.Void.Instance;
case GET_ZONEMAP:
return ApiObject.envelope(getZoneMap());
return ApiObject.envelope(getZoneMap());
case SET_ZONEMAP:
setZoneMap(((ApiObject.String)parameters[0]).Value);
setZoneMap(((ApiObject.String)parameters[0]).Value);
return ApiObject.Void.Instance;
case GET_ZONEMAP_HEIGHT:
return ApiObject.envelope(getZoneMapHeight(((ApiObject.String)parameters[0]).Value));
@ -207,12 +227,20 @@ public class ApiServerImplementation extends ApiInterface.Stub implements Api, A
{
final ArrayList<String> actions = new ArrayList<String>(parameters.length);
for (ApiObject o : parameters) {
actions.add(((ApiObject.String)o).Value);
actions.add(((ApiObject.String)o).Value);
}
return ApiObject.envelope(listActionNames(actions));
}
case LIST_ZONEMAPS:
return ApiObject.envelope(listZoneMaps());
case GET_PARAGRAPH_WORDS_COUNT:
return ApiObject.envelope(getParagraphWordsCount(
((ApiObject.Integer)parameters[0]).Value
));
case GET_PARAGRAPH_WORD_INDICES:
return ApiObject.envelope(getParagraphWordIndices(
((ApiObject.Integer)parameters[0]).Value
));
default:
return Collections.<ApiObject>singletonList(unsupportedMethodError(method));
}
@ -376,11 +404,43 @@ public class ApiServerImplementation extends ApiInterface.Stub implements Api, A
myReader.getTextView().clearHighlighting();
}
public int getBottomMargin() {
return myReader.BottomMarginOption.getValue();
}
public void setBottomMargin(int value) {
myReader.BottomMarginOption.setValue(value);
}
public int getTopMargin() {
return myReader.TopMarginOption.getValue();
}
public void setTopMargin(int value) {
myReader.TopMarginOption.setValue(value);
}
public int getLeftMargin() {
return myReader.LeftMarginOption.getValue();
}
public void setLeftMargin(int value) {
myReader.LeftMarginOption.setValue(value);
}
public int getRightMargin() {
return myReader.RightMarginOption.getValue();
}
public void setRightMargin(int value) {
myReader.RightMarginOption.setValue(value);
}
public int getParagraphsNumber() {
return myReader.Model.getTextModel().getParagraphsNumber();
}
public int getElementsNumber(int paragraphIndex) {
public int getParagraphElementsCount(int paragraphIndex) {
final ZLTextWordCursor cursor = new ZLTextWordCursor(myReader.getTextView().getStartCursor());
cursor.moveToParagraph(paragraphIndex);
cursor.moveToParagraphEnd();
@ -402,6 +462,36 @@ public class ApiServerImplementation extends ApiInterface.Stub implements Api, A
return sb.toString();
}
public List<String> getParagraphWordsCount(int paragraphIndex) {
final ArrayList<String> words = new ArrayList<String>();
final ZLTextWordCursor cursor = new ZLTextWordCursor(myReader.getTextView().getStartCursor());
cursor.moveToParagraph(paragraphIndex);
cursor.moveToParagraphStart();
while (!cursor.isEndOfParagraph()) {
ZLTextElement element = cursor.getElement();
if (element instanceof ZLTextWord) {
words.add(element.toString());
}
cursor.nextWord();
}
return words;
}
public ArrayList<Integer> getParagraphWordIndices(int paragraphIndex) {
final ArrayList<Integer> indices = new ArrayList<Integer>();
final ZLTextWordCursor cursor = new ZLTextWordCursor(myReader.getTextView().getStartCursor());
cursor.moveToParagraph(paragraphIndex);
cursor.moveToParagraphStart();
while (!cursor.isEndOfParagraph()) {
ZLTextElement element = cursor.getElement();
if (element instanceof ZLTextWord) {
indices.add(cursor.getElementIndex());
}
cursor.nextWord();
}
return indices;
}
// action control
public List<String> listActions() {
// TODO: implement
@ -427,11 +517,11 @@ public class ApiServerImplementation extends ApiInterface.Stub implements Api, A
}
public String getZoneMap() {
return ScrollingPreferences.Instance().TapZoneMapOption.getValue();
return ScrollingPreferences.Instance().TapZoneMapOption.getValue();
}
public void setZoneMap(String name) {
ScrollingPreferences.Instance().TapZoneMapOption.setValue(name);
ScrollingPreferences.Instance().TapZoneMapOption.setValue(name);
}
public int getZoneMapHeight(String name) {