Author: desruisseaux
Date: Mon Apr 23 08:26:50 2018
New Revision: 1829833
URL: http://svn.apache.org/viewvc?rev=1829833&view=rev
Log:
Renamed "toString(StringBuilder)" private method as "appendStringTo(…)" as
proposed on https://github.com/apache/sis/pull/7
Modified:
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
Modified:
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java?rev=1829833&r1=1829832&r2=1829833&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
[UTF-8] Mon Apr 23 08:26:50 2018
@@ -1016,7 +1016,7 @@ public class FeatureTypeBuilder extends
buffer.append(" {");
separator = System.lineSeparator();
for (final PropertyTypeBuilder p : properties) {
- p.toString(buffer.append(separator).append("
").append(p.getClass().getSimpleName()));
+ p.appendStringTo(buffer.append(separator).append("
").append(p.getClass().getSimpleName()));
}
buffer.append(separator).append('}');
}
Modified:
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java?rev=1829833&r1=1829832&r2=1829833&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
[UTF-8] Mon Apr 23 08:26:50 2018
@@ -542,14 +542,14 @@ public abstract class TypeBuilder implem
@Debug
@Override
public String toString() {
- return toString(new
StringBuilder(Classes.getShortClassName(this))).toString();
+ return appendStringTo(new
StringBuilder(Classes.getShortClassName(this))).toString();
}
/**
* Partial implementation of {@link #toString()}. This method assumes that
the class name
* has already be written in the buffer.
*/
- final StringBuilder toString(final StringBuilder buffer) {
+ final StringBuilder appendStringTo(final StringBuilder buffer) {
toStringInternal(buffer.append("[“").append(getDisplayName()).append('”'));
return buffer.append(']');
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java?rev=1829833&r1=1829832&r2=1829833&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
[UTF-8] Mon Apr 23 08:26:50 2018
@@ -222,7 +222,7 @@ public class SimpleIdentifier implements
if (open) {
buffer.append('”');
}
- appendToString(buffer);
+ appendStringTo(buffer);
return buffer.append(']').toString();
}
@@ -232,7 +232,7 @@ public class SimpleIdentifier implements
*
* @param buffer a buffer filled with the {@link #toString()}
characters, that subclasses can update.
*/
- protected void appendToString(final StringBuilder buffer) {
+ protected void appendStringTo(final StringBuilder buffer) {
}
/**
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java?rev=1829833&r1=1829832&r2=1829833&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
[UTF-8] Mon Apr 23 08:26:50 2018
@@ -383,7 +383,7 @@ final class PropertyInformation<E> exten
* Invoked by {@link #toString()} in order to append additional
information after the identifier.
*/
@Override
- protected void appendToString(final StringBuilder buffer) {
+ protected void appendStringTo(final StringBuilder buffer) {
buffer.append(" : ").append(Types.getCodeLabel(getDataType()))
.append(",
").append(getObligation().name().toLowerCase(Locale.US))
.append(", maxOccurs=");
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java?rev=1829833&r1=1829832&r2=1829833&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
[UTF-8] Mon Apr 23 08:26:50 2018
@@ -897,14 +897,14 @@ class TreeNode implements Node {
@Override
public final String toString() {
final StringBuilder buffer = new StringBuilder(60);
- toString(buffer);
+ appendStringTo(buffer);
return buffer.toString();
}
/**
* Implementation of {@link #toString()} appending the string
representation in the given buffer.
*/
- final void toString(final StringBuilder buffer) {
+ final void appendStringTo(final StringBuilder buffer) {
appendIdentifier(buffer.append("Node["));
buffer.append(" :
").append(Classes.getShortName(baseType)).append(']');
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java?rev=1829833&r1=1829832&r2=1829833&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
[UTF-8] Mon Apr 23 08:26:50 2018
@@ -614,11 +614,11 @@ final class TreeNodeChildren extends Abs
public String toString() {
final String lineSeparator = System.lineSeparator();
final StringBuilder buffer = new StringBuilder(512);
- parent.toString(buffer);
+ parent.appendStringTo(buffer);
buffer.append(lineSeparator);
for (final TreeTable.Node node : this) {
buffer.append(" ");
- ((TreeNode) node).toString(buffer);
+ ((TreeNode) node).appendStringTo(buffer);
buffer.append(lineSeparator);
}
return buffer.toString();
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java?rev=1829833&r1=1829832&r2=1829833&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
[UTF-8] Mon Apr 23 08:26:50 2018
@@ -2157,7 +2157,7 @@ public abstract class ConcurrentAuthorit
*/
@Debug
@Override
- final void toString(final StringBuilder buffer) {
+ final void appendStringTo(final StringBuilder buffer) {
buffer.append(", cache=").append(cache.size()).append(", DAO=");
synchronized (availableDAOs) {
buffer.append(availableDAOs.size());
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java?rev=1829833&r1=1829832&r2=1829833&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
[UTF-8] Mon Apr 23 08:26:50 2018
@@ -1312,13 +1312,13 @@ public abstract class GeodeticAuthorityF
public String toString() {
final StringBuilder buffer = new
StringBuilder(Classes.getShortClassName(this))
.append("[“").append(Citations.getIdentifier(getAuthority(),
false)).append('”');
- toString(buffer);
+ appendStringTo(buffer);
return buffer.append(']').toString();
}
/**
* Hook for subclasses.
*/
- void toString(final StringBuilder buffer) {
+ void appendStringTo(final StringBuilder buffer) {
}
}
Modified:
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java?rev=1829833&r1=1829832&r2=1829833&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
[UTF-8] Mon Apr 23 08:26:50 2018
@@ -702,7 +702,7 @@ public final class DefinitionURI {
if (!isHTTP) {
buffer.append(PREFIX);
}
- toString(buffer, SEPARATOR);
+ appendStringTo(buffer, SEPARATOR);
return buffer.toString();
}
@@ -713,7 +713,7 @@ public final class DefinitionURI {
* @param buffer where to format the string representation.
* @param separator first separator to append. Ignored if the URI is
actually a URL.
*/
- private void toString(final StringBuilder buffer, char separator) {
+ private void appendStringTo(final StringBuilder buffer, char separator) {
if (isHTTP) {
buffer.append("http://";).append(DOMAIN).append("/def");
separator = '/';
@@ -768,7 +768,7 @@ public final class DefinitionURI {
: COMPONENT_SEPARATOR_2)
.append(i).append(KEY_VALUE_SEPARATOR);
}
- c.toString(buffer, COMPONENT_SEPARATOR);
+ c.appendStringTo(buffer, COMPONENT_SEPARATOR);
}
}
}
