Skip to content

style: collapse verbose string building in pre-existing classes #1412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joaodinissf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

style: collapse verbose string building in pre-existing classes #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions ....tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/ClasspathBasedChecks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,8 @@ public void checkFileNamingConventions(final CheckCatalog catalog) {
Resource resource = catalog.eResource();
URI resourceURI = resource.getURI();
String packageName = catalog.getPackageName();
StringBuilder classpathURIBuilder = new StringBuilder(ClasspathUriUtil.CLASSPATH_SCHEME);
classpathURIBuilder.append(":/");
if (packageName != null) {
classpathURIBuilder.append(packageName.replace(DOT, SLASH)).append(SLASH);
}
classpathURIBuilder.append(resourceURI.lastSegment());
URI classpathURI = URI.createURI(classpathURIBuilder.toString());
String packagePath = packageName != null ? packageName.replace(DOT, SLASH) + SLASH : "";
URI classpathURI = URI.createURI(ClasspathUriUtil.CLASSPATH_SCHEME + ":/" + packagePath + resourceURI.lastSegment());
URIConverter uriConverter = resource.getResourceSet().getURIConverter();
try {
URI normalizedClasspathURI = uriConverter.normalize(classpathURI);
Expand Down
4 changes: 2 additions & 2 deletions ...nerator/src/com/avaloq/tools/ddk/xtext/generator/util/CustomClassAwareEcoreGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ public class CustomClassAwareEcoreGenerator extends EcoreGenerator {

// CHECKSTYLE:OFF
private boolean generateModel = true;
private boolean generateEdit = false;
private boolean generateEditor = false;
private boolean generateEdit;
private boolean generateEditor;
// CHECKSTYLE:ON
private ResourceSet resourceSet;

Expand Down
2 changes: 1 addition & 1 deletion ...ls.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/StandaloneSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ private List<URI> splitCommaSeparatedString(final String input) {
return Collections.<URI> emptyList();
}
String trimmed = input.trim();
if (trimmed.length() == 0) {
if (trimmed.isEmpty()) {
return Collections.<URI> emptyList();
}
List<URI> result = Lists.newArrayList();
Expand Down
4 changes: 1 addition & 3 deletions ....tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/labeling/AbstractLabelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,7 @@ protected Object getStyledLabel(final EObject modelElement, final EStructuralFea
}
}
if (valueString != null && valueString.length() > MAX_FEATURE_VALUE_LENGTH) {
StringBuilder stringBuilder = new StringBuilder(valueString.substring(0, MAX_FEATURE_VALUE_LENGTH - CONTINUED.length()));
stringBuilder.append(CONTINUED);
valueString = stringBuilder.toString();
valueString = valueString.substring(0, MAX_FEATURE_VALUE_LENGTH - CONTINUED.length()) + CONTINUED;
}
}
return assignmentStyledString(name, valueString);
Expand Down
6 changes: 1 addition & 5 deletions ...s.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/AbstractValidElementBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,7 @@ public IConfigurationElement getConfigurationElement() {

@Override
public String toString() {
StringBuilder b = new StringBuilder(this.getClass().getSimpleName());
b.append("(\""); //$NON-NLS-1$
b.append(getElementTypeName());
b.append("\")"); //$NON-NLS-1$
return b.toString();
return this.getClass().getSimpleName() + "(\"" + getElementTypeName() + "\")"; //$NON-NLS-1$ //$NON-NLS-2$
}

/**
Expand Down
10 changes: 1 addition & 9 deletions ...ols.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/FixedCopiedResourceDescription.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,7 @@ public Iterable<IReferenceDescription> getReferenceDescriptions() {

@Override
public String toString() {
StringBuilder result = new StringBuilder(getClass().getName());
result.append('@');
result.append(Integer.toHexString(hashCode()));

result.append(" (URI: "); //$NON-NLS-1$
result.append(uri);
result.append(')');

return result.toString();
return String.format("%s@%s (URI: %s)", getClass().getName(), Integer.toHexString(hashCode()), uri); //$NON-NLS-1$
}

@Override
Expand Down
7 changes: 2 additions & 5 deletions ...com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,9 @@ protected void loadFeatureValue(final InternalEObject internalEObject, final ESt
super.loadFeatureValue(internalEObject, eStructuralFeatureData);
// CHECKSTYLE:OFF
} catch (Exception e) {
StringBuilder infoMessage = new StringBuilder(100);
// CHECKSTYLE:ON
infoMessage.append("Failed to load feature's value. Owner: ").append(internalEObject.eClass()); //$NON-NLS-1$
if (eStructuralFeatureData.eStructuralFeature != null) {
infoMessage.append(", feature name: ").append(eStructuralFeatureData.eStructuralFeature.getName()); //$NON-NLS-1$
}
String infoMessage = "Failed to load feature's value. Owner: " + internalEObject.eClass() //$NON-NLS-1$
+ (eStructuralFeatureData.eStructuralFeature != null ? ", feature name: " + eStructuralFeatureData.eStructuralFeature.getName() : ""); //$NON-NLS-1$ //$NON-NLS-2$
LOG.info(infoMessage);
throw e;
}
Expand Down
11 changes: 3 additions & 8 deletions ...ols.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,16 +178,11 @@ private CompositeNode delegate() {
* @return the string
*/
private String toString(final EObject eObject) {
StringBuilder result = new StringBuilder(eObject.getClass().getName());
result.append('@');
result.append(Integer.toHexString(hashCode()));

String result = String.format("%s@%s", eObject.getClass().getName(), Integer.toHexString(hashCode())); //$NON-NLS-1$
if (eObject.eIsProxy() && eObject instanceof InternalEObject internal) {
result.append(" (eProxyURI: "); //$NON-NLS-1$
result.append(internal.eProxyURI());
result.append(')');
result += " (eProxyURI: " + internal.eProxyURI() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
return result.toString();
return result;
}

@Override
Expand Down
14 changes: 3 additions & 11 deletions ...avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/AbstractRecursiveScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,20 +229,12 @@ public String getId() {
@SuppressWarnings("nls")
@Override
public String toString() {
final StringBuilder result = new StringBuilder(getClass().getName());
result.append('@');
result.append(Integer.toHexString(hashCode()));

result.append(" (id: ");
result.append(getId());
result.append(')');

String result = String.format("%s@%s (id: %s)", getClass().getName(), Integer.toHexString(hashCode()), getId());
final IScope outerScope = getParent();
if (outerScope != IScope.NULLSCOPE) {
result.append("\n >> ");
result.append(outerScope.toString().replaceAll("\\\n", "\n "));
result += "\n >> " + outerScope.toString().replaceAll("\\\n", "\n ");
}
return result.toString();
return result;
}

}
21 changes: 3 additions & 18 deletions com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/ContainerBasedScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,26 +135,11 @@ protected Iterable<IEObjectDescription> getAllLocalElements() {
@SuppressWarnings("nls")
@Override
public String toString() {
final StringBuilder result = new StringBuilder(getClass().getName());
result.append('@');
result.append(Integer.toHexString(hashCode()));

result.append(" (id: ");
result.append(getId());

result.append(", query: ");
result.append(criteria);

result.append(", container: ");
result.append(container);

result.append(')');

String result = String.format("%s@%s (id: %s, query: %s, container: %s)", getClass().getName(), Integer.toHexString(hashCode()), getId(), criteria, container);
final IScope parent = getParent();
if (parent != IScope.NULLSCOPE) {
result.append("\n >> ");
result.append(parent.toString().replaceAll("\\\n", "\n "));
result += "\n >> " + parent.toString().replaceAll("\\\n", "\n ");
}
return result.toString();
return result;
}
}
21 changes: 4 additions & 17 deletions com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/DelegatingScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,26 +267,13 @@ protected Iterable<IEObjectDescription> getLocalElementsByName(final QualifiedNa
@SuppressWarnings("nls")
@Override
public String toString() {
final StringBuilder result = new StringBuilder(getClass().getName());
result.append('@');
result.append(Integer.toHexString(hashCode()));

result.append(" (id: ");
result.append(getId());

final Iterable<IScope> delegateScopes = getDelegates();
if (delegateScopes != null && !Iterables.isEmpty(delegateScopes)) {
result.append(", delegates: ");
result.append(Iterables.toString(delegateScopes));
}
result.append(')');

String delegatesSuffix = delegateScopes != null && !Iterables.isEmpty(delegateScopes) ? ", delegates: " + Iterables.toString(delegateScopes) : "";
String result = String.format("%s@%s (id: %s%s)", getClass().getName(), Integer.toHexString(hashCode()), getId(), delegatesSuffix);
final IScope outerScope = getParent();
if (outerScope != IScope.NULLSCOPE) {
result.append("\n >> ");
result.append(outerScope.toString().replaceAll("\\\n", "\n "));
result += "\n >> " + outerScope.toString().replaceAll("\\\n", "\n ");
}

return result.toString();
return result;
}
}
24 changes: 3 additions & 21 deletions ...q.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/PrefixedContainerBasedScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,29 +134,11 @@ public IEObjectDescription apply(final IEObjectDescription input) {
@SuppressWarnings("nls")
@Override
public String toString() {
final StringBuilder result = new StringBuilder(getClass().getName());
result.append('@');
result.append(Integer.toHexString(hashCode()));

result.append(" (id: ");
result.append(getId());

result.append(", prefix: ");
result.append(prefix);

result.append(", query: ");
result.append(criteria);

result.append(", container: ");
result.append(container);

result.append(')');

String result = String.format("%s@%s (id: %s, prefix: %s, query: %s, container: %s)", getClass().getName(), Integer.toHexString(hashCode()), getId(), prefix, criteria, container);
final IScope parent = getParent();
if (parent != IScope.NULLSCOPE) {
result.append("\n >> ");
result.append(parent.toString().replaceAll("\\\n", "\n "));
result += "\n >> " + parent.toString().replaceAll("\\\n", "\n ");
}
return result.toString();
return result;
}
}
16 changes: 1 addition & 15 deletions com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/ScopeTrace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*******************************************************************************/
package com.avaloq.tools.ddk.xtext.scoping;

import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
Expand Down Expand Up @@ -47,20 +46,7 @@ public List<String> getFullTrace() {
@SuppressWarnings("nls")
@Override
public String toString() {
final StringBuilder builder = new StringBuilder(getClass().getName());
builder.append('@');
builder.append(Integer.toHexString(hashCode()));
builder.append(" [");

for (final Iterator<String> i = elements.iterator(); i.hasNext();) {
builder.append(i.next());
if (i.hasNext()) {
builder.append(" >> ");
}
}

builder.append(']');
return builder.toString();
return String.format("%s@%s [%s]", getClass().getName(), Integer.toHexString(hashCode()), String.join(" >> ", elements));
}

/**
Expand Down
7 changes: 1 addition & 6 deletions com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/EObjectUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,8 @@ public static String getFileLocation(final EObject object) {
// CHECKSTYLE:CHECK-OFF MagicNumber
String path = uri.isPlatform() ? '/' + String.join("/", uri.segmentsList().subList(3, uri.segmentCount())) : uri.path(); //$NON-NLS-1$
// CHECKSTYLE:CHECK-ON MagicNumber
StringBuilder result = new StringBuilder(path);
final ICompositeNode node = NodeModelUtils.getNode(object);
if (node != null) {
result.append(':').append(node.getStartLine());
}

return result.toString();
return node != null ? path + ":" + node.getStartLine() : path; //$NON-NLS-1$
}

}