From: Sune S. <sun...@us...> - 2006-05-19 22:20:18
|
Update of /cvsroot/jedit/plugins/SuperAbbrevs/superabbrevs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21506/superabbrevs Modified Files: Tag: jedit_42-stable012 SuperAbbrevs.java Log Message: shift-tab loads abbrev if defined Index: SuperAbbrevs.java =================================================================== RCS file: /cvsroot/jedit/plugins/SuperAbbrevs/superabbrevs/SuperAbbrevs.java,v retrieving revision 1.5.2.7 retrieving revision 1.5.2.8 diff -u -d -r1.5.2.7 -r1.5.2.8 --- SuperAbbrevs.java 19 May 2006 21:42:26 -0000 1.5.2.7 +++ SuperAbbrevs.java 19 May 2006 22:20:15 -0000 1.5.2.8 @@ -69,6 +69,7 @@ Hashtable abbrevs = (Hashtable)modeAbbrevs.get(mode); if(abbrevs == null){ abbrevs = SuperAbbrevsIO.readModeFile(mode); + modeAbbrevs.put(mode,abbrevs); } return abbrevs; } @@ -149,7 +150,12 @@ } else { String abbrev = getAbbrev(textArea, buffer); if (!abbrev.trim().equals("")){ - AddAbbrevDialog dialog = new AddAbbrevDialog(view,abbrev); + Hashtable abbrevs = loadAbbrevs(getMode(textArea, buffer)); + String expansion = (String)abbrevs.get(abbrev); + expansion = (expansion==null) ? "" : expansion; + + AddAbbrevDialog dialog = + new AddAbbrevDialog(view,abbrev,expansion); } else { textArea.shiftIndentLeft(); } |