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

classes renaming

Browse source
This commit is contained in:
Nikolay Pultsin 2013-04-30 16:21:42 +02:00
parent 585e0e170f
commit 18b720ba65
5 changed files with 70 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/org/geometerplus/zlibrary/text/view/ZLTextAbstractHighlighting.java
View file

@ -1,30 +0,0 @@
/*
* Copyright (C) 2007-2013 Geometer Plus <contact@geometerplus.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
package org.geometerplus.zlibrary.text.view;
interface ZLTextAbstractHighlighting {
boolean clear();
boolean isEmpty();
ZLTextPosition getStartPosition();
ZLTextPosition getEndPosition();
ZLTextElementArea getStartArea(ZLTextPage page);
ZLTextElementArea getEndArea(ZLTextPage page);
}

43
src/org/geometerplus/zlibrary/text/view/ZLTextHighlighting.java
View file

@ -19,41 +19,12 @@
package org.geometerplus.zlibrary.text.view;
class ZLTextHighlighting implements ZLTextAbstractHighlighting {
private ZLTextPosition myStartPosition;
private ZLTextPosition myEndPosition;
interface ZLTextHighlighting {
boolean clear();
void setup(ZLTextPosition start, ZLTextPosition end) {
myStartPosition = new ZLTextFixedPosition(start);
myEndPosition = new ZLTextFixedPosition(end);
}
public boolean clear() {
if (isEmpty()) {
return false;
}
myStartPosition = null;
myEndPosition = null;
return true;
}
public boolean isEmpty() {
return myStartPosition == null;
}
public ZLTextPosition getStartPosition() {
return myStartPosition;
}
public ZLTextPosition getEndPosition() {
return myEndPosition;
}
public ZLTextElementArea getStartArea(ZLTextPage page) {
return page.TextElementMap.getFirstAfter(myStartPosition);
}
public ZLTextElementArea getEndArea(ZLTextPage page) {
return page.TextElementMap.getLastBefore(myEndPosition);
}
boolean isEmpty();
ZLTextPosition getStartPosition();
ZLTextPosition getEndPosition();
ZLTextElementArea getStartArea(ZLTextPage page);
ZLTextElementArea getEndArea(ZLTextPage page);
}

59
src/org/geometerplus/zlibrary/text/view/ZLTextManualHighlighting.java Normal file
View file

@ -0,0 +1,59 @@
/*
* Copyright (C) 2007-2013 Geometer Plus <contact@geometerplus.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
package org.geometerplus.zlibrary.text.view;
class ZLTextManualHighlighting implements ZLTextHighlighting {
private ZLTextPosition myStartPosition;
private ZLTextPosition myEndPosition;
void setup(ZLTextPosition start, ZLTextPosition end) {
myStartPosition = new ZLTextFixedPosition(start);
myEndPosition = new ZLTextFixedPosition(end);
}
public boolean clear() {
if (isEmpty()) {
return false;
}
myStartPosition = null;
myEndPosition = null;
return true;
}
public boolean isEmpty() {
return myStartPosition == null;
}
public ZLTextPosition getStartPosition() {
return myStartPosition;
}
public ZLTextPosition getEndPosition() {
return myEndPosition;
}
public ZLTextElementArea getStartArea(ZLTextPage page) {
return page.TextElementMap.getFirstAfter(myStartPosition);
}
public ZLTextElementArea getEndArea(ZLTextPage page) {
return page.TextElementMap.getLastBefore(myEndPosition);
}
}

2
src/org/geometerplus/zlibrary/text/view/ZLTextSelection.java
View file

@ -19,7 +19,7 @@
package org.geometerplus.zlibrary.text.view;
class ZLTextSelection implements ZLTextAbstractHighlighting {
class ZLTextSelection implements ZLTextHighlighting {
static class Point {
int X;
int Y;

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

@ -61,12 +61,12 @@ public abstract class ZLTextView extends ZLTextViewBase {
private boolean myHighlightSelectedRegion = true;
private ZLTextSelection mySelection;
private ZLTextHighlighting myHighlighting;
private ZLTextManualHighlighting myHighlighting;
public ZLTextView(ZLApplication application) {
super(application);
mySelection = new ZLTextSelection(this);
myHighlighting = new ZLTextHighlighting();
myHighlighting = new ZLTextManualHighlighting();
}
public synchronized void setModel(ZLTextModel model) {
@ -743,7 +743,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
}
private void drawBackgroung(
ZLTextAbstractHighlighting highligting, ZLColor color,
ZLTextHighlighting highligting, ZLColor color,
ZLTextPage page, ZLTextLineInfo info, int from, int to, int x, int y
) {
if (!highligting.isEmpty() && from != to) {