From 5cf2b083c00c9502d1907d7c52e19dd788f4ba8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Porras=20Campo?= <pcr@avaloq.com>
Date: Fri, 22 May 2026 12:16:39 +0200
Subject: [PATCH 1/2] build: prevent unused imports

---
 .../com/avaloq/tools/ddk/check/lib/IResourceCache.java    | 8 ++++----
 .../check/runtime/core/validation/CheckValidatorTest.java | 2 +-
 .../tools/ddk/check/runtime/issue/ICheckCatalogImpl.java  | 2 +-
 .../ui/editor/PlatformPluginAwareEditorOpener.java        | 2 +-
 .../tools/ddk/test/core/jupiter/BugTestAwareRule.java     | 2 +-
 .../tools/ddk/test/core/jupiter/IssueAwareRule.java       | 2 +-
 .../tools/ddk/test/core/mock/ExtensionRegistryMock.java   | 2 +-
 .../tools/ddk/test/ui/swtbot/FixedDefaultWorkbench.java   | 3 ++-
 .../ddk/xtext/expression/generator/GenModelUtil2.java     | 2 +-
 .../tools/ddk/xtext/test/IllegalJUnitAnnotation.java      | 2 +-
 .../tools/ddk/xtext/test/jupiter/AbstractScopingTest.java | 4 ++--
 .../xtext/test/jupiter/AbstractXtextMarkerBasedTest.java  | 2 +-
 .../ui/quickfix/WorkbenchMarkerResolutionGenerator.java   | 4 ++--
 .../ddk/xtext/formatting/locators/IExtendedLocator.java   | 3 ++-
 .../xtext/formatting/locators/RightPaddingLocator.java    | 2 +-
 .../tools/ddk/xtext/linking/ILazyLinkingResource2.java    | 2 +-
 ddk-configuration/checkstyle/avaloq.xml                   | 1 +
 17 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.lib/src/com/avaloq/tools/ddk/check/lib/IResourceCache.java b/com.avaloq.tools.ddk.check.lib/src/com/avaloq/tools/ddk/check/lib/IResourceCache.java
index 9119a2330c..dbdba2ae6f 100644
--- a/com.avaloq.tools.ddk.check.lib/src/com/avaloq/tools/ddk/check/lib/IResourceCache.java
+++ b/com.avaloq.tools.ddk.check.lib/src/com/avaloq/tools/ddk/check/lib/IResourceCache.java
@@ -35,7 +35,7 @@ public interface IResourceCache {
    * <em>Note:</em> throws
    * </p>
    * <ul>
-   * <li>{@link IllegalArgumentException} if {@code context} or {@code key} are {@©ode null}.</li>
+   * <li>{@link IllegalArgumentException} if {@code context} or {@code key} are {@code null}.</li>
    * <li>{@link IllegalStateException} if the resource of {@code context} is not an Xtext resource.</li>
    * </ul>
    *
@@ -57,7 +57,7 @@ public interface IResourceCache {
    * <em>Note:</em> throws
    * </p>
    * <ul>
-   * <li>{@link IllegalArgumentException} if {@code context} or {@code key} are {@©ode null}.</li>
+   * <li>{@link IllegalArgumentException} if {@code context} or {@code key} are {@code null}.</li>
    * <li>{@link IllegalStateException} if the resource of {@code context} is not an Xtext resource.</li>
    * <li>{@link ClassCastException} if the value cannot be converted to type T.</li>
    * </ul>
@@ -78,7 +78,7 @@ public interface IResourceCache {
    * <em>Note:</em> throws
    * </p>
    * <ul>
-   * <li>{@link IllegalArgumentException} if {@code context} or {@code key} are {@©ode null}.</li>
+   * <li>{@link IllegalArgumentException} if {@code context} or {@code key} are {@code null}.</li>
    * <li>{@link IllegalStateException} if the resource of {@code context} is not an Xtext resource.</li>
    * </ul>
    *
@@ -96,7 +96,7 @@ public interface IResourceCache {
    * <em>Note:</em> throws
    * </p>
    * <ul>
-   * <li>{@link IllegalArgumentException} if {@code context} is {@©ode null}.</li>
+   * <li>{@link IllegalArgumentException} if {@code context} is {@code null}.</li>
    * <li>{@link IllegalStateException} if the resource of {@code context} is not an Xtext resource.</li>
    * </ul>
    *
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/src/com/avaloq/tools/ddk/check/runtime/core/validation/CheckValidatorTest.java b/com.avaloq.tools.ddk.check.runtime.core.test/src/com/avaloq/tools/ddk/check/runtime/core/validation/CheckValidatorTest.java
index 2d4ab13ec5..eb1dcb342e 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/src/com/avaloq/tools/ddk/check/runtime/core/validation/CheckValidatorTest.java
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/src/com/avaloq/tools/ddk/check/runtime/core/validation/CheckValidatorTest.java
@@ -43,7 +43,7 @@ protected String getHostLanguage() {
   /**
    * Tests that the dummy validator is found via the check validator extension point.
    *
-   * @see {@link com.avaloq.tools.ddk.check.extensionpoint.test.validation.DummyValidator}
+   * @see com.avaloq.tools.ddk.check.extensionpoint.test.validation.DummyValidator
    */
   @Test
   void testAtLeastOneValidatorFound() {
diff --git a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/ICheckCatalogImpl.java b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/ICheckCatalogImpl.java
index 1b454a0c44..b1a943977d 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/ICheckCatalogImpl.java
+++ b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/ICheckCatalogImpl.java
@@ -18,7 +18,7 @@
  * Resources containing check catalogs are identified by the optional {@code catalog} extension attribute.
  * Descriptors of this kind are created for check validator extensions.
  * 
- * @see {@link com.avaloq.tools.ddk.check.runtime.internal.CheckCatalogDescriptor}
+ * @see com.avaloq.tools.ddk.check.runtime.internal.CheckCatalogDescriptor
  */
 public interface ICheckCatalogImpl extends Resource {
 
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/src/com/avaloq/tools/ddk/check/runtime/ui/editor/PlatformPluginAwareEditorOpener.java b/com.avaloq.tools.ddk.check.runtime.ui/src/com/avaloq/tools/ddk/check/runtime/ui/editor/PlatformPluginAwareEditorOpener.java
index 4095e99469..8c694a8f2d 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/src/com/avaloq/tools/ddk/check/runtime/ui/editor/PlatformPluginAwareEditorOpener.java
+++ b/com.avaloq.tools.ddk.check.runtime.ui/src/com/avaloq/tools/ddk/check/runtime/ui/editor/PlatformPluginAwareEditorOpener.java
@@ -68,7 +68,7 @@ public class PlatformPluginAwareEditorOpener extends LanguageSpecificURIEditorOp
   /**
    * If a platform plugin URI is given, a read-only Xtext editor is opened and returned. {@inheritDoc}
    *
-   * @see {@link org.eclipse.emf.common.util.URI#isPlatformPlugin()}
+   * @see org.eclipse.emf.common.util.URI#isPlatformPlugin()
    */
   @Override
   public IEditorPart open(final URI uri, final EReference crossReference, final int indexInList, final boolean select) {
diff --git a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/jupiter/BugTestAwareRule.java b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/jupiter/BugTestAwareRule.java
index 7b085015c6..c149d838bb 100644
--- a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/jupiter/BugTestAwareRule.java
+++ b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/jupiter/BugTestAwareRule.java
@@ -21,7 +21,7 @@
 /**
  * This {@link InvocationInterceptor} implementation changes the behavior for unresolved bug tests.
  * <p>
- * The behavior for at test that is annotated with {@link BugTest(unresolved=true)} is the following:
+ * The behavior for at test that is annotated with {@link BugTest} (with {@code unresolved=true}) is the following:
  * <ul>
  * <li>Test evaluation <code>OK</code> results in <code>FAIL</code> ({@link AssertionError})</li>
  * <li>Test evaluation <code>FAIL</code> results in <code>OK</code></li>
diff --git a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/jupiter/IssueAwareRule.java b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/jupiter/IssueAwareRule.java
index 2dfe5c3155..9095509551 100644
--- a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/jupiter/IssueAwareRule.java
+++ b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/jupiter/IssueAwareRule.java
@@ -22,7 +22,7 @@
 /**
  * This {@link InvocationInterceptor} implementation changes the behavior for not fixed issues.
  * <p>
- * The behavior for at test that is annotated with {@link Issue(fixed = false)} is the following:
+ * The behavior for at test that is annotated with {@link Issue} (with {@code fixed = false}) is the following:
  * <ul>
  * <li>Test evaluation <code>OK</code> results in <code>FAIL</code> ({@link AssertionError})</li>
  * <li>Test evaluation <code>FAIL</code> results in <code>OK</code></li>
diff --git a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/mock/ExtensionRegistryMock.java b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/mock/ExtensionRegistryMock.java
index b6da91dc6c..e52df21034 100644
--- a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/mock/ExtensionRegistryMock.java
+++ b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/mock/ExtensionRegistryMock.java
@@ -94,7 +94,7 @@ public static void mockExecutableExtension(final IConfigurationElement mockedEle
 
   /**
    * Mocks an {@link IConfigurationElement} for an extension point with the given id. The extension point is only mocked via
-   * {@link IExtensionRegistry#getConfigurationElementsFor(String) and will not be visible otherwise.
+   * {@link IExtensionRegistry#getConfigurationElementsFor(String)} and will not be visible otherwise.
    *
    * @param extensionPointId
    *          the fully-qualified id for the extension point, must not be {@code null}
diff --git a/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/FixedDefaultWorkbench.java b/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/FixedDefaultWorkbench.java
index f8743ff689..3a87737867 100644
--- a/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/FixedDefaultWorkbench.java
+++ b/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/FixedDefaultWorkbench.java
@@ -31,7 +31,8 @@
  */
 class FixedDefaultWorkbench {
 
-  /** @see org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.getLimboShell() */
+  /** @see org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine#getLimboShell() */
+  @SuppressWarnings("restriction")
   private static final String LIMBO_SHELL = "PartRenderingEngine's limbo"; //$NON-NLS-1$
   private static final String QUIK_ACCESS_SHELL = "Quick Access"; //$NON-NLS-1$
 
diff --git a/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/GenModelUtil2.java b/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/GenModelUtil2.java
index 8704396fee..58b44c9d15 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/GenModelUtil2.java
+++ b/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/GenModelUtil2.java
@@ -64,7 +64,7 @@ public static String qualifiedPackageInterfaceName(final EPackage ePackage) {
   /**
    * Formats a name by parsing it into words separated by underscores and/or mixed-casing and then
    * recombining them using the specified separator.
-   * {@see CodeGenUtil#format(String, char, String, boolean, boolean)
+   * {@link CodeGenUtil#format(String, char, String, boolean, boolean)}
    *
    * @param name
    *          the name to format
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/IllegalJUnitAnnotation.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/IllegalJUnitAnnotation.java
index 79690e68cd..cc853ce5c8 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/IllegalJUnitAnnotation.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/IllegalJUnitAnnotation.java
@@ -11,7 +11,7 @@
 package com.avaloq.tools.ddk.xtext.test;
 
 /**
- * Raised when a test wants to annotate a method with either a {@link @BeforeClass} or a {@link @AfterClass} annotation.
+ * Raised when a test wants to annotate a method with either a {@code @BeforeClass} or a {@code @AfterClass} annotation.
  */
 public class IllegalJUnitAnnotation extends RuntimeException {
   private static final long serialVersionUID = 1L;
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jupiter/AbstractScopingTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jupiter/AbstractScopingTest.java
index c6b2ee29fd..2f4d9e3d44 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jupiter/AbstractScopingTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jupiter/AbstractScopingTest.java
@@ -682,7 +682,7 @@ protected String link(final Supplier<EObject> getTargetObject) {
   }
 
   /**
-   * Performs linking test. Checks expectations which were set in a source using {@link #link(int)} or {@link #link(Function, int).
+   * Performs linking test. Checks expectations which were set in a source using {@link #link(int)} or {@link #link(Function, int)}.
    *
    * @see #link(int)
    * @see #link(Supplier)
@@ -695,7 +695,7 @@ protected void testLinking(final Pair<String, String> sourceFileNameAndContent)
   }
 
   /**
-   * Performs linking test. Checks expectations which were set in a source using {@link #link(int)} or {@link #link(Function, int).
+   * Performs linking test. Checks expectations which were set in a source using {@link #link(int)} or {@link #link(Function, int)}.
    *
    * @see #link(int)
    * @see #link(Supplier)
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jupiter/AbstractXtextMarkerBasedTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jupiter/AbstractXtextMarkerBasedTest.java
index 6a1a0bad00..4731ae9273 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jupiter/AbstractXtextMarkerBasedTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jupiter/AbstractXtextMarkerBasedTest.java
@@ -642,7 +642,7 @@ protected String getAdditionalErrorMessageInformation() {
   }
 
   /**
-   * Returns an unmodifiable view of the tags generated by {@link getTag()}.
+   * Returns an unmodifiable view of the tags generated by {@link #getTag()}.
    *
    * @return the unmodifiable view of the {@link #usedTags} set
    */
diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchMarkerResolutionGenerator.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchMarkerResolutionGenerator.java
index 72c5fc2f21..cd1844bb53 100644
--- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchMarkerResolutionGenerator.java
+++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchMarkerResolutionGenerator.java
@@ -116,8 +116,8 @@ public XtextEditor getEditor(final IResource resource) {
    * This method may not be called in this implementation.
    * Use getAdaptedResolutions(final List<IssueResolution> resolutions, final IMarker marker).
    *
-   * @throws {@code
-   *           NotImplementedException} if called
+   * @throws NotImplementedException
+   *           if called
    */
   @Override
   protected IMarkerResolution[] getAdaptedResolutions(final List<IssueResolution> resolutions) {
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/locators/IExtendedLocator.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/locators/IExtendedLocator.java
index e5a61999af..979d5a4b29 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/locators/IExtendedLocator.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/locators/IExtendedLocator.java
@@ -28,7 +28,8 @@ enum AggregationPolicy {
    * Get the locator's aggregation policy. OVERRIDE locators (e.g. NoLinewrapLocatorFacade)
    * are not combined, whereas COMBINED_MAXIMUM locators are combined/aggregated, and ADDITIVE locators are added to previous locators.
    *
-   * @see {@link com.avaloq.tools.ddk.xtext.formatting.SpaceEntry SpaceEntry} and {@link com.avaloq.tools.ddk.xtext.formatting.WrapEntry WrapEntry}
+   * @see com.avaloq.tools.ddk.xtext.formatting.SpaceEntry
+   * @see com.avaloq.tools.ddk.xtext.formatting.WrapEntry
    * @return policy of locator
    */
   AggregationPolicy getPolicy();
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/locators/RightPaddingLocator.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/locators/RightPaddingLocator.java
index 9bf5f65b29..dd09662c5a 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/locators/RightPaddingLocator.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/locators/RightPaddingLocator.java
@@ -34,7 +34,7 @@ public class RightPaddingLocator extends ElementLocator implements ISpaceLocator
    *          the formatting configuration
    * @param length
    *          the minimum amount of space allocated for an entry
-   * @see {@link #getPadding(ExtendedLineEntry)}
+   * @see #getPadding(ExtendedLineEntry)
    */
   public RightPaddingLocator(final FormattingConfig formattingConfig, final int length) { // NOPMD CallSuperInConstructor - false positive by PMD
     formattingConfig.super();
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/ILazyLinkingResource2.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/ILazyLinkingResource2.java
index 084e6e3058..2d28547b42 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/ILazyLinkingResource2.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/ILazyLinkingResource2.java
@@ -39,7 +39,7 @@ public interface ILazyLinkingResource2 extends Resource.Internal {
    * Creates diagnostics for given triple.
    *
    * @param triple
-   *          triple <EObject, EReference, INode>, must not be {@code null}
+   *          triple {@code <EObject, EReference, INode>}, must not be {@code null}
    */
   void createAndAddDiagnostic(Triple<EObject, EReference, INode> triple);
 
diff --git a/ddk-configuration/checkstyle/avaloq.xml b/ddk-configuration/checkstyle/avaloq.xml
index 2965fb9430..61a84ad17f 100644
--- a/ddk-configuration/checkstyle/avaloq.xml
+++ b/ddk-configuration/checkstyle/avaloq.xml
@@ -38,6 +38,7 @@
       <property name="allowInSwitchCase" value="true"/>
     </module>
     <module name="AvoidStarImport"/>
+    <module name="UnusedImports"/>
     <module name="BooleanExpressionComplexity"/>
     <module name="CovariantEquals"/>
     <!--module name="ClassFanOutComplexity"/-->

From 97832f4106143a37cc628d70c36d5bfbb3c60e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Dinis=20Ferreira?= <hello@joaof.eu>
Date: Sat, 23 May 2026 15:01:27 +0200
Subject: [PATCH 2/2] fix: clean up three Javadoc parse errors that trip
 UnusedImports

The maven-checkstyle UnusedImports check parses Javadoc to track
{@link} references, so malformed Javadoc tags abort the check. Three
files escaped the broader cleanup in this branch:

  - CheckValidator.java: @see {@link X} -> @see X
  - CheckCfgValidator.java: @see {@link X} -> @see X
  - TemplateVariableResolverTestHelper.java: stray @ in
    {@link TemplateVariableResolver@} typo, plus three
    @throws {@link X}\n   X} multilines normalized to single-line
    @throws X.

Verified locally on macOS: mvn -T 3C clean verify checkstyle:check
pmd:check pmd:cpd-check spotbugs:check -f ddk-parent/pom.xml passes
with 357 tests, 0 checkstyle / PMD / SpotBugs violations.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../tools/ddk/check/validation/CheckValidator.java  |  2 +-
 .../ddk/checkcfg/validation/CheckCfgValidator.java  |  2 +-
 .../TemplateVariableResolverTestHelper.java         | 13 ++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/CheckValidator.java b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/CheckValidator.java
index c49ae410a1..277c57b762 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/CheckValidator.java
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/CheckValidator.java
@@ -379,7 +379,7 @@ public void checkCategoryName(final Category category) {
   /**
    * Checks that given package name is a valid fully qualified name.
    *
-   * @see {@link CheckJavaValidatorUtil#isValidFullyQualifiedName(String)}
+   * @see CheckJavaValidatorUtil#isValidFullyQualifiedName(String)
    * @param catalog
    *          the catalog
    */
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidator.java b/com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidator.java
index b9412ae508..61a1b61f38 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidator.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidator.java
@@ -117,7 +117,7 @@ private boolean isParameterConfigured(final ConfiguredCheck configuredCheck) {
   /**
    * Checks that final catalogs are not configured for severity.
    *
-   * @see {@link com.avaloq.tools.ddk.check.check.CheckCatalog#isFinal()}
+   * @see com.avaloq.tools.ddk.check.check.CheckCatalog#isFinal()
    * @param catalog
    *          the configured catalog
    */
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateVariableResolverTestHelper.java b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateVariableResolverTestHelper.java
index 891e0d87cc..5f238b2897 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateVariableResolverTestHelper.java
+++ b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateVariableResolverTestHelper.java
@@ -35,18 +35,17 @@ public class TemplateVariableResolverTestHelper {
    * Create a {@link TemplateVariable}.
    *
    * @param resolver
-   *          {@link TemplateVariableResolver@} of the type which will resolve the {@link TemplateVariable} created, may not be {@code null}
+   *          {@link TemplateVariableResolver} of the type which will resolve the {@link TemplateVariable} created, may not be {@code null}
    * @param name
    *          the name of the variable, may not be {@code null}
    * @param values
    *          the values available at this variable, non-empty, may not be {@code null}
    * @return a {@link TemplateVariable}
-   * @throws {@link
-   *           NullPointerException} if resolver.getType(), name or values is null
-   * @throws {@link
-   *           IllegalArgumentException} if resolver.getType() or name contains whitespace or values is empty
-   * @throws {@link
-   *           TemplateException}
+   * @throws NullPointerException
+   *           if resolver.getType(), name or values is null
+   * @throws IllegalArgumentException
+   *           if resolver.getType() or name contains whitespace or values is empty
+   * @throws TemplateException
    *           if translation failed
    */
   public TemplateVariable createTemplateVariable(final TemplateVariableResolver resolver, final String name, final Object... values) throws NullPointerException, IllegalArgumentException, TemplateException {