[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commit-cp] classpath ChangeLog javax/swing/text/DefaultCar...
From: |
Lillian Angel |
Subject: |
[commit-cp] classpath ChangeLog javax/swing/text/DefaultCar... |
Date: |
Wed, 21 Jun 2006 15:35:10 +0000 |
CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Lillian Angel <langel> 06/06/21 15:35:10
Modified files:
. : ChangeLog
javax/swing/text: DefaultCaret.java
Log message:
2006-06-21 Lillian Angel <address@hidden>
* javax/swing/text/DefaultCaret.java
(install): Added check to prevent NPE.
(propertyChange): Added checks to prevent NPEs.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7901&r2=1.7902
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/DefaultCaret.java?cvsroot=classpath&r1=1.41&r2=1.42
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7901
retrieving revision 1.7902
diff -u -b -r1.7901 -r1.7902
--- ChangeLog 21 Jun 2006 14:55:00 -0000 1.7901
+++ ChangeLog 21 Jun 2006 15:35:08 -0000 1.7902
@@ -1,3 +1,9 @@
+2006-06-21 Lillian Angel <address@hidden>
+
+ * javax/swing/text/DefaultCaret.java
+ (install): Added check to prevent NPE.
+ (propertyChange): Added checks to prevent NPEs.
+
2006-06-21 Tania Bento <address@hidden>
* javax/swing/JMenu.java
Index: javax/swing/text/DefaultCaret.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/DefaultCaret.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- javax/swing/text/DefaultCaret.java 11 May 2006 16:29:29 -0000 1.41
+++ javax/swing/text/DefaultCaret.java 21 Jun 2006 15:35:09 -0000 1.42
@@ -221,8 +221,11 @@
if (name.equals("document"))
{
Document oldDoc = (Document) e.getOldValue();
+ if (oldDoc != null)
oldDoc.removeDocumentListener(documentListener);
+
Document newDoc = (Document) e.getNewValue();
+ if (newDoc != null)
newDoc.addDocumentListener(documentListener);
}
else if (name.equals("editable"))
@@ -708,7 +711,11 @@
propertyChangeListener = new PropertyChangeHandler();
textComponent.addPropertyChangeListener(propertyChangeListener);
documentListener = new DocumentHandler();
- textComponent.getDocument().addDocumentListener(documentListener);
+
+ Document doc = textComponent.getDocument();
+ if (doc != null)
+ doc.addDocumentListener(documentListener);
+
active = textComponent.isEditable() && textComponent.isEnabled();
repaint();
- [commit-cp] classpath ChangeLog javax/swing/text/DefaultCar...,
Lillian Angel <=