From 99f533cc15d9246947f230cd85682327bb93969f Mon Sep 17 00:00:00 2001 From: Ahmed Ashour Date: Tue, 3 Mar 2020 13:55:04 +0100 Subject: [PATCH] Use StringBuilder instead of StringBuffer --- .../BasicRelationFeatureFactory.java | 2 +- .../machinereading/common/SimpleTokenize.java | 24 ++++----- .../machinereading/domains/ace/AceReader.java | 2 +- .../domains/ace/reader/AceCharSeq.java | 40 +++++++------- .../domains/ace/reader/AceDocument.java | 54 +++++++++---------- .../domains/ace/reader/AceElement.java | 5 +- .../domains/ace/reader/AceEntity.java | 2 +- .../domains/ace/reader/AceEntityMention.java | 2 +- .../ace/reader/AceMentionArgument.java | 18 +++---- .../domains/ace/reader/AceRelation.java | 2 +- .../ace/reader/AceRelationMention.java | 28 +++++----- .../domains/ace/reader/RobustTokenizer.java | 42 +++++++-------- src/edu/stanford/nlp/ie/pascal/Alignment.java | 18 +++---- .../stanford/nlp/ie/pascal/TeXHyphenator.java | 4 +- .../arabic/pipeline/ATBArabicDataset.java | 2 +- .../pipeline/DecimatedArabicDataset.java | 2 +- .../arabic/pipeline/IBMMTArabicDataset.java | 10 ++-- .../arabic/pipeline/LabeledATBDataset.java | 4 +- .../arabic/pipeline/TaggedArabicDataset.java | 2 +- .../french/pipeline/FTBDataset.java | 2 +- .../tokensregex/parser/ParseException.java | 4 +- .../tokensregex/parser/TokenMgrError.java | 2 +- .../parser/lexparser/HTKLatticeReader.java | 2 +- .../lexparser/ParentAnnotationStats.java | 4 +- .../lexparser/SisterAnnotationStats.java | 4 +- .../stanford/nlp/patterns/SPIEDServlet.java | 2 +- .../stanford/nlp/patterns/ScorePhrases.java | 2 +- .../nlp/patterns/TextAnnotationPatterns.java | 2 +- .../ChineseDocumentToSentenceProcessor.java | 6 +-- .../stanford/nlp/process/TransformXML.java | 8 +-- .../nlp/semgraph/semgrex/ParseException.java | 4 +- .../nlp/semgraph/semgrex/TokenMgrError.java | 2 +- .../stats/MultiClassPrecisionRecallStats.java | 2 +- src/edu/stanford/nlp/trees/Constituent.java | 6 +-- src/edu/stanford/nlp/trees/Tree.java | 2 +- .../nlp/trees/treebank/AbstractDataset.java | 8 +-- .../nlp/trees/tregex/ParseException.java | 4 +- .../nlp/trees/tregex/TokenMgrError.java | 2 +- .../nlp/trees/tregex/gui/InputPanel.java | 4 +- .../trees/tregex/tsurgeon/ParseException.java | 4 +- .../trees/tregex/tsurgeon/TokenMgrError.java | 2 +- .../stanford/nlp/trees/ud/CoNLLUUtils.java | 4 +- .../nlp/util/CommandLineTokenizer.java | 10 ++-- 43 files changed, 177 insertions(+), 178 deletions(-) diff --git a/src/edu/stanford/nlp/ie/machinereading/BasicRelationFeatureFactory.java b/src/edu/stanford/nlp/ie/machinereading/BasicRelationFeatureFactory.java index b8d7d3bb12..965daeb89a 100644 --- a/src/edu/stanford/nlp/ie/machinereading/BasicRelationFeatureFactory.java +++ b/src/edu/stanford/nlp/ie/machinereading/BasicRelationFeatureFactory.java @@ -563,7 +563,7 @@ else if (gender.equals("FEMALE")) } String sentToString(CoreMap sentence) { - StringBuffer os = new StringBuffer(); + StringBuilder os = new StringBuilder(); List tokens = sentence.get(TokensAnnotation.class); if(tokens != null){ boolean first = true; diff --git a/src/edu/stanford/nlp/ie/machinereading/common/SimpleTokenize.java b/src/edu/stanford/nlp/ie/machinereading/common/SimpleTokenize.java index fface97d6d..3ef767b766 100644 --- a/src/edu/stanford/nlp/ie/machinereading/common/SimpleTokenize.java +++ b/src/edu/stanford/nlp/ie/machinereading/common/SimpleTokenize.java @@ -1,10 +1,10 @@ package edu.stanford.nlp.ie.machinereading.common; -import edu.stanford.nlp.util.logging.Redwood; - import java.util.ArrayList; import java.util.StringTokenizer; +import edu.stanford.nlp.util.logging.Redwood; + /** * Simple string tokenization */ @@ -52,19 +52,19 @@ private static int findWhitespace(String s, int start) { } /** - * Replaces all occurences of \" with " + * Replaces all occurrences of \" with " */ private static String normalizeQuotes(String str) { - StringBuffer buffer = new StringBuffer(); + StringBuilder builder = new StringBuilder(); for (int i = 0; i < str.length(); i++) { // do not include \ if followed by " if (str.charAt(i) == '\\' && i < str.length() - 1 && str.charAt(i + 1) == '\"') { continue; } else { - buffer.append(str.charAt(i)); + builder.append(str.charAt(i)); } } - return buffer.toString(); + return builder.toString(); } /** @@ -121,15 +121,15 @@ public static ArrayList tokenizeWithQuotes(String line) { * \ */ public static String quotify(String str) { - StringBuffer buffer = new StringBuffer(); - buffer.append('\"'); + StringBuilder builder = new StringBuilder(); + builder.append('\"'); for (int i = 0; i < str.length(); i++) { if (str.charAt(i) == '\"') - buffer.append('\\'); - buffer.append(str.charAt(i)); + builder.append('\\'); + builder.append(str.charAt(i)); } - buffer.append('\"'); - return buffer.toString(); + builder.append('\"'); + return builder.toString(); } /** Implements a simple test */ diff --git a/src/edu/stanford/nlp/ie/machinereading/domains/ace/AceReader.java b/src/edu/stanford/nlp/ie/machinereading/domains/ace/AceReader.java index 364afae1f8..62bd801057 100644 --- a/src/edu/stanford/nlp/ie/machinereading/domains/ace/AceReader.java +++ b/src/edu/stanford/nlp/ie/machinereading/domains/ace/AceReader.java @@ -238,7 +238,7 @@ private List readDocument(String prefix, Annotation corpus) throws IOEx /* for (int sentenceIndex = 0; sentenceIndex < aceDocument.getSentenceCount(); sentenceIndex++) { List tokens = aceDocument.getSentence(sentenceIndex); - StringBuffer b = new StringBuffer(); + StringBuilder b = new StringBuilder(); for(AceToken t: tokens) b.append(t.getLiteral() + " " ); logger.info("SENTENCE: " + b.toString()); } diff --git a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceCharSeq.java b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceCharSeq.java index a630526286..02597fdb48 100644 --- a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceCharSeq.java +++ b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceCharSeq.java @@ -40,27 +40,27 @@ public AceCharSeq(String text, int start, int end) { } public String toXml(String label, int offset) { - StringBuffer buffer = new StringBuffer(); - AceElement.appendOffset(buffer, offset); - buffer.append('<').append(label).append(">\n"); - - AceElement.appendOffset(buffer, offset + 2); - buffer.append(""); - buffer.append(mText).append(""); - buffer.append('\n'); - - AceElement.appendOffset(buffer, offset); - buffer.append("'); - return buffer.toString(); + StringBuilder builder = new StringBuilder(); + AceElement.appendOffset(builder, offset); + builder.append('<').append(label).append(">\n"); + + AceElement.appendOffset(builder, offset + 2); + builder.append(""); + builder.append(mText).append(""); + builder.append('\n'); + + AceElement.appendOffset(builder, offset); + builder.append("'); + return builder.toString(); } public String toXml(int offset) { - StringBuffer buffer = new StringBuffer(); + StringBuilder builder = new StringBuilder(); - AceElement.appendOffset(buffer, offset + 2); - buffer.append(""); - buffer.append(mText).append(""); - return buffer.toString(); + AceElement.appendOffset(builder, offset + 2); + builder.append(""); + builder.append(mText).append(""); + return builder.toString(); } public String getText() { @@ -162,9 +162,9 @@ public String toString() { /* * private AceToken makePhrase(Vector tokens, Span span) { - * StringBuffer word = new StringBuffer(); StringBuffer lemma = new - * StringBuffer(); StringBuffer pos = new StringBuffer(); StringBuffer chunk = - * new StringBuffer(); StringBuffer nerc = new StringBuffer(); + * StringBuilder word = new StringBuilder(); StringBuilder lemma = new + * StringBuilder(); StringBuilder pos = new StringBuilder(); StringBuilder chunk = + * new StringBuilder(); StringBuilder nerc = new StringBuilder(); * * for(int i = span.mStart; i <= span.mEnd; i ++){ if(i > span.mStart){ * word.append("_"); lemma.append("_"); pos.append("_"); chunk.append("_"); diff --git a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceDocument.java b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceDocument.java index 2d25b9f50b..9a0618e205 100644 --- a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceDocument.java +++ b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceDocument.java @@ -229,23 +229,23 @@ public String toString() { } public String toXml(int offset) { - StringBuffer buffer = new StringBuffer(); - appendOffset(buffer, offset); - buffer.append("\n"); - appendOffset(buffer, offset); - buffer.append("\n"); - appendOffset(buffer, offset); - buffer.append("\n"); + appendOffset(builder, offset); + builder.append("\n"); + appendOffset(builder, offset); + builder.append("\n"); - appendOffset(buffer, offset); - buffer.append("\n"); + appendOffset(builder, offset); + builder.append("\n"); // display all entities Set entKeys = mEntities.keySet(); for (String key : entKeys) { AceEntity e = mEntities.get(key); - buffer.append(e.toXml(offset)); - buffer.append("\n"); + builder.append(e.toXml(offset)); + builder.append("\n"); } // display all relations @@ -253,24 +253,24 @@ public String toXml(int offset) { for (String key : relKeys) { AceRelation r = mRelations.get(key); if (!r.getType().equals(AceRelation.NIL_LABEL)) { - buffer.append(r.toXml(offset)); - buffer.append("\n"); + builder.append(r.toXml(offset)); + builder.append("\n"); } } // TODO: display all events - appendOffset(buffer, offset); - buffer.append("\n"); - appendOffset(buffer, offset); - buffer.append("\n"); - return buffer.toString(); + appendOffset(builder, offset); + builder.append("\n"); + appendOffset(builder, offset); + builder.append("\n"); + return builder.toString(); } private String tokensWithByteSpan(int start, int end) { - StringBuffer buf = new StringBuffer(); + StringBuilder builder = new StringBuilder(); boolean doPrint = false; - buf.append("..."); + builder.append("..."); for (AceToken mToken : mTokens) { // start printing if (doPrint == false && mToken.getByteOffset().start() > start - 20 @@ -284,11 +284,11 @@ else if (doPrint == true && mToken.getByteOffset().start() > end + 20) { } if (doPrint) { - buf.append(" " + mToken.display()); + builder.append(" " + mToken.display()); } } - buf.append("..."); - return buf.toString(); + builder.append("..."); + return builder.toString(); } /** @@ -751,11 +751,11 @@ public int countCommas(int start, int end) { private void readRawBytes(String fileName) throws IOException { BufferedReader in = new BufferedReader(new FileReader(fileName)); - StringBuffer buf = new StringBuffer(); + StringBuilder builder = new StringBuilder(); int c; while ((c = in.read()) >= 0) - buf.append((char) c); - mRawBuffer = buf.toString(); + builder.append((char) c); + mRawBuffer = builder.toString(); // System.out.println(mRawBuffer); in.close(); } @@ -826,7 +826,7 @@ private void readPredictedEntityBoundaries(BufferedReader is) throws java.io.IOE public AceCharSeq makeCharSeq(int startToken, int endToken) { /* - * StringBuffer buf = new StringBuffer(); for(int i = startToken; i < + * StringBuilder buf = new StringBuilder(); for(int i = startToken; i < * endToken; i ++){ if(i > startToken) buf.append(" "); * buf.append(mTokens.get(i).getLiteral()); } */ diff --git a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceElement.java b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceElement.java index 982ec62578..492dc781a5 100644 --- a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceElement.java +++ b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceElement.java @@ -14,11 +14,10 @@ public AceElement(String id) { public String getId() { return mId; } - // todo [cdm 2014]: Change this to using StringBuilder or Appendable or similar - public static void appendOffset(StringBuffer buffer, + public static void appendOffset(StringBuilder builder, int offset) { for(int i = 0; i < offset; i ++){ - buffer.append(' '); + builder.append(' '); } } diff --git a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceEntity.java b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceEntity.java index 99097e2a33..490f07a2d3 100644 --- a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceEntity.java +++ b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceEntity.java @@ -44,7 +44,7 @@ public void addMention(AceEntityMention m) { public String getClasss() { return mClass; } public String toXml(int offset) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); appendOffset(buffer, offset); buffer.append(" getEventMentions() { } public String toXml(int offset) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); String mentionType = mType; appendOffset(buffer, offset); diff --git a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceMentionArgument.java b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceMentionArgument.java index 7c98328df5..b6274c38a4 100644 --- a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceMentionArgument.java +++ b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceMentionArgument.java @@ -18,24 +18,24 @@ public AceMentionArgument(String role, public String getRole() { return mRole; } public String toXml(int offset) { - StringBuffer buffer = new StringBuffer(); - AceElement.appendOffset(buffer, offset); - buffer.append("<" + mentionType + "_mention_argument REFID=\"" + mContent.getId() + + StringBuilder builder = new StringBuilder(); + AceElement.appendOffset(builder, offset); + builder.append("<" + mentionType + "_mention_argument REFID=\"" + mContent.getId() + "\" ROLE=\"" + mRole + "\">\n"); //buffer.append(getContent().toXml(offset + 2)); AceCharSeq ext = getContent().getExtent(); - buffer.append(ext.toXml("extent", offset + 2)); - buffer.append("\n"); + builder.append(ext.toXml("extent", offset + 2)); + builder.append("\n"); - AceElement.appendOffset(buffer, offset); - buffer.append(""); - return buffer.toString(); + AceElement.appendOffset(builder, offset); + builder.append(""); + return builder.toString(); } public String toXmlShort(int offset) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); AceElement.appendOffset(buffer, offset); buffer.append("<" + mentionType + "_argument REFID=\"" + mContent.getParent().getId() + diff --git a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceRelation.java b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceRelation.java index 7582a79fe2..aabbc3181a 100644 --- a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceRelation.java +++ b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/AceRelation.java @@ -50,7 +50,7 @@ public AceRelationMention getMention(int which) { public void setSubtype(String s) { mSubtype = s; } public String toXml(int offset) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); appendOffset(buffer, offset); buffer.append("\n"); + builder.append(" LEXICALCONDITION=\"" + mLexicalCondition + "\""); + builder.append(">\n"); - buffer.append(mExtent.toXml("extent", offset + 2)); - buffer.append("\n"); + builder.append(mExtent.toXml("extent", offset + 2)); + builder.append("\n"); AceRelationMentionArgument arg1 = getArgs()[0]; AceRelationMentionArgument arg2 = getArgs()[1]; if(arg1.getRole().equals("Arg-1")){ // left to right - buffer.append(arg1.toXml(offset + 2) + "\n"); - buffer.append(arg2.toXml(offset + 2) + "\n"); + builder.append(arg1.toXml(offset + 2) + "\n"); + builder.append(arg2.toXml(offset + 2) + "\n"); } else { // right to left - buffer.append(arg2.toXml(offset + 2) + "\n"); - buffer.append(arg1.toXml(offset + 2) + "\n"); + builder.append(arg2.toXml(offset + 2) + "\n"); + builder.append(arg1.toXml(offset + 2) + "\n"); } - appendOffset(buffer, offset); - buffer.append(""); - return buffer.toString(); + appendOffset(builder, offset); + builder.append(""); + return builder.toString(); } } diff --git a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/RobustTokenizer.java b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/RobustTokenizer.java index 0665261534..ec9edc713b 100644 --- a/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/RobustTokenizer.java +++ b/src/edu/stanford/nlp/ie/machinereading/domains/ace/reader/RobustTokenizer.java @@ -362,12 +362,12 @@ private static int hasApostropheBlock(String s) { private static String concatenate(List tokens, int start, int end) { - StringBuffer buffer = new StringBuffer(); + StringBuilder builder = new StringBuilder(); for(; start < end; start ++){ - buffer.append(((WordToken) tokens.get(start)).getWord()); + builder.append(((WordToken) tokens.get(start)).getWord()); } - return buffer.toString(); + return builder.toString(); } private static int countNewLines(List tokens, @@ -447,7 +447,7 @@ public List tokenizeToWordTokens() { // replace illegal characters with SPACE // /* - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); for(int i = 0; i < originalString.length(); i ++){ int c = (int) originalString.charAt(i); // @@ -577,16 +577,16 @@ else if ((i = hasApostropheBlock(crtMatch)) != -1){ */ public String tokenizeText() throws java.io.IOException{ List tokenList = tokenizeToWordTokens(); - StringBuffer strBuffer = new StringBuffer(); + StringBuilder builder = new StringBuilder(); Iterator iter = tokenList.iterator(); if (iter.hasNext()){ - strBuffer.append(iter.next()); + builder.append(iter.next()); } while(iter.hasNext()){ - strBuffer.append(" "); - strBuffer.append(iter.next()); + builder.append(" "); + builder.append(iter.next()); } - return strBuffer.toString().replaceAll("\\s\\s+", " "); + return builder.toString().replaceAll("\\s\\s+", " "); } public static class AbbreviationMap { @@ -1076,15 +1076,15 @@ public WordToken(String w, int s, int e, int nl) { } public String toString() { - StringBuffer buffer = new StringBuffer(); - buffer.append("["); - buffer.append(mWord); - buffer.append(", "); - buffer.append(mStart); - buffer.append(", "); - buffer.append(mEnd); - buffer.append("]"); - return buffer.toString(); + StringBuilder builder = new StringBuilder(); + builder.append("["); + builder.append(mWord); + builder.append(", "); + builder.append(mStart); + builder.append(", "); + builder.append(mEnd); + builder.append("]"); + return builder.toString(); } public int getStart() { return mStart; } @@ -1136,11 +1136,11 @@ public static void main(String argv[]) throws Exception { // read the whole file in a buffer // XXX: for sure there are more efficient ways of reading a file... int ch; - StringBuffer buffer = new StringBuffer(); - while((ch = is.read()) != -1) buffer.append((char) ch); + StringBuilder builder = new StringBuilder(); + while((ch = is.read()) != -1) builder.append((char) ch); // create the tokenizer object - RobustTokenizer t = new RobustTokenizer<>(buffer.toString()); + RobustTokenizer t = new RobustTokenizer<>(builder.toString()); List tokens = t.tokenize(); for (Word token : tokens) { diff --git a/src/edu/stanford/nlp/ie/pascal/Alignment.java b/src/edu/stanford/nlp/ie/pascal/Alignment.java index 2eb002a957..7858bbe66c 100644 --- a/src/edu/stanford/nlp/ie/pascal/Alignment.java +++ b/src/edu/stanford/nlp/ie/pascal/Alignment.java @@ -25,7 +25,7 @@ public Alignment(char[] longForm, char[] shortForm, int[] pointers) { public void serialize(PrintWriter writer) { writer.println(new String(longForm)); writer.println(new String(shortForm)); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int pointer : pointers) { sb.append(pointer + " "); } @@ -70,25 +70,25 @@ public String toString() { private static final char[] spaces = " ".toCharArray(); public String toString(String prefix) { - StringBuffer buf = new StringBuffer(); - buf.append(prefix); - buf.append(longForm); - buf.append("\n"); - buf.append(spaces, 0, prefix.length()); + StringBuilder builder = new StringBuilder(); + builder.append(prefix); + builder.append(longForm); + builder.append("\n"); + builder.append(spaces, 0, prefix.length()); int l = 0; for (int s = 0; s < shortForm.length; ++s) { if (pointers[s] == -1) { continue; } for (; l < longForm.length && pointers[s] != l; ++l) { - buf.append(" "); + builder.append(" "); } if (l < longForm.length) { - buf.append(shortForm[s]); + builder.append(shortForm[s]); ++l; } } - return buf.toString(); + return builder.toString(); } @Override diff --git a/src/edu/stanford/nlp/ie/pascal/TeXHyphenator.java b/src/edu/stanford/nlp/ie/pascal/TeXHyphenator.java index dc823057c5..c1f2443d22 100644 --- a/src/edu/stanford/nlp/ie/pascal/TeXHyphenator.java +++ b/src/edu/stanford/nlp/ie/pascal/TeXHyphenator.java @@ -68,7 +68,7 @@ public void load(BufferedReader input) throws IOException { private Node head = new Node(); public static String toString(int[]i) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int anI : i) { sb.append(anI); } @@ -180,7 +180,7 @@ public static void main(String[] args) throws Exception { char[] chars = arg.toLowerCase().toCharArray(); boolean[] breakPoints = hyphenator.findBreakPoints(chars); System.out.println(arg); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (boolean breakPoint : breakPoints) { if (breakPoint) { sb.append("^"); diff --git a/src/edu/stanford/nlp/international/arabic/pipeline/ATBArabicDataset.java b/src/edu/stanford/nlp/international/arabic/pipeline/ATBArabicDataset.java index 407950c44f..66f21ff00b 100644 --- a/src/edu/stanford/nlp/international/arabic/pipeline/ATBArabicDataset.java +++ b/src/edu/stanford/nlp/international/arabic/pipeline/ATBArabicDataset.java @@ -63,7 +63,7 @@ public void build() { if(makeFlatFile) { outputFileList.add(flatFileName); - toStringBuffer.append(" Made flat files\n"); + toStringBuilder.append(" Made flat files\n"); } } catch (UnsupportedEncodingException e) { diff --git a/src/edu/stanford/nlp/international/arabic/pipeline/DecimatedArabicDataset.java b/src/edu/stanford/nlp/international/arabic/pipeline/DecimatedArabicDataset.java index 7e96bd4075..b8d095e2ea 100644 --- a/src/edu/stanford/nlp/international/arabic/pipeline/DecimatedArabicDataset.java +++ b/src/edu/stanford/nlp/international/arabic/pipeline/DecimatedArabicDataset.java @@ -38,7 +38,7 @@ public void build() { int prevSize = treebank.size(); treebank.loadPath(path,treeFileExtension,false); - toStringBuffer.append(String.format(" Loaded %d trees from %s\n", treebank.size() - prevSize, path.getPath())); + toStringBuilder.append(String.format(" Loaded %d trees from %s\n", treebank.size() - prevSize, path.getPath())); prevSize = treebank.size(); } diff --git a/src/edu/stanford/nlp/international/arabic/pipeline/IBMMTArabicDataset.java b/src/edu/stanford/nlp/international/arabic/pipeline/IBMMTArabicDataset.java index d1ec08d218..9d82494766 100644 --- a/src/edu/stanford/nlp/international/arabic/pipeline/IBMMTArabicDataset.java +++ b/src/edu/stanford/nlp/international/arabic/pipeline/IBMMTArabicDataset.java @@ -37,11 +37,11 @@ public class IBMMTArabicDataset implements Dataset { protected final Set configuredOptions; protected final Set requiredOptions; - protected final StringBuilder toStringBuffer; + protected final StringBuilder toStringBuilder; public IBMMTArabicDataset() { configuredOptions = Generics.newHashSet(); - toStringBuffer = new StringBuilder(); + toStringBuilder = new StringBuilder(); pathsToData = new ArrayList<>(); escaper = new IBMArabicEscaper(true); @@ -77,7 +77,7 @@ public void build() { outfile.println(SentenceUtils.listToString(sent)); } - toStringBuffer.append(String.format(" Read %d input lines from %s",infile.getLineNumber(),path.getPath())); + toStringBuilder.append(String.format(" Read %d input lines from %s",infile.getLineNumber(),path.getPath())); } infile.close(); @@ -106,7 +106,7 @@ public List getFilenames() { @Override public String toString() { - return toStringBuffer.toString(); + return toStringBuilder.toString(); } public boolean setOptions(Properties opts) { @@ -128,7 +128,7 @@ public boolean setOptions(Properties opts) { } else if(opt.equals(ConfigParser.paramName)) { Matcher inThisFilename = fileNameNormalizer.matcher(value.trim()); outFileName = inThisFilename.replaceAll("-"); - toStringBuffer.append(String.format("Dataset Name: %s\n",value.trim())); + toStringBuilder.append(String.format("Dataset Name: %s\n",value.trim())); } } diff --git a/src/edu/stanford/nlp/international/arabic/pipeline/LabeledATBDataset.java b/src/edu/stanford/nlp/international/arabic/pipeline/LabeledATBDataset.java index 2013d3f10c..1e400bb654 100644 --- a/src/edu/stanford/nlp/international/arabic/pipeline/LabeledATBDataset.java +++ b/src/edu/stanford/nlp/international/arabic/pipeline/LabeledATBDataset.java @@ -20,7 +20,7 @@ public void build() { else treebank.loadPath(path,splitFilter); - toStringBuffer.append(String.format(" Loaded %d trees from %s\n", treebank.size() - prevSize, path.getPath())); + toStringBuilder.append(String.format(" Loaded %d trees from %s\n", treebank.size() - prevSize, path.getPath())); } PrintWriter outfile = null; @@ -37,7 +37,7 @@ public void build() { if(makeFlatFile) { outputFileList.add(flatFileName); - toStringBuffer.append(" Made flat files\n"); + toStringBuilder.append(" Made flat files\n"); } } catch (UnsupportedEncodingException e) { diff --git a/src/edu/stanford/nlp/international/arabic/pipeline/TaggedArabicDataset.java b/src/edu/stanford/nlp/international/arabic/pipeline/TaggedArabicDataset.java index 4d22d7cac7..522c46f76d 100644 --- a/src/edu/stanford/nlp/international/arabic/pipeline/TaggedArabicDataset.java +++ b/src/edu/stanford/nlp/international/arabic/pipeline/TaggedArabicDataset.java @@ -42,7 +42,7 @@ public void build() { } else { treebank.loadPath(path,splitFilter); } - toStringBuffer.append(String.format(" Loaded %d trees from %s\n", treebank.size() - prevSize, path.getPath())); + toStringBuilder.append(String.format(" Loaded %d trees from %s\n", treebank.size() - prevSize, path.getPath())); prevSize = treebank.size(); } diff --git a/src/edu/stanford/nlp/international/french/pipeline/FTBDataset.java b/src/edu/stanford/nlp/international/french/pipeline/FTBDataset.java index d8bbb35128..3870884935 100644 --- a/src/edu/stanford/nlp/international/french/pipeline/FTBDataset.java +++ b/src/edu/stanford/nlp/international/french/pipeline/FTBDataset.java @@ -95,7 +95,7 @@ public void build() { if(makeFlatFile) { outputFileList.add(flatFileName); - toStringBuffer.append(" Made flat files\n"); + toStringBuilder.append(" Made flat files\n"); } preprocessMWEs(); diff --git a/src/edu/stanford/nlp/ling/tokensregex/parser/ParseException.java b/src/edu/stanford/nlp/ling/tokensregex/parser/ParseException.java index 4dba82a1e8..7deca3843e 100644 --- a/src/edu/stanford/nlp/ling/tokensregex/parser/ParseException.java +++ b/src/edu/stanford/nlp/ling/tokensregex/parser/ParseException.java @@ -89,7 +89,7 @@ private static String initialise(Token currentToken, int[][] expectedTokenSequences, String[] tokenImage) { String eol = System.getProperty("line.separator", "\n"); - StringBuffer expected = new StringBuffer(); + StringBuilder expected = new StringBuilder(); int maxSize = 0; for (int i = 0; i < expectedTokenSequences.length; i++) { if (maxSize < expectedTokenSequences[i].length) { @@ -139,7 +139,7 @@ private static String initialise(Token currentToken, * string literal. */ static 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)) diff --git a/src/edu/stanford/nlp/ling/tokensregex/parser/TokenMgrError.java b/src/edu/stanford/nlp/ling/tokensregex/parser/TokenMgrError.java index ab2d282707..3a0ae20f5b 100644 --- a/src/edu/stanford/nlp/ling/tokensregex/parser/TokenMgrError.java +++ b/src/edu/stanford/nlp/ling/tokensregex/parser/TokenMgrError.java @@ -48,7 +48,7 @@ class TokenMgrError extends Error * 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)) diff --git a/src/edu/stanford/nlp/parser/lexparser/HTKLatticeReader.java b/src/edu/stanford/nlp/parser/lexparser/HTKLatticeReader.java index b38238baac..0318b8a4b0 100644 --- a/src/edu/stanford/nlp/parser/lexparser/HTKLatticeReader.java +++ b/src/edu/stanford/nlp/parser/lexparser/HTKLatticeReader.java @@ -617,7 +617,7 @@ public void merge(LatticeWord lw) { @Override public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(startNode).append("\t"); sb.append(endNode).append("\t"); sb.append("lm=").append(lm).append(","); diff --git a/src/edu/stanford/nlp/parser/lexparser/ParentAnnotationStats.java b/src/edu/stanford/nlp/parser/lexparser/ParentAnnotationStats.java index bb2b4ff5f8..dbb6c60129 100644 --- a/src/edu/stanford/nlp/parser/lexparser/ParentAnnotationStats.java +++ b/src/edu/stanford/nlp/parser/lexparser/ParentAnnotationStats.java @@ -133,9 +133,9 @@ public void printStats() { // System.out.println(gPRules); // Store java code for selSplit - StringBuffer[] javaSB = new StringBuffer[CUTOFFS.length]; + StringBuilder[] javaSB = new StringBuilder[CUTOFFS.length]; for (int i = 0; i < CUTOFFS.length; i++) { - javaSB[i] = new StringBuffer(" private static String[] splitters" + (i + 1) + " = new String[] {"); + javaSB[i] = new StringBuilder(" private static String[] splitters" + (i + 1) + " = new String[] {"); } ClassicCounter> allScores = new ClassicCounter<>(); diff --git a/src/edu/stanford/nlp/parser/lexparser/SisterAnnotationStats.java b/src/edu/stanford/nlp/parser/lexparser/SisterAnnotationStats.java index 091951eae0..b7c26dab7d 100644 --- a/src/edu/stanford/nlp/parser/lexparser/SisterAnnotationStats.java +++ b/src/edu/stanford/nlp/parser/lexparser/SisterAnnotationStats.java @@ -169,9 +169,9 @@ public void printStats() { // System.out.println(gPRules); // Store java code for selSplit - StringBuffer[] javaSB = new StringBuffer[CUTOFFS.length]; + StringBuilder[] javaSB = new StringBuilder[CUTOFFS.length]; for (int i = 0; i < CUTOFFS.length; i++) { - javaSB[i] = new StringBuffer(" private static String[] sisterSplit" + (i + 1) + " = new String[] {"); + javaSB[i] = new StringBuilder(" private static String[] sisterSplit" + (i + 1) + " = new String[] {"); } /** topScores contains all enriched categories, to be sorted diff --git a/src/edu/stanford/nlp/patterns/SPIEDServlet.java b/src/edu/stanford/nlp/patterns/SPIEDServlet.java index 902a520964..c11b7f90b9 100644 --- a/src/edu/stanford/nlp/patterns/SPIEDServlet.java +++ b/src/edu/stanford/nlp/patterns/SPIEDServlet.java @@ -217,7 +217,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr doGet(request, response); // logger.info("POST SPIED query from " + request.getRemoteAddr()); // -// //StringBuffer jb = new StringBuffer(); +// //StringBuilder jb = new StringBuilder(); // String line = ""; // response.setContentType("text/json; charset=UTF-8"); // PrintWriter out = response.getWriter(); diff --git a/src/edu/stanford/nlp/patterns/ScorePhrases.java b/src/edu/stanford/nlp/patterns/ScorePhrases.java index ac427b3ae4..4e9384f08c 100644 --- a/src/edu/stanford/nlp/patterns/ScorePhrases.java +++ b/src/edu/stanford/nlp/patterns/ScorePhrases.java @@ -631,7 +631,7 @@ else if (phraseScorer.wordFreqNorm.equals(Normalization.LOG)) if(constVars.goldEntities != null){ Map goldEntities4Label = constVars.goldEntities.get(label); if(goldEntities4Label != null) { - StringBuffer s = new StringBuffer(); + StringBuilder s = new StringBuilder(); finalwords.keySet().stream().forEach(x -> s.append(x.getPhrase() + (goldEntities4Label.containsKey(x.getPhrase()) ? ":"+goldEntities4Label.get(x.getPhrase()) : ":UKNOWN")+"\n")); diff --git a/src/edu/stanford/nlp/patterns/TextAnnotationPatterns.java b/src/edu/stanford/nlp/patterns/TextAnnotationPatterns.java index 805da95e31..65f8e0f1ac 100644 --- a/src/edu/stanford/nlp/patterns/TextAnnotationPatterns.java +++ b/src/edu/stanford/nlp/patterns/TextAnnotationPatterns.java @@ -150,7 +150,7 @@ public String suggestPhrasesTest(Properties testProps, String modelPropertiesFil allExtractions.put(label, new ClassicCounter<>()); for(Map.Entry sent: Data.sents.entrySet()){ - StringBuffer str = new StringBuffer(); + StringBuilder str = new StringBuilder(); for(CoreLabel l : sent.getValue().getTokens()){ if(l.get(PatternsAnnotations.MatchedPatterns.class) != null && !l.get(PatternsAnnotations.MatchedPatterns.class).isEmpty()){ str.append(" " + l.word()); diff --git a/src/edu/stanford/nlp/process/ChineseDocumentToSentenceProcessor.java b/src/edu/stanford/nlp/process/ChineseDocumentToSentenceProcessor.java index 908cf341bb..321b1f2ba8 100644 --- a/src/edu/stanford/nlp/process/ChineseDocumentToSentenceProcessor.java +++ b/src/edu/stanford/nlp/process/ChineseDocumentToSentenceProcessor.java @@ -369,7 +369,7 @@ private static String removeWhitespace(String str, boolean segmented) { static class MyHTMLParser extends HTMLEditorKit.ParserCallback { - protected StringBuffer textBuffer; + protected StringBuilder textBuffer; protected List sentences; protected String title; protected boolean isTitle; @@ -406,7 +406,7 @@ public void handleText(char[] data, int pos) { sentences.add(text); - textBuffer = new StringBuffer(500); + textBuffer = new StringBuilder(500); } } @@ -457,7 +457,7 @@ public List parse(String text) throws IOException { text = text.replaceAll("/>", ">"); text = text.replaceAll("<\\?","<"); StringReader r = new StringReader(text); - textBuffer = new StringBuffer(200); + textBuffer = new StringBuilder(200); sentences = new ArrayList<>(); new ParserDelegator().parse(r, this, true); return sentences; diff --git a/src/edu/stanford/nlp/process/TransformXML.java b/src/edu/stanford/nlp/process/TransformXML.java index 66f6bea1e2..5489551d35 100644 --- a/src/edu/stanford/nlp/process/TransformXML.java +++ b/src/edu/stanford/nlp/process/TransformXML.java @@ -41,7 +41,7 @@ public class TransformXML { public static class SAXInterface extends DefaultHandler { protected List elementsToBeTransformed; - protected StringBuffer textToBeTransformed; + protected StringBuilder textToBeTransformed; protected PrintWriter outWriter = new PrintWriter(System.out, true); protected Function function; @@ -56,7 +56,7 @@ public SAXInterface() { elementsToBeTransformed = new ArrayList<>(); depth = 0; openingTag = null; - textToBeTransformed = new StringBuffer(); + textToBeTransformed = new StringBuilder(); } /** @@ -74,7 +74,7 @@ private void outputTextAndTag(String qName, Attributes attributes, boolean close // If we're not already in an element to be transformed, first // echo the previous text... outWriter.print(XMLUtils.escapeXML(textToBeTransformed.toString())); - textToBeTransformed = new StringBuffer(); + textToBeTransformed = new StringBuilder(); // ... then echo the new tag to outStream outWriter.print('<'); @@ -146,7 +146,7 @@ public void endElement(String uri, String localName, String qName) String text = textToBeTransformed.toString().trim(); // factored out so subclasses can handle the text differently processText(text); - textToBeTransformed = new StringBuffer(); + textToBeTransformed = new StringBuilder(); outWriter.print("\n"); } } diff --git a/src/edu/stanford/nlp/semgraph/semgrex/ParseException.java b/src/edu/stanford/nlp/semgraph/semgrex/ParseException.java index 590d750aa8..cc61d933d0 100644 --- a/src/edu/stanford/nlp/semgraph/semgrex/ParseException.java +++ b/src/edu/stanford/nlp/semgraph/semgrex/ParseException.java @@ -94,7 +94,7 @@ private static String initialise(Token currentToken, int[][] expectedTokenSequences, String[] tokenImage) { - StringBuffer expected = new StringBuffer(); + StringBuilder expected = new StringBuilder(); int maxSize = 0; for (int i = 0; i < expectedTokenSequences.length; i++) { if (maxSize < expectedTokenSequences[i].length) { @@ -147,7 +147,7 @@ private static String initialise(Token currentToken, * string literal. */ static 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)) diff --git a/src/edu/stanford/nlp/semgraph/semgrex/TokenMgrError.java b/src/edu/stanford/nlp/semgraph/semgrex/TokenMgrError.java index d48c10afd0..9f92b114ec 100644 --- a/src/edu/stanford/nlp/semgraph/semgrex/TokenMgrError.java +++ b/src/edu/stanford/nlp/semgraph/semgrex/TokenMgrError.java @@ -48,7 +48,7 @@ class TokenMgrError extends Error * 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)) diff --git a/src/edu/stanford/nlp/stats/MultiClassPrecisionRecallStats.java b/src/edu/stanford/nlp/stats/MultiClassPrecisionRecallStats.java index ae5ff11625..10825c1d6f 100644 --- a/src/edu/stanford/nlp/stats/MultiClassPrecisionRecallStats.java +++ b/src/edu/stanford/nlp/stats/MultiClassPrecisionRecallStats.java @@ -229,7 +229,7 @@ public String getF1Description(int numDigits, L label) { * Returns a String summarizing F1 that will print nicely. */ public String getDescription(int numDigits) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("--- PR Stats ---").append("\n"); for (L label : labelIndex) { if (label == null || label.equals(negLabel)) { continue; } diff --git a/src/edu/stanford/nlp/trees/Constituent.java b/src/edu/stanford/nlp/trees/Constituent.java index 215dd15f5c..f12797b968 100644 --- a/src/edu/stanford/nlp/trees/Constituent.java +++ b/src/edu/stanford/nlp/trees/Constituent.java @@ -102,12 +102,12 @@ public void setScore(double score) { */ @Override public String toString() { - StringBuffer sb; + StringBuilder sb; Label lab = label(); if (lab != null) { - sb = new StringBuffer(lab.toString()); + sb = new StringBuilder(lab.toString()); } else { - sb = new StringBuffer(); + sb = new StringBuilder(); } sb.append("(").append(start()).append(",").append(end()).append(")"); return sb.toString(); diff --git a/src/edu/stanford/nlp/trees/Tree.java b/src/edu/stanford/nlp/trees/Tree.java index 2e63720df1..408ff652f7 100644 --- a/src/edu/stanford/nlp/trees/Tree.java +++ b/src/edu/stanford/nlp/trees/Tree.java @@ -656,7 +656,7 @@ public Set localTrees() { /** * Most instances of {@code Tree} will take a lot more than - * than the default {@code StringBuffer} size of 16 to print + * than the default {@code StringBuilder} size of 16 to print * as an indented list of the whole tree, so we enlarge the default. */ private static final int initialPrintStringBuilderSize = 500; diff --git a/src/edu/stanford/nlp/trees/treebank/AbstractDataset.java b/src/edu/stanford/nlp/trees/treebank/AbstractDataset.java index 2e74dee2cd..1253198fcc 100644 --- a/src/edu/stanford/nlp/trees/treebank/AbstractDataset.java +++ b/src/edu/stanford/nlp/trees/treebank/AbstractDataset.java @@ -55,7 +55,7 @@ public abstract class AbstractDataset implements Dataset { protected Treebank treebank; protected final Set configuredOptions; protected final Set requiredOptions; - protected final StringBuilder toStringBuffer; + protected final StringBuilder toStringBuilder; protected String treeFileExtension = "tree"; //Current LDC releases use this extension @@ -68,7 +68,7 @@ public AbstractDataset() { outputFileList = new ArrayList<>(); pathsToData = new ArrayList<>(); pathsToMappings = new ArrayList<>(); - toStringBuffer = new StringBuilder(); + toStringBuilder = new StringBuilder(); //Read the raw file as UTF-8 irrespective of output encoding // treebank = new DiskTreebank(new ArabicTreeReaderFactory.ArabicRawTreeReaderFactory(true), "UTF-8"); @@ -125,7 +125,7 @@ else if(param.equals(ConfigParser.paramEncode)) else if(param.equals(ConfigParser.paramName)) { Matcher inThisFilename = fileNameNormalizer.matcher(value.trim()); outFileName = inThisFilename.replaceAll("-"); - toStringBuffer.append(String.format("Dataset Name: %s\n",value.trim())); + toStringBuilder.append(String.format("Dataset Name: %s\n",value.trim())); } else if(param.equals(ConfigParser.paramDT)) addDeterminer = Boolean.parseBoolean(value); @@ -220,7 +220,7 @@ public List getFilenames() { @Override public String toString() { - return toStringBuffer.toString(); + return toStringBuilder.toString(); } /* diff --git a/src/edu/stanford/nlp/trees/tregex/ParseException.java b/src/edu/stanford/nlp/trees/tregex/ParseException.java index 82f0ef1b60..d3321ca98c 100644 --- a/src/edu/stanford/nlp/trees/tregex/ParseException.java +++ b/src/edu/stanford/nlp/trees/tregex/ParseException.java @@ -89,7 +89,7 @@ private static String initialise(Token currentToken, int[][] expectedTokenSequences, String[] tokenImage) { String eol = System.getProperty("line.separator", "\n"); - StringBuffer expected = new StringBuffer(); + StringBuilder expected = new StringBuilder(); int maxSize = 0; for (int[] expectedTokenSequence : expectedTokenSequences) { if (maxSize < expectedTokenSequence.length) { @@ -139,7 +139,7 @@ private static String initialise(Token currentToken, * string literal. */ static 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)) diff --git a/src/edu/stanford/nlp/trees/tregex/TokenMgrError.java b/src/edu/stanford/nlp/trees/tregex/TokenMgrError.java index fa01872b07..85acc4c070 100644 --- a/src/edu/stanford/nlp/trees/tregex/TokenMgrError.java +++ b/src/edu/stanford/nlp/trees/tregex/TokenMgrError.java @@ -48,7 +48,7 @@ class TokenMgrError extends Error * 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)) diff --git a/src/edu/stanford/nlp/trees/tregex/gui/InputPanel.java b/src/edu/stanford/nlp/trees/tregex/gui/InputPanel.java index 3ac834758c..6c67cb36d0 100644 --- a/src/edu/stanford/nlp/trees/tregex/gui/InputPanel.java +++ b/src/edu/stanford/nlp/trees/tregex/gui/InputPanel.java @@ -913,7 +913,7 @@ private void displayHelp() { //JPanel helpPanel = new JPanel(); JEditorPane helpText = new JEditorPane(); helpText.setContentType("text/html"); - // StringBuffer s = new StringBuffer(); + // StringBuilder s = new StringBuilder(); // s.append(htmlHelp); helpText.setText(htmlHelp); helpText.setEditable(false); @@ -937,7 +937,7 @@ private void displayTsurgeonHelp() { tsurgeonHelpFrame = new JFrame("TSurgeon Help..."); JEditorPane helpText = new JEditorPane(); helpText.setContentType("text/html"); - // StringBuffer s = new StringBuffer(); + // StringBuilder s = new StringBuilder(); // s.append(htmlTsurgeonHelp); helpText.setText(htmlTsurgeonHelp); helpText.setEditable(false); diff --git a/src/edu/stanford/nlp/trees/tregex/tsurgeon/ParseException.java b/src/edu/stanford/nlp/trees/tregex/tsurgeon/ParseException.java index c3765b7c92..d53c332777 100644 --- a/src/edu/stanford/nlp/trees/tregex/tsurgeon/ParseException.java +++ b/src/edu/stanford/nlp/trees/tregex/tsurgeon/ParseException.java @@ -89,7 +89,7 @@ private static String initialise(Token currentToken, int[][] expectedTokenSequences, String[] tokenImage) { String eol = System.getProperty("line.separator", "\n"); - StringBuffer expected = new StringBuffer(); + StringBuilder expected = new StringBuilder(); int maxSize = 0; for (int[] expectedTokenSequence : expectedTokenSequences) { if (maxSize < expectedTokenSequence.length) { @@ -139,7 +139,7 @@ private static String initialise(Token currentToken, * string literal. */ static 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)) diff --git a/src/edu/stanford/nlp/trees/tregex/tsurgeon/TokenMgrError.java b/src/edu/stanford/nlp/trees/tregex/tsurgeon/TokenMgrError.java index 8ca3654b7a..45ba3f0a58 100644 --- a/src/edu/stanford/nlp/trees/tregex/tsurgeon/TokenMgrError.java +++ b/src/edu/stanford/nlp/trees/tregex/tsurgeon/TokenMgrError.java @@ -48,7 +48,7 @@ class TokenMgrError extends Error * 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)) diff --git a/src/edu/stanford/nlp/trees/ud/CoNLLUUtils.java b/src/edu/stanford/nlp/trees/ud/CoNLLUUtils.java index 4b502c59a0..1b253b29d7 100644 --- a/src/edu/stanford/nlp/trees/ud/CoNLLUUtils.java +++ b/src/edu/stanford/nlp/trees/ud/CoNLLUUtils.java @@ -36,7 +36,7 @@ public static HashMap parseFeatures(String featureString) { * @return The feature string. */ public static String toFeatureString(HashMap features) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); boolean first = true; if (features != null) { List sortedKeys = new ArrayList<>(features.keySet()); @@ -93,7 +93,7 @@ public static HashMap parseExtraDeps(String extraDepsString) { * @return The extra dependencies string. */ public static String toExtraDepsString(HashMap extraDeps) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); boolean first = true; if (extraDeps != null) { List sortedKeys = new ArrayList<>(extraDeps.keySet()); diff --git a/src/edu/stanford/nlp/util/CommandLineTokenizer.java b/src/edu/stanford/nlp/util/CommandLineTokenizer.java index ecb3da8c1f..563b7f1b63 100644 --- a/src/edu/stanford/nlp/util/CommandLineTokenizer.java +++ b/src/edu/stanford/nlp/util/CommandLineTokenizer.java @@ -37,16 +37,16 @@ private CommandLineTokenizer() { /** * Goofy internal utility to avoid duplicated code. If the specified - * StringBuffer is not empty, its contents are appended to the resulting - * array (temporarily stored in the specified ArrayList). The StringBuffer + * StringBuilder is not empty, its contents are appended to the resulting + * array (temporarily stored in the specified ArrayList). The StringBuilder * is then emptied in order to begin storing the next argument. * @param resultBuffer the List temporarily storing the resulting * argument array. - * @param buf the StringBuffer storing the current argument. + * @param buf the StringBuilder storing the current argument. */ private static void appendToBuffer( List resultBuffer, - StringBuffer buf) { + StringBuilder buf) { if (buf.length() > 0) { resultBuffer.add(buf.toString()); buf.setLength(0); @@ -69,7 +69,7 @@ public static String[] tokenize(String commandLine) { if (commandLine != null) { int z = commandLine.length(); boolean insideQuotes = false; - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int i = 0; i < z; ++i) { char c = commandLine.charAt(i);