[ jEdit-commits ] SF.net SVN: jedit:[20465] jEdit/trunk

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

Revision: 20465
          http://jedit.svn.sourceforge.net/jedit/?rev=20465&view=rev
Author:   ezust
Date:     2011-11-29 07:36:48 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Rollback 20447

Modified Paths:
--------------
    jEdit/trunk/doc/TODO.txt
    jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java

Modified: jEdit/trunk/doc/TODO.txt
===================================================================
--- jEdit/trunk/doc/TODO.txt	2011-11-29 07:11:44 UTC (rev 20464)
+++ jEdit/trunk/doc/TODO.txt	2011-11-29 07:36:48 UTC (rev 20465)
@@ -8,9 +8,6 @@
 splitting messes up last physical line in the newly created text area
 
 + text area:
-TODO: something else.
-FIXME: blah di blah
-
   - click&drag breaks fast scroll
   - format: doesn't wrap right if selection starts in the middle of the
     line

Modified: jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java	2011-11-29 07:11:44 UTC (rev 20464)
+++ jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java	2011-11-29 07:36:48 UTC (rev 20465)
@@ -165,30 +165,19 @@
 		return arg;
 	} //}}}
 
-	//{{{ abbreviate() methods
+	//{{{ abbreviate() method
 	/** @return an abbreviated path, replacing values with variables, if a prefix exists.
-	 *          uses platform convention (%varname% on windows, $varname on other platforms)
+		uses platform convention (%varname% on windows, $varname on other platforms)
 	 *  @see #expandVariables
 	 *  @since jEdit 4.3pre16
 	 */
 	public static String abbreviate(String path)
 	{
-		return abbreviate(path, false);
-	} 
-
-	/** @param path the original path to abbreviate 
-	  * @param crossPlatform if true, use $variable syntax on all platforms
-	  * @return an abbreviated path with variable prefix. 
-	  * @since jEdit 5.0pre1
-	*/
-	public static String abbreviate(String path, boolean crossPlatform)
-	{
 		if (svc == null)
 			svc = new VarCompressor();
-		return svc.compress(path, crossPlatform);
-	
+		return svc.compress(path);
 	} //}}}
-	
+
 	//{{{ resolveSymlinks() method
 	/**
 	 * Resolves any symbolic links in the path name specified
@@ -1239,12 +1228,7 @@
 		} //}}}
 
 		//{{{ compress() method
-		/**
-		  @param path the path to compress
-		  @param crossPlatform if true, will always use $variable syntax regardless of platform.
-		  @return a compressed pathname with variable prefix. 
-		*/
-		String compress(String path, boolean crossPlatform)
+		String compress(String path)
 		{
 			String original = path;
 			if (previous.containsKey(path))
@@ -1278,7 +1262,7 @@
 				String envvar = prefixMap.get(bestPrefix);
 				if (envvar.equals("~"))
 					path = envvar + remainder;
-				else if (!crossPlatform && OperatingSystem.isWindows())
+				else if (OperatingSystem.isWindows())
 					path = '%' + envvar.toUpperCase() + '%' + remainder;
 				else
 					path = '$' + envvar + remainder;

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