Thread: [Squirrel-sql-commits] sql12/plugins/editextras/src/net/sourceforge/squirrel_sql/plugins/editextras/
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Gerd W. <ger...@us...> - 2004-10-21 19:45:06
|
Update of /cvsroot/squirrel-sql/sql12/plugins/editextras/src/net/sourceforge/squirrel_sql/plugins/editextras/codereformat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16987 Modified Files: CodeReformator.java Log Message: Bug fix: Format code removed whitespaces in literals. Index: CodeReformator.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/editextras/src/net/sourceforge/squirrel_sql/plugins/editextras/codereformat/CodeReformator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CodeReformator.java 8 Feb 2004 12:13:33 -0000 1.2 --- CodeReformator.java 21 Oct 2004 19:44:55 -0000 1.3 *************** *** 500,503 **** --- 500,504 ---- private String flatenWhiteSpaces(String in, boolean force) { + if(hasCommentEndingWithLineFeed(in) && ! force) { *************** *** 506,518 **** } ! int lenOld = 0; ! int lenNew = -1; ! while(lenOld > lenNew) ! { ! lenOld = in.length(); ! in = in.replaceAll("\\s\\s", " "); ! lenNew = in.length(); ! } ! return in.replaceAll("\\s", " "); } --- 507,552 ---- } ! ! StringBuffer ret = new StringBuffer(); ! int aposCount = 0; ! for(int i=0; i < in.length(); ++i) ! { ! ! if('\'' == in.charAt(i)) ! { ! ++aposCount; ! } ! ! boolean dontAppend = false; ! ! if(0 != aposCount % 2 ) ! { ! ! } ! else ! { ! if(Character.isWhitespace(in.charAt(i)) && i + 1 < in.length() && Character.isWhitespace(in.charAt(i+1))) ! { ! dontAppend = true; ! } ! } ! ! if(false == dontAppend) ! { ! char toAppend; ! if(Character.isWhitespace(in.charAt(i)) && 0 == aposCount % 2) ! { ! toAppend = ' '; ! } ! else ! { ! toAppend = in.charAt(i); ! } ! ret.append(toAppend); ! } ! } ! ! return ret.toString(); ! } |