Skip to content

Commit

Permalink
Replaced single-character strings in StringBuffer.append() and replac…
Browse files Browse the repository at this point in the history 
…ed StringBuffer by StringBuilder where appropriate.

Signed-off-by: John May <john.wilkinsonmay@gmail.com>
  • Loading branch information
@johnmay
Mark B Vine authored and johnmay committed Sep 1, 2014
1 parent 17d1251 commit e200c63
Show file tree
Hide file tree
Showing 30 changed files with 86 additions and 86 deletions.
4 changes: 2 additions & 2 deletions base/core/src/main/java/org/openscience/cdk/DynamicFactory.java
View file
Expand Up @@ -1078,14 +1078,14 @@ public boolean isAssignable(ConstructorKey candidate) {
public String toString() {
StringBuilder sb = new StringBuilder(n() * 50);
sb.append(intf().getSimpleName());
sb.append("(");
sb.append('(');
int max = n() - 1;
for (int i = 0; i <= max; i++) {
sb.append(type(i).getSimpleName());
if (i != max)
sb.append(", ");
}
sb.append(")");
sb.append(')');
return sb.toString();
}

Expand Down
2 changes: 1 addition & 1 deletion base/core/src/main/java/org/openscience/cdk/graph/BitMatrix.java
View file
Expand Up @@ -237,7 +237,7 @@ private int eliminate(int x, int y) {
for (int i = 0; i < n; i++) {
sb.append(rows[j].get(i) ? '1' : '-');
}
sb.append("\n");
sb.append('\n');
}
return sb.toString();
}
Expand Down
4 changes: 2 additions & 2 deletions base/core/src/main/java/org/openscience/cdk/stereo/TetrahedralChirality.java
View file
Expand Up @@ -163,9 +163,9 @@ public String toString() {
builder.append("c:").append(this.getChiralAtom()).append(", ");
IAtom[] ligands = this.getLigands();
for (int i=0; i<ligands.length; i++) {
builder.append(i+1).append(":").append(ligands[i]).append(", ");
builder.append(i+1).append(':').append(ligands[i]).append(", ");
}
builder.append("}");
builder.append('}');
return builder.toString();
}
}
4 changes: 2 additions & 2 deletions base/data/src/main/java/org/openscience/cdk/Monomer.java
View file
Expand Up @@ -125,15 +125,15 @@ public IMonomer clone() throws CloneNotSupportedException {
}

public String toString() {
StringBuffer buffer = new StringBuffer();
StringBuilder buffer = new StringBuilder();
buffer.append("Monomer{").append(this.hashCode());
if (getMonomerName() != null) {
buffer.append(", N=").append(getMonomerName());
}
if (getMonomerType() != null) {
buffer.append(", T=").append(getMonomerType());
}
buffer.append("}");
buffer.append('}');
return buffer.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions base/data/src/main/java/org/openscience/cdk/protein/data/PDBAtom.java
View file
Expand Up @@ -314,7 +314,7 @@ public Double getOccupancy() {
* @return The string representation of this Atom
*/
public String toString() {
StringBuffer description = new StringBuffer();
StringBuilder description = new StringBuilder();
description.append("PDBAtom(");
description.append(this.hashCode()).append(", ");
description.append("altLoc=").append(getAltLoc()).append(", ");
Expand All @@ -329,7 +329,7 @@ public String toString() {
description.append("oxt=").append(getOxt()).append(", ");
description.append("hetatm=").append(getHetAtom()).append(", ");
description.append(super.toString());
description.append(")");
description.append(')');
return description.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions base/data/src/main/java/org/openscience/cdk/protein/data/PDBMonomer.java
View file
Expand Up @@ -84,13 +84,13 @@ public String getChainID() {
* @return The string representation of this Atom
*/
public String toString() {
StringBuffer description = new StringBuffer();
StringBuilder description = new StringBuilder();
description.append("PDBMonomer(");
description.append(this.hashCode()).append(", ");
description.append("iCode=").append(getICode()).append(", ");
description.append("chainID=").append(getChainID()).append(", ");
description.append(super.toString());
description.append(")");
description.append(')');
return description.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions base/data/src/main/java/org/openscience/cdk/protein/data/PDBPolymer.java
View file
Expand Up @@ -125,11 +125,11 @@ public IPDBPolymer clone() throws CloneNotSupportedException {
}

public String toString() {
StringBuffer stringContent = new StringBuffer();
StringBuilder stringContent = new StringBuilder();
stringContent.append("PDBPolymer(");
stringContent.append(this.hashCode()).append(", ");
stringContent.append(super.toString());
stringContent.append(")");
stringContent.append(')');
return stringContent.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions ...ism/src/main/java/org/openscience/cdk/isomorphism/matchers/InverseSymbolSetQueryAtom.java
View file
Expand Up @@ -109,11 +109,11 @@ public Set<String> getSymbolSet() {
*@return The String representation of this object.
*/
public String toString() {
StringBuffer s = new StringBuffer();
StringBuilder s = new StringBuilder();
s.append("InverseSymbolSetQueryAtom(");
s.append(this.hashCode() + ", ");
s.append(symbols.toString());
s.append(")");
s.append(')');
return s.toString();
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...somorphism/src/main/java/org/openscience/cdk/isomorphism/matchers/QueryAtomContainer.java
View file
Expand Up @@ -42,7 +42,7 @@ public class QueryAtomContainer extends QueryChemObject implements IQueryAtomCon
private static final long serialVersionUID = -1876912362585898476L;

public String toString() {
StringBuffer s = new StringBuffer();
StringBuilder s = new StringBuilder();
s.append("QueryAtomContainer(");
s.append(this.hashCode() + ", ");
s.append("#A:" + getAtomCount() + ", ");
Expand All @@ -59,7 +59,7 @@ public String toString() {
for (int i = 0; i < getSingleElectronCount(); i++) {
s.append(getSingleElectron(i).toString() + ", ");
}
s.append(")");
s.append(')');
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions ...hism/src/main/java/org/openscience/cdk/isomorphism/matchers/SymbolAndChargeQueryAtom.java
View file
Expand Up @@ -46,12 +46,12 @@ public boolean matches(IAtom atom) {
};

public String toString() {
StringBuffer s = new StringBuffer();
StringBuilder s = new StringBuilder();
s.append("SymbolAndChargeQueryAtom(");
s.append(this.hashCode() + ", ");
s.append(getSymbol() + ", ");
s.append(getFormalCharge());
s.append(")");
s.append(')');
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions ...phism/src/main/java/org/openscience/cdk/isomorphism/matchers/SymbolChargeIDQueryAtom.java
View file
Expand Up @@ -46,13 +46,13 @@ public boolean matches(IAtom atom) {
};

public String toString() {
StringBuffer s = new StringBuffer();
StringBuilder s = new StringBuilder();
s.append("SymbolAndChargeQueryAtom(");
s.append(this.hashCode() + ", ");
s.append(getID() + ", ");
s.append(getSymbol() + ", ");
s.append(getFormalCharge());
s.append(")");
s.append(')');
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions base/isomorphism/src/main/java/org/openscience/cdk/isomorphism/matchers/SymbolQueryAtom.java
View file
Expand Up @@ -57,11 +57,11 @@ public void setOperator(String str){


public String toString() {
StringBuffer s = new StringBuffer();
StringBuilder s = new StringBuilder();
s.append("SymbolQueryAtom(");
s.append(this.hashCode() + ", ");
s.append(getSymbol());
s.append(")");
s.append(')');
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions ...somorphism/src/main/java/org/openscience/cdk/isomorphism/matchers/SymbolSetQueryAtom.java
View file
Expand Up @@ -108,11 +108,11 @@ public Set<String> getSymbolSet() {
*@return The String representation of this object.
*/
public String toString() {
StringBuffer s = new StringBuffer();
StringBuilder s = new StringBuilder();
s.append("SymbolSetQueryAtom(");
s.append(this.hashCode() + ", ");
s.append(symbols.toString());
s.append(")");
s.append(')');
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions base/silent/src/main/java/org/openscience/cdk/silent/Monomer.java
View file
Expand Up @@ -123,15 +123,15 @@ public IMonomer clone() throws CloneNotSupportedException {
}

public String toString() {
StringBuffer buffer = new StringBuffer();
StringBuilder buffer = new StringBuilder();
buffer.append("Monomer{").append(this.hashCode());
if (getMonomerName() != null) {
buffer.append(", N=").append(getMonomerName());
}
if (getMonomerType() != null) {
buffer.append(", T=").append(getMonomerType());
}
buffer.append("}");
buffer.append('}');
return buffer.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions base/silent/src/main/java/org/openscience/cdk/silent/PDBAtom.java
View file
Expand Up @@ -313,7 +313,7 @@ public Double getOccupancy() {
* @return The string representation of this Atom
*/
public String toString() {
StringBuffer description = new StringBuffer();
StringBuilder description = new StringBuilder();
description.append("PDBAtom(");
description.append(this.hashCode()).append(", ");
description.append("altLoc=").append(getAltLoc()).append(", ");
Expand All @@ -328,7 +328,7 @@ public String toString() {
description.append("oxt=").append(getOxt()).append(", ");
description.append("hetatm=").append(getHetAtom()).append(", ");
description.append(super.toString());
description.append(")");
description.append(')');
return description.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions base/silent/src/main/java/org/openscience/cdk/silent/PDBMonomer.java
View file
Expand Up @@ -83,13 +83,13 @@ public String getChainID() {
* @return The string representation of this Atom
*/
public String toString() {
StringBuffer description = new StringBuffer();
StringBuilder description = new StringBuilder();
description.append("PDBMonomer(");
description.append(this.hashCode()).append(", ");
description.append("iCode=").append(getICode()).append(", ");
description.append("chainID=").append(getChainID()).append(", ");
description.append(super.toString());
description.append(")");
description.append(')');
return description.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions base/silent/src/main/java/org/openscience/cdk/silent/PDBPolymer.java
View file
Expand Up @@ -124,11 +124,11 @@ public IPDBPolymer clone() throws CloneNotSupportedException {
}

public String toString() {
StringBuffer stringContent = new StringBuffer();
StringBuilder stringContent = new StringBuilder();
stringContent.append("PDBPolymer(");
stringContent.append(this.hashCode()).append(", ");
stringContent.append(super.toString());
stringContent.append(")");
stringContent.append(')');
return stringContent.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions base/standard/src/main/java/org/openscience/cdk/qsar/result/DoubleArrayResult.java
View file
Expand Up @@ -68,10 +68,10 @@ public int length() {

@TestMethod("testToString")
public String toString() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
for (int i=0; i<length(); i++) {
buf.append(get(i));
if (i+1<length()) buf.append(",");
if (i+1<length()) buf.append(',');
}
return buf.toString();
}
Expand Down
4 changes: 2 additions & 2 deletions base/standard/src/main/java/org/openscience/cdk/qsar/result/IntegerArrayResult.java
View file
Expand Up @@ -68,10 +68,10 @@ public int length() {

@TestMethod("testToString")
public String toString() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
for (int i=0; i<length(); i++) {
buf.append(get(i));
if (i+1<length()) buf.append(",");
if (i+1<length()) buf.append(',');
}
return buf.toString();
}
Expand Down
4 changes: 2 additions & 2 deletions base/standard/src/main/java/org/openscience/cdk/smiles/InvPair.java
View file
Expand Up @@ -145,9 +145,9 @@ public void commit() {
*/
@TestMethod("testToString")
public String toString() {
StringBuffer buff = new StringBuffer();
StringBuilder buff = new StringBuilder();
buff.append(curr);
buff.append("\t");
buff.append('\t');
return buff.toString();
}

Expand Down
20 changes: 10 additions & 10 deletions base/standard/src/main/java/org/openscience/cdk/tools/HOSECodeGenerator.java
View file
Expand Up @@ -317,14 +317,14 @@ private String getRingcode(IAtom root, IAtomContainer ac){
if(bool[i])
sb.append(i+"");
}
if(sb.toString().equals(""))
if(sb.toString().isEmpty())
return "";
else
return "-"+sb.toString();
}

private String createChargeCode(IAtom atom) {
StringBuffer tempCode = new StringBuffer();
StringBuilder tempCode = new StringBuilder();

if (atom != null) {

Expand All @@ -335,18 +335,18 @@ private String createChargeCode(IAtom atom) {

if (Math.abs(formalCharge) == 1) {
if (formalCharge < 0)
tempCode.append("-");
tempCode.append('-');
else
tempCode.append("+");
tempCode.append('+');
} else {
tempCode.append("'");
tempCode.append('\'');
if (formalCharge > 0)
tempCode.append("+");
tempCode.append(formalCharge + "'");
tempCode.append('+');
tempCode.append(formalCharge).append('\'');
}
}
}
return (tempCode + "");
return (tempCode.toString());
}

/**
Expand Down Expand Up @@ -568,7 +568,7 @@ private String getSphereCode(List<TreeNode> sphereNodes) throws CDKException
if (!treeNode.source.stopper && treeNode.source.atom != branch)
{
branch = treeNode.source.atom;
code.append(",");
code.append(',');
}

if (!treeNode.source.stopper && treeNode.source.atom == branch)
Expand All @@ -586,7 +586,7 @@ private String getSphereCode(List<TreeNode> sphereNodes) throws CDKException
}
else if (treeNode.atom != null && treeNode.atom.getFlag(CDKConstants.VISITED))
{
tempCode.append("&");
tempCode.append('&');
treeNode.stopper = true;
}
code.append(tempCode+createChargeCode(treeNode.atom));
Expand Down
6 changes: 3 additions & 3 deletions ...mic/src/main/java/org/openscience/cdk/qsar/descriptors/atomic/IPAtomicHOSEDescriptor.java
View file
Expand Up @@ -288,11 +288,11 @@ public double extractIP(IAtomContainer container, IAtom atom) {
hoseCodeBuffer.append(partcode);
}
if (k == 0) {
hoseCodeBuffer.append("(");
hoseCodeBuffer.append('(');
} else if (k == 3) {
hoseCodeBuffer.append(")");
hoseCodeBuffer.append(')');
} else {
hoseCodeBuffer.append("/");
hoseCodeBuffer.append('/');
}
}
String hoseCodeBU = hoseCodeBuffer.toString();
Expand Down

0 comments on commit e200c63

Please sign in to comment.