From 18b720ba655d5b3b34c7f520950b7b8b654bcd05 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Tue, 30 Apr 2013 16:21:42 +0200 Subject: [PATCH] classes renaming --- .../text/view/ZLTextAbstractHighlighting.java | 30 ---------- .../text/view/ZLTextHighlighting.java | 43 +++----------- .../text/view/ZLTextManualHighlighting.java | 59 +++++++++++++++++++ .../zlibrary/text/view/ZLTextSelection.java | 2 +- .../zlibrary/text/view/ZLTextView.java | 6 +- 5 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 src/org/geometerplus/zlibrary/text/view/ZLTextAbstractHighlighting.java create mode 100644 src/org/geometerplus/zlibrary/text/view/ZLTextManualHighlighting.java diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextAbstractHighlighting.java b/src/org/geometerplus/zlibrary/text/view/ZLTextAbstractHighlighting.java deleted file mode 100644 index 4c8deb7dd..000000000 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextAbstractHighlighting.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2007-2013 Geometer Plus - * - * 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); -} diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextHighlighting.java b/src/org/geometerplus/zlibrary/text/view/ZLTextHighlighting.java index 2d15ede78..3cd59c5b4 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextHighlighting.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextHighlighting.java @@ -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); } diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextManualHighlighting.java b/src/org/geometerplus/zlibrary/text/view/ZLTextManualHighlighting.java new file mode 100644 index 000000000..65c617e91 --- /dev/null +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextManualHighlighting.java @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2007-2013 Geometer Plus + * + * 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); + } +} diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextSelection.java b/src/org/geometerplus/zlibrary/text/view/ZLTextSelection.java index 9ad4f0084..b9e00c1f6 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextSelection.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextSelection.java @@ -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; diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java index 43372a99f..27527cd7f 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java @@ -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) {