Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[15613] jEdit/trunk/org/gjt/sp
|
From: <vo...@us...> - 2009-06-30 07:07:46
|
Revision: 15613
http://jedit.svn.sourceforge.net/jedit/?rev=15613&view=rev
Author: voituk
Date: 2009-06-30 07:07:43 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
Code cleanup performed:
- Syncronized StringBuffer was replaced to non-locking StringBuilder (where it is possible)
- Introduced Java5 generic types into collections usage (code become more easy to read)
- Removed few compiler warnings
Modified Paths:
--------------
jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java
jEdit/trunk/org/gjt/sp/jedit/PerspectiveManager.java
jEdit/trunk/org/gjt/sp/jedit/TextUtilities.java
jEdit/trunk/org/gjt/sp/jedit/browser/VFSDirectoryEntryTable.java
jEdit/trunk/org/gjt/sp/jedit/bsh/BSHLiteral.java
jEdit/trunk/org/gjt/sp/jedit/bsh/CallStack.java
jEdit/trunk/org/gjt/sp/jedit/bsh/ClassGeneratorUtil.java
jEdit/trunk/org/gjt/sp/jedit/bsh/CollectionManager.java
jEdit/trunk/org/gjt/sp/jedit/bsh/ParseException.java
jEdit/trunk/org/gjt/sp/jedit/bsh/Parser.java
jEdit/trunk/org/gjt/sp/jedit/bsh/Reflect.java
jEdit/trunk/org/gjt/sp/jedit/bsh/Remote.java
jEdit/trunk/org/gjt/sp/jedit/bsh/SimpleNode.java
jEdit/trunk/org/gjt/sp/jedit/bsh/StringUtil.java
jEdit/trunk/org/gjt/sp/jedit/bsh/TokenMgrError.java
jEdit/trunk/org/gjt/sp/jedit/bsh/XThis.java
jEdit/trunk/org/gjt/sp/jedit/bsh/commands/dir.java
jEdit/trunk/org/gjt/sp/jedit/bsh/org/objectweb/asm/Type.java
jEdit/trunk/org/gjt/sp/jedit/gui/AbbrevEditor.java
jEdit/trunk/org/gjt/sp/jedit/gui/AbstractContextOptionPane.java
jEdit/trunk/org/gjt/sp/jedit/gui/DockableWindowFactory.java
jEdit/trunk/org/gjt/sp/jedit/gui/KeyEventTranslator.java
jEdit/trunk/org/gjt/sp/jedit/gui/PasteFromListDialog.java
jEdit/trunk/org/gjt/sp/jedit/gui/StyleEditor.java
jEdit/trunk/org/gjt/sp/jedit/help/HelpIndex.java
jEdit/trunk/org/gjt/sp/jedit/help/HelpTOCPanel.java
jEdit/trunk/org/gjt/sp/jedit/io/RegexEncodingDetector.java
jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchResults.java
jEdit/trunk/org/gjt/sp/jedit/syntax/ParserRule.java
jEdit/trunk/org/gjt/sp/jedit/textarea/InputMethodSupport.java
jEdit/trunk/org/gjt/sp/util/PropertiesBean.java
Modified: jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -1241,7 +1241,7 @@
* @param ignoreCase If true, case insensitive
* @since jEdit 4.2pre2
*/
- public static String getLongestPrefix(List str, boolean ignoreCase)
+ public static String getLongestPrefix(List<String> str, boolean ignoreCase)
{
if(str.isEmpty())
return "";
@@ -1250,13 +1250,13 @@
loop: for(;;)
{
- String s = str.get(0).toString();
+ String s = str.get(0);
if(prefixLength >= s.length())
break loop;
char ch = s.charAt(prefixLength);
for(int i = 1; i < str.size(); i++)
{
- s = str.get(i).toString();
+ s = str.get(i);
if(prefixLength >= s.length())
break loop;
if(!compareChars(s.charAt(prefixLength),ch,ignoreCase))
@@ -1265,7 +1265,7 @@
prefixLength++;
}
- return str.get(0).toString().substring(0,prefixLength);
+ return str.get(0).substring(0,prefixLength);
}
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/PerspectiveManager.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/PerspectiveManager.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/PerspectiveManager.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -245,7 +245,7 @@
private static class PerspectiveHandler extends DefaultHandler
{
View view;
- StringBuffer charData;
+ private StringBuilder charData;
View.ViewConfig config;
boolean restoreFiles;
String autoReload, autoReloadDialog;
@@ -254,7 +254,7 @@
{
this.restoreFiles = restoreFiles;
config = new View.ViewConfig();
- charData = new StringBuffer();
+ charData = new StringBuilder();
config.docking = View.getDockingFrameworkProvider().createDockingLayout();
}
Modified: jEdit/trunk/org/gjt/sp/jedit/TextUtilities.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/TextUtilities.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/TextUtilities.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -285,16 +285,16 @@
*
* @since jedit 4.3pre3
*/
- public static String join(Collection c, String delim) {
+ public static String join(Collection<String> c, String delim) {
StringBuilder retval = new StringBuilder();
- Iterator itr = c.iterator();
- if (itr.hasNext()) {
- retval.append( itr.next().toString() );
- }
- else return "";
+ Iterator<String> itr = c.iterator();
+ if (itr.hasNext())
+ retval.append( itr.next() );
+ else
+ return "";
while (itr.hasNext()) {
retval.append(delim);
- retval.append(itr.next().toString());
+ retval.append(itr.next());
}
return retval.toString();
}
@@ -385,7 +385,7 @@
int type = getCharType(ch, noWordSep);
//}}}
-loop: for(int i = pos; i >= 0; i--)
+ for(int i = pos; i >= 0; i--)
{
char lastCh = ch;
ch = line.charAt(i);
@@ -578,7 +578,7 @@
int type = getCharType(ch, noWordSep);
//}}}
-loop: for(int i = pos; i < line.length(); i++)
+ for(int i = pos; i < line.length(); i++)
{
char lastCh = ch;
ch = line.charAt(i);
Modified: jEdit/trunk/org/gjt/sp/jedit/browser/VFSDirectoryEntryTable.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/browser/VFSDirectoryEntryTable.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/browser/VFSDirectoryEntryTable.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -509,7 +509,7 @@
for(int i = 1; i < widths.length; i++)
{
- String extAttr = model.getExtendedAttribute(i);
+ //String extAttr = model.getExtendedAttribute(i);
widths[i] = Math.max(widths[i],model.getColumnWidth(i));
}
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/BSHLiteral.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/BSHLiteral.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/BSHLiteral.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -102,7 +102,7 @@
void stringSetup(String str)
{
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for(int i = 0; i < str.length(); i++)
{
char ch = str.charAt(i);
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/CallStack.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/CallStack.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/CallStack.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -61,7 +61,7 @@
*/
public class CallStack
{
- private Vector stack = new Vector(2);
+ private Vector<NameSpace> stack = new Vector<NameSpace>(2);
public CallStack() { }
@@ -128,7 +128,7 @@
}
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("CallStack:\n");
NameSpace [] nsa = toArray();
for(int i=0; i<nsa.length; i++)
@@ -141,9 +141,10 @@
Occasionally we need to freeze the callstack for error reporting
purposes, etc.
*/
+ @SuppressWarnings("unchecked")
public CallStack copy() {
CallStack cs = new CallStack();
- cs.stack = (Vector)this.stack.clone();
+ cs.stack = (Vector<NameSpace>) stack.clone();
return cs;
}
}
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/ClassGeneratorUtil.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/ClassGeneratorUtil.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/ClassGeneratorUtil.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -573,7 +573,7 @@
static String getMethodDescriptor( String returnType, String [] paramTypes )
{
- StringBuffer sb = new StringBuffer("(");
+ StringBuilder sb = new StringBuilder("(");
for(int i=0; i<paramTypes.length; i++)
sb.append(paramTypes[i]);
sb.append(")"+returnType);
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/CollectionManager.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/CollectionManager.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/CollectionManager.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -171,6 +171,10 @@
return createEnumeration(
iterateOverMe.toString().toCharArray());
+ if (iterateOverMe instanceof StringBuilder)
+ return createEnumeration(
+ iterateOverMe.toString().toCharArray());
+
throw new IllegalArgumentException(
"Cannot enumerate object of type "+iterateOverMe.getClass());
}
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/ParseException.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/ParseException.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/ParseException.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -219,7 +219,7 @@
* string literal.
*/
protected String add_escapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/Parser.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/Parser.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/Parser.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -959,10 +959,10 @@
boolean jjtc000 = true;
jjtree.openNodeScope(jjtn000);
jjtreeOpenNodeScope(jjtn000);Token t;
- StringBuffer s;
+ StringBuilder s;
try {
t = jj_consume_token(IDENTIFIER);
- s = new StringBuffer(t.image);
+ s = new StringBuilder(t.image);
label_5:
while (true) {
if (jj_2_7(2)) {
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/Reflect.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/Reflect.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/Reflect.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -846,7 +846,7 @@
if ( !type.isArray() )
return type.getName();
- StringBuffer className = new StringBuffer();
+ StringBuilder className = new StringBuilder();
try {
className.append( getArrayBaseType(type).getName() +" ");
for(int i = 0; i < getArrayDimensions(type); i++)
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/Remote.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/Remote.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/Remote.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -146,7 +146,7 @@
static String doHttp( String postURL, String text )
{
String returnValue = null;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( "bsh.client=Remote" );
sb.append( "&bsh.script=" );
sb.append( URLEncoder.encode( text ) );
@@ -204,7 +204,7 @@
static String getFile( String name )
throws FileNotFoundException, IOException
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
BufferedReader bin = new BufferedReader( new FileReader( name ) );
String line;
while ( (line=bin.readLine()) != null )
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/SimpleNode.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/SimpleNode.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/SimpleNode.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -206,7 +206,7 @@
*/
public String getText()
{
- StringBuffer text = new StringBuffer();
+ StringBuilder text = new StringBuilder();
Token t = firstToken;
while ( t!=null ) {
text.append(t.image);
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/StringUtil.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/StringUtil.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/StringUtil.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -81,7 +81,7 @@
public static String methodString(String name, Class[] types)
{
- StringBuffer sb = new StringBuffer(name + "(");
+ StringBuilder sb = new StringBuilder(name + "(");
if ( types.length > 0 )
sb.append(" ");
for( int i=0; i<types.length; i++ )
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/TokenMgrError.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/TokenMgrError.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/TokenMgrError.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -38,7 +38,7 @@
* equivalents in the given string
*/
protected static final String addEscapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/XThis.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/XThis.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/XThis.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -182,7 +182,7 @@
{
Class [] ints = proxy.getClass().getInterfaces();
// XThis.this refers to the enclosing class instance
- StringBuffer sb = new StringBuffer(
+ StringBuilder sb = new StringBuilder(
XThis.this.toString() + "\nimplements:" );
for(int i=0; i<ints.length; i++)
sb.append( " "+ ints[i].getName()
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/commands/dir.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/commands/dir.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/commands/dir.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -58,7 +58,7 @@
for( int i=0; i< files.length; i++ ) {
File f = new File( dir + File.separator + files[i] );
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( f.canRead() ? "r": "-" );
sb.append( f.canWrite() ? "w": "-" );
sb.append( "_" );
@@ -76,7 +76,7 @@
// hack to get fixed length 'length' field
int fieldlen = 8;
- StringBuffer len = new StringBuffer();
+ StringBuilder len = new StringBuilder();
for(int j=0; j<fieldlen; j++)
len.append(" ");
len.insert(0, f.length());
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/org/objectweb/asm/Type.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/org/objectweb/asm/Type.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/org/objectweb/asm/Type.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -464,7 +464,7 @@
*/
public String getDescriptor () {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
getDescriptor(buf);
return buf.toString();
}
@@ -483,7 +483,7 @@
final Type returnType,
final Type[] argumentTypes)
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append('(');
for (int i = 0; i < argumentTypes.length; ++i) {
argumentTypes[i].getDescriptor(buf);
@@ -500,7 +500,7 @@
* @param buf the string buffer to which the descriptor must be appended.
*/
- private void getDescriptor (final StringBuffer buf) {
+ private void getDescriptor(final StringBuilder buf) {
switch (sort) {
case VOID: buf.append('V'); return;
case BOOLEAN: buf.append('Z'); return;
@@ -542,7 +542,7 @@
*/
public static String getDescriptor (final Class c) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
getDescriptor(buf, c);
return buf.toString();
}
@@ -556,7 +556,7 @@
public static String getMethodDescriptor (final Method m) {
Class[] parameters = m.getParameterTypes();
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append('(');
for (int i = 0; i < parameters.length; ++i) {
getDescriptor(buf, parameters[i]);
@@ -573,7 +573,7 @@
* @param c the class whose descriptor must be computed.
*/
- private static void getDescriptor (final StringBuffer buf, final Class c) {
+ private static void getDescriptor (final StringBuilder buf, final Class c) {
Class d = c;
while (true) {
if (d.isPrimitive()) {
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/AbbrevEditor.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/AbbrevEditor.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/AbbrevEditor.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -102,7 +102,7 @@
//{{{ getExpansion() method
public String getExpansion()
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
String beforeCaretText = beforeCaret.getText();
String afterCaretText = afterCaret.getText();
@@ -167,7 +167,7 @@
String beforeCaretText = null;
String afterCaretText = null;
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for(int i = 0; i < expansion.length(); i++)
{
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/AbstractContextOptionPane.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/AbstractContextOptionPane.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/AbstractContextOptionPane.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -137,20 +137,17 @@
buttons.add(c);
}
- static class MenuItemCompare implements Comparator
+ static class MenuItemCompare implements Comparator<MenuItem>
{
- public int compare(Object obj1, Object obj2)
+ public int compare(MenuItem obj1, MenuItem obj2)
{
- return StandardUtilities.compareStrings(
- ((MenuItem)obj1).label,
- ((MenuItem)obj2).label,
- true);
+ return StandardUtilities.compareStrings(obj1.label, obj2.label, true);
}
}
protected void _save()
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for(int i = 0; i < listModel.getSize(); i++)
{
if(i != 0)
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/DockableWindowFactory.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/DockableWindowFactory.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/DockableWindowFactory.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -201,7 +201,7 @@
actions = true;
movable = MOVABLE_DEFAULT;
- code = new StringBuffer();
+ code = new StringBuilder();
cachedDockableNames = new LinkedList<String>();
cachedDockableActionFlags = new LinkedList<Boolean>();
cachedDockableMovableFlags = new LinkedList<Boolean>();
@@ -338,7 +338,7 @@
private java.util.List<Boolean> cachedDockableMovableFlags;
private String dockableName;
- private StringBuffer code;
+ private StringBuilder code;
private boolean actions;
private boolean movable;
final boolean MOVABLE_DEFAULT = false;
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/KeyEventTranslator.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/KeyEventTranslator.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/KeyEventTranslator.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -379,7 +379,7 @@
public static String modifiersToString(int mods)
{
- StringBuffer buf = null;
+ StringBuilder buf = null;
for(int i = 0; i < MODS.length; i++)
{
@@ -422,10 +422,10 @@
/** This map is a pool of Key. */
private static final Map<Key, Key> transMap = new HashMap<Key, Key>();
- private static StringBuffer lazyAppend(StringBuffer buf, char ch)
+ private static StringBuilder lazyAppend(StringBuilder buf, char ch)
{
if(buf == null)
- buf = new StringBuffer();
+ buf = new StringBuilder();
if(buf.indexOf(String.valueOf(ch)) == -1)
buf.append(ch);
return buf;
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/PasteFromListDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/PasteFromListDialog.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/PasteFromListDialog.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -145,7 +145,7 @@
private String getSelectedClipText()
{
Object[] selected = clips.getSelectedValues();
- StringBuffer clip = new StringBuffer();
+ StringBuilder clip = new StringBuilder();
for(int i = 0; i < selected.length; i++)
{
if(i != 0)
@@ -182,7 +182,7 @@
{
String shorten(String item)
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
// workaround for Swing rendering labels starting
// with <html> using the HTML engine
if(item.toLowerCase().startsWith("<html>"))
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/StyleEditor.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/StyleEditor.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/StyleEditor.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -40,7 +40,6 @@
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
-import org.gjt.sp.jedit.GUIUtilities;
import org.gjt.sp.jedit.jEdit;
import org.gjt.sp.jedit.syntax.SyntaxStyle;
Modified: jEdit/trunk/org/gjt/sp/jedit/help/HelpIndex.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/help/HelpIndex.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/help/HelpIndex.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -230,7 +230,7 @@
try
{
- StringBuffer word = new StringBuffer();
+ StringBuilder word = new StringBuilder();
boolean insideTag = false;
boolean insideEntity = false;
Modified: jEdit/trunk/org/gjt/sp/jedit/help/HelpTOCPanel.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/help/HelpTOCPanel.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/help/HelpTOCPanel.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -300,7 +300,7 @@
//{{{ Private members
private String tag;
- private StringBuffer title = new StringBuffer();
+ private StringBuilder title = new StringBuilder();
private String href;
private DefaultMutableTreeNode node;
private Stack nodes;
Modified: jEdit/trunk/org/gjt/sp/jedit/io/RegexEncodingDetector.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/RegexEncodingDetector.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/io/RegexEncodingDetector.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -84,8 +84,7 @@
* Returns a replaced string for a Matcher which has been matched
* by find() method.
*/
- private static String extractReplacement(Matcher found
- , String replacement)
+ private static String extractReplacement(Matcher found, String replacement)
{
/*
* It doesn't make sense to read before start, but
@@ -94,8 +93,7 @@
int found_start = found.start();
int found_end = found.end();
int source_length = found_end - found_start;
- StringBuffer replaced = new StringBuffer(found_start
- + (source_length * 2));
+ StringBuffer replaced = new StringBuffer(found_start + (source_length * 2));
found.appendReplacement(replaced, replacement);
return replaced.substring(found_start);
}
Modified: jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchResults.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchResults.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchResults.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -534,7 +534,7 @@
}
SearchMatcher matcher =
((HyperSearchOperationNode) node.getUserObject()).getSearchMatcher();
- StringBuffer sb = new StringBuffer("<html><style>.highlight {");
+ StringBuilder sb = new StringBuilder("<html><style>.highlight {");
sb.append(styleTag);
sb.append("}</style><body>");
int lineTextIndex = s.indexOf(": ");
@@ -561,7 +561,7 @@
private String color2html(Color c)
{
- StringBuffer cs = new StringBuffer("rgb(");
+ StringBuilder cs = new StringBuilder("rgb(");
cs.append(c.getRed());
cs.append(",");
cs.append(c.getGreen());
@@ -573,7 +573,7 @@
private String style2html(String prop)
{
- StringBuffer tag = new StringBuffer();
+ StringBuilder tag = new StringBuilder();
SyntaxStyle style = parseHighlightStyle(prop);
Font f = style.getFont();
Color c = style.getForegroundColor();
@@ -589,19 +589,27 @@
return tag.toString();
}
- private void appendString2html(StringBuffer sb, String s)
- {
- for (int i = 0; i < s.length(); i++)
- {
+ private void appendString2html(StringBuilder sb, String s) {
+ for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
String r;
switch (c) {
- case '"': r = """; break;
- //case '\'': r = "'"; break;
- case '&': r = "&"; break;
- case '<': r = "<"; break;
- case '>': r = ">"; break;
- default: r = String.valueOf(c); break;
+ case '"':
+ r = """;
+ break;
+ // case '\'': r = "'"; break;
+ case '&':
+ r = "&";
+ break;
+ case '<':
+ r = "<";
+ break;
+ case '>':
+ r = ">";
+ break;
+ default:
+ r = String.valueOf(c);
+ break;
}
sb.append(r);
}
Modified: jEdit/trunk/org/gjt/sp/jedit/syntax/ParserRule.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/syntax/ParserRule.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/syntax/ParserRule.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -295,7 +295,7 @@
//{{{ toString() method
public String toString()
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append(getClass().getName()).append("[action=");
switch (action & MAJOR_ACTIONS)
{
Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/InputMethodSupport.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/textarea/InputMethodSupport.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/jedit/textarea/InputMethodSupport.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -212,7 +212,7 @@
{
lastCommittedText = null;
lastCommittedAt = owner.getCaretPosition();
- StringBuffer committed = new StringBuffer(committed_count);
+ StringBuilder committed = new StringBuilder(committed_count);
char c;
int count;
for(c = text.first(), count = committed_count
Modified: jEdit/trunk/org/gjt/sp/util/PropertiesBean.java
===================================================================
--- jEdit/trunk/org/gjt/sp/util/PropertiesBean.java 2009-06-29 22:24:19 UTC (rev 15612)
+++ jEdit/trunk/org/gjt/sp/util/PropertiesBean.java 2009-06-30 07:07:43 UTC (rev 15613)
@@ -25,14 +25,10 @@
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
-
import java.lang.reflect.Array;
import java.lang.reflect.Method;
-
-import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
-import java.util.WeakHashMap;
/**
* A "java bean" that can serialize itself into a java.util.Properties
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|