From b0d07335e1ccaa6dbac20c56e2521b9f812c33cd Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sat, 11 Dec 2010 08:36:34 +0000 Subject: [PATCH] renaming: WordArea -> ElementRegion, HyperlinkArea -> HyperlinkRegion --- .../text/view/ZLTextElementAreaVector.java | 18 ++++---- ...WordArea.java => ZLTextElementRegion.java} | 4 +- ...nkArea.java => ZLTextHyperlinkRegion.java} | 8 ++-- .../zlibrary/text/view/ZLTextView.java | 46 +++++++++---------- 4 files changed, 38 insertions(+), 38 deletions(-) rename src/org/geometerplus/zlibrary/text/view/{ZLTextWordArea.java => ZLTextElementRegion.java} (93%) rename src/org/geometerplus/zlibrary/text/view/{ZLTextHyperlinkArea.java => ZLTextHyperlinkRegion.java} (79%) diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java b/src/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java index 3ed861bd3..dad0946d1 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java @@ -22,13 +22,13 @@ package org.geometerplus.zlibrary.text.view; import java.util.ArrayList; final class ZLTextElementAreaVector extends ArrayList { - final ArrayList WordAreas = new ArrayList(); - private ZLTextWordArea myCurrentWordArea; + final ArrayList ElementRegions = new ArrayList(); + private ZLTextElementRegion myCurrentElementRegion; @Override public void clear() { - WordAreas.clear(); - myCurrentWordArea = null; + ElementRegions.clear(); + myCurrentElementRegion = null; super.clear(); } @@ -36,13 +36,13 @@ final class ZLTextElementAreaVector extends ArrayList { public boolean add(ZLTextElementArea area) { final ZLTextHyperlink hyperlink = area.Style.Hyperlink; if (hyperlink.Id == null) { - myCurrentWordArea = null; + myCurrentElementRegion = null; } else { - if ((myCurrentWordArea == null) || (((ZLTextHyperlinkArea)myCurrentWordArea).Hyperlink != hyperlink)) { - myCurrentWordArea = new ZLTextHyperlinkArea(hyperlink, this, size()); - WordAreas.add(myCurrentWordArea); + if ((myCurrentElementRegion == null) || (((ZLTextHyperlinkRegion)myCurrentElementRegion).Hyperlink != hyperlink)) { + myCurrentElementRegion = new ZLTextHyperlinkRegion(hyperlink, this, size()); + ElementRegions.add(myCurrentElementRegion); } else { - myCurrentWordArea.extend(); + myCurrentElementRegion.extend(); } } return super.add(area); diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextWordArea.java b/src/org/geometerplus/zlibrary/text/view/ZLTextElementRegion.java similarity index 93% rename from src/org/geometerplus/zlibrary/text/view/ZLTextWordArea.java rename to src/org/geometerplus/zlibrary/text/view/ZLTextElementRegion.java index b8af8ec0b..d9684edcc 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextWordArea.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextElementRegion.java @@ -23,13 +23,13 @@ import java.util.*; import org.geometerplus.zlibrary.core.view.ZLPaintContext; -class ZLTextWordArea { +abstract class ZLTextElementRegion { private final List myList; private final int myFromIndex; private int myToIndex; private ZLTextHorizontalConvexHull myHull; - ZLTextWordArea(List list, int fromIndex) { + ZLTextElementRegion(List list, int fromIndex) { myList = list; myFromIndex = fromIndex; myToIndex = fromIndex + 1; diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkArea.java b/src/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkRegion.java similarity index 79% rename from src/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkArea.java rename to src/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkRegion.java index 00f3d12ff..2e6c47047 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkArea.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextHyperlinkRegion.java @@ -21,18 +21,18 @@ package org.geometerplus.zlibrary.text.view; import java.util.List; -class ZLTextHyperlinkArea extends ZLTextWordArea { +class ZLTextHyperlinkRegion extends ZLTextElementRegion { final ZLTextHyperlink Hyperlink; - ZLTextHyperlinkArea(ZLTextHyperlink hyperlink, List list, int fromIndex) { + ZLTextHyperlinkRegion(ZLTextHyperlink hyperlink, List list, int fromIndex) { super(list, fromIndex); Hyperlink = hyperlink; } public boolean equals(Object other) { - if (!(other instanceof ZLTextHyperlinkArea)) { + if (!(other instanceof ZLTextHyperlinkRegion)) { return false; } - return Hyperlink == ((ZLTextHyperlinkArea)other).Hyperlink; + return Hyperlink == ((ZLTextHyperlinkRegion)other).Hyperlink; } } diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java index 2707f440b..9e12c1038 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java @@ -313,9 +313,9 @@ public abstract class ZLTextView extends ZLTextViewBase { ++index; } - final ZLTextWordArea selectedWordArea = getCurrentWordArea(page); - if (selectedWordArea != null) { - selectedWordArea.draw(context); + final ZLTextElementRegion selectedElementRegion = getCurrentElementRegion(page); + if (selectedElementRegion != null) { + selectedElementRegion.draw(context); } } @@ -1290,39 +1290,39 @@ public abstract class ZLTextView extends ZLTextViewBase { } } - private ZLTextWordArea myCurrentSelectedElement; + private ZLTextElementRegion myCurrentSelectedElement; - private ZLTextWordArea getCurrentWordArea(ZLTextPage page) { - final ArrayList wordAreas = page.TextElementMap.WordAreas; - final int index = wordAreas.indexOf(myCurrentSelectedElement); + private ZLTextElementRegion getCurrentElementRegion(ZLTextPage page) { + final ArrayList elementRegions = page.TextElementMap.ElementRegions; + final int index = elementRegions.indexOf(myCurrentSelectedElement); if (index == -1) { return null; } - return wordAreas.get(index); + return elementRegions.get(index); } public ZLTextHyperlink getCurrentHyperlink() { - final ZLTextWordArea area = getCurrentWordArea(myCurrentPage); - return (area instanceof ZLTextHyperlinkArea) ? ((ZLTextHyperlinkArea)area).Hyperlink : null; + final ZLTextElementRegion area = getCurrentElementRegion(myCurrentPage); + return (area instanceof ZLTextHyperlinkRegion) ? ((ZLTextHyperlinkRegion)area).Hyperlink : null; } protected ZLTextHyperlink findHyperlink(int x, int y, int maxDistance) { - ZLTextWordArea area = null; + ZLTextElementRegion area = null; int distance = Integer.MAX_VALUE; - for (ZLTextWordArea a : myCurrentPage.TextElementMap.WordAreas) { + for (ZLTextElementRegion a : myCurrentPage.TextElementMap.ElementRegions) { final int d = a.distanceTo(x, y); if ((d < distance) && (d <= maxDistance)) { area = a; distance = d; } } - return (area instanceof ZLTextHyperlinkArea) ? ((ZLTextHyperlinkArea)area).Hyperlink : null; + return (area instanceof ZLTextHyperlinkRegion) ? ((ZLTextHyperlinkRegion)area).Hyperlink : null; } protected void selectHyperlink(ZLTextHyperlink hyperlink) { - for (ZLTextWordArea area : myCurrentPage.TextElementMap.WordAreas) { - if (area instanceof ZLTextHyperlinkArea && - ((ZLTextHyperlinkArea)area).Hyperlink == hyperlink) { + for (ZLTextElementRegion area : myCurrentPage.TextElementMap.ElementRegions) { + if (area instanceof ZLTextHyperlinkRegion && + ((ZLTextHyperlinkRegion)area).Hyperlink == hyperlink) { myCurrentSelectedElement = area; break; } @@ -1330,21 +1330,21 @@ public abstract class ZLTextView extends ZLTextViewBase { } protected boolean moveHyperlinkPointer(boolean forward) { - final ArrayList wordAreas = myCurrentPage.TextElementMap.WordAreas; - if (!wordAreas.isEmpty()) { - final int index = wordAreas.indexOf(myCurrentSelectedElement); + final ArrayList elementRegions = myCurrentPage.TextElementMap.ElementRegions; + if (!elementRegions.isEmpty()) { + final int index = elementRegions.indexOf(myCurrentSelectedElement); if (index == -1) { - myCurrentSelectedElement = wordAreas.get(forward ? 0 : wordAreas.size() - 1); + myCurrentSelectedElement = elementRegions.get(forward ? 0 : elementRegions.size() - 1); return true; } else { if (forward) { - if (index + 1 < wordAreas.size()) { - myCurrentSelectedElement = wordAreas.get(index + 1); + if (index + 1 < elementRegions.size()) { + myCurrentSelectedElement = elementRegions.get(index + 1); return true; } } else { if (index > 0) { - myCurrentSelectedElement = wordAreas.get(index - 1); + myCurrentSelectedElement = elementRegions.get(index - 1); return true; } }