From: <kp...@us...> - 2010-11-25 18:23:33
|
Revision: 19024 http://jedit.svn.sourceforge.net/jedit/?rev=19024&view=rev Author: kpouer Date: 2010-11-25 18:23:26 +0000 (Thu, 25 Nov 2010) Log Message: ----------- More api removed Buffer.addBufferChangeListener(BufferChangeListener listener) Buffer.removeBufferChangeListener(BufferChangeListener listener) Buffer.addBufferChangeListener(BufferChangeListener listener) BufferChangeAdapter BufferChangeListener Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/Buffer.java Removed Paths: ------------- jEdit/trunk/org/gjt/sp/jedit/buffer/BufferChangeAdapter.java jEdit/trunk/org/gjt/sp/jedit/buffer/BufferChangeListener.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2010-11-25 18:18:44 UTC (rev 19023) +++ jEdit/trunk/doc/CHANGES.txt 2010-11-25 18:23:26 UTC (rev 19024) @@ -39,6 +39,11 @@ Buffer.getMarkersPath(VFS vfs) Buffer.insertString(int offset, String str, AttributeSet attr) Buffer.editSyntaxStyle(JEditTextArea textArea) + Buffer.addBufferChangeListener(BufferChangeListener listener) + Buffer.removeBufferChangeListener(BufferChangeListener listener) + Buffer.addBufferChangeListener(BufferChangeListener listener) + BufferChangeAdapter + BufferChangeListener BufferIORequest.UTF8_MAGIC_1 BufferIORequest.UTF8_MAGIC_2 BufferIORequest.UTF8_MAGIC_3 Modified: jEdit/trunk/org/gjt/sp/jedit/Buffer.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/Buffer.java 2010-11-25 18:18:44 UTC (rev 19023) +++ jEdit/trunk/org/gjt/sp/jedit/Buffer.java 2010-11-25 18:23:26 UTC (rev 19024) @@ -34,12 +34,9 @@ import javax.swing.Icon; import javax.swing.JOptionPane; -import javax.swing.text.AttributeSet; import javax.swing.text.Segment; import org.gjt.sp.jedit.browser.VFSBrowser; -import org.gjt.sp.jedit.buffer.BufferChangeListener; -import org.gjt.sp.jedit.buffer.BufferListener; import org.gjt.sp.jedit.buffer.BufferUndoListener; import org.gjt.sp.jedit.buffer.FoldHandler; import org.gjt.sp.jedit.buffer.JEditBuffer; @@ -47,18 +44,14 @@ import org.gjt.sp.jedit.bufferio.BufferIORequest; import org.gjt.sp.jedit.bufferio.MarkersSaveRequest; import org.gjt.sp.jedit.bufferset.BufferSet; -import org.gjt.sp.jedit.gui.StyleEditor; import org.gjt.sp.jedit.io.FileVFS; import org.gjt.sp.jedit.io.VFS; import org.gjt.sp.jedit.io.VFSFile; import org.gjt.sp.jedit.io.VFSManager; import org.gjt.sp.jedit.msg.BufferUpdate; import org.gjt.sp.jedit.options.GeneralOptionPane; -import org.gjt.sp.jedit.syntax.DefaultTokenHandler; import org.gjt.sp.jedit.syntax.ModeProvider; import org.gjt.sp.jedit.syntax.ParserRuleSet; -import org.gjt.sp.jedit.syntax.Token; -import org.gjt.sp.jedit.textarea.JEditTextArea; import org.gjt.sp.jedit.visitors.JEditVisitorAdapter; import org.gjt.sp.jedit.visitors.SaveCaretInfoVisitor; import org.gjt.sp.util.IntegerArray; @@ -937,43 +930,6 @@ //}}} - //{{{ Buffer events - - //{{{ addBufferChangeListener() method - /** - * @deprecated Call {@link JEditBuffer#addBufferListener(BufferListener)}. - */ - @Deprecated - public void addBufferChangeListener(BufferChangeListener listener) - { - addBufferListener(new BufferChangeListener.Adapter(listener), NORMAL_PRIORITY); - } //}}} - - //{{{ removeBufferChangeListener() method - /** - * @deprecated Call {@link JEditBuffer#removeBufferListener(BufferListener)}. - */ - @Deprecated - public void removeBufferChangeListener(BufferChangeListener listener) - { - BufferListener[] listeners = getBufferListeners(); - - for(int i = 0; i < listeners.length; i++) - { - BufferListener l = listeners[i]; - if(l instanceof BufferChangeListener.Adapter) - { - if(((BufferChangeListener.Adapter)l).getDelegate() == listener) - { - removeBufferListener(l); - return; - } - } - } - } //}}} - - //}}} - //{{{ Property methods //{{{ propertiesChanged() method Deleted: jEdit/trunk/org/gjt/sp/jedit/buffer/BufferChangeAdapter.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/buffer/BufferChangeAdapter.java 2010-11-25 18:18:44 UTC (rev 19023) +++ jEdit/trunk/org/gjt/sp/jedit/buffer/BufferChangeAdapter.java 2010-11-25 18:23:26 UTC (rev 19024) @@ -1,126 +0,0 @@ -/* - * BufferChangeListener.java - Buffer listener adapter - * :tabSize=8:indentSize=8:noTabs=false: - * :folding=explicit:collapseFolds=1: - * - * Copyright (C) 2001, 2003 Slava Pestov - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -package org.gjt.sp.jedit.buffer; - -import org.gjt.sp.jedit.Buffer; - -/** - * An adapter you can subclass to avoid having to implement all the methods - * of the {@link BufferChangeListener} interface. - * @author Slava Pestov - * @version $Id$ - * @since jEdit 4.0pre1 - */ -public abstract class BufferChangeAdapter implements BufferChangeListener -{ - //{{{ foldLevelChanged() method - /** - * Called when line fold levels change. - * @param buffer The buffer in question - * @param start The start line number - * @param end The end line number - * @since jEdit 4.0pre1 - */ - public void foldLevelChanged(Buffer buffer, int start, int end) - { - } //}}} - - //{{{ contentInserted() method - /** - * Called when text is inserted into the buffer. - * @param buffer The buffer in question - * @param startLine The first line - * @param offset The start offset, from the beginning of the buffer - * @param numLines The number of lines inserted - * @param length The number of characters inserted - * @since jEdit 4.0pre1 - */ - public void contentInserted(Buffer buffer, int startLine, int offset, - int numLines, int length) {} - //}}} - - //{{{ preContentRemoved() method - /** - * Called when text is about to be removed from the buffer, but is - * still present. - * @param buffer The buffer in question - * @param startLine The first line - * @param offset The start offset, from the beginning of the buffer - * @param numLines The number of lines to be removed - * @param length The number of characters to be removed - * @since jEdit 4.2pre1 - */ - public void preContentRemoved(Buffer buffer, int startLine, int offset, - int numLines, int length) {} - //}}} - - //{{{ contentRemoved() method - /** - * Called when text is removed from the buffer. - * @param buffer The buffer in question - * @param startLine The first line - * @param offset The start offset, from the beginning of the buffer - * @param numLines The number of lines removed - * @param length The number of characters removed - * @since jEdit 4.0pre1 - */ - public void contentRemoved(Buffer buffer, int startLine, int offset, - int numLines, int length) {} - //}}} - - //{{{ transactionComplete() method - /** - * Called after an undo or compound edit has finished. The text area - * uses this event to queue up and collapse cleanup operations so they - * are only run once during a long transaction (such as a "Replace All" - * operation.) - * - * @param buffer The buffer in question - * @since jEdit 4.0pre6 - */ - public void transactionComplete(Buffer buffer) {} - //}}} - - //{{{ foldHandlerChanged() method - /** - * Called to notify the text area that folds need to be collapsed if - * the "collapseFolds" property is set. This method is called after the - * buffer has been loaded, and also if the user changes the fold - * handler. - * - * @param buffer The buffer in question - * @since jEdit 4.2pre2 - */ - public void foldHandlerChanged(Buffer buffer) {} - //}}} - - //{{{ foldHandlerChanged() method - /** - * Called to notify the text area that the buffer has been reloaded. - * - * @param buffer The buffer in question - * @since jEdit 4.3pre1 - */ - public void bufferLoaded(Buffer buffer) {} - //}}} -} Deleted: jEdit/trunk/org/gjt/sp/jedit/buffer/BufferChangeListener.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/buffer/BufferChangeListener.java 2010-11-25 18:18:44 UTC (rev 19023) +++ jEdit/trunk/org/gjt/sp/jedit/buffer/BufferChangeListener.java 2010-11-25 18:23:26 UTC (rev 19024) @@ -1,268 +0,0 @@ -/* - * BufferChangeListener.java - Buffer listener interface - * :tabSize=8:indentSize=8:noTabs=false: - * :folding=explicit:collapseFolds=1: - * - * Copyright (C) 2001, 2003 Slava Pestov - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -package org.gjt.sp.jedit.buffer; - -import org.gjt.sp.jedit.Buffer; - -/** - * A interface for notification of changes to buffer text. While the - * {@link org.gjt.sp.jedit.msg.BufferUpdate} EditBus message is used for - * general buffer state changes, this interface is used for events which are - * fired frequently, or for which performance is essential.<p> - * - * Because this interface is subject to change in the future, you - * should subclass <code>BufferChangeAdapter</code> instead of - * implementing it directly. - * - * @author Slava Pestov - * @version $Id$ - * @since jEdit 4.0pre1 - */ -public interface BufferChangeListener -{ - //{{{ foldLevelChanged() method - /** - * Called when line fold levels change. - * @param buffer The buffer in question - * @param startLine The start line number - * @param endLine The end line number - * @since jEdit 4.0pre1 - */ - void foldLevelChanged(Buffer buffer, int startLine, int endLine); - //}}} - - //{{{ contentInserted() method - /** - * Called when text is inserted into the buffer. - * @param buffer The buffer in question - * @param startLine The first line - * @param offset The start offset, from the beginning of the buffer - * @param numLines The number of lines inserted - * @param length The number of characters inserted - * @since jEdit 4.0pre1 - */ - void contentInserted(Buffer buffer, int startLine, int offset, - int numLines, int length); - //}}} - - //{{{ contentRemoved() method - /** - * Called when text is removed from the buffer. - * @param buffer The buffer in question - * @param startLine The first line - * @param offset The start offset, from the beginning of the buffer - * @param numLines The number of lines removed - * @param length The number of characters removed - * @since jEdit 4.0pre1 - */ - void contentRemoved(Buffer buffer, int startLine, int offset, - int numLines, int length); - //}}} - - //{{{ preContentRemoved() method - /** - * Called when text is about to be removed from the buffer, but is - * still present. - * @param buffer The buffer in question - * @param startLine The first line - * @param offset The start offset, from the beginning of the buffer - * @param numLines The number of lines to be removed - * @param length The number of characters to be removed - * @since jEdit 4.2pre1 - */ - public void preContentRemoved(Buffer buffer, int startLine, int offset, - int numLines, int length); - //}}} - - //{{{ transactionComplete() method - /** - * Called after an undo or compound edit has finished. The text area - * uses this event to queue up and collapse cleanup operations so they - * are only run once during a long transaction (such as a "Replace All" - * operation.) - * - * @param buffer The buffer in question - * @since jEdit 4.0pre6 - */ - void transactionComplete(Buffer buffer); - //}}} - - //{{{ foldHandlerChanged() method - /** - * Called to notify the text area that folds need to be collapsed if - * the "collapseFolds" property is set. This method is called after the - * buffer has been loaded, and also if the user changes the fold - * handler. - * - * @param buffer The buffer in question - * @since jEdit 4.2pre2 - */ - void foldHandlerChanged(Buffer buffer); - //}}} - - //{{{ foldHandlerChanged() method - /** - * Called to notify the text area that the buffer has been reloaded. - * - * @param buffer The buffer in question - * @since jEdit 4.3pre1 - */ - void bufferLoaded(Buffer buffer); - //}}} - - //{{{ Compatibility with older jEdit plugins - public class Adapter implements BufferListener - { - private BufferChangeListener delegate; - - //{{{ Adapter constructor - public Adapter(BufferChangeListener delegate) - { - this.delegate = delegate; - } //}}} - - //{{{ getDelegate() method - public BufferChangeListener getDelegate() - { - return delegate; - } //}}} - - //{{{ foldLevelChanged() method - /** - * Called when line fold levels change. - * @param buffer The buffer in question - * @param startLine The start line number - * @param endLine The end line number - * @since jEdit 4.3pre3 - */ - public void foldLevelChanged(JEditBuffer buffer, int startLine, int endLine) - { - delegate.foldLevelChanged((Buffer)buffer,startLine,endLine); - } //}}} - - //{{{ contentInserted() method - /** - * Called when text is inserted into the buffer. - * @param buffer The buffer in question - * @param startLine The first line - * @param offset The start offset, from the beginning of the buffer - * @param numLines The number of lines inserted - * @param length The number of characters inserted - * @since jEdit 4.3pre3 - */ - public void contentInserted(JEditBuffer buffer, int startLine, int offset, - int numLines, int length) - { - delegate.contentInserted((Buffer)buffer,startLine,offset,numLines,length); - } //}}} - - //{{{ contentRemoved() method - /** - * Called when text is removed from the buffer. - * @param buffer The buffer in question - * @param startLine The first line - * @param offset The start offset, from the beginning of the buffer - * @param numLines The number of lines removed - * @param length The number of characters removed - * @since jEdit 4.3pre3 - */ - public void contentRemoved(JEditBuffer buffer, int startLine, int offset, - int numLines, int length) - { - delegate.contentRemoved((Buffer)buffer,startLine,offset,numLines,length); - } //}}} - - /** - * Called when text is about to be inserted in the buffer. - * - * @param buffer The buffer in question - * @param startLine The first line - * @param offset The start offset, from the beginning of the buffer - * @param numLines The number of lines inserted - * @param length The number of characters inserted - * @since jEdit 4.3pre11 - */ - public void preContentInserted(JEditBuffer buffer, int startLine, int offset, int numLines, int length) - { - } - - //{{{ preContentRemoved() method - /** - * Called when text is about to be removed from the buffer, but is - * still present. - * @param buffer The buffer in question - * @param startLine The first line - * @param offset The start offset, from the beginning of the buffer - * @param numLines The number of lines to be removed - * @param length The number of characters to be removed - * @since jEdit 4.3pre3 - */ - public void preContentRemoved(JEditBuffer buffer, int startLine, int offset, - int numLines, int length) - { - delegate.preContentRemoved((Buffer)buffer,startLine,offset,numLines,length); - } //}}} - - //{{{ transactionComplete() method - /** - * Called after an undo or compound edit has finished. The text area - * uses this event to queue up and collapse cleanup operations so they - * are only run once during a long transaction (such as a "Replace All" - * operation.) - * - * @param buffer The buffer in question - * @since jEdit 4.3pre3 - */ - public void transactionComplete(JEditBuffer buffer) - { - delegate.transactionComplete((Buffer)buffer); - } //}}} - - //{{{ foldHandlerChanged() method - /** - * Called to notify the text area that folds need to be collapsed if - * the "collapseFolds" property is set. This method is called after the - * buffer has been loaded, and also if the user changes the fold - * handler. - * - * @param buffer The buffer in question - * @since jEdit 4.3pre3 - */ - public void foldHandlerChanged(JEditBuffer buffer) - { - delegate.foldHandlerChanged((Buffer)buffer); - } //}}} - - //{{{ foldHandlerChanged() method - /** - * Called to notify the text area that the buffer has been reloaded. - * - * @param buffer The buffer in question - * @since jEdit 4.3pre3 - */ - public void bufferLoaded(JEditBuffer buffer) - { - delegate.bufferLoaded((Buffer)buffer); - } //}}} - } //}}} -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |