[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5623] branches/squirrel-sql_3_1_1/sql12/app/src/ net/sourceforge/squirrel_sql/client/session/FileManager.java

[<man...@us...>]

Revision: 5623
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5623&view=rev
Author:   manningr
Date:     2010-05-09 18:14:02 +0000 (Sun, 09 May 2010)

Log Message:
-----------
2992443: Cannot use RSyntax or Netbeans editors. Merged from trunk revision 5618 (Parser could be triggered far to often which resulted in high CPU and memory load. This problem was caused by redundant carriage return chars (\r).)

Revision Links:
--------------
    http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5618&view=rev

Modified Paths:
--------------
    branches/squirrel-sql_3_1_1/sql12/app/src/net/sourceforge/squirrel_sql/client/session/FileManager.java

Modified: branches/squirrel-sql_3_1_1/sql12/app/src/net/sourceforge/squirrel_sql/client/session/FileManager.java
===================================================================
--- branches/squirrel-sql_3_1_1/sql12/app/src/net/sourceforge/squirrel_sql/client/session/FileManager.java	2010-05-09 18:03:20 UTC (rev 5622)
+++ branches/squirrel-sql_3_1_1/sql12/app/src/net/sourceforge/squirrel_sql/client/session/FileManager.java	2010-05-09 18:14:02 UTC (rev 5623)
@@ -299,9 +299,16 @@
    private String convertLineFeedToPlatformEOL(String result)
    {
       String platformEolStr = StringUtilities.getEolStr();
-      if( result != null && !"".equals(result) && !platformEolStr.equals("\n") )
+      if (result != null && !"".equals(result))
       {
-         result = result.replaceAll("\\n", platformEolStr);
+         // We eagerly take care that no redundant CRs exist
+         // because they hide in files and cause any kind of trouble.
+         result = result.replaceAll("\\r", "");
+
+         if (!platformEolStr.equals("\n"))
+         {
+            result = result.replaceAll("\\n", platformEolStr);
+         }
       }
       return result;
    }
@@ -315,12 +322,19 @@
    {
       String platformEolStr = StringUtilities.getEolStr();
 
-      if(null == s || "".equals(s) || platformEolStr.equals("\n"))
+      if (null == s || "".equals(s))
       {
          return s;
       }
 
-      return s.replaceAll(platformEolStr, "\n");
+      if (false == platformEolStr.equals("\n"))
+      {
+         s = s.replaceAll(platformEolStr, "\n");
+      }
+
+      // We eagerly take care that no redundant CRs exist
+      // because they hide in files and cause any kind of trouble.
+      return s.replaceAll("\\r", "");
    }
 
 


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