From: Matthieu C. <kp...@us...> - 2006-06-23 22:05:05
|
Update of /cvsroot/jedit/jEdit/org/gjt/sp/jedit/textarea In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30967/jEdit/org/gjt/sp/jedit/textarea Modified Files: JEditTextArea.java MouseHandler.java Selection.java Log Message: new StandardUtilities class StandardUtilities must contains only import from JDK The MiscUtilities has too many dependancies so it will be splitted and some of it's methods are moved to this new class (in fact deprecated and calls StandardUtilities now) Index: MouseHandler.java =================================================================== RCS file: /cvsroot/jedit/jEdit/org/gjt/sp/jedit/textarea/MouseHandler.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- MouseHandler.java 20 Jun 2006 21:53:46 -0000 1.10 +++ MouseHandler.java 23 Jun 2006 22:04:58 -0000 1.11 @@ -29,10 +29,10 @@ import javax.swing.*; import javax.swing.event.*; import org.gjt.sp.jedit.GUIUtilities; -import org.gjt.sp.jedit.MiscUtilities; import org.gjt.sp.jedit.OperatingSystem; import org.gjt.sp.jedit.Registers; import org.gjt.sp.jedit.TextUtilities; +import org.gjt.sp.util.StandardUtilities; //}}} class MouseHandler extends MouseInputAdapter @@ -164,7 +164,7 @@ { // control-click in virtual space inserts // whitespace and moves caret - String whitespace = MiscUtilities + String whitespace = StandardUtilities .createWhiteSpace(extraEndVirt,0); textArea.getBuffer().insert(dragStart,whitespace); Index: JEditTextArea.java =================================================================== RCS file: /cvsroot/jedit/jEdit/org/gjt/sp/jedit/textarea/JEditTextArea.java,v retrieving revision 1.371 retrieving revision 1.372 diff -u -d -r1.371 -r1.372 --- JEditTextArea.java 20 Jun 2006 21:27:24 -0000 1.371 +++ JEditTextArea.java 23 Jun 2006 22:04:58 -0000 1.372 @@ -47,7 +47,7 @@ import org.gjt.sp.jedit.gui.InputHandler; import org.gjt.sp.jedit.syntax.*; import org.gjt.sp.util.Log; - +import org.gjt.sp.util.StandardUtilities; //}}} @@ -2992,7 +2992,7 @@ int firstIndent = chunkCache.getSubregionStartOffset(line,offset); if(firstIndent == getLineStartOffset(line)) { - firstIndent = MiscUtilities.getLeadingWhiteSpace(getLineText(line)); + firstIndent = StandardUtilities.getLeadingWhiteSpace(getLineText(line)); if(firstIndent == getLineLength(line)) firstIndent = 0; firstIndent += getLineStartOffset(line); @@ -3940,7 +3940,7 @@ { String text = getLineText(lines[i]); buffer.insert(getLineStartOffset(lines[i]) - + MiscUtilities.getLeadingWhiteSpace(text), + + StandardUtilities.getLeadingWhiteSpace(text), comment); } } @@ -4292,7 +4292,7 @@ // if caret is inside leading whitespace, indent. String text = buffer.getLineText(caretLine); int start = buffer.getLineStartOffset(caretLine); - int whiteSpace = MiscUtilities.getLeadingWhiteSpace(text); + int whiteSpace = StandardUtilities.getLeadingWhiteSpace(text); if(caret - start <= whiteSpace && buffer.indentLine(caretLine,false)) @@ -4365,7 +4365,7 @@ try { buffer.beginCompoundEdit(); - buffer.remove(end - 1,MiscUtilities.getLeadingWhiteSpace( + buffer.remove(end - 1,StandardUtilities.getLeadingWhiteSpace( buffer.getLineText(caretLine + 1)) + 1); buffer.insert(end - 1, " "); } @@ -4390,7 +4390,7 @@ int end = getLineEndOffset(selectedLines[i]-offset); buffer.remove( - end - 1,MiscUtilities.getLeadingWhiteSpace( + end - 1,StandardUtilities.getLeadingWhiteSpace( buffer.getLineText(selectedLines[i] + 1 - offset)) + 1); buffer.insert(end - 1, " "); offset++; @@ -5369,7 +5369,7 @@ } } - replaceSelection(MiscUtilities.createWhiteSpace( + replaceSelection(StandardUtilities.createWhiteSpace( tabSize - pos,0)); } else @@ -5887,7 +5887,7 @@ String line = buffer.getLineText(lineStart); String whitespace = line.substring(0, - MiscUtilities.getLeadingWhiteSpace(line)); + StandardUtilities.getLeadingWhiteSpace(line)); if(caretEnd == buffer.getLineStartOffset(lineEnd)) Index: Selection.java =================================================================== RCS file: /cvsroot/jedit/jEdit/org/gjt/sp/jedit/textarea/Selection.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- Selection.java 20 Jun 2006 21:53:46 -0000 1.25 +++ Selection.java 23 Jun 2006 22:04:58 -0000 1.26 @@ -24,8 +24,8 @@ //{{{ Imports import java.util.ArrayList; -import org.gjt.sp.jedit.MiscUtilities; import org.gjt.sp.jedit.buffer.JEditBuffer; +import org.gjt.sp.util.StandardUtilities; //}}} /** @@ -518,7 +518,7 @@ if(startWhitespace != 0) { buffer.insert(rectStart + lineStart, - MiscUtilities.createWhiteSpace(startWhitespace,0)); + StandardUtilities.createWhiteSpace(startWhitespace,0)); } int endWhitespace; @@ -549,7 +549,7 @@ { buffer.insert(rectStart + lineStart + startWhitespace, - MiscUtilities.createWhiteSpace(endWhitespace,0)); + StandardUtilities.createWhiteSpace(endWhitespace,0)); } endOffset = rectStart + lineStart |