[ jEdit-commits ] SF.net SVN: jedit:[20526] plugins/BufferList/trunk

[<ez...@us...>]

Revision: 20526
          http://jedit.svn.sourceforge.net/jedit/?rev=20526&view=rev
Author:   ezust
Date:     2011-12-04 21:37:16 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Use MiscUtilities.abbreviate instead of just doing s/$HOME/~ 

Modified Paths:
--------------
    plugins/BufferList/trunk/BufferList.props
    plugins/BufferList/trunk/bufferlist/BufferListRenderer.java

Modified: plugins/BufferList/trunk/BufferList.props
===================================================================
--- plugins/BufferList/trunk/BufferList.props	2011-12-04 21:02:54 UTC (rev 20525)
+++ plugins/BufferList/trunk/BufferList.props	2011-12-04 21:37:16 UTC (rev 20526)
@@ -22,7 +22,7 @@
 plugin.bufferlist.BufferListPlugin.activate=defer
 plugin.bufferlist.BufferListPlugin.name=BufferList
 plugin.bufferlist.BufferListPlugin.author=Dirk Moebius
-plugin.bufferlist.BufferListPlugin.version=1.3
+plugin.bufferlist.BufferListPlugin.version=1.3.1
 plugin.bufferlist.BufferListPlugin.docs=BufferList.html
 plugin.bufferlist.BufferListPlugin.usePluginHome=true
 plugin.bufferlist.BufferListPlugin.depend.0=jedit 04.03.99.00
@@ -95,7 +95,7 @@
 options.bufferlist.closeFilesOnDoubleClick=Close files on double click
 options.bufferlist.startExpanded=Fully expand directory tree by default
 options.bufferlist.displayMode=Use flat tree by default
-options.bufferlist.shortenHome=Replace occurences of user\'s home directory with "~"
+options.bufferlist.shortenHome=Compress paths with variable prefixes in tree
 options.bufferlist.textClipping.label=Clip long paths with "...":
 options.bufferlist.textClipping.start=at start
 options.bufferlist.textClipping.end=at end

Modified: plugins/BufferList/trunk/bufferlist/BufferListRenderer.java
===================================================================
--- plugins/BufferList/trunk/bufferlist/BufferListRenderer.java	2011-12-04 21:02:54 UTC (rev 20525)
+++ plugins/BufferList/trunk/bufferlist/BufferListRenderer.java	2011-12-04 21:37:16 UTC (rev 20526)
@@ -40,6 +40,7 @@
 import javax.swing.tree.DefaultTreeCellRenderer;
 
 import org.gjt.sp.jedit.Buffer;
+import org.gjt.sp.jedit.MiscUtilities;
 import org.gjt.sp.jedit.View;
 import org.gjt.sp.jedit.jEdit;
 import org.gjt.sp.util.Log;
@@ -109,12 +110,12 @@
 		fontNormal = font.deriveFont(font.isItalic() ? Font.ITALIC : Font.PLAIN);
 		fontSelected = font.deriveFont(font.isItalic() ? Font.BOLD | Font.ITALIC : Font.BOLD);
 	} // }}}
-	
+
 	// {{{ +getTreeCellRendererComponent(JTree, Object, boolean, boolean,
 	// boolean, int, boolean) : Component
 	/**
 	 * Configures the renderer.
-	 * 
+	 *
 	 * @return this
 	 */
 	public Component getTreeCellRendererComponent(JTree tree, Object value, boolean isSelected,
@@ -145,14 +146,7 @@
 			String path = (String) node.getUserObject();
 			if (jEdit.getBooleanProperty("bufferlist.shortenHome", true))
 			{
-				if (path.equals(USER_HOME))
-				{
-					path = "~";
-				}
-				else if (path.startsWith(USER_HOME_SEP))
-				{
-					path = "~" + path.substring(USER_HOME.length());
-				}
+				path = MiscUtilities.abbreviate(path);
 			}
 			// setText((node.isExpanded()?"+":"-")+node.getReused()+":"+obj.toString());
 			// // NOTE: debug only

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