[autocomplete] 135/143: Replacing StringBuffers with StringBuilders where applicable
Benjamin Mesing
ben at alioth.debian.org
Sat Oct 19 12:53:32 UTC 2013
This is an automated email from the git hooks/post-receive script.
ben pushed a commit to branch master
in repository autocomplete.
commit d348aceacbb6524f90d0a184bc683259dda766ee
Author: bobbylight <robert at fifesoft.com>
Date: Sat Aug 10 23:46:03 2013 -0400
Replacing StringBuffers with StringBuilders where applicable
---
build.xml | 2 +-
.../fife/ui/autocomplete/AbstractCompletionProvider.java | 2 +-
src/org/fife/ui/autocomplete/CompletionCellRenderer.java | 10 +++++-----
src/org/fife/ui/autocomplete/CompletionXMLParser.java | 12 ++++++------
src/org/fife/ui/autocomplete/FunctionCompletion.java | 10 +++++-----
src/org/fife/ui/autocomplete/MarkupTagCompletion.java | 12 ++++++------
src/org/fife/ui/autocomplete/ParameterizedCompletion.java | 2 +-
.../ParameterizedCompletionDescriptionToolTip.java | 2 +-
src/org/fife/ui/autocomplete/TemplateCompletion.java | 4 ++--
src/org/fife/ui/autocomplete/Util.java | 2 +-
src/org/fife/ui/autocomplete/VariableCompletion.java | 10 +++++-----
11 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/build.xml b/build.xml
index 579e832..956171d 100644
--- a/build.xml
+++ b/build.xml
@@ -30,7 +30,7 @@
<property name="doc-dir" location="javadoc"/>
<property name="debug" value="true"/>
<property name="debuglevel" value="lines,vars,source"/>
- <property name="java-level" value="1.4"/>
+ <property name="java-level" value="1.5"/>
<!-- Compiles the classes. -->
diff --git a/src/org/fife/ui/autocomplete/AbstractCompletionProvider.java b/src/org/fife/ui/autocomplete/AbstractCompletionProvider.java
index d6c4339..fc2eae5 100644
--- a/src/org/fife/ui/autocomplete/AbstractCompletionProvider.java
+++ b/src/org/fife/ui/autocomplete/AbstractCompletionProvider.java
@@ -228,7 +228,7 @@ public abstract class AbstractCompletionProvider
* against a String lexicographically, ignoring case.
*/
@SuppressWarnings("rawtypes")
- private static class CaseInsensitiveComparator implements Comparator,
+ protected static class CaseInsensitiveComparator implements Comparator,
Serializable {
public int compare(Object o1, Object o2) {
diff --git a/src/org/fife/ui/autocomplete/CompletionCellRenderer.java b/src/org/fife/ui/autocomplete/CompletionCellRenderer.java
index 4546fcd..206d3bd 100644
--- a/src/org/fife/ui/autocomplete/CompletionCellRenderer.java
+++ b/src/org/fife/ui/autocomplete/CompletionCellRenderer.java
@@ -338,7 +338,7 @@ public class CompletionCellRenderer extends DefaultListCellRenderer {
protected void prepareForFunctionCompletion(JList list,
FunctionCompletion fc, int index, boolean selected, boolean hasFocus) {
- StringBuffer sb = new StringBuffer(PREFIX);
+ StringBuilder sb = new StringBuilder(PREFIX);
sb.append(fc.getName());
char paramListStart = fc.getProvider().getParameterListStart();
@@ -404,7 +404,7 @@ public class CompletionCellRenderer extends DefaultListCellRenderer {
protected void prepareForMarkupTagCompletion(JList list,
MarkupTagCompletion mc, int index, boolean selected, boolean hasFocus) {
- StringBuffer sb = new StringBuffer(PREFIX);
+ StringBuilder sb = new StringBuilder(PREFIX);
sb.append(mc.getName());
setText(sb.toString());
@@ -425,7 +425,7 @@ public class CompletionCellRenderer extends DefaultListCellRenderer {
protected void prepareForOtherCompletion(JList list,
Completion c, int index, boolean selected, boolean hasFocus) {
- StringBuffer sb = new StringBuffer(PREFIX);
+ StringBuilder sb = new StringBuilder(PREFIX);
sb.append(c.getInputText());
if (c instanceof BasicCompletion) {
@@ -459,7 +459,7 @@ public class CompletionCellRenderer extends DefaultListCellRenderer {
protected void prepareForTemplateCompletion(JList list,
TemplateCompletion tc, int index, boolean selected, boolean hasFocus) {
- StringBuffer sb = new StringBuffer(PREFIX);
+ StringBuilder sb = new StringBuilder(PREFIX);
sb.append(tc.getInputText());
String definition = tc.getShortDescription();
@@ -491,7 +491,7 @@ public class CompletionCellRenderer extends DefaultListCellRenderer {
protected void prepareForVariableCompletion(JList list,
VariableCompletion vc, int index, boolean selected, boolean hasFocus) {
- StringBuffer sb = new StringBuffer(PREFIX);
+ StringBuilder sb = new StringBuilder(PREFIX);
sb.append(vc.getName());
if (getShowTypes() && vc.getType()!=null) {
diff --git a/src/org/fife/ui/autocomplete/CompletionXMLParser.java b/src/org/fife/ui/autocomplete/CompletionXMLParser.java
index 59e135d..a66105c 100644
--- a/src/org/fife/ui/autocomplete/CompletionXMLParser.java
+++ b/src/org/fife/ui/autocomplete/CompletionXMLParser.java
@@ -49,11 +49,11 @@ public class CompletionXMLParser extends DefaultHandler {
private String name;
private String type;
private String returnType;
- private StringBuffer returnValDesc;
- private StringBuffer desc;
+ private StringBuilder returnValDesc;
+ private StringBuilder desc;
private String paramName;
private String paramType;
- private StringBuffer paramDesc;
+ private StringBuilder paramDesc;
private List<ParameterizedCompletion.Parameter> params;
private String definedIn;
private boolean doingKeywords;
@@ -114,9 +114,9 @@ public class CompletionXMLParser extends DefaultHandler {
}
completions = new ArrayList<Completion>();
params = new ArrayList<ParameterizedCompletion.Parameter>(1);
- desc = new StringBuffer();
- paramDesc = new StringBuffer();
- returnValDesc = new StringBuffer();
+ desc = new StringBuilder();
+ paramDesc = new StringBuilder();
+ returnValDesc = new StringBuilder();
paramStartChar = paramEndChar = 0;
paramSeparator = null;
}
diff --git a/src/org/fife/ui/autocomplete/FunctionCompletion.java b/src/org/fife/ui/autocomplete/FunctionCompletion.java
index a3da5f3..85913ec 100644
--- a/src/org/fife/ui/autocomplete/FunctionCompletion.java
+++ b/src/org/fife/ui/autocomplete/FunctionCompletion.java
@@ -48,7 +48,7 @@ public class FunctionCompletion extends VariableCompletion
}
- protected void addDefinitionString(StringBuffer sb) {
+ protected void addDefinitionString(StringBuilder sb) {
sb.append("<html><b>");
sb.append(getDefinitionString());
sb.append("</b>");
@@ -60,7 +60,7 @@ public class FunctionCompletion extends VariableCompletion
*
* @param sb The buffer to append to.
*/
- protected void addParameters(StringBuffer sb) {
+ protected void addParameters(StringBuilder sb) {
// TODO: Localize me
@@ -101,7 +101,7 @@ public class FunctionCompletion extends VariableCompletion
*/
public String getDefinitionString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
// Add the return type if applicable (C macros like NULL have no type).
String type = getType();
@@ -151,7 +151,7 @@ public class FunctionCompletion extends VariableCompletion
ParameterizedCompletionInsertionInfo info =
new ParameterizedCompletionInsertionInfo();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
char paramListStart = getProvider().getParameterListStart();
if (paramListStart!='\0') {
sb.append(paramListStart);
@@ -265,7 +265,7 @@ public class FunctionCompletion extends VariableCompletion
* {@inheritDoc}
*/
public String getSummary() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
addDefinitionString(sb);
if (!possiblyAddDescription(sb)) {
sb.append("<br><br><br>");
diff --git a/src/org/fife/ui/autocomplete/MarkupTagCompletion.java b/src/org/fife/ui/autocomplete/MarkupTagCompletion.java
index 442f676..c524f3e 100644
--- a/src/org/fife/ui/autocomplete/MarkupTagCompletion.java
+++ b/src/org/fife/ui/autocomplete/MarkupTagCompletion.java
@@ -50,7 +50,7 @@ public class MarkupTagCompletion extends AbstractCompletion {
*
* @param sb The buffer to append to.
*/
- protected void addAttributes(StringBuffer sb) {
+ protected void addAttributes(StringBuilder sb) {
// TODO: Localize me.
@@ -76,7 +76,7 @@ public class MarkupTagCompletion extends AbstractCompletion {
}
- protected void addDefinitionString(StringBuffer sb) {
+ protected void addDefinitionString(StringBuilder sb) {
sb.append("<html><b>").append(name).append("</b>");
}
@@ -162,7 +162,7 @@ public class MarkupTagCompletion extends AbstractCompletion {
* {@inheritDoc}
*/
public String getSummary() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
addDefinitionString(sb);
possiblyAddDescription(sb);
addAttributes(sb);
@@ -177,7 +177,7 @@ public class MarkupTagCompletion extends AbstractCompletion {
*
* @param sb The buffer to append to.
*/
- protected void possiblyAddDefinedIn(StringBuffer sb) {
+ protected void possiblyAddDefinedIn(StringBuilder sb) {
if (definedIn!=null) {
sb.append("<hr>Defined in:"); // TODO: Localize me
sb.append(" <em>").append(definedIn).append("</em>");
@@ -191,7 +191,7 @@ public class MarkupTagCompletion extends AbstractCompletion {
*
* @param sb The buffer to append to.
*/
- protected void possiblyAddDescription(StringBuffer sb) {
+ protected void possiblyAddDescription(StringBuilder sb) {
if (desc!=null) {
sb.append("<hr><br>");
sb.append(desc);
@@ -231,7 +231,7 @@ public class MarkupTagCompletion extends AbstractCompletion {
* @see #getAttribute(int)
* @see #getAttributeCount()
*/
- public void setAttributes(List<Parameter> attrs) {
+ public void setAttributes(List<? extends Parameter> attrs) {
// Deep copy so parsing can re-use its array.
this.attrs = new ArrayList<Parameter>(attrs);
}
diff --git a/src/org/fife/ui/autocomplete/ParameterizedCompletion.java b/src/org/fife/ui/autocomplete/ParameterizedCompletion.java
index 43098b8..b58eb22 100644
--- a/src/org/fife/ui/autocomplete/ParameterizedCompletion.java
+++ b/src/org/fife/ui/autocomplete/ParameterizedCompletion.java
@@ -152,7 +152,7 @@ public interface ParameterizedCompletion extends Completion {
}
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (getType()!=null) {
sb.append(getType());
}
diff --git a/src/org/fife/ui/autocomplete/ParameterizedCompletionDescriptionToolTip.java b/src/org/fife/ui/autocomplete/ParameterizedCompletionDescriptionToolTip.java
index cfecaf0..30e3716 100644
--- a/src/org/fife/ui/autocomplete/ParameterizedCompletionDescriptionToolTip.java
+++ b/src/org/fife/ui/autocomplete/ParameterizedCompletionDescriptionToolTip.java
@@ -158,7 +158,7 @@ class ParameterizedCompletionDescriptionToolTip {
*/
public boolean updateText(int selectedParam) {
- StringBuffer sb = new StringBuffer("<html>");
+ StringBuilder sb = new StringBuilder("<html>");
int paramCount = pc.getParamCount();
for (int i=0; i<paramCount; i++) {
diff --git a/src/org/fife/ui/autocomplete/TemplateCompletion.java b/src/org/fife/ui/autocomplete/TemplateCompletion.java
index d2ebcab..4afc80f 100644
--- a/src/org/fife/ui/autocomplete/TemplateCompletion.java
+++ b/src/org/fife/ui/autocomplete/TemplateCompletion.java
@@ -160,7 +160,7 @@ public class TemplateCompletion extends AbstractCompletion
ParameterizedCompletionInsertionInfo info =
new ParameterizedCompletionInsertionInfo();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
int dot = tc.getCaretPosition();
// Get the range in which the caret can move before we hide
@@ -321,7 +321,7 @@ public class TemplateCompletion extends AbstractCompletion
}
- private int possiblyReplaceTabsWithSpaces(StringBuffer sb, String text,
+ private int possiblyReplaceTabsWithSpaces(StringBuilder sb, String text,
JTextComponent tc, int start) {
int tab = text.indexOf('\t');
diff --git a/src/org/fife/ui/autocomplete/Util.java b/src/org/fife/ui/autocomplete/Util.java
index 65a03df..cb6c708 100644
--- a/src/org/fife/ui/autocomplete/Util.java
+++ b/src/org/fife/ui/autocomplete/Util.java
@@ -159,7 +159,7 @@ public class Util {
// Don't assume 0xff alpha
//return "#" + Integer.toHexString(c.getRGB()&0xffffff).substring(2);
- StringBuffer sb = new StringBuffer("#");
+ StringBuilder sb = new StringBuilder("#");
int r = c.getRed();
if (r<16) {
sb.append('0');
diff --git a/src/org/fife/ui/autocomplete/VariableCompletion.java b/src/org/fife/ui/autocomplete/VariableCompletion.java
index 26645e2..5b32d21 100644
--- a/src/org/fife/ui/autocomplete/VariableCompletion.java
+++ b/src/org/fife/ui/autocomplete/VariableCompletion.java
@@ -51,14 +51,14 @@ public class VariableCompletion extends BasicCompletion {
}
- protected void addDefinitionString(StringBuffer sb) {
+ protected void addDefinitionString(StringBuilder sb) {
sb.append("<html><b>").append(getDefinitionString()).append("</b>");
}
public String getDefinitionString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
// Add the return type if applicable (C macros like NULL have no type).
if (type!=null) {
@@ -98,7 +98,7 @@ public class VariableCompletion extends BasicCompletion {
* {@inheritDoc}
*/
public String getSummary() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
addDefinitionString(sb);
possiblyAddDescription(sb);
possiblyAddDefinedIn(sb);
@@ -143,7 +143,7 @@ public class VariableCompletion extends BasicCompletion {
*
* @param sb The buffer to append to.
*/
- protected void possiblyAddDefinedIn(StringBuffer sb) {
+ protected void possiblyAddDefinedIn(StringBuilder sb) {
if (definedIn!=null) {
sb.append("<hr>Defined in:"); // TODO: Localize me
sb.append(" <em>").append(definedIn).append("</em>");
@@ -158,7 +158,7 @@ public class VariableCompletion extends BasicCompletion {
* @param sb The buffer to append to.
* @return Whether there was a description to add.
*/
- protected boolean possiblyAddDescription(StringBuffer sb) {
+ protected boolean possiblyAddDescription(StringBuilder sb) {
if (getShortDescription()!=null) {
sb.append("<hr><br>");
sb.append(getShortDescription());
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/autocomplete.git
More information about the pkg-java-commits
mailing list