diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java
index 90d1523cb..4bd09e523 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java
@@ -473,6 +473,7 @@ public class Checker extends AutomaticBean implements MessageDispatcher
      * @param aFileName
      *            the file to be audited
      */
+    @Override
     public void fireFileStarted(String aFileName)
     {
         final String stripped = getStrippedFileName(aFileName);
@@ -488,6 +489,7 @@ public class Checker extends AutomaticBean implements MessageDispatcher
      * @param aFileName
      *            the audited file
      */
+    @Override
     public void fireFileFinished(String aFileName)
     {
         final String stripped = getStrippedFileName(aFileName);
@@ -503,6 +505,7 @@ public class Checker extends AutomaticBean implements MessageDispatcher
      * @param aFileName the audited file
      * @param aErrors the audit errors from the file
      */
+    @Override
     public void fireErrors(String aFileName,
         SortedSet<LocalizedMessage> aErrors)
     {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultConfiguration.java b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultConfiguration.java
index ae48f21d9..078512096 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultConfiguration.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultConfiguration.java
@@ -60,6 +60,7 @@ public final class DefaultConfiguration implements Configuration
     }
 
     /** {@inheritDoc} */
+    @Override
     public String[] getAttributeNames()
     {
         final Set<String> keySet = mAttributeMap.keySet();
@@ -67,6 +68,7 @@ public final class DefaultConfiguration implements Configuration
     }
 
     /** {@inheritDoc} */
+    @Override
     public String getAttribute(String aName) throws CheckstyleException
     {
         if (!mAttributeMap.containsKey(aName)) {
@@ -78,6 +80,7 @@ public final class DefaultConfiguration implements Configuration
     }
 
     /** {@inheritDoc} */
+    @Override
     public Configuration[] getChildren()
     {
         return mChildren.toArray(
@@ -85,6 +88,7 @@ public final class DefaultConfiguration implements Configuration
     }
 
     /** {@inheritDoc} */
+    @Override
     public String getName()
     {
         return mName;
@@ -139,6 +143,7 @@ public final class DefaultConfiguration implements Configuration
      * for this configuration.
      * @return unmodifiable map containing custom messages
      */
+    @Override
     public ImmutableMap<String, String> getMessages()
     {
         return ImmutableMap.copyOf(mMessages);
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultContext.java b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultContext.java
index 2fee8170b..0bd912a10 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultContext.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultContext.java
@@ -36,12 +36,14 @@ public final class DefaultContext implements Context
     private final Map<String, Object> mEntries = Maps.newHashMap();
 
     /** {@inheritDoc} */
+    @Override
     public Object get(String aKey)
     {
         return mEntries.get(aKey);
     }
 
     /** {@inheritDoc} */
+    @Override
     public ImmutableCollection<String> getAttributeNames()
     {
         return ImmutableList.copyOf(mEntries.keySet());
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java
index d6e302e00..cca13d6cd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java
@@ -91,6 +91,7 @@ public class DefaultLogger
      * @param aEvt {@inheritDoc}
      * @see AuditListener
      **/
+    @Override
     public void addError(AuditEvent aEvt)
     {
         final SeverityLevel severityLevel = aEvt.getSeverityLevel();
@@ -118,6 +119,7 @@ public class DefaultLogger
     }
 
     /** {@inheritDoc} */
+    @Override
     public void addException(AuditEvent aEvt, Throwable aThrowable)
     {
         synchronized (mErrorWriter) {
@@ -127,22 +129,26 @@ public class DefaultLogger
     }
 
     /** {@inheritDoc} */
+    @Override
     public void auditStarted(AuditEvent aEvt)
     {
         mInfoWriter.println("Starting audit...");
     }
 
     /** {@inheritDoc} */
+    @Override
     public void fileFinished(AuditEvent aEvt)
     {
     }
 
     /** {@inheritDoc} */
+    @Override
     public void fileStarted(AuditEvent aEvt)
     {
     }
 
     /** {@inheritDoc} */
+    @Override
     public void auditFinished(AuditEvent aEvt)
     {
         mInfoWriter.println("Audit done.");
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java b/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java
index dac0827fd..43f675702 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java
@@ -140,6 +140,7 @@ class PackageObjectFactory implements ModuleFactory
      * @return the <code>Object</code> created by aLoader.
      * @throws CheckstyleException if an error occurs.
      */
+    @Override
     public Object createModule(String aName)
         throws CheckstyleException
     {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java b/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java
index 4c856d7f9..7b09127e3 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java
@@ -47,6 +47,7 @@ public final class PropertiesExpander
     }
 
     /** {@inheritDoc} */
+    @Override
     public String resolve(String aPropertyName)
     {
         return mProperties.getProperty(aPropertyName);
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java
index 9e7a08d10..8cffef3ff 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java
@@ -87,6 +87,7 @@ public class XMLLogger
     }
 
     /** {@inheritDoc} */
+    @Override
     public void auditStarted(AuditEvent aEvt)
     {
         mWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
@@ -100,6 +101,7 @@ public class XMLLogger
     }
 
     /** {@inheritDoc} */
+    @Override
     public void auditFinished(AuditEvent aEvt)
     {
         mWriter.println("</checkstyle>");
@@ -112,18 +114,21 @@ public class XMLLogger
     }
 
     /** {@inheritDoc} */
+    @Override
     public void fileStarted(AuditEvent aEvt)
     {
         mWriter.println("<file name=\"" + encode(aEvt.getFileName()) + "\">");
     }
 
     /** {@inheritDoc} */
+    @Override
     public void fileFinished(AuditEvent aEvt)
     {
         mWriter.println("</file>");
     }
 
     /** {@inheritDoc} */
+    @Override
     public void addError(AuditEvent aEvt)
     {
         if (!SeverityLevel.IGNORE.equals(aEvt.getSeverityLevel())) {
@@ -144,6 +149,7 @@ public class XMLLogger
     }
 
     /** {@inheritDoc} */
+    @Override
     public void addException(AuditEvent aEvt, Throwable aThrowable)
     {
         final StringWriter sw = new StringWriter();
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java
index 5f5066be4..8d66c02a8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java
@@ -49,21 +49,25 @@ public abstract class AbstractFileSetCheck
     protected abstract void processFiltered(File aFile, List<String> aLines);
 
     /** {@inheritDoc} */
+    @Override
     public void init()
     {
     }
 
     /** {@inheritDoc} */
+    @Override
     public void destroy()
     {
     }
 
     /** {@inheritDoc} */
+    @Override
     public void beginProcessing(String aCharset)
     {
     }
 
     /** {@inheritDoc} */
+    @Override
     public final TreeSet<LocalizedMessage> process(File aFile,
                                                    List<String> aLines)
     {
@@ -76,11 +80,13 @@ public abstract class AbstractFileSetCheck
     }
 
     /** {@inheritDoc} */
+    @Override
     public void finishProcessing()
     {
     }
 
     /** {@inheritDoc} */
+    @Override
     public final void setMessageDispatcher(MessageDispatcher aDispatcher)
     {
         mDispatcher = aDispatcher;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
index 571395a85..10ff45204 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
@@ -119,6 +119,7 @@ public class AutomaticBean
      * @throws CheckstyleException {@inheritDoc}
      * @see Configurable
      */
+    @Override
     public final void configure(Configuration aConfiguration)
         throws CheckstyleException
     {
@@ -191,6 +192,7 @@ public class AutomaticBean
      * @throws CheckstyleException {@inheritDoc}
      * @see Contextualizable
      */
+    @Override
     public final void contextualize(Context aContext)
         throws CheckstyleException
     {
@@ -273,6 +275,7 @@ public class AutomaticBean
     private static class RelaxedStringArrayConverter implements Converter
     {
         /** {@inheritDoc} */
+        @Override
         public Object convert(@SuppressWarnings("rawtypes") Class aType,
             Object aValue)
         {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Comment.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Comment.java
index 22e42dc2e..4b096447e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Comment.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Comment.java
@@ -59,36 +59,42 @@ public class Comment implements TextBlock
     }
 
     /** {@inheritDoc} */
+    @Override
     public final String[] getText()
     {
         return mText.clone();
     }
 
     /** {@inheritDoc} */
+    @Override
     public final int getStartLineNo()
     {
         return mFirstLine;
     }
 
     /** {@inheritDoc} */
+    @Override
     public final int getEndLineNo()
     {
         return mLastLine;
     }
 
     /** {@inheritDoc} */
+    @Override
     public int getStartColNo()
     {
         return mFirstCol;
     }
 
     /** {@inheritDoc} */
+    @Override
     public int getEndColNo()
     {
         return mLastCol;
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean intersects(int aStartLineNo, int aStartColNo,
                               int aEndLineNo, int aEndColNo)
     {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/FastStack.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/FastStack.java
index 19fd292bc..ecdffdf85 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FastStack.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FastStack.java
@@ -123,6 +123,7 @@ public class FastStack<E> implements Iterable<E>
      * Returns an iterator that goes from the oldest element to the newest.
      * @return an iterator
      */
+    @Override
     public Iterator<E> iterator()
     {
         return mEntries.iterator();
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java
index 51524517b..250d1b59a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java
@@ -93,6 +93,7 @@ public final class FileContents implements CommentListener
     }
 
     /** {@inheritDoc} */
+    @Override
     public void reportSingleLineComment(String aType, int aStartLineNo,
             int aStartColNo)
     {
@@ -100,6 +101,7 @@ public final class FileContents implements CommentListener
     }
 
     /** {@inheritDoc} */
+    @Override
     public void reportBlockComment(String aType, int aStartLineNo,
             int aStartColNo, int aEndLineNo, int aEndColNo)
     {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/FilterSet.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/FilterSet.java
index 0251cf6ce..34493354c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FilterSet.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FilterSet.java
@@ -83,6 +83,7 @@ public class FilterSet
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean accept(AuditEvent aEvent)
     {
         for (Filter filter : mFilters) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/LineColumn.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/LineColumn.java
index 69a76cc7d..eaf4f6e90 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/LineColumn.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/LineColumn.java
@@ -56,6 +56,7 @@ public class LineColumn implements Comparable<LineColumn>
     }
 
     /** {@inheritDoc} */
+    @Override
     public int compareTo(LineColumn aLineColumn)
     {
         return (this.getLine() != aLineColumn.getLine())
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java
index 33ad88a93..19de721ef 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java
@@ -369,6 +369,7 @@ public final class LocalizedMessage
     ////////////////////////////////////////////////////////////////////////////
 
     /** {@inheritDoc} */
+    @Override
     public int compareTo(LocalizedMessage aOther)
     {
         if (getLineNo() == aOther.getLineNo()) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.java
index 5814acf0c..80763f833 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.java
@@ -45,6 +45,7 @@ public final class SeverityLevelCounter implements AuditListener
     }
 
     /** {@inheritDoc} */
+    @Override
     public void addError(AuditEvent aEvt)
     {
         if (mLevel.equals(aEvt.getSeverityLevel())) {
@@ -53,6 +54,7 @@ public final class SeverityLevelCounter implements AuditListener
     }
 
     /** {@inheritDoc} */
+    @Override
     public void addException(AuditEvent aEvt, Throwable aThrowable)
     {
         if (SeverityLevel.ERROR.equals(mLevel)) {
@@ -61,22 +63,26 @@ public final class SeverityLevelCounter implements AuditListener
     }
 
     /** {@inheritDoc} */
+    @Override
     public void auditStarted(AuditEvent aEvt)
     {
         mCount = 0;
     }
 
     /** {@inheritDoc} */
+    @Override
     public void fileStarted(AuditEvent aEvt)
     {
     }
 
     /** {@inheritDoc} */
+    @Override
     public void auditFinished(AuditEvent aEvt)
     {
     }
 
     /** {@inheritDoc} */
+    @Override
     public void fileFinished(AuditEvent aEvt)
     {
     }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/CSVFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/CSVFilter.java
index 369f7a57c..8dbf8bca0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/CSVFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/CSVFilter.java
@@ -88,6 +88,7 @@ class CSVFilter implements IntFilter
      * @param aInt the Integer to check.
      * @return true if aInt is an Integer that matches a CSV value.
      */
+    @Override
     public boolean accept(int aInt)
     {
         for (IntFilter filter : getFilters()) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilter.java
index 1860d9465..056c1f2a3 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilter.java
@@ -37,6 +37,7 @@ class IntMatchFilter implements IntFilter
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean accept(int aInt)
     {
         return mMatchValue == aInt;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilter.java
index 25cc87e64..e1fd134f5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilter.java
@@ -46,6 +46,7 @@ class IntRangeFilter implements IntFilter
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean accept(int aInt)
     {
         return ((mLowerBound.compareTo(aInt) <= 0)
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java
index d57e4aa20..2f4dae8e3 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java
@@ -62,6 +62,7 @@ public class SeverityMatchFilter
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean accept(AuditEvent aEvent)
     {
         final boolean result = mSeverityLevel.equals(aEvent.getSeverityLevel());
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java
index 30b9966d7..b01c1ce3c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java
@@ -135,6 +135,7 @@ public class SuppressElement
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean accept(AuditEvent aEvent)
     {
         // file and check match?
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.java
index ea2d56edf..79ddc4cf3 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.java
@@ -33,6 +33,7 @@ public class SuppressWarningsFilter
     implements Filter
 {
     /** {@inheritDoc} */
+    @Override
     public boolean accept(AuditEvent aEvent)
     {
         return !SuppressWarningsHolder.isSuppressed(aEvent.getSourceName(),
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
index cfae9a3e2..2fdb07aeb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
@@ -179,6 +179,7 @@ public class SuppressWithNearbyCommentFilter
          * tag is after the other tag.
          * @see java.lang.Comparable#compareTo(java.lang.Object)
          */
+        @Override
         public int compareTo(Tag aOther)
         {
             if (mFirstLine == aOther.mFirstLine) {
@@ -426,6 +427,7 @@ public class SuppressWithNearbyCommentFilter
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean accept(AuditEvent aEvent)
     {
         if (aEvent.getLocalizedMessage() == null) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java
index 5967c9c7c..85c9d2286 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java
@@ -183,6 +183,7 @@ public class SuppressionCommentFilter
          * tag is after the other tag.
          * @see java.lang.Comparable#compareTo(java.lang.Object)
          */
+        @Override
         public int compareTo(Tag aObject)
         {
             if (mLine == aObject.mLine) {
@@ -406,6 +407,7 @@ public class SuppressionCommentFilter
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean accept(AuditEvent aEvent)
     {
         if (aEvent.getLocalizedMessage() == null) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java
index 479017ee2..205760d9b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java
@@ -50,6 +50,7 @@ public class SuppressionFilter
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean accept(AuditEvent aEvent)
     {
         return mFilters.accept(aEvent);
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractCellEditor.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractCellEditor.java
index f6ec9e71e..09c6681e3 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractCellEditor.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractCellEditor.java
@@ -80,41 +80,48 @@ public class AbstractCellEditor implements CellEditor
     private final EventListenerList mListenerList = new EventListenerList();
 
     /** @see CellEditor */
+    @Override
     public Object getCellEditorValue()
     {
         return null;
     }
 
     /** @see CellEditor */
+    @Override
     public boolean isCellEditable(EventObject e)
     {
         return true;
     }
 
     /** @see CellEditor */
+    @Override
     public boolean shouldSelectCell(EventObject anEvent)
     {
         return false;
     }
 
     /** @see CellEditor */
+    @Override
     public boolean stopCellEditing()
     {
         return true;
     }
 
     /** @see CellEditor */
+    @Override
     public void cancelCellEditing()
     {
     }
 
     /** @see CellEditor */
+    @Override
     public void addCellEditorListener(CellEditorListener l)
     {
         mListenerList.add(CellEditorListener.class, l);
     }
 
     /** @see CellEditor */
+    @Override
     public void removeCellEditorListener(CellEditorListener l)
     {
         mListenerList.remove(CellEditorListener.class, l);
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractTreeTableModel.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractTreeTableModel.java
index da044ae04..8296f2d69 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractTreeTableModel.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractTreeTableModel.java
@@ -86,21 +86,25 @@ public abstract class AbstractTreeTableModel implements TreeTableModel
     // Default implmentations for methods in the TreeModel interface.
     //
 
+    @Override
     public Object getRoot()
     {
         return mRoot;
     }
 
+    @Override
     public boolean isLeaf(Object node)
     {
         return getChildCount(node) == 0;
     }
 
+    @Override
     public void valueForPathChanged(TreePath path, Object newValue)
     {
     }
 
     // This is not called in the JTree's default mode: use a naive implementation.
+    @Override
     public int getIndexOfChild(Object parent, Object child)
     {
         for (int i = 0; i < getChildCount(parent); i++) {
@@ -111,11 +115,13 @@ public abstract class AbstractTreeTableModel implements TreeTableModel
         return -1;
     }
 
+    @Override
     public void addTreeModelListener(TreeModelListener l)
     {
         mListenerList.add(TreeModelListener.class, l);
     }
 
+    @Override
     public void removeTreeModelListener(TreeModelListener l)
     {
         mListenerList.remove(TreeModelListener.class, l);
@@ -237,6 +243,7 @@ public abstract class AbstractTreeTableModel implements TreeTableModel
     // Default impelmentations for methods in the TreeTableModel interface.
     //
 
+    @Override
     public Class<?> getColumnClass(int column)
     {
         return Object.class;
@@ -246,11 +253,13 @@ public abstract class AbstractTreeTableModel implements TreeTableModel
      *  Making this column editable causes the JTable to forward mouse
      *  and keyboard events in the Tree column to the underlying JTree.
      */
+    @Override
     public boolean isCellEditable(Object node, int column)
     {
         return getColumnClass(column) == TreeTableModel.class;
     }
 
+    @Override
     public void setValueAt(Object aValue, Object node, int column)
     {
     }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java
index 4c4932f63..7f4895137 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java
@@ -144,6 +144,7 @@ class FileDrop
         // drop target when the parent gets cleared out.
         c.addHierarchyListener(new HierarchyListener()
         {
+            @Override
             public void hierarchyChanged(HierarchyEvent evt)
             {
                 final Component parent = c.getParent();
@@ -256,6 +257,7 @@ class FileDrop
         private final Border mDragBorder;
         private final Listener mListener;
 
+        @Override
         public void dragEnter(DropTargetDragEvent evt)
         {
             if (isDragOk(evt)) {
@@ -271,6 +273,7 @@ class FileDrop
             }
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public void drop(DropTargetDropEvent evt)
         {
@@ -309,6 +312,7 @@ class FileDrop
             }
         }
 
+        @Override
         public void dragExit(DropTargetEvent evt)
         {
             if (mC instanceof JComponent) {
@@ -317,6 +321,7 @@ class FileDrop
             }
         }
 
+        @Override
         public void dropActionChanged(DropTargetDragEvent evt)
         {
             if (isDragOk(evt)) {
@@ -327,6 +332,7 @@ class FileDrop
             }
         }
 
+        @Override
         public void dragOver(DropTargetDragEvent dtde)
         {
         }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/JTreeTable.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/JTreeTable.java
index e68f17508..c4f250559 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/JTreeTable.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/JTreeTable.java
@@ -147,6 +147,7 @@ public class JTreeTable extends JTable
              */
             private static final long serialVersionUID = -5859674518660156121L;
 
+                @Override
                 public void actionPerformed(ActionEvent e) {
                     final TreePath selected = tree.getSelectionPath();
 
@@ -303,6 +304,7 @@ public class JTreeTable extends JTable
          * TreeCellRenderer method. Overridden to update the visible row.
          * @see TableCellRenderer
          */
+        @Override
         public Component getTableCellRendererComponent(JTable table,
                 Object value,
                 boolean isSelected,
@@ -328,6 +330,7 @@ public class JTreeTable extends JTable
     public class TreeTableCellEditor extends AbstractCellEditor implements
             TableCellEditor
     {
+        @Override
         public Component getTableCellEditorComponent(JTable table,
                 Object value,
                 boolean isSelected,
@@ -485,6 +488,7 @@ public class JTreeTable extends JTable
          */
         class ListSelectionHandler implements ListSelectionListener
         {
+            @Override
             public void valueChanged(ListSelectionEvent e)
             {
                 updateSelectedPathsFromSelectedRows();
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java
index 3269a3398..f9f3f1263 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java
@@ -118,6 +118,7 @@ public class ParseTreeInfoPanel extends JPanel
             putValue(Action.MNEMONIC_KEY, KeyEvent.VK_S);
         }
 
+        @Override
         public void actionPerformed(ActionEvent e)
         {
             final JFileChooser fc = new JFileChooser( mLastDirectory );
@@ -145,6 +146,7 @@ public class ParseTreeInfoPanel extends JPanel
             putValue(Action.MNEMONIC_KEY, KeyEvent.VK_R);
         }
 
+        @Override
         public void actionPerformed(ActionEvent e)
         {
             final Component parent =
@@ -158,6 +160,7 @@ public class ParseTreeInfoPanel extends JPanel
     {
         private final JScrollPane mSp;
 
+        @Override
         public void filesDropped(File[] files)
         {
             if ((files != null) && (files.length > 0))
@@ -315,6 +318,7 @@ public class ParseTreeInfoPanel extends JPanel
     {
         final Runnable showError = new Runnable()
         {
+            @Override
             public void run()
             {
                 JOptionPane.showMessageDialog(parent, msg);
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeModel.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeModel.java
index 9109bff85..225200b8b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeModel.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeModel.java
@@ -59,11 +59,13 @@ public class ParseTreeModel extends AbstractTreeTableModel
         fireTreeStructureChanged(this, path, null, null);
     }
 
+    @Override
     public int getColumnCount()
     {
         return COLUMN_NAMES.length;
     }
 
+    @Override
     public String getColumnName(int column)
     {
         return COLUMN_NAMES[column];
@@ -87,6 +89,7 @@ public class ParseTreeModel extends AbstractTreeTableModel
         return Object.class;
     }
 
+    @Override
     public Object getValueAt(Object node, int column)
     {
         final DetailAST ast = (DetailAST) node;
@@ -110,6 +113,7 @@ public class ParseTreeModel extends AbstractTreeTableModel
     {
     }
 
+    @Override
     public Object getChild(Object parent, int index)
     {
         final DetailAST ast = (DetailAST) parent;
@@ -122,6 +126,7 @@ public class ParseTreeModel extends AbstractTreeTableModel
         return child;
     }
 
+    @Override
     public int getChildCount(Object parent)
     {
         final DetailAST ast = (DetailAST) parent;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java
index d8f6ed67d..244d9c566 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java
@@ -95,11 +95,13 @@ public class TreeTableModelAdapter extends AbstractTableModel
         {
             // Don't use fireTableRowsInserted() here; the selection model
             // would get updated twice.
+            @Override
             public void treeExpanded(TreeExpansionEvent event)
             {
                 fireTableDataChanged();
             }
 
+            @Override
             public void treeCollapsed(TreeExpansionEvent event)
             {
                 fireTableDataChanged();
@@ -112,21 +114,25 @@ public class TreeTableModelAdapter extends AbstractTableModel
         // the event before us.
         aTreeTableModel.addTreeModelListener(new TreeModelListener()
         {
+            @Override
             public void treeNodesChanged(TreeModelEvent e)
             {
                 delayedFireTableDataChanged();
             }
 
+            @Override
             public void treeNodesInserted(TreeModelEvent e)
             {
                 delayedFireTableDataChanged();
             }
 
+            @Override
             public void treeNodesRemoved(TreeModelEvent e)
             {
                 delayedFireTableDataChanged();
             }
 
+            @Override
             public void treeStructureChanged(TreeModelEvent e)
             {
                 delayedFireTableDataChanged();
@@ -136,6 +142,7 @@ public class TreeTableModelAdapter extends AbstractTableModel
 
     // Wrappers, implementing TableModel interface.
 
+    @Override
     public int getColumnCount()
     {
         return mTreeTableModel.getColumnCount();
@@ -159,6 +166,7 @@ public class TreeTableModelAdapter extends AbstractTableModel
         return mTreeTableModel.getColumnClass(column);
     }
 
+    @Override
     public int getRowCount()
     {
         return mTree.getRowCount();
@@ -170,6 +178,7 @@ public class TreeTableModelAdapter extends AbstractTableModel
         return treePath.getLastPathComponent();
     }
 
+    @Override
     public Object getValueAt(int row, int column)
     {
         return mTreeTableModel.getValueAt(nodeForRow(row), column);
@@ -201,6 +210,7 @@ public class TreeTableModelAdapter extends AbstractTableModel
     {
         SwingUtilities.invokeLater(new Runnable()
         {
+            @Override
             public void run()
             {
                 fireTableDataChanged();
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DebugAuditAdapter.java b/src/test/java/com/puppycrawl/tools/checkstyle/DebugAuditAdapter.java
index 3a0108d92..c92d2b53b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/DebugAuditAdapter.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/DebugAuditAdapter.java
@@ -24,36 +24,42 @@ class DebugAuditAdapter implements AuditListener
     }
 
     /** @see AuditListener */
+    @Override
     public void addError(AuditEvent aEvt)
     {
         mCalled = true;
     }
 
     /** @see AuditListener */
+    @Override
     public void addException(AuditEvent aEvt, Throwable aThrowable)
     {
         mCalled = true;
     }
 
     /** @see AuditListener */
+    @Override
     public void auditStarted(AuditEvent aEvt)
     {
         mCalled = true;
     }
 
     /** @see AuditListener */
+    @Override
     public void fileStarted(AuditEvent aEvt)
     {
         mCalled = true;
     }
 
     /** @see AuditListener */
+    @Override
     public void auditFinished(AuditEvent aEvt)
     {
         mCalled = true;
     }
 
     /** @see AuditListener */
+    @Override
     public void fileFinished(AuditEvent aEvt)
     {
         mCalled = true;
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DebugFilter.java b/src/test/java/com/puppycrawl/tools/checkstyle/DebugFilter.java
index f9c66e742..282b46728 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/DebugFilter.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/DebugFilter.java
@@ -12,6 +12,7 @@ class DebugFilter implements Filter
 {
     private boolean mCalled;
 
+    @Override
     public boolean accept(AuditEvent aEvent)
     {
         mCalled = true;
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/DetailASTTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/DetailASTTest.java
index bd2bbe63a..cc2ccb033 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/DetailASTTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/DetailASTTest.java
@@ -71,6 +71,7 @@ public class DetailASTTest
     private void checkDir(File dir) throws Exception
     {
         File[] files = dir.listFiles(new FileFilter() {
+                @Override
                 public boolean accept(File file)
                 {
                     return (file.getName().endsWith(".java")