[ jEdit-commits ] SF.net SVN: jedit:[19022] plugins/SuperAbbrevs/trunk

[<kp...@us...>]

Revision: 19022
          http://jedit.svn.sourceforge.net/jedit/?rev=19022&view=rev
Author:   kpouer
Date:     2010-11-25 18:02:59 +0000 (Thu, 25 Nov 2010)

Log Message:
-----------
Removed use of some deprecated apis

Modified Paths:
--------------
    plugins/SuperAbbrevs/trunk/SuperAbbrevs.props
    plugins/SuperAbbrevs/trunk/SuperAbbrevsPlugin.java
    plugins/SuperAbbrevs/trunk/superabbrevs/Handler.java
    plugins/SuperAbbrevs/trunk/superabbrevs/gui/AbbrevsOptionPane.java

Modified: plugins/SuperAbbrevs/trunk/SuperAbbrevs.props
===================================================================
--- plugins/SuperAbbrevs/trunk/SuperAbbrevs.props	2010-11-25 15:07:31 UTC (rev 19021)
+++ plugins/SuperAbbrevs/trunk/SuperAbbrevs.props	2010-11-25 18:02:59 UTC (rev 19022)
@@ -1,7 +1,7 @@
 plugin.SuperAbbrevsPlugin.name=SuperAbbrevs
 plugin.SuperAbbrevsPlugin.author=Sune Simonsen
-plugin.SuperAbbrevsPlugin.version=0.32
-plugin.SuperAbbrevsPlugin.depend.0=jedit 04.03.15.00
+plugin.SuperAbbrevsPlugin.version=1.0
+plugin.SuperAbbrevsPlugin.depend.0=jedit 04.03.99.00
 plugin.SuperAbbrevsPlugin.depend.1=jdk 1.5
 plugin.SuperAbbrevsPlugin.activate=defer
 #plugin.SuperAbbrevsPlugin.activate=startup

Modified: plugins/SuperAbbrevs/trunk/SuperAbbrevsPlugin.java
===================================================================
--- plugins/SuperAbbrevs/trunk/SuperAbbrevsPlugin.java	2010-11-25 15:07:31 UTC (rev 19021)
+++ plugins/SuperAbbrevs/trunk/SuperAbbrevsPlugin.java	2010-11-25 18:02:59 UTC (rev 19022)
@@ -16,14 +16,10 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-import java.util.*;
-import java.io.*;
-
 import org.gjt.sp.jedit.Buffer;
 import org.gjt.sp.jedit.EditPlugin;
 import org.gjt.sp.jedit.textarea.JEditTextArea;
 import org.gjt.sp.jedit.View;
-import org.gjt.sp.jedit.*;
 import superabbrevs.SuperAbbrevs;
 import superabbrevs.DisplayAbbrevs;
 

Modified: plugins/SuperAbbrevs/trunk/superabbrevs/Handler.java
===================================================================
--- plugins/SuperAbbrevs/trunk/superabbrevs/Handler.java	2010-11-25 15:07:31 UTC (rev 19021)
+++ plugins/SuperAbbrevs/trunk/superabbrevs/Handler.java	2010-11-25 18:02:59 UTC (rev 19022)
@@ -6,7 +6,7 @@
 import org.gjt.sp.jedit.textarea.JEditTextArea;
 import superabbrevs.template.*;
 
-public class Handler extends BufferChangeAdapter {
+public class Handler extends BufferAdapter {
 	private boolean disabled;
 	private JEditTextArea textArea;
 	private boolean justEdited = false;
@@ -39,59 +39,55 @@
 	public boolean isDisabled(){
 		return disabled;
 	}
-	
-	public void contentInserted(Buffer buffer, int startLine, int offset, 
-								int numLines, int length){
-		
+
+	public void contentInserted(JEditBuffer buffer, int startLine, int offset, int numLines, int length) {
 		if (!disabled){
 			String insertedText = buffer.getText(offset, length);
-			
+
 			try{
-				
+
 				if(justEdited){
 					offset = caret;
 					oldTemplateLength += length;
 				} else {
 					oldTemplateLength = template.getLength()+length;
 				}
-								
+
 				int fieldOffset = template.getCurrentField().getOffset();
-				
+
 				template.insert(offset,insertedText);
-				
+
 				int offsetChanged = template.getCurrentField().getOffset() - fieldOffset;
-				caret = offset + offsetChanged + length; 
-				
+				caret = offset + offsetChanged + length;
+
 				justEdited = true;
 			} catch (WriteOutsideTemplateException e) {
 				removeHandler(buffer);
 				//System.out.println("Handler removed "+e.getMessage());
-			} 
+			}
 		}
 	}
-	
-	public void contentRemoved(Buffer buffer, int startLine, int offset, 
-							   int numLines, int length){
-		
+
+	public void contentRemoved(JEditBuffer buffer, int startLine, int offset, int numLines, int length) {
 		if (!disabled){
 			try{
 				oldTemplateLength = template.getLength()-length;
-				
+
 				int fieldOffset = template.getCurrentField().getOffset();
 				template.delete(offset,length);
 				int offsetChanged = template.getCurrentField().getOffset() - fieldOffset;
 				caret = offset + offsetChanged;
-				
+
 				justEdited = true;
-				
+
 				textArea.setCaretPosition(caret);
 			} catch (WriteOutsideTemplateException e) {
 				removeHandler(buffer);
 				//System.out.println("Handler removed "+e.getMessage());
 			}
 		}
-	} 
-	
+	}
+
 	/**
 	 * Method postEdit()
 	 */
@@ -127,18 +123,18 @@
 		
 	public static void putHandler(Buffer buffer, Handler t){
 		Handler h = getHandler(buffer);
-		buffer.removeBufferChangeListener(h);
-		buffer.addBufferChangeListener(t);
+		buffer.removeBufferListener(h);
+		buffer.addBufferListener(t);
 		handlers.put(buffer,t);
 	}
 	
-	public static Handler getHandler(Buffer buffer){
+	public static Handler getHandler(JEditBuffer buffer){
 		return (Handler)handlers.get(buffer);
 	}
 	
-	public static Handler removeHandler(Buffer buffer){
+	public static Handler removeHandler(JEditBuffer buffer){
 		Handler h = getHandler(buffer);
-		buffer.removeBufferChangeListener(h);
+		buffer.removeBufferListener(h);
 		handlers.remove(buffer);
 		return h;
 	}

Modified: plugins/SuperAbbrevs/trunk/superabbrevs/gui/AbbrevsOptionPane.java
===================================================================
--- plugins/SuperAbbrevs/trunk/superabbrevs/gui/AbbrevsOptionPane.java	2010-11-25 15:07:31 UTC (rev 19021)
+++ plugins/SuperAbbrevs/trunk/superabbrevs/gui/AbbrevsOptionPane.java	2010-11-25 18:02:59 UTC (rev 19022)
@@ -72,7 +72,7 @@
 
 		modeAbbrevs = new Hashtable();
 		Mode[] modes = jEdit.getModes();
-		Arrays.sort(modes,new MiscUtilities.StringICaseCompare());
+		Arrays.sort(modes,new StandardUtilities.StringCompare<Mode>(true));
 		String[] sets = new String[modes.length + 1];
 		sets[0] = "global";
 		modeAbbrevs.put(sets[0],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.