From 150c84b7c5588c2085a7463af3c48ac3dbbdd5fa Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sat, 25 Nov 2006 19:28:42 +0000 Subject: * javax/swing/text/CompositeView.java (modelToView): Never return null. --- ChangeLog | 5 +++++ javax/swing/text/CompositeView.java | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 533283c6b..319515b0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-11-25 Mark Wielaard + + * javax/swing/text/CompositeView.java (modelToView): Never return + null. + 2006-11-25 Mark Wielaard * javax/swing/text/html/TableView.java (calculateColumnRequirements): diff --git a/javax/swing/text/CompositeView.java b/javax/swing/text/CompositeView.java index 90458b6f2..570fc955c 100644 --- a/javax/swing/text/CompositeView.java +++ b/javax/swing/text/CompositeView.java @@ -282,12 +282,12 @@ public abstract class CompositeView } } } - else - { - throw new BadLocationException("Position " + pos - + " is not represented by view.", pos); - } } + + if (ret == null) + throw new BadLocationException("Position " + pos + + " is not represented by view.", pos); + return ret; } -- cgit v1.2.1