summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kennke <roman@kennke.org>2006-03-03 19:39:24 +0000
committerRoman Kennke <roman@kennke.org>2006-03-03 19:39:24 +0000
commitaa852b9ddc842db04720bd58d964f3343697a223 (patch)
tree489e6c51957882e0643714b3c5b0f8b38a95baf9
parent66b4973184946b9bcdef8229159b4a341797ac6d (diff)
downloadclasspath-aa852b9ddc842db04720bd58d964f3343697a223.tar.gz
2006-03-03 Roman Kennke <kennke@aicas.com>
* javax/swing/text/FlowView.java (FlowStrategy.layoutRow): Added check for rowCount == 0. (FlowStrategy.getLogicalView): Made method protected.
-rw-r--r--ChangeLog6
-rw-r--r--javax/swing/text/FlowView.java7
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e56b6e12b..f1e1f117a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-03 Roman Kennke <kennke@aicas.com>
+
+ * javax/swing/text/FlowView.java
+ (FlowStrategy.layoutRow): Added check for rowCount == 0.
+ (FlowStrategy.getLogicalView): Made method protected.
+
2006-03-03 Chris Burdess <dog@gnu.org>
* gnu/xml/validation/relaxng/AnyNameNameClass.java,
diff --git a/javax/swing/text/FlowView.java b/javax/swing/text/FlowView.java
index 219ab8ebe..8be8f41e9 100644
--- a/javax/swing/text/FlowView.java
+++ b/javax/swing/text/FlowView.java
@@ -127,7 +127,7 @@ public abstract class FlowView extends BoxView
*
* @return the logical view of the managed <code>FlowView</code>
*/
- public View getLogicalView(FlowView fv)
+ protected View getLogicalView(FlowView fv)
{
return fv.layoutPool;
}
@@ -210,7 +210,10 @@ public abstract class FlowView extends BoxView
int flowSpan = fv.getFlowSpan(axis);
adjustRow(fv, rowIndex, flowSpan, flowStart);
int rowViewCount = row.getViewCount();
- offset = row.getView(rowViewCount - 1).getEndOffset();
+ if (rowViewCount > 0)
+ offset = row.getView(rowViewCount - 1).getEndOffset();
+ else
+ offset = -1;
}
return offset != pos ? offset : -1;
}