diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/AbstractPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/AbstractPropertyEditor.java
index d8764d6b427..b1858048adf 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/AbstractPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/AbstractPropertyEditor.java
@@ -36,10 +36,12 @@ public abstract class AbstractPropertyEditor extends PropertyEditorSupport imple
     private String format;
 
     @Nullable
+    @Override
     public String getFormat() {
         return format;
     }
 
+    @Override
     public void setFormat(@Nullable String format) {
         this.format = format;
     }
@@ -83,6 +85,7 @@ protected String getAsTextInternal() {
         return super.getAsText();
     }
 
+    @Override
     @SuppressWarnings({"unchecked", "rawtypes"})
     public String getFormattedValue() {
         Object value = getValueInternal();
@@ -93,6 +96,7 @@ public String getFormattedValue() {
         return value != null ? value.toString() : null;
     }
 
+    @Override
     @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
     public void setFormattedValue(String value) {
         Formatter<?> formatter = resolveFormatter();
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/BigDecimalPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/BigDecimalPropertyEditor.java
index 4be99508d03..75ac09ba876 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/BigDecimalPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/BigDecimalPropertyEditor.java
@@ -28,6 +28,7 @@
  * @since 2.0.0
  */
 public class BigDecimalPropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
@@ -58,6 +59,7 @@ protected void handleAsNumber(Number number) {
         }
     }
 
+    @Override
     protected Formatter<BigDecimal> resolveFormatter() {
         return isBlank(getFormat()) ? null : new BigDecimalFormatter(getFormat());
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/BigIntegerPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/BigIntegerPropertyEditor.java
index 923740b1c4e..baec522722f 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/BigIntegerPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/BigIntegerPropertyEditor.java
@@ -28,6 +28,7 @@
  * @since 2.0.0
  */
 public class BigIntegerPropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
@@ -58,6 +59,7 @@ protected void handleAsNumber(Number number) {
         }
     }
 
+    @Override
     protected Formatter<BigInteger> resolveFormatter() {
         return isBlank(getFormat()) ? null : new BigIntegerFormatter(getFormat());
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/BooleanPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/BooleanPropertyEditor.java
index febf0deb68a..cca6957b8aa 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/BooleanPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/BooleanPropertyEditor.java
@@ -25,6 +25,7 @@
  * @since 2.0.0
  */
 public class BooleanPropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
@@ -45,6 +46,7 @@ protected void handleAsBoolean(Boolean bool) {
         super.setValueInternal(bool);
     }
 
+    @Override
     protected Formatter<Boolean> resolveFormatter() {
         return isBlank(getFormat()) ? null : BooleanFormatter.getInstance(getFormat());
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/BytePropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/BytePropertyEditor.java
index 1f150a443db..05491b38368 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/BytePropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/BytePropertyEditor.java
@@ -25,6 +25,7 @@
  * @since 2.0.0
  */
 public class BytePropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
@@ -49,6 +50,7 @@ protected void handleAsNumber(Number number) {
         super.setValueInternal(number.byteValue());
     }
 
+    @Override
     protected Formatter<Byte> resolveFormatter() {
         return isBlank(getFormat()) ? null : new ByteFormatter(getFormat());
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/CalendarPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/CalendarPropertyEditor.java
index 713758c806c..915541f9951 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/CalendarPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/CalendarPropertyEditor.java
@@ -30,6 +30,7 @@
  * @since 2.0.0
  */
 public class CalendarPropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
@@ -73,6 +74,7 @@ protected void handleAsString(String str) {
         }
     }
 
+    @Override
     protected Formatter<Calendar> resolveFormatter() {
         return isBlank(getFormat()) ? null : new CalendarFormatter(getFormat());
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/DatePropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/DatePropertyEditor.java
index ade6cba04cd..ec862ca634c 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/DatePropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/DatePropertyEditor.java
@@ -30,6 +30,7 @@
  * @since 2.0.0
  */
 public class DatePropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
@@ -66,6 +67,7 @@ protected void handleAsString(String str) {
         }
     }
 
+    @Override
     protected Formatter<Date> resolveFormatter() {
         return isBlank(getFormat()) ? null : new DateFormatter(getFormat());
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/DoublePropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/DoublePropertyEditor.java
index 488ff687f61..28bbbae5a42 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/DoublePropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/DoublePropertyEditor.java
@@ -25,6 +25,7 @@
  * @since 2.0.0
  */
 public class DoublePropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
@@ -49,6 +50,7 @@ protected void handleAsNumber(Number number) {
         super.setValueInternal(number.doubleValue());
     }
 
+    @Override
     protected Formatter<Double> resolveFormatter() {
         return isBlank(getFormat()) ? null : new DoubleFormatter(getFormat());
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/EnumPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/EnumPropertyEditor.java
index 00321b8948e..a9b716324aa 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/EnumPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/EnumPropertyEditor.java
@@ -33,6 +33,7 @@ public void setEnumType(Class<? extends Enum> enumType) {
         this.enumType = enumType;
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/FilePropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/FilePropertyEditor.java
index 29b3b177b7a..3b4c9d30823 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/FilePropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/FilePropertyEditor.java
@@ -24,6 +24,7 @@
  * @since 2.0.0
  */
 public class FilePropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/FloatPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/FloatPropertyEditor.java
index 25477e828ce..3745e0b99fd 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/FloatPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/FloatPropertyEditor.java
@@ -25,6 +25,7 @@
  * @since 2.0.0
  */
 public class FloatPropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
@@ -49,6 +50,7 @@ protected void handleAsNumber(Number number) {
         super.setValueInternal(number.floatValue());
     }
 
+    @Override
     protected Formatter<Float> resolveFormatter() {
         return isBlank(getFormat()) ? null : new FloatFormatter(getFormat());
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/IntegerPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/IntegerPropertyEditor.java
index c650f108c38..66d12249113 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/IntegerPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/IntegerPropertyEditor.java
@@ -25,6 +25,7 @@
  * @since 2.0.0
  */
 public class IntegerPropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
@@ -49,6 +50,7 @@ protected void handleAsNumber(Number number) {
         super.setValueInternal(number.intValue());
     }
 
+    @Override
     protected Formatter<Integer> resolveFormatter() {
         return isBlank(getFormat()) ? null : new IntegerFormatter(getFormat());
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/LocalePropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/LocalePropertyEditor.java
index 6a28cde260a..5b0f7803a71 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/LocalePropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/LocalePropertyEditor.java
@@ -25,6 +25,7 @@
  * @since 2.0.0
  */
 public class LocalePropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
@@ -37,6 +38,7 @@ protected void setValueInternal(Object value) {
         }
     }
 
+    @Override
     protected Formatter<Locale> resolveFormatter() {
         return new LocaleFormatter();
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/LongPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/LongPropertyEditor.java
index 36f07a7d590..1b767ec2706 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/LongPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/LongPropertyEditor.java
@@ -25,6 +25,7 @@
  * @since 2.0.0
  */
 public class LongPropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
@@ -49,6 +50,7 @@ protected void handleAsNumber(Number number) {
         super.setValueInternal(number.longValue());
     }
 
+    @Override
     protected Formatter<Long> resolveFormatter() {
         return isBlank(getFormat()) ? null : new LongFormatter(getFormat());
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/PropertyEditorChain.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/PropertyEditorChain.java
index 879d42ae0d9..514aa7359a8 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/PropertyEditorChain.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/PropertyEditorChain.java
@@ -58,11 +58,13 @@ public PropertyEditorChain(@Nonnull Class<?> targetClass, @Nonnull Class<? exten
         }
     }
 
+    @Override
     @Nullable
     public String getFormat() {
         return format;
     }
 
+    @Override
     public void setFormat(@Nullable String format) {
         this.format = format;
     }
@@ -127,6 +129,7 @@ public void setValue(Object value) {
         }
     }
 
+    @Override
     @SuppressWarnings({"unchecked", "rawtypes"})
     public String getFormattedValue() {
         initPropertyEditors();
@@ -149,6 +152,7 @@ public String getFormattedValue() {
         throw illegalValue(value, targetClass);
     }
 
+    @Override
     @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
     public void setFormattedValue(String value) {
         initPropertyEditors();
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/ShortPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/ShortPropertyEditor.java
index d13ef94e5ce..ef1bd7a95bb 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/ShortPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/ShortPropertyEditor.java
@@ -25,6 +25,7 @@
  * @since 2.0.0
  */
 public class ShortPropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
@@ -49,6 +50,7 @@ protected void handleAsNumber(Number number) {
         super.setValueInternal(number.shortValue());
     }
 
+    @Override
     protected Formatter<Short> resolveFormatter() {
         return isBlank(getFormat()) ? null : new ShortFormatter(getFormat());
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/StringPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/StringPropertyEditor.java
index 24967c0980d..5d0cbedb101 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/StringPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/StringPropertyEditor.java
@@ -20,6 +20,7 @@
  * @since 2.0.0
  */
 public class StringPropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/URIPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/URIPropertyEditor.java
index 454face640a..757adb83458 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/URIPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/URIPropertyEditor.java
@@ -26,6 +26,7 @@
  * @since 2.0.0
  */
 public class URIPropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/URLPropertyEditor.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/URLPropertyEditor.java
index 3ea638e308d..fb0594c262d 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/URLPropertyEditor.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/URLPropertyEditor.java
@@ -26,6 +26,7 @@
  * @since 2.0.0
  */
 public class URLPropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/editors/ValueConversionException.java b/subprojects/griffon-core/src/main/java/griffon/core/editors/ValueConversionException.java
index 9797aebe3c4..dd8a7433f10 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/editors/ValueConversionException.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/editors/ValueConversionException.java
@@ -15,6 +15,9 @@
  */
 package griffon.core.editors;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author Andres Almiray
  * @since 2.0.0
@@ -22,7 +25,7 @@
 public class ValueConversionException extends IllegalArgumentException {
     private static final long serialVersionUID = 6344566641106178891L;
 
-    private Object value;
+    private final Object value;
     private Class<?> type;
 
     public ValueConversionException(Object value) {
@@ -44,10 +47,12 @@ public ValueConversionException(Object value, Exception cause) {
         this.value = value;
     }
 
+    @Nonnull
     public Object getValue() {
         return value;
     }
 
+    @Nullable
     public Class<?> getType() {
         return type;
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/formatters/BigDecimalFormatter.java b/subprojects/griffon-core/src/main/java/griffon/core/formatters/BigDecimalFormatter.java
index e4070ddf1be..f947aa85bb3 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/formatters/BigDecimalFormatter.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/formatters/BigDecimalFormatter.java
@@ -51,6 +51,7 @@ public BigDecimalFormatter(@Nullable String pattern) {
     }
 
     @Nullable
+    @Override
     public String format(@Nullable BigDecimal number) {
         return number == null ? null : numberFormat.format(number);
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/formatters/BigIntegerFormatter.java b/subprojects/griffon-core/src/main/java/griffon/core/formatters/BigIntegerFormatter.java
index caff1b7b24c..d7301a15fe1 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/formatters/BigIntegerFormatter.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/formatters/BigIntegerFormatter.java
@@ -52,6 +52,7 @@ public BigIntegerFormatter(@Nullable String pattern) {
     }
 
     @Nullable
+    @Override
     public String format(@Nullable BigInteger number) {
         return number == null ? null : numberFormat.format(number);
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/formatters/BooleanFormatter.java b/subprojects/griffon-core/src/main/java/griffon/core/formatters/BooleanFormatter.java
index 5f3df8fe3bd..c3ee5e8eaa7 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/formatters/BooleanFormatter.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/formatters/BooleanFormatter.java
@@ -104,7 +104,7 @@ public Boolean parse(@Nullable String str) throws ParseException {
         return isBlank(str) ? null : delegate.parse(str);
     }
 
-    private static interface BooleanFormatterDelegate {
+    private interface BooleanFormatterDelegate {
         @Nonnull
         String getPattern();
 
@@ -125,17 +125,20 @@ private AbstractBooleanFormatterDelegate(String pattern, String[] tokens) {
         }
 
         @Nonnull
+        @Override
         public String getPattern() {
             return pattern;
         }
 
         @Nonnull
+        @Override
         public String format(@Nonnull Boolean bool) {
             requireNonNull(bool, "Can't format given Boolean because it's null");
             return bool ? tokens[1] : tokens[0];
         }
 
         @Nonnull
+        @Override
         public Boolean parse(@Nonnull String str) throws ParseException {
             if (tokens[0].equalsIgnoreCase(str)) {
                 return Boolean.FALSE;
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/formatters/ByteFormatter.java b/subprojects/griffon-core/src/main/java/griffon/core/formatters/ByteFormatter.java
index d7863107cc4..9ca426f2588 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/formatters/ByteFormatter.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/formatters/ByteFormatter.java
@@ -49,6 +49,7 @@ public ByteFormatter(@Nullable String pattern) {
     }
 
     @Nullable
+    @Override
     public String format(@Nullable Byte number) {
         return number == null ? null : numberFormat.format(number);
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/formatters/CalendarFormatter.java b/subprojects/griffon-core/src/main/java/griffon/core/formatters/CalendarFormatter.java
index 3875f1716a0..88dc20bf0a9 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/formatters/CalendarFormatter.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/formatters/CalendarFormatter.java
@@ -47,6 +47,7 @@ public String getPattern() {
     }
 
     @Nullable
+    @Override
     public String format(@Nullable Calendar date) {
         return date == null ? null : dateFormat.format(date.getTime());
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/formatters/DateFormatter.java b/subprojects/griffon-core/src/main/java/griffon/core/formatters/DateFormatter.java
index 3ab3746a809..d096354f364 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/formatters/DateFormatter.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/formatters/DateFormatter.java
@@ -47,6 +47,7 @@ public String getPattern() {
     }
 
     @Nullable
+    @Override
     public String format(@Nullable Date date) {
         return date == null ? null : dateFormat.format(date);
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/formatters/DoubleFormatter.java b/subprojects/griffon-core/src/main/java/griffon/core/formatters/DoubleFormatter.java
index bdac53f3b81..7b4e5257b23 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/formatters/DoubleFormatter.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/formatters/DoubleFormatter.java
@@ -48,6 +48,7 @@ public DoubleFormatter(@Nullable String pattern) {
     }
 
     @Nullable
+    @Override
     public String format(@Nullable Double number) {
         return number == null ? null : numberFormat.format(number);
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/formatters/FloatFormatter.java b/subprojects/griffon-core/src/main/java/griffon/core/formatters/FloatFormatter.java
index 18895dbfa52..541ed67cc41 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/formatters/FloatFormatter.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/formatters/FloatFormatter.java
@@ -48,6 +48,7 @@ public FloatFormatter(@Nullable String pattern) {
     }
 
     @Nullable
+    @Override
     public String format(@Nullable Float number) {
         return number == null ? null : numberFormat.format(number);
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/formatters/IntegerFormatter.java b/subprojects/griffon-core/src/main/java/griffon/core/formatters/IntegerFormatter.java
index d628924f210..3711afebd3a 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/formatters/IntegerFormatter.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/formatters/IntegerFormatter.java
@@ -49,6 +49,7 @@ public IntegerFormatter(@Nullable String pattern) {
     }
 
     @Nullable
+    @Override
     public String format(@Nullable Integer number) {
         return number == null ? null : numberFormat.format(number);
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/formatters/LocaleFormatter.java b/subprojects/griffon-core/src/main/java/griffon/core/formatters/LocaleFormatter.java
index 225bbfc9d4b..43a237f9331 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/formatters/LocaleFormatter.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/formatters/LocaleFormatter.java
@@ -27,6 +27,7 @@
  */
 public class LocaleFormatter extends AbstractFormatter<Locale> {
     @Nullable
+    @Override
     public String format(@Nullable Locale locale) {
         if (locale == null) return null;
         StringBuilder b = new StringBuilder();
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/formatters/LongFormatter.java b/subprojects/griffon-core/src/main/java/griffon/core/formatters/LongFormatter.java
index 4af2924ff2f..31a0e5543bd 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/formatters/LongFormatter.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/formatters/LongFormatter.java
@@ -49,6 +49,7 @@ public LongFormatter(@Nullable String pattern) {
     }
 
     @Nullable
+    @Override
     public String format(@Nullable Long number) {
         return number == null ? null : numberFormat.format(number);
     }
diff --git a/subprojects/griffon-core/src/main/java/griffon/core/formatters/ShortFormatter.java b/subprojects/griffon-core/src/main/java/griffon/core/formatters/ShortFormatter.java
index ea85f971659..9568f9fe0ca 100644
--- a/subprojects/griffon-core/src/main/java/griffon/core/formatters/ShortFormatter.java
+++ b/subprojects/griffon-core/src/main/java/griffon/core/formatters/ShortFormatter.java
@@ -49,6 +49,7 @@ public ShortFormatter(@Nullable String pattern) {
     }
 
     @Nullable
+    @Override
     public String format(@Nullable Short number) {
         return number == null ? null : numberFormat.format(number);
     }
diff --git a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/ColorPropertyEditor.java b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/ColorPropertyEditor.java
index 2c71b0091ba..44c4f06106c 100644
--- a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/ColorPropertyEditor.java
+++ b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/ColorPropertyEditor.java
@@ -44,6 +44,7 @@ public String getAsText() {
         return isBlank(getFormat()) ? format((Color) getValueInternal()) : getFormattedValue();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/Dimension2DPropertyEditor.java b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/Dimension2DPropertyEditor.java
index 4e9d1416438..47295bff6b2 100644
--- a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/Dimension2DPropertyEditor.java
+++ b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/Dimension2DPropertyEditor.java
@@ -29,6 +29,7 @@
  */
 @PropertyEditorFor(Dimension2D.class)
 public class Dimension2DPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Dimension2D dimension = (Dimension2D) getValue();
diff --git a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/GraphicPropertyEditor.java b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/GraphicPropertyEditor.java
index 34525d7452a..573358dff4f 100644
--- a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/GraphicPropertyEditor.java
+++ b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/GraphicPropertyEditor.java
@@ -34,6 +34,7 @@
 public class GraphicPropertyEditor extends AbstractPropertyEditor {
     protected final ImagePropertyEditor imagePropertyEditor = new ImagePropertyEditor();
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/ImagePropertyEditor.java b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/ImagePropertyEditor.java
index d8606dd17b0..dd269e0b009 100644
--- a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/ImagePropertyEditor.java
+++ b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/ImagePropertyEditor.java
@@ -35,6 +35,7 @@
  */
 @PropertyEditorFor(Image.class)
 public class ImagePropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/InsetsPropertyEditor.java b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/InsetsPropertyEditor.java
index d0ba7986080..6a225b9141e 100644
--- a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/InsetsPropertyEditor.java
+++ b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/InsetsPropertyEditor.java
@@ -29,12 +29,14 @@
  */
 @PropertyEditorFor(Insets.class)
 public class InsetsPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Insets i = (Insets) getValue();
         return i.getTop() + ", " + i.getRight() + ", " + i.getBottom() + ", " + i.getLeft();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/LinearGradientPropertyEditor.java b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/LinearGradientPropertyEditor.java
index 50888f123a3..04f6b097395 100644
--- a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/LinearGradientPropertyEditor.java
+++ b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/LinearGradientPropertyEditor.java
@@ -40,6 +40,7 @@ public String getAsText() {
         return getValueInternal().toString();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/PaintPropertyEditor.java b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/PaintPropertyEditor.java
index 3c5c34d20ad..8af9bc30732 100644
--- a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/PaintPropertyEditor.java
+++ b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/PaintPropertyEditor.java
@@ -34,13 +34,13 @@
  */
 @PropertyEditorFor(Paint.class)
 public class PaintPropertyEditor extends AbstractPropertyEditor {
-
     @Override
     public String getAsText() {
         if (null == getValue()) return null;
         return getValueInternal().toString();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/Point2DPropertyEditor.java b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/Point2DPropertyEditor.java
index 86f3fb8cac9..b9266772533 100644
--- a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/Point2DPropertyEditor.java
+++ b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/Point2DPropertyEditor.java
@@ -29,12 +29,14 @@
  */
 @PropertyEditorFor(Point2D.class)
 public class Point2DPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Point2D p = (Point2D) getValue();
         return p.getX() + ", " + p.getY();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/RadialGradientPropertyEditor.java b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/RadialGradientPropertyEditor.java
index 3c59704186e..7b29e37a233 100644
--- a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/RadialGradientPropertyEditor.java
+++ b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/RadialGradientPropertyEditor.java
@@ -40,6 +40,7 @@ public String getAsText() {
         return getValueInternal().toString();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/Rectangle2DPropertyEditor.java b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/Rectangle2DPropertyEditor.java
index fc5521300a6..20e3433f7af 100644
--- a/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/Rectangle2DPropertyEditor.java
+++ b/subprojects/griffon-javafx/src/main/java/griffon/javafx/editors/Rectangle2DPropertyEditor.java
@@ -29,12 +29,14 @@
  */
 @PropertyEditorFor(Rectangle2D.class)
 public class Rectangle2DPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Rectangle2D r = (Rectangle2D) getValue();
         return r.getMinX() + ", " + r.getMinY() + ", " + r.getWidth() + ", " + r.getHeight();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-javafx/src/main/java/griffon/javafx/formatters/ColorFormatter.java b/subprojects/griffon-javafx/src/main/java/griffon/javafx/formatters/ColorFormatter.java
index be74c6fac09..372cdff72b6 100644
--- a/subprojects/griffon-javafx/src/main/java/griffon/javafx/formatters/ColorFormatter.java
+++ b/subprojects/griffon-javafx/src/main/java/griffon/javafx/formatters/ColorFormatter.java
@@ -136,11 +136,13 @@ protected ColorFormatter(@Nullable String pattern) {
         }
     }
 
+    @Override
     @Nullable
     public String format(@Nullable Color color) {
         return color == null ? null : delegate.format(color);
     }
 
+    @Override
     @Nullable
     public Color parse(@Nullable String str) throws ParseException {
         return isBlank(str) ? null : delegate.parse(str);
@@ -220,6 +222,7 @@ private AbstractColorFormatterDelegate(@Nonnull String pattern) {
             this.pattern = pattern;
         }
 
+        @Override
         @Nonnull
         public String getPattern() {
             return pattern;
@@ -251,6 +254,7 @@ private ShortColorFormatterDelegate() {
             super(PATTERN_SHORT);
         }
 
+        @Override
         @Nonnull
         public String format(@Nonnull Color color) {
             requireNonNull(color, "Cannot format given Color because it's null");
@@ -262,6 +266,7 @@ public String format(@Nonnull Color color) {
                 .toString();
         }
 
+        @Override
         @Nonnull
         public Color parse(@Nonnull String str) throws ParseException {
             if (!str.startsWith("#") || str.length() != 4) {
@@ -290,6 +295,7 @@ private ShortWithAlphaColorFormatterDelegate() {
             super(PATTERN_SHORT_WITH_ALPHA);
         }
 
+        @Override
         @Nonnull
         public String format(@Nonnull Color color) {
             requireNonNull(color, "Cannot format given Color because it's null");
@@ -302,6 +308,7 @@ public String format(@Nonnull Color color) {
                 .toString();
         }
 
+        @Override
         @Nonnull
         public Color parse(@Nonnull String str) throws ParseException {
             if (!str.startsWith("#") || str.length() != 5) {
@@ -334,6 +341,7 @@ private LongColorFormatterDelegate() {
             super(PATTERN_LONG);
         }
 
+        @Override
         @Nonnull
         public String format(@Nonnull Color color) {
             requireNonNull(color, "Cannot format given Color because it's null");
@@ -345,6 +353,7 @@ public String format(@Nonnull Color color) {
                 .toString();
         }
 
+        @Override
         @Nonnull
         public Color parse(@Nonnull String str) throws ParseException {
             if (!str.startsWith("#") || str.length() != 7) {
@@ -373,6 +382,7 @@ private LongWithAlphaColorFormatterDelegate() {
             super(PATTERN_LONG_WITH_ALPHA);
         }
 
+        @Override
         @Nonnull
         public String format(@Nonnull Color color) {
             requireNonNull(color, "Cannot format given Color because it's null");
@@ -385,6 +395,7 @@ public String format(@Nonnull Color color) {
                 .toString();
         }
 
+        @Override
         @Nonnull
         public Color parse(@Nonnull String str) throws ParseException {
             if (!str.startsWith("#") || str.length() != 9) {
diff --git a/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/BoundsPropertyEditor.java b/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/BoundsPropertyEditor.java
index c73ee57a3b9..5c80f825053 100644
--- a/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/BoundsPropertyEditor.java
+++ b/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/BoundsPropertyEditor.java
@@ -30,12 +30,14 @@
  */
 @PropertyEditorFor(Bounds.class)
 public class BoundsPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Bounds r = (Bounds) getValue();
         return r.x + ", " + r.y + ", " + r.width + ", " + r.height;
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/ColorPropertyEditor.java b/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/ColorPropertyEditor.java
index 0d9d0abf7d4..89e7fe03602 100644
--- a/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/ColorPropertyEditor.java
+++ b/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/ColorPropertyEditor.java
@@ -44,6 +44,7 @@ public String getAsText() {
         return isBlank(getFormat()) ? format((Color) getValueInternal()) : getFormattedValue();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/DimensionsPropertyEditor.java b/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/DimensionsPropertyEditor.java
index 3b4ea7521b8..0da370dfffb 100644
--- a/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/DimensionsPropertyEditor.java
+++ b/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/DimensionsPropertyEditor.java
@@ -30,12 +30,14 @@
  */
 @PropertyEditorFor(Dimensions.class)
 public class DimensionsPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Dimensions dimension = (Dimensions) getValue();
         return dimension.width + ", " + dimension.height;
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/InsetsPropertyEditor.java b/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/InsetsPropertyEditor.java
index b8e48c414fd..2bdfcaf1b3f 100644
--- a/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/InsetsPropertyEditor.java
+++ b/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/InsetsPropertyEditor.java
@@ -30,12 +30,14 @@
  */
 @PropertyEditorFor(Insets.class)
 public class InsetsPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Insets i = (Insets) getValue();
         return i.top + ", " + i.left + ", " + i.bottom + ", " + i.right;
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/PointPropertyEditor.java b/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/PointPropertyEditor.java
index 3c9a969a74c..b79e3257bf2 100644
--- a/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/PointPropertyEditor.java
+++ b/subprojects/griffon-pivot/src/main/java/griffon/pivot/editors/PointPropertyEditor.java
@@ -30,12 +30,14 @@
  */
 @PropertyEditorFor(Point.class)
 public class PointPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Point p = (Point) getValue();
         return p.x + ", " + p.y;
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-pivot/src/main/java/griffon/pivot/formatters/ColorFormatter.java b/subprojects/griffon-pivot/src/main/java/griffon/pivot/formatters/ColorFormatter.java
index 622fc9969c6..427709bb991 100644
--- a/subprojects/griffon-pivot/src/main/java/griffon/pivot/formatters/ColorFormatter.java
+++ b/subprojects/griffon-pivot/src/main/java/griffon/pivot/formatters/ColorFormatter.java
@@ -138,11 +138,13 @@ protected ColorFormatter(@Nullable String pattern) {
     }
 
     @Nullable
+    @Override
     public String format(@Nullable Color color) {
         return color == null ? null : delegate.format(color);
     }
 
     @Nullable
+    @Override
     public Color parse(@Nullable String str) throws ParseException {
         return isBlank(str) ? null : delegate.parse(str);
     }
@@ -221,6 +223,7 @@ private AbstractColorFormatterDelegate(@Nonnull String pattern) {
         }
 
         @Nonnull
+        @Override
         public String getPattern() {
             return pattern;
         }
@@ -232,6 +235,7 @@ private ShortColorFormatterDelegate() {
         }
 
         @Nonnull
+        @Override
         public String format(@Nonnull Color color) {
             requireNonNull(color, "Cannot format given Color because it's null");
 
@@ -243,6 +247,7 @@ public String format(@Nonnull Color color) {
         }
 
         @Nonnull
+        @Override
         public Color parse(@Nonnull String str) throws ParseException {
             if (!str.startsWith("#") || str.length() != 4) {
                 throw parseError(str, Color.class);
@@ -271,6 +276,7 @@ private ShortWithAlphaColorFormatterDelegate() {
         }
 
         @Nonnull
+        @Override
         public String format(@Nonnull Color color) {
             requireNonNull(color, "Cannot format given Color because it's null");
 
@@ -283,6 +289,7 @@ public String format(@Nonnull Color color) {
         }
 
         @Nonnull
+        @Override
         public Color parse(@Nonnull String str) throws ParseException {
             if (!str.startsWith("#") || str.length() != 5) {
                 throw parseError(str, Color.class);
@@ -315,6 +322,7 @@ private LongColorFormatterDelegate() {
         }
 
         @Nonnull
+        @Override
         public String format(@Nonnull Color color) {
             requireNonNull(color, "Cannot format given Color because it's null");
             return new StringBuilder("#")
@@ -325,6 +333,7 @@ public String format(@Nonnull Color color) {
         }
 
         @Nonnull
+        @Override
         public Color parse(@Nonnull String str) throws ParseException {
             if (!str.startsWith("#") || str.length() != 7) {
                 throw parseError(str, Color.class);
@@ -353,6 +362,7 @@ private LongWithAlphaColorFormatterDelegate() {
         }
 
         @Nonnull
+        @Override
         public String format(@Nonnull Color color) {
             requireNonNull(color, "Cannot format given Color because it's null");
 
@@ -365,6 +375,7 @@ public String format(@Nonnull Color color) {
         }
 
         @Nonnull
+        @Override
         public Color parse(@Nonnull String str) throws ParseException {
             if (!str.startsWith("#") || str.length() != 9) {
                 throw parseError(str, Color.class);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/BufferedImagePropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/BufferedImagePropertyEditor.java
index 629c4c377e3..18ac71b230f 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/BufferedImagePropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/BufferedImagePropertyEditor.java
@@ -36,6 +36,7 @@
  */
 @PropertyEditorFor(BufferedImage.class)
 public class BufferedImagePropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/ColorPropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/ColorPropertyEditor.java
index 3ea3aff40eb..f366d52392e 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/ColorPropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/ColorPropertyEditor.java
@@ -46,6 +46,7 @@ public String getAsText() {
         return isBlank(getFormat()) ? format((Color) getValueInternal()) : getFormattedValue();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/DimensionPropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/DimensionPropertyEditor.java
index 2c91530352b..982ebe5f3d8 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/DimensionPropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/DimensionPropertyEditor.java
@@ -31,12 +31,14 @@
  */
 @PropertyEditorFor(Dimension.class)
 public class DimensionPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Dimension dimension = (Dimension) getValue();
         return dimension.getWidth() + ", " + dimension.getHeight();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/FontPropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/FontPropertyEditor.java
index b7108c77b47..70279ab81ba 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/FontPropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/FontPropertyEditor.java
@@ -29,6 +29,7 @@
  */
 @PropertyEditorFor(Font.class)
 public class FontPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Font font = (Font) getValue();
@@ -46,6 +47,7 @@ protected String formatStyle(Font font) {
         return "PLAIN";
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/GradientPaintPropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/GradientPaintPropertyEditor.java
index 37d54699b2d..1f498837239 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/GradientPaintPropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/GradientPaintPropertyEditor.java
@@ -32,6 +32,7 @@
  */
 @PropertyEditorFor(GradientPaint.class)
 public class GradientPaintPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         GradientPaint p = (GradientPaint) getValue();
@@ -52,6 +53,7 @@ public String getAsText() {
             .toString();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/IconPropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/IconPropertyEditor.java
index 6f0271a9edc..0274d112187 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/IconPropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/IconPropertyEditor.java
@@ -40,6 +40,7 @@
  */
 @PropertyEditorFor(Icon.class)
 public class IconPropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/ImagePropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/ImagePropertyEditor.java
index e0e629a83bb..1e546dbac35 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/ImagePropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/ImagePropertyEditor.java
@@ -37,6 +37,7 @@
  */
 @PropertyEditorFor(Image.class)
 public class ImagePropertyEditor extends AbstractPropertyEditor {
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/InsetsPropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/InsetsPropertyEditor.java
index 5c621b00828..84f63e2fd78 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/InsetsPropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/InsetsPropertyEditor.java
@@ -31,12 +31,14 @@
  */
 @PropertyEditorFor(Insets.class)
 public class InsetsPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Insets i = (Insets) getValue();
         return i.top + ", " + i.left + ", " + i.bottom + ", " + i.right;
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/LinearGradientPaintPropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/LinearGradientPaintPropertyEditor.java
index 89838ddd441..d55942b3b39 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/LinearGradientPaintPropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/LinearGradientPaintPropertyEditor.java
@@ -33,6 +33,7 @@
  */
 @PropertyEditorFor(LinearGradientPaint.class)
 public class LinearGradientPaintPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         LinearGradientPaint p = (LinearGradientPaint) getValue();
@@ -83,6 +84,7 @@ protected String formatColors(Color[] colors) {
         return b.append("]").toString();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/Point2DPropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/Point2DPropertyEditor.java
index 8eba1a6f3a2..cce73e26d57 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/Point2DPropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/Point2DPropertyEditor.java
@@ -30,12 +30,14 @@
  */
 @PropertyEditorFor(Point2D.class)
 public class Point2DPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Point2D p = (Point2D) getValue();
         return p.getX() + ", " + p.getY();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/PointPropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/PointPropertyEditor.java
index 845c946ad56..b22e8244d72 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/PointPropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/PointPropertyEditor.java
@@ -31,12 +31,14 @@
  */
 @PropertyEditorFor(Point.class)
 public class PointPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Point p = (Point) getValue();
         return p.getX() + ", " + p.getY();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/PolygonPropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/PolygonPropertyEditor.java
index 6f584eb5b6a..5267dfad662 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/PolygonPropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/PolygonPropertyEditor.java
@@ -29,6 +29,7 @@
  */
 @PropertyEditorFor(Polygon.class)
 public class PolygonPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Polygon p = (Polygon) getValue();
@@ -44,6 +45,7 @@ public String getAsText() {
         return b.toString();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/RadialGradientPaintPropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/RadialGradientPaintPropertyEditor.java
index 06a01dfd70f..75041af52d9 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/RadialGradientPaintPropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/RadialGradientPaintPropertyEditor.java
@@ -33,6 +33,7 @@
  */
 @PropertyEditorFor(RadialGradientPaint.class)
 public class RadialGradientPaintPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         RadialGradientPaint p = (RadialGradientPaint) getValue();
@@ -85,6 +86,7 @@ protected String formatColors(Color[] colors) {
         return b.append("]").toString();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/Rectangle2DPropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/Rectangle2DPropertyEditor.java
index bd86a5a50bc..357e589d96b 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/Rectangle2DPropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/Rectangle2DPropertyEditor.java
@@ -30,12 +30,14 @@
  */
 @PropertyEditorFor(Rectangle2D.class)
 public class Rectangle2DPropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Rectangle2D r = (Rectangle2D) getValue();
         return r.getX() + ", " + r.getY() + ", " + r.getWidth() + ", " + r.getHeight();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/RectanglePropertyEditor.java b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/RectanglePropertyEditor.java
index 991ef234fae..6abe201f4d7 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/editors/RectanglePropertyEditor.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/editors/RectanglePropertyEditor.java
@@ -31,12 +31,14 @@
  */
 @PropertyEditorFor(Rectangle.class)
 public class RectanglePropertyEditor extends AbstractPropertyEditor {
+    @Override
     public String getAsText() {
         if (null == getValue()) return null;
         Rectangle r = (Rectangle) getValue();
         return r.getX() + ", " + r.getY() + ", " + r.getWidth() + ", " + r.getHeight();
     }
 
+    @Override
     protected void setValueInternal(Object value) {
         if (null == value) {
             super.setValueInternal(null);
diff --git a/subprojects/griffon-swing/src/main/java/griffon/swing/formatters/ColorFormatter.java b/subprojects/griffon-swing/src/main/java/griffon/swing/formatters/ColorFormatter.java
index 49991ddc16f..d8463a74855 100644
--- a/subprojects/griffon-swing/src/main/java/griffon/swing/formatters/ColorFormatter.java
+++ b/subprojects/griffon-swing/src/main/java/griffon/swing/formatters/ColorFormatter.java
@@ -138,11 +138,13 @@ protected ColorFormatter(@Nullable String pattern) {
     }
 
     @Nullable
+    @Override
     public String format(@Nullable Color color) {
         return color == null ? null : delegate.format(color);
     }
 
     @Nullable
+    @Override
     public Color parse(@Nullable String str) throws ParseException {
         return isBlank(str) ? null : delegate.parse(str);
     }
@@ -221,6 +223,7 @@ private AbstractColorFormatterDelegate(@Nonnull String pattern) {
         }
 
         @Nonnull
+        @Override
         public String getPattern() {
             return pattern;
         }
@@ -232,6 +235,7 @@ private ShortColorFormatterDelegate() {
         }
 
         @Nonnull
+        @Override
         public String format(@Nonnull Color color) {
             requireNonNull(color, "Cannot format given Color because it's null");
 
@@ -243,6 +247,7 @@ public String format(@Nonnull Color color) {
         }
 
         @Nonnull
+        @Override
         public Color parse(@Nonnull String str) throws ParseException {
             if (!str.startsWith("#") || str.length() != 4) {
                 throw parseError(str, Color.class);
@@ -271,6 +276,7 @@ private ShortWithAlphaColorFormatterDelegate() {
         }
 
         @Nonnull
+        @Override
         public String format(@Nonnull Color color) {
             requireNonNull(color, "Cannot format given Color because it's null");
 
@@ -283,6 +289,7 @@ public String format(@Nonnull Color color) {
         }
 
         @Nonnull
+        @Override
         public Color parse(@Nonnull String str) throws ParseException {
             if (!str.startsWith("#") || str.length() != 5) {
                 throw parseError(str, Color.class);
@@ -315,6 +322,7 @@ private LongColorFormatterDelegate() {
         }
 
         @Nonnull
+        @Override
         public String format(@Nonnull Color color) {
             requireNonNull(color, "Cannot format given Color because it's null");
             return new StringBuilder("#")
@@ -325,6 +333,7 @@ public String format(@Nonnull Color color) {
         }
 
         @Nonnull
+        @Override
         public Color parse(@Nonnull String str) throws ParseException {
             if (!str.startsWith("#") || str.length() != 7) {
                 throw parseError(str, Color.class);
@@ -353,6 +362,7 @@ private LongWithAlphaColorFormatterDelegate() {
         }
 
         @Nonnull
+        @Override
         public String format(@Nonnull Color color) {
             requireNonNull(color, "Cannot format given Color because it's null");
 
@@ -365,6 +375,7 @@ public String format(@Nonnull Color color) {
         }
 
         @Nonnull
+        @Override
         public Color parse(@Nonnull String str) throws ParseException {
             if (!str.startsWith("#") || str.length() != 9) {
                 throw parseError(str, Color.class);