From: <k_s...@us...> - 2008-08-02 15:36:02
|
Revision: 13148 http://jedit.svn.sourceforge.net/jedit/?rev=13148&view=rev Author: k_satoda Date: 2008-08-02 15:35:56 +0000 (Sat, 02 Aug 2008) Log Message: ----------- Eliminated possible attempt to edit read only buffer in joinLines() with selection. Also, dropped an unnecessary test (end > buffer.getLength()) because getLineEndOffset() must not return the offset beyond buffer length. Modified Paths: -------------- jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java 2008-08-02 13:04:27 UTC (rev 13147) +++ jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java 2008-08-02 15:35:56 UTC (rev 13148) @@ -4589,15 +4589,15 @@ */ public void joinLines() { + if(!buffer.isEditable()) + { + getToolkit().beep(); + return; + } + if (getSelectionCount() == 0) { int end = getLineEndOffset(caretLine); - if(!buffer.isEditable() || end > buffer.getLength()) - { - getToolkit().beep(); - return; - } - try { buffer.beginCompoundEdit(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |