diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/ClasspathBasedChecks.java b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/ClasspathBasedChecks.java index 5292f0608..58d0e561b 100644 --- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/ClasspathBasedChecks.java +++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/ClasspathBasedChecks.java @@ -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); diff --git a/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/CustomClassAwareEcoreGenerator.java b/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/CustomClassAwareEcoreGenerator.java index b07f7664b..f2ce43079 100644 --- a/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/CustomClassAwareEcoreGenerator.java +++ b/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/CustomClassAwareEcoreGenerator.java @@ -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; diff --git a/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/StandaloneSetup.java b/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/StandaloneSetup.java index dd4a11e1d..a18f5b344 100644 --- a/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/StandaloneSetup.java +++ b/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/StandaloneSetup.java @@ -50,7 +50,7 @@ private List splitCommaSeparatedString(final String input) { return Collections. emptyList(); } String trimmed = input.trim(); - if (trimmed.length() == 0) { + if (trimmed.isEmpty()) { return Collections. emptyList(); } List result = Lists.newArrayList(); diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/labeling/AbstractLabelProvider.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/labeling/AbstractLabelProvider.java index d7d31dde1..0dda5051a 100644 --- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/labeling/AbstractLabelProvider.java +++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/labeling/AbstractLabelProvider.java @@ -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); diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/AbstractValidElementBase.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/AbstractValidElementBase.java index 3d596c724..12414d927 100644 --- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/AbstractValidElementBase.java +++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/AbstractValidElementBase.java @@ -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$ } /** diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/FixedCopiedResourceDescription.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/FixedCopiedResourceDescription.java index 8da46eadd..ff43fbef6 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/FixedCopiedResourceDescription.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/FixedCopiedResourceDescription.java @@ -105,15 +105,7 @@ public Iterable 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 diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java index f7ea6075a..bd6ea489a 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java @@ -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; } diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java index 46eeed91a..d4ff158c8 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java @@ -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 diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/AbstractRecursiveScope.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/AbstractRecursiveScope.java index 8dd4e4bc1..acfe91621 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/AbstractRecursiveScope.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/AbstractRecursiveScope.java @@ -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; } } diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/ContainerBasedScope.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/ContainerBasedScope.java index 1a61fae64..b081ba63c 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/ContainerBasedScope.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/ContainerBasedScope.java @@ -135,26 +135,11 @@ protected Iterable 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; } } diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/DelegatingScope.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/DelegatingScope.java index c874f1f36..e0713ee95 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/DelegatingScope.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/DelegatingScope.java @@ -267,26 +267,13 @@ protected Iterable 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 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; } } diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/PrefixedContainerBasedScope.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/PrefixedContainerBasedScope.java index 4f75bde19..a79266c6f 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/PrefixedContainerBasedScope.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/PrefixedContainerBasedScope.java @@ -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; } } diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/ScopeTrace.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/ScopeTrace.java index ffaac779b..f738674b3 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/ScopeTrace.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/ScopeTrace.java @@ -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; @@ -47,20 +46,7 @@ public List 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 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)); } /** diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/EObjectUtil.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/EObjectUtil.java index 0046140d8..43af6b249 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/EObjectUtil.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/EObjectUtil.java @@ -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$ } }