diff --git a/.claude/skills/architecture-sync/SKILL.md b/.claude/skills/architecture-sync/SKILL.md
index 2c1da91008..cdd340b813 100644
--- a/.claude/skills/architecture-sync/SKILL.md
+++ b/.claude/skills/architecture-sync/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: architecture-sync
-description: Read this WHEN A CHANGE ALTERS THE SHAPE OF THE LIBRARY — adding, removing, renaming or moving a Java package under logback-android/src/main/java; moving a responsibility between packages; adding an android.* import to a new package or any core→classic import; adding a published output (artifact, flavor, the XSD, consumer R8 rules) or a runtime dependency; or changing how configuration is discovered or a log call is dispatched. Also read it before opening the PR for such a change, and when asked to check whether docs/architecture is still accurate.
+description: Read this WHEN A CHANGE ALTERS THE SHAPE OF THE LIBRARY — adding, removing, renaming or moving a Java or Kotlin package under logback-android/src/main/java or src/main/kotlin; moving a responsibility between packages; adding an android.* import to a new package or any core→classic import; adding a published output (artifact, flavor, the XSD, consumer R8 rules) or a runtime dependency; or changing how configuration is discovered or a log call is dispatched. Also read it before opening the PR for such a change, and when asked to check whether docs/architecture is still accurate.
 ---
 
 # Keeping the architecture docs true
@@ -44,7 +44,7 @@ is a design question, not a documentation question — ask before writing it dow
 ```
 
 Add, remove or rename the entry to match. The backticked directory path (relative to
-`logback-android/src/main/java`) is what the gate matches on, so it has to be exact. Mark
+`logback-android/src/main/java` or `logback-android/src/main/kotlin`) is what the gate matches on, so it has to be exact. Mark
 Android-only packages as such.
 
 Then read the entries **either side of the change**, not just the one you added. A
diff --git a/docs/architecture/components.md b/docs/architecture/components.md
index ca8a819397..aa64969db9 100644
--- a/docs/architecture/components.md
+++ b/docs/architecture/components.md
@@ -1,6 +1,7 @@
 # Component catalogue
 
-One entry per Java package under `logback-android/src/main/java`. The heading's backticked
+One entry per package under `logback-android/src/main/java` (the upstream logback port) or
+`logback-android/src/main/kotlin` (the Android layer, #388). The heading's backticked
 path is what `scripts/check-architecture-docs.sh` matches on, so it must be exact. Each entry
 says what the package is responsible for, and anything that must stay true of it.
 
@@ -29,7 +30,7 @@ safety of `Logger` and `LoggerContext` is load-bearing: they are called from eve
 
 ### `ch/qos/logback/classic/android` — `ch.qos.logback.classic.android`
 
-Android-only appenders: `LogcatAppender`, `SQLiteAppender` (+ `SQLiteLogCleaner`), and
+Kotlin. Android-only appenders: `LogcatAppender`, `SQLiteAppender` (+ `SQLiteLogCleaner`), and
 `BasicLogcatConfigurator`, which an app calls to log to logcat without a `logback.xml`. One of the few
 packages allowed to import `android.*`.
 
@@ -133,7 +134,7 @@ the locking model of every appender built on them.
 
 ### `ch/qos/logback/core/android` — `ch.qos.logback.core.android`
 
-Android-only: `AndroidContextUtil` (resolves `DATA_DIR`, `EXT_DIR`, package name, etc. for
+Kotlin. Android-only: `AndroidContextUtil` (resolves `DATA_DIR`, `EXT_DIR`, package name, etc. for
 configuration properties) and `SystemPropertiesProxy`. Lookups are lazy so configuration does
 not read disk on the main thread (see #383).
 
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/AsyncAppender.java b/logback-android/src/main/java/ch/qos/logback/classic/AsyncAppender.java
index 9c888c9a3b..e4de2a1f4a 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/AsyncAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/AsyncAppender.java
@@ -37,11 +37,13 @@ public class AsyncAppender extends AsyncAppenderBase<ILoggingEvent> {
    * @param event
    * @return true if the event is of level TRACE, DEBUG or INFO false otherwise.
    */
+  @Override
   protected boolean isDiscardable(ILoggingEvent event) {
     Level level = event.getLevel();
     return level.toInt() <= Level.INFO_INT;
   }
 
+  @Override
   protected void preprocess(ILoggingEvent eventObject) {
     eventObject.prepareForDeferredProcessing();
     if(includeCallerData)
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/BasicConfigurator.java b/logback-android/src/main/java/ch/qos/logback/classic/BasicConfigurator.java
index 12890d08e8..6327c1dee8 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/BasicConfigurator.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/BasicConfigurator.java
@@ -36,6 +36,7 @@ public class BasicConfigurator extends ContextAwareBase implements Configurator
   public BasicConfigurator() {
   }
 
+  @Override
   public void configure(LoggerContext lc) {
     addInfo("Setting up default configuration.");
     ConsoleAppender<ILoggingEvent> ca = new ConsoleAppender<ILoggingEvent>();
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/Level.java b/logback-android/src/main/java/ch/qos/logback/classic/Level.java
index 48d3801088..0ac53dc82f 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/Level.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/Level.java
@@ -96,6 +96,7 @@ private Level(int levelInt, String levelStr) {
    * Returns the string representation of this Level.
    * @return the string value of this level
    */
+  @Override
   public String toString() {
     return levelStr;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/Logger.java b/logback-android/src/main/java/ch/qos/logback/classic/Logger.java
index 95cd38dea4..37c2e22239 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/Logger.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/Logger.java
@@ -54,7 +54,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger,
   private String name;
 
   // The assigned levelInt of this logger. Can be null.
-  transient private Level level;
+  transient private volatile Level level;
 
   // The effective levelInt is the assigned levelInt and if null, a levelInt is
   // inherited form a parent.
@@ -122,6 +122,7 @@ public Level getLevel() {
     return level;
   }
 
+  @Override
   public String getName() {
     return name;
   }
@@ -207,12 +208,14 @@ private synchronized void handleParentLevelChange(int newParentLevelInt) {
    * <p>
    * This is useful when re-reading configuration information.
    */
+  @Override
   public void detachAndStopAllAppenders() {
     if (aai != null) {
       aai.detachAndStopAllAppenders();
     }
   }
 
+  @Override
   public boolean detachAppender(String name) {
     if (aai == null) {
       return false;
@@ -222,6 +225,7 @@ public boolean detachAppender(String name) {
 
   // this method MUST be synchronized. See comments on 'aai' field for further
   // details.
+  @Override
   public synchronized void addAppender(Appender<ILoggingEvent> newAppender) {
     if (aai == null) {
       aai = new AppenderAttachableImpl<ILoggingEvent>();
@@ -229,6 +233,7 @@ public synchronized void addAppender(Appender<ILoggingEvent> newAppender) {
     aai.addAppender(newAppender);
   }
 
+  @Override
   public boolean isAttached(Appender<ILoggingEvent> appender) {
     if (aai == null) {
       return false;
@@ -237,6 +242,7 @@ public boolean isAttached(Appender<ILoggingEvent> appender) {
   }
 
   @SuppressWarnings("unchecked")
+  @Override
   public Iterator<Appender<ILoggingEvent>> iteratorForAppenders() {
     if (aai == null) {
       return Collections.EMPTY_LIST.iterator();
@@ -244,6 +250,7 @@ public Iterator<Appender<ILoggingEvent>> iteratorForAppenders() {
     return aai.iteratorForAppenders();
   }
 
+  @Override
   public Appender<ILoggingEvent> getAppender(String name) {
     if (aai == null) {
       return null;
@@ -282,6 +289,7 @@ private int appendLoopOnAppenders(ILoggingEvent event) {
   /**
    * Remove the appender passed as parameter form the list of appenders.
    */
+  @Override
   public boolean detachAppender(Appender<ILoggingEvent> appender) {
     if (aai == null) {
       return false;
@@ -439,22 +447,27 @@ private void buildLoggingEventAndAppend(final String localFQCN,
     callAppenders(le);
   }
 
+  @Override
   public void trace(String msg) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.TRACE, msg, null, null);
   }
 
+  @Override
   public void trace(String format, Object arg) {
     filterAndLog_1(FQCN, null, Level.TRACE, format, arg, null);
   }
 
+  @Override
   public void trace(String format, Object arg1, Object arg2) {
     filterAndLog_2(FQCN, null, Level.TRACE, format, arg1, arg2, null);
   }
 
+  @Override
   public void trace(String format, Object... argArray) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.TRACE, format, argArray, null);
   }
 
+  @Override
   public void trace(String msg, Throwable t) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.TRACE, msg, null, t);
   }
@@ -509,6 +522,7 @@ public void trace(List<Marker> markers, String msg, Throwable t) {
     filterAndLog_0_Or3Plus(FQCN, markers, Level.TRACE, msg, null, t);
   }
 
+  @Override
   public boolean isDebugEnabled() {
     return isDebugEnabled(Collections.<Marker>emptyList());
   }
@@ -526,22 +540,27 @@ public boolean isDebugEnabled(List<Marker> markers) {
     }
   }
 
+  @Override
   public void debug(String msg) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.DEBUG, msg, null, null);
   }
 
+  @Override
   public void debug(String format, Object arg) {
     filterAndLog_1(FQCN, null, Level.DEBUG, format, arg, null);
   }
 
+  @Override
   public void debug(String format, Object arg1, Object arg2) {
     filterAndLog_2(FQCN, null, Level.DEBUG, format, arg1, arg2, null);
   }
 
+  @Override
   public void debug(String format, Object... argArray) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.DEBUG, format, argArray, null);
   }
 
+  @Override
   public void debug(String msg, Throwable t) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.DEBUG, msg, null, t);
   }
@@ -596,22 +615,27 @@ public void debug(List<Marker> markers, String msg, Throwable t) {
     filterAndLog_0_Or3Plus(FQCN, markers, Level.DEBUG, msg, null, t);
   }
 
+  @Override
   public void error(String msg) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.ERROR, msg, null, null);
   }
 
+  @Override
   public void error(String format, Object arg) {
     filterAndLog_1(FQCN, null, Level.ERROR, format, arg, null);
   }
 
+  @Override
   public void error(String format, Object arg1, Object arg2) {
     filterAndLog_2(FQCN, null, Level.ERROR, format, arg1, arg2, null);
   }
 
+  @Override
   public void error(String format, Object... argArray) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.ERROR, format, argArray, null);
   }
 
+  @Override
   public void error(String msg, Throwable t) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.ERROR, msg, null, t);
   }
@@ -666,6 +690,7 @@ public void error(List<Marker> markers, String msg, Throwable t) {
     filterAndLog_0_Or3Plus(FQCN, markers, Level.ERROR, msg, null, t);
   }
 
+  @Override
   public boolean isInfoEnabled() {
     return isInfoEnabled(Collections.<Marker>emptyList());
   }
@@ -683,22 +708,27 @@ public boolean isInfoEnabled(List<Marker> markers) {
     }
   }
 
+  @Override
   public void info(String msg) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.INFO, msg, null, null);
   }
 
+  @Override
   public void info(String format, Object arg) {
     filterAndLog_1(FQCN, null, Level.INFO, format, arg, null);
   }
 
+  @Override
   public void info(String format, Object arg1, Object arg2) {
     filterAndLog_2(FQCN, null, Level.INFO, format, arg1, arg2, null);
   }
 
+  @Override
   public void info(String format, Object... argArray) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.INFO, format, argArray, null);
   }
 
+  @Override
   public void info(String msg, Throwable t) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.INFO, msg, null, t);
   }
@@ -753,6 +783,7 @@ public void info(List<Marker> markers, String msg, Throwable t) {
     filterAndLog_0_Or3Plus(FQCN, markers, Level.INFO, msg, null, t);
   }
 
+  @Override
   public boolean isTraceEnabled() {
     return isTraceEnabled(Collections.<Marker>emptyList());
   }
@@ -770,6 +801,7 @@ public boolean isTraceEnabled(List<Marker> markers) {
     }
   }
 
+  @Override
   public boolean isErrorEnabled() {
     return isErrorEnabled(Collections.<Marker>emptyList());
   }
@@ -787,6 +819,7 @@ public boolean isErrorEnabled(List<Marker> markers) {
     }
   }
 
+  @Override
   public boolean isWarnEnabled() {
     return isWarnEnabled(Collections.<Marker>emptyList());
   }
@@ -822,10 +855,12 @@ public boolean isEnabledFor(Level level) {
     return isEnabledFor(null, level);
   }
 
+  @Override
   public void warn(String msg) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.WARN, msg, null, null);
   }
 
+  @Override
   public void warn(String msg, Throwable t) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.WARN, msg, null, t);
   }
@@ -860,14 +895,17 @@ public void warn(Marker marker, String msg, Throwable t) {
     warn(Collections.singletonList(marker), msg, t);
   }
 
+  @Override
   public void warn(String format, Object arg) {
     filterAndLog_1(FQCN, null, Level.WARN, format, arg, null);
   }
 
+  @Override
   public void warn(String format, Object arg1, Object arg2) {
     filterAndLog_2(FQCN, null, Level.WARN, format, arg1, arg2, null);
   }
 
+  @Override
   public void warn(String format, Object... argArray) {
     filterAndLog_0_Or3Plus(FQCN, null, Level.WARN, format, argArray, null);
   }
@@ -900,6 +938,7 @@ public void setAdditive(boolean additive) {
     this.additive = additive;
   }
 
+  @Override
   public String toString() {
     return "Logger[" + name + "]";
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/LoggerContext.java b/logback-android/src/main/java/ch/qos/logback/classic/LoggerContext.java
index 7876f48905..152891f007 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/LoggerContext.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/LoggerContext.java
@@ -116,6 +116,7 @@ public final Logger getLogger(final Class<?> clazz) {
     return getLogger(clazz.getName());
   }
 
+  @Override
   public Logger getLogger(final String name) {
 
     if (name == null) {
@@ -350,11 +351,13 @@ private void fireOnStop() {
 
   // === end listeners ==============================================
 
+  @Override
   public void start() {
     super.start();
     fireOnStart();
   }
 
+  @Override
   public void stop() {
     reset();
     fireOnStop();
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/PatternLayout.java b/logback-android/src/main/java/ch/qos/logback/classic/PatternLayout.java
index b89a074508..2add84c011 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/PatternLayout.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/PatternLayout.java
@@ -139,10 +139,12 @@ public PatternLayout() {
     this.postCompileProcessor = new EnsureExceptionHandling();
   }
 
+  @Override
   public Map<String, String> getDefaultConverterMap() {
     return defaultConverterMap;
   }
 
+  @Override
   public String doLayout(ILoggingEvent event) {
     if (!isStarted()) {
       return CoreConstants.EMPTY_STRING;
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/boolex/OnErrorEvaluator.java b/logback-android/src/main/java/ch/qos/logback/classic/boolex/OnErrorEvaluator.java
index 9d7a6e262f..90e84b5869 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/boolex/OnErrorEvaluator.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/boolex/OnErrorEvaluator.java
@@ -33,6 +33,7 @@ public class OnErrorEvaluator extends EventEvaluatorBase<ILoggingEvent> {
    * Return true if event passed as parameter has level ERROR or higher, returns
    * false otherwise.
    */
+  @Override
   public boolean evaluate(ILoggingEvent event) throws NullPointerException,
       EvaluationException {
     return event.getLevel().levelInt >= Level.ERROR_INT;
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/boolex/OnMarkerEvaluator.java b/logback-android/src/main/java/ch/qos/logback/classic/boolex/OnMarkerEvaluator.java
index 9c47f67f0b..e82fdd28c3 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/boolex/OnMarkerEvaluator.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/boolex/OnMarkerEvaluator.java
@@ -42,6 +42,7 @@ public void addMarker(String markerStr) {
    * Return true if event passed as parameter contains one of the specified
    * user-markers.
    */
+  @Override
   public boolean evaluate(ILoggingEvent event) throws NullPointerException,
       EvaluationException {
 
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/db/names/DefaultDBNameResolver.java b/logback-android/src/main/java/ch/qos/logback/classic/db/names/DefaultDBNameResolver.java
index edbeec2ac1..08ebe73fec 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/db/names/DefaultDBNameResolver.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/db/names/DefaultDBNameResolver.java
@@ -27,10 +27,12 @@
  */
 public class DefaultDBNameResolver implements DBNameResolver {
 
+  @Override
   public <N extends Enum<?>> String getTableName(N tableName) {
     return tableName.toString().toLowerCase(Locale.US);
   }
 
+  @Override
   public <N extends Enum<?>> String getColumnName(N columnName) {
     return columnName.toString().toLowerCase(Locale.US);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/db/names/SimpleDBNameResolver.java b/logback-android/src/main/java/ch/qos/logback/classic/db/names/SimpleDBNameResolver.java
index 0d6db8ad6b..0eb3550c9e 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/db/names/SimpleDBNameResolver.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/db/names/SimpleDBNameResolver.java
@@ -33,10 +33,12 @@ public class SimpleDBNameResolver implements DBNameResolver {
 
   private String columnNameSuffix = "";
 
+  @Override
   public <N extends Enum<?>> String getTableName(N tableName) {
     return tableNamePrefix + tableName.name().toLowerCase(Locale.US) + tableNameSuffix;
   }
 
+  @Override
   public <N extends Enum<?>> String getColumnName(N columnName) {
     return columnNamePrefix + columnName.name().toLowerCase(Locale.US) + columnNameSuffix;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/filter/LevelFilter.java b/logback-android/src/main/java/ch/qos/logback/classic/filter/LevelFilter.java
index 55d10ec434..0f00e32a66 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/filter/LevelFilter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/filter/LevelFilter.java
@@ -51,6 +51,7 @@ public void setLevel(Level level) {
     this.level = level;
   }
 
+  @Override
   public void start() {
     if (this.level != null) {
       super.start();
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/filter/ThresholdFilter.java b/logback-android/src/main/java/ch/qos/logback/classic/filter/ThresholdFilter.java
index 9ad67e2cc3..0a79ae739c 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/filter/ThresholdFilter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/filter/ThresholdFilter.java
@@ -55,6 +55,7 @@ public void setLevel(String level) {
     this.level = Level.toLevel(level);
   }
   
+  @Override
   public void start() {
     if (this.level != null) {
       super.start();
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java b/logback-android/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java
index 0eccd1ca01..542f292bfa 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java
@@ -29,6 +29,7 @@
  */
 public class DefaultCssBuilder implements CssBuilder {
 
+  @Override
   public void addCss(StringBuilder sbuf) {
     sbuf.append("<style  type=\"text/css\">");
     sbuf.append(LINE_SEPARATOR);
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/html/DefaultThrowableRenderer.java b/logback-android/src/main/java/ch/qos/logback/classic/html/DefaultThrowableRenderer.java
index 41369d54fa..434805f991 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/html/DefaultThrowableRenderer.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/html/DefaultThrowableRenderer.java
@@ -27,6 +27,7 @@ public class DefaultThrowableRenderer implements
 
   static final String TRACE_PREFIX = "<br />&nbsp;&nbsp;&nbsp;&nbsp;";
 
+  @Override
   public void render(StringBuilder sbuf, ILoggingEvent event) {
     IThrowableProxy tp = event.getThrowableProxy();
     sbuf.append("<tr><td class=\"Exception\" colspan=\"6\">");
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java b/logback-android/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java
index 7d42ec7832..db00a85bb9 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java
@@ -71,10 +71,12 @@ public void start() {
     }
   }
 
+  @Override
   protected Map<String, String> getDefaultConverterMap() {
     return PatternLayout.defaultConverterMap;
   }
 
+  @Override
   public String doLayout(ILoggingEvent event) {
     StringBuilder buf = new StringBuilder();
     startNewTableIfLimitReached(buf);
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java b/logback-android/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java
index bb0afbe98c..e0589856b3 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java
@@ -37,6 +37,7 @@ public void setUrl(String url) {
     this.url = url;
   }
   
+  @Override
   public void addCss(StringBuilder sbuf) {
     sbuf.append("<link REL=StyleSheet HREF=\"");
     sbuf.append(url);
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/joran/ReconfigureOnChangeTask.java b/logback-android/src/main/java/ch/qos/logback/classic/joran/ReconfigureOnChangeTask.java
index 28ef82afac..18d9eeca17 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/joran/ReconfigureOnChangeTask.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/joran/ReconfigureOnChangeTask.java
@@ -114,17 +114,16 @@ private void performXMLConfiguration(LoggerContext lc, URL mainConfigurationURL)
         StatusUtil statusUtil = new StatusUtil(lc);
         List<SaxEvent> eventList = jc.recallSafeConfiguration();
 
-        URL mainURL = ConfigurationWatchListUtil.getMainWatchURL(lc);
         lc.reset();
         new AndroidContextUtil().setupProperties(lc);
         long threshold = System.currentTimeMillis();
         try {
             jc.doConfigure(mainConfigurationURL);
             if (statusUtil.hasXMLParsingErrors(threshold)) {
-                fallbackConfiguration(lc, eventList, mainURL);
+                fallbackConfiguration(lc, eventList);
             }
         } catch (JoranException e) {
-            fallbackConfiguration(lc, eventList, mainURL);
+            fallbackConfiguration(lc, eventList);
         }
     }
 
@@ -141,7 +140,7 @@ private List<SaxEvent> removeIncludeEvents(List<SaxEvent> unsanitizedEventList)
         return sanitizedEvents;
     }
 
-    private void fallbackConfiguration(LoggerContext lc, List<SaxEvent> eventList, URL mainURL) {
+    private void fallbackConfiguration(LoggerContext lc, List<SaxEvent> eventList) {
         // failsafe events are used only in case of errors. Therefore, we must *not*
         // invoke file inclusion since the included files may be the cause of the error.
 
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/joran/action/ConditionalIncludeAction.java b/logback-android/src/main/java/ch/qos/logback/classic/joran/action/ConditionalIncludeAction.java
index 74e95607ee..f9297b2895 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/joran/action/ConditionalIncludeAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/joran/action/ConditionalIncludeAction.java
@@ -35,7 +35,7 @@ public class ConditionalIncludeAction extends AbstractIncludeAction {
    * Path container, used to determine whether an include has found a path,
    * in which case subsequent includes are ignored
    */
-  class State {
+  static class State {
     private URL url;
     URL getUrl() { return url; }
     void setUrl(URL url) { this.url = url; }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/joran/action/ContextNameAction.java b/logback-android/src/main/java/ch/qos/logback/classic/joran/action/ContextNameAction.java
index 0401a5abe6..f3fd31351c 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/joran/action/ContextNameAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/joran/action/ContextNameAction.java
@@ -22,9 +22,11 @@
 
 public class ContextNameAction extends Action {
 
+  @Override
   public void begin(InterpretationContext ec, String name, Attributes attributes) {
   }
 
+  @Override
   public void body(InterpretationContext ec, String body) {
 
     String finalBody = ec.subst(body);
@@ -37,6 +39,7 @@ public void body(InterpretationContext ec, String body) {
     }
   }
 
+  @Override
   public void end(InterpretationContext ec, String name) {
   }
 }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/joran/action/LevelAction.java b/logback-android/src/main/java/ch/qos/logback/classic/joran/action/LevelAction.java
index 1b9159d9ed..f59d2efdfe 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/joran/action/LevelAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/joran/action/LevelAction.java
@@ -37,6 +37,7 @@ public class LevelAction extends Action {
 
   boolean inError = false;
 
+  @Override
   public void begin(InterpretationContext ec, String name, Attributes attributes) {
     Object o = ec.peekObject();
 
@@ -66,6 +67,7 @@ public void begin(InterpretationContext ec, String name, Attributes attributes)
   public void finish(InterpretationContext ec) {
   }
 
+  @Override
   public void end(InterpretationContext ec, String e) {
   }
 }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/joran/action/LoggerAction.java b/logback-android/src/main/java/ch/qos/logback/classic/joran/action/LoggerAction.java
index 1afffd7bec..4319946c66 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/joran/action/LoggerAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/joran/action/LoggerAction.java
@@ -35,6 +35,7 @@ public class LoggerAction extends Action {
 
   boolean inError = false;
   Logger logger;
+  @Override
   public void begin(InterpretationContext ec, String name, Attributes attributes) {
     // Let us forget about previous errors (in this object)
     inError = false;
@@ -79,6 +80,7 @@ public void begin(InterpretationContext ec, String name, Attributes attributes)
     ec.pushObject(logger);
   }
 
+  @Override
   public void end(InterpretationContext ec, String e) {
     if (inError) {
       return;
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/joran/action/RootLoggerAction.java b/logback-android/src/main/java/ch/qos/logback/classic/joran/action/RootLoggerAction.java
index 76c62145ba..6b165163df 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/joran/action/RootLoggerAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/joran/action/RootLoggerAction.java
@@ -30,6 +30,7 @@ public class RootLoggerAction extends Action {
   Logger root;
   boolean inError = false;
 
+  @Override
   public void begin(InterpretationContext ec, String name, Attributes attributes) {
     inError = false;
 
@@ -45,6 +46,7 @@ public void begin(InterpretationContext ec, String name, Attributes attributes)
     ec.pushObject(root);
   }
 
+  @Override
   public void end(InterpretationContext ec, String name) {
     if (inError) {
       return;
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/layout/TTLLLayout.java b/logback-android/src/main/java/ch/qos/logback/classic/layout/TTLLLayout.java
index eedd3c53cf..8726a2d5e6 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/layout/TTLLLayout.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/layout/TTLLLayout.java
@@ -46,6 +46,7 @@ public void start() {
         super.start();
     }
 
+    @Override
     public String doLayout(ILoggingEvent event) {
         if (!isStarted()) {
             return CoreConstants.EMPTY_STRING;
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/log4j/XMLLayout.java b/logback-android/src/main/java/ch/qos/logback/classic/log4j/XMLLayout.java
index 4b06e2a383..2869eaa6b1 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/log4j/XMLLayout.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/log4j/XMLLayout.java
@@ -96,6 +96,7 @@ public boolean getProperties() {
   /**
    * Formats a {@link ILoggingEvent} in conformity with the log4j.dtd.
    */
+  @Override
   public String doLayout(ILoggingEvent event) {
 
     // Reset working buffer. If the buffer is too large, then we need a new
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/LoggingEventPreSerializationTransformer.java b/logback-android/src/main/java/ch/qos/logback/classic/net/LoggingEventPreSerializationTransformer.java
index 8bacef27ee..0c4cc6be40 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/LoggingEventPreSerializationTransformer.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/LoggingEventPreSerializationTransformer.java
@@ -25,6 +25,7 @@
 public class LoggingEventPreSerializationTransformer implements
     PreSerializationTransformer<ILoggingEvent> {
 
+  @Override
   public Serializable transform(ILoggingEvent event) {
     if(event == null) {
       return null;
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/ReceiverBase.java b/logback-android/src/main/java/ch/qos/logback/classic/net/ReceiverBase.java
index 3917b1dcf0..132b76bbd8 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/ReceiverBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/ReceiverBase.java
@@ -32,6 +32,7 @@ public abstract class ReceiverBase extends ContextAwareBase
   /**
    * {@inheritDoc}
    */
+  @Override
   public final void start() {
     if (isStarted()) return;
     if (getContext() == null) {
@@ -46,6 +47,7 @@ public final void start() {
   /**
    * {@inheritDoc}
    */
+  @Override
   public final void stop() {
     if (!isStarted()) return;
     try {
@@ -60,6 +62,7 @@ public final void stop() {
   /**
    * {@inheritDoc}
    */
+  @Override
   public final boolean isStarted() {
     return started;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java b/logback-android/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java
index b5adbaff35..bcb8db4bee 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java
@@ -54,6 +54,7 @@ public SMTPAppender() {
 
   }
 
+  @Override
   public void start() {    
     if (eventEvaluator == null) {
       OnErrorEvaluator onError = new OnErrorEvaluator();
@@ -77,6 +78,7 @@ public SMTPAppender(EventEvaluator<ILoggingEvent> eventEvaluator) {
    * Perform SMTPAppender specific appending actions, mainly adding the event to
    * a cyclic buffer.
    */
+  @Override
   protected void subAppend(CyclicBuffer<ILoggingEvent> cb, ILoggingEvent event) {
     if(includeCallerData) {
       event.getCallerData();
@@ -94,6 +96,7 @@ protected void fillBuffer(CyclicBuffer<ILoggingEvent> cb, StringBuffer sbuf) {
     }
   }
 
+  @Override
   protected boolean eventMarksEndOfLife(ILoggingEvent eventObject) {
     List<Marker> markers = eventObject.getMarkers();
     if(markers == null || markers.isEmpty())
@@ -124,6 +127,7 @@ protected Layout<ILoggingEvent> makeSubjectLayout(String subjectStr) {
     return pl;
   }
 
+  @Override
   protected PatternLayout makeNewToPatternLayout(String toPattern) {
     PatternLayout pl = new PatternLayout();
     pl.setPattern(toPattern+"%nopex");
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java b/logback-android/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java
index 78306e8b01..2badb9d6b4 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java
@@ -48,6 +48,7 @@ public void setIncludeCallerData(boolean includeCallerData) {
     this.includeCallerData = includeCallerData;
   }
 
+  @Override
   public PreSerializationTransformer<ILoggingEvent> getPST() {
     return pst;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/SSLSocketReceiver.java b/logback-android/src/main/java/ch/qos/logback/classic/net/SSLSocketReceiver.java
index b9ceba88da..f597980716 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/SSLSocketReceiver.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/SSLSocketReceiver.java
@@ -68,6 +68,7 @@ protected boolean shouldStart() {
    * @return SSL configuration; if no configuration has been set, a
    *    default configuration is returned
    */
+  @Override
   public SSLConfiguration getSsl() {
     if (ssl == null) {
       ssl = new SSLConfiguration();
@@ -79,6 +80,7 @@ public SSLConfiguration getSsl() {
    * Sets the SSL configuration.
    * @param ssl the SSL configuration to set
    */
+  @Override
   public void setSsl(SSLConfiguration ssl) {
     this.ssl = ssl;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java b/logback-android/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java
index 8a19fbf17d..e34dcacd8c 100755
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java
@@ -88,6 +88,7 @@ public SimpleSocketServer(LoggerContext lc, int port) {
   }
 
 
+  @Override
   public void run() {
 
     final String oldThreadName = Thread.currentThread().getName();
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/SocketAppender.java b/logback-android/src/main/java/ch/qos/logback/classic/net/SocketAppender.java
index 9c42e7a00e..44aa9750a3 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/SocketAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/SocketAppender.java
@@ -53,6 +53,7 @@ public void setIncludeCallerData(boolean includeCallerData) {
     this.includeCallerData = includeCallerData;
   }
 
+  @Override
   public PreSerializationTransformer<ILoggingEvent> getPST() {
     return pst;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/SocketNode.java b/logback-android/src/main/java/ch/qos/logback/classic/net/SocketNode.java
index b8d01b374c..cea6c4d413 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/SocketNode.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/SocketNode.java
@@ -67,6 +67,7 @@ public SocketNode(SimpleSocketServer socketServer, Socket socket, LoggerContext
   // System.err.flush();
   // }
 
+  @Override
   public void run() {
 
     try {
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java b/logback-android/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java
index 59d4300ac2..4ddc835f95 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java
@@ -61,6 +61,7 @@ public class SocketReceiver extends ReceiverBase
   /**
    * {@inheritDoc}
    */
+  @Override
   protected boolean shouldStart() {
     int errorCount = 0;
     if (port == 0) {
@@ -98,6 +99,7 @@ protected boolean shouldStart() {
   /**
    * {@inheritDoc}
    */
+  @Override
   protected void onStop() {
     if (socket != null) {
       CloseUtil.closeQuietly(socket);
@@ -112,6 +114,7 @@ protected Runnable getRunnableTask() {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void run() {
     try {
       LoggerContext lc = (LoggerContext) getContext();
@@ -192,6 +195,7 @@ private void dispatchEvents(LoggerContext lc) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void connectionFailed(SocketConnector connector, Exception ex) {
     if (ex instanceof InterruptedException) {
       addWarn("connector interrupted", ex);
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/SyslogAppender.java b/logback-android/src/main/java/ch/qos/logback/classic/net/SyslogAppender.java
index 9648bad325..a294073c45 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/SyslogAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/SyslogAppender.java
@@ -49,6 +49,7 @@ public class SyslogAppender extends SyslogAppenderBase<ILoggingEvent> {
   boolean throwableExcluded = false;
 
 
+  @Override
   public void start() {
     super.start();
     setupStackTraceLayout();
@@ -118,11 +119,7 @@ private void handleThrowableFirstLine(OutputStream sw, IThrowableProxy tp, Strin
     sw.flush();
   }
 
-  boolean stackTraceHeaderLine(StringBuilder sb, boolean topException) {
-
-    return false;
-  }
-
+  @Override
   public Layout<ILoggingEvent> buildLayout() {
     PatternLayout layout = new PatternLayout();
     layout.getInstanceConverterMap().put("syslogStart",
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/server/RemoteAppenderStreamClient.java b/logback-android/src/main/java/ch/qos/logback/classic/net/server/RemoteAppenderStreamClient.java
index f604063212..5bbddbf22e 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/server/RemoteAppenderStreamClient.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/server/RemoteAppenderStreamClient.java
@@ -43,7 +43,7 @@ class RemoteAppenderStreamClient implements RemoteAppenderClient {
   /**
    * Constructs a new client.
    * @param id a display name for the client
-   * @param inputStream input stream from which events will be read
+   * @param socket socket from which events will be read
    */
   public RemoteAppenderStreamClient(String id, Socket socket) {
     this.id = id;
@@ -69,6 +69,7 @@ public RemoteAppenderStreamClient(String id, InputStream inputStream) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void setLoggerContext(LoggerContext lc) {
     this.lc = lc;
     this.logger = lc.getLogger(getClass().getPackage().getName());
@@ -77,6 +78,7 @@ public void setLoggerContext(LoggerContext lc) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void close() {
     if (socket == null) return;
     CloseUtil.closeQuietly(socket);
@@ -85,6 +87,7 @@ public void close() {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void run() {
     logger.info(this + ": connected");
     HardenedObjectInputStream ois = null;
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/server/SSLServerSocketReceiver.java b/logback-android/src/main/java/ch/qos/logback/classic/net/server/SSLServerSocketReceiver.java
index 5db05bd112..9b368b1b74 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/server/SSLServerSocketReceiver.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/server/SSLServerSocketReceiver.java
@@ -54,6 +54,7 @@ protected ServerSocketFactory getServerSocketFactory() throws Exception {
    * @return SSL configuration; if no SSL configuration was provided
    *    a default configuration is returned
    */
+  @Override
   public SSLConfiguration getSsl() {
     if (ssl == null) {
       ssl = new SSLConfiguration();
@@ -65,6 +66,7 @@ public SSLConfiguration getSsl() {
    * Gets the server's SSL configuration.
    * @param ssl the SSL configuration to set.
    */
+  @Override
   public void setSsl(SSLConfiguration ssl) {
     this.ssl = ssl;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/net/server/ServerSocketReceiver.java b/logback-android/src/main/java/ch/qos/logback/classic/net/server/ServerSocketReceiver.java
index ad438e6cea..5311d7a9be 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/net/server/ServerSocketReceiver.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/net/server/ServerSocketReceiver.java
@@ -50,6 +50,7 @@ public class ServerSocketReceiver extends ReceiverBase {
   /**
    * Starts the server.
    */
+  @Override
   protected boolean shouldStart() {
     ServerSocket serverSocket = null;
     try {
@@ -89,6 +90,7 @@ protected Runnable getRunnableTask() {
   /**
    * {@inheritDoc}
    */
+  @Override
   protected void onStop() {
     try {
       if (runner == null) return;
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java
index 416ada5ec4..1a27064236 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java
@@ -48,6 +48,7 @@ public class CallerDataConverter extends ClassicConverter {
   int errorCount = 0;
 
   @SuppressWarnings("unchecked")
+  @Override
   public void start() {
     String depthStr = getFirstOption();
     if (depthStr == null) {
@@ -114,6 +115,7 @@ private void addEvaluator(EventEvaluator<ILoggingEvent> ee) {
     evaluatorList.add(ee);
   }
 
+  @Override
   public String convert(ILoggingEvent le) {
     StringBuilder buf = new StringBuilder();
 
@@ -136,7 +138,7 @@ public String convert(ILoggingEvent le) {
                 "Exception thrown for evaluator named [" + ee.getName() + "].",
                 this, eex);
             errorStatus.add(new ErrorStatus(
-                "This was the last warning about this evaluator's errors."
+                "This was the last warning about this evaluator's errors. "
                     + "We don't want the StatusManager to get flooded.", this));
             addStatus(errorStatus);
           }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java
index 35596a62f3..5268513233 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java
@@ -25,6 +25,7 @@
  */
 public class ClassNameOnlyAbbreviator implements Abbreviator {
 
+  @Override
   public String abbreviate(String fqClassName) {
     // we ignore the fact that the separator character can also be a dollar
     // If the inner class is org.good.AClass#Inner, returning
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/ClassOfCallerConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/ClassOfCallerConverter.java
index 5380874f5c..3e2b57fb51 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/ClassOfCallerConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/ClassOfCallerConverter.java
@@ -20,6 +20,7 @@
 
 public class ClassOfCallerConverter extends NamedConverter {
 
+  @Override
   protected String getFullyQualifiedName(ILoggingEvent event) {
     
     StackTraceElement[] cda = event.getCallerData();
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/ContextNameConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/ContextNameConverter.java
index 0e15388f78..83dbc82c2a 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/ContextNameConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/ContextNameConverter.java
@@ -27,6 +27,7 @@ public class ContextNameConverter extends ClassicConverter {
   /**
    * Return the name of the logger context's name.
    */
+  @Override
   public String convert(ILoggingEvent event) {
     return event.getLoggerContextVO().getName();
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java
index eed20f4f04..f31f39112f 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java
@@ -27,6 +27,7 @@ public class DateConverter extends ClassicConverter {
 
   CachingDateFormatter cachingDateFormatter = null;
 
+  @Override
   public void start() {
 
 
@@ -79,6 +80,7 @@ private Locale parseLocale(String input) {
     return locale;
   }
 
+  @Override
   public String convert(ILoggingEvent le) {
     long timestamp = le.getTimeStamp();
     return cachingDateFormatter.format(timestamp);
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java
index 9bb4d5c546..24835bef9a 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java
@@ -40,6 +40,7 @@ public class EnsureExceptionHandling implements
    * 
    * 
    */
+  @Override
   public void process(Context context, Converter<ILoggingEvent> head) {
     if(head == null) {
       // this should never happen
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/FileOfCallerConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/FileOfCallerConverter.java
index 05ec95def0..c0c3298b86 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/FileOfCallerConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/FileOfCallerConverter.java
@@ -20,6 +20,7 @@
 
 public class FileOfCallerConverter extends ClassicConverter {
 
+  @Override
   public String convert(ILoggingEvent le) {
     StackTraceElement[] cda = le.getCallerData();
     if (cda != null && cda.length > 0) {
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/LevelConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/LevelConverter.java
index cf504a6cc1..a0b751ecfe 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/LevelConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/LevelConverter.java
@@ -24,6 +24,7 @@
  */
 public class LevelConverter extends ClassicConverter {
 
+  @Override
   public String convert(ILoggingEvent le) {
     return le.getLevel().toString();
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/LineOfCallerConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/LineOfCallerConverter.java
index a6829088c5..9c5f2a1cec 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/LineOfCallerConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/LineOfCallerConverter.java
@@ -20,6 +20,7 @@
 
 public class LineOfCallerConverter extends ClassicConverter {
 
+  @Override
   public String convert(ILoggingEvent le) {
     StackTraceElement[] cda = le.getCallerData();
     if (cda != null && cda.length > 0) {
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/LineSeparatorConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/LineSeparatorConverter.java
index dc0741522d..f86e10835d 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/LineSeparatorConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/LineSeparatorConverter.java
@@ -20,6 +20,7 @@
 
 public class LineSeparatorConverter extends ClassicConverter {
 
+  @Override
   public String convert(ILoggingEvent event) {
     return CoreConstants.LINE_SEPARATOR;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/LoggerConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/LoggerConverter.java
index 6eb4447eaa..f74bfe266c 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/LoggerConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/LoggerConverter.java
@@ -19,6 +19,7 @@
 
 public class LoggerConverter extends NamedConverter {
 
+  @Override
   protected String getFullyQualifiedName(ILoggingEvent event) {
     return event.getLoggerName();
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/MarkerConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/MarkerConverter.java
index 1d529fb8fe..7f886ef831 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/MarkerConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/MarkerConverter.java
@@ -30,6 +30,7 @@ public class MarkerConverter extends ClassicConverter {
 
   private static String EMPTY = "";
 
+  @Override
   public String convert(ILoggingEvent le) {
     List<Marker> markers = le.getMarkers();
     if (markers == null || markers.isEmpty()) {
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java
index 98f8689d48..b37fa88583 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java
@@ -24,6 +24,7 @@
  */
 public class MessageConverter extends ClassicConverter {
 
+  @Override
   public String convert(ILoggingEvent event) {
     return event.getFormattedMessage();
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/MethodOfCallerConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/MethodOfCallerConverter.java
index 214c344b6c..279b130f89 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/MethodOfCallerConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/MethodOfCallerConverter.java
@@ -20,6 +20,7 @@
 
 public class MethodOfCallerConverter extends ClassicConverter {
 
+  @Override
   public String convert(ILoggingEvent le) {
     StackTraceElement[] cda = le.getCallerData();
     if (cda != null && cda.length > 0) {
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/NamedConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/NamedConverter.java
index 26c23c3fc4..fc652c41b2 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/NamedConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/NamedConverter.java
@@ -30,6 +30,7 @@ public abstract class NamedConverter extends ClassicConverter {
    */
   protected abstract String getFullyQualifiedName(final ILoggingEvent event);
 
+  @Override
   public void start() {
     String optStr = getFirstOption();
     if (optStr != null) {
@@ -46,6 +47,7 @@ public void start() {
     }
   }
 
+  @Override
   public String convert(ILoggingEvent event) {
     String fqn = getFullyQualifiedName(event);
 
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/NopThrowableInformationConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/NopThrowableInformationConverter.java
index 6c8e4e4d2f..2da159636e 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/NopThrowableInformationConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/NopThrowableInformationConverter.java
@@ -38,6 +38,7 @@
  */
 public class NopThrowableInformationConverter extends ThrowableHandlingConverter {
 
+  @Override
   public String convert(ILoggingEvent event) {
     return CoreConstants.EMPTY_STRING;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/PropertyConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/PropertyConverter.java
index 33dbdd85f5..92c9ddbd6e 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/PropertyConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/PropertyConverter.java
@@ -24,6 +24,7 @@ public final class PropertyConverter extends ClassicConverter {
 
   String key;
 
+  @Override
   public void start() {
     String optStr = getFirstOption();
     if (optStr != null) {
@@ -32,6 +33,7 @@ public void start() {
     }
   }
 
+  @Override
   public String convert(ILoggingEvent event) {
     if (key == null) {
       return "Property_HAS_NO_KEY";
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/RelativeTimeConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/RelativeTimeConverter.java
index 81b8f403e0..bbd2a082d5 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/RelativeTimeConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/RelativeTimeConverter.java
@@ -22,6 +22,7 @@ public class RelativeTimeConverter extends ClassicConverter {
   long lastTimestamp = -1;
   String timesmapCache = null;
 
+  @Override
   public String convert(ILoggingEvent event) {
     long now = event.getTimeStamp();
 
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java
index 1833841ad5..1672dadffe 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/SyslogStartConverter.java
@@ -36,6 +36,7 @@ public class SyslogStartConverter extends ClassicConverter {
   final String localHostName = "localhost";
   int facility;
 
+  @Override
   public void start() {
     int errorCount = 0;
     
@@ -63,6 +64,7 @@ public void start() {
     }
   }
 
+  @Override
   public String convert(ILoggingEvent event) {
     StringBuilder sb = new StringBuilder();
 
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java
index 4e8b745a96..6953b06d49 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java
@@ -26,6 +26,7 @@ public TargetLengthBasedClassNameAbbreviator(int targetLength) {
     this.targetLength = targetLength;
   }
 
+  @Override
   public String abbreviate(String fqClassName) {
     StringBuilder buf = new StringBuilder(targetLength);
     if (fqClassName == null) {
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/ThreadConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/ThreadConverter.java
index 566268a923..a3b614ac96 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/ThreadConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/ThreadConverter.java
@@ -24,6 +24,7 @@
  */
 public class ThreadConverter extends ClassicConverter {
 
+  @Override
   public String convert(ILoggingEvent event) {
     return event.getThreadName();
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java b/logback-android/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java
index 370181147f..003f5fcdec 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java
@@ -46,6 +46,7 @@ public class ThrowableProxyConverter extends ThrowableHandlingConverter {
   int errorCount = 0;
 
   @SuppressWarnings("unchecked")
+  @Override
   public void start() {
 
     String lengthStr = getFirstOption();
@@ -103,6 +104,7 @@ private void addIgnoreStackTraceLine(String ignoredStackTraceLine) {
     ignoredStackTraceLines.add(ignoredStackTraceLine);
   }
 
+  @Override
   public void stop() {
     evaluatorList = null;
     super.stop();
@@ -112,6 +114,7 @@ protected void extraData(StringBuilder builder, StackTraceElementProxy step) {
     // nop
   }
 
+  @Override
   public String convert(ILoggingEvent event) {
 
     IThrowableProxy tp = event.getThrowableProxy();
@@ -139,7 +142,7 @@ public String convert(ILoggingEvent event) {
                     "Exception thrown for evaluator named [" + ee.getName() + "].",
                     this, eex);
             errorStatus.add(new ErrorStatus(
-                    "This was the last warning about this evaluator's errors."
+                    "This was the last warning about this evaluator's errors. "
                             + "We don't want the StatusManager to get flooded.", this));
             addStatus(errorStatus);
           }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/selector/DefaultContextSelector.java b/logback-android/src/main/java/ch/qos/logback/classic/selector/DefaultContextSelector.java
index 6ddfeb6830..08f7d923c7 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/selector/DefaultContextSelector.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/selector/DefaultContextSelector.java
@@ -28,22 +28,27 @@ public DefaultContextSelector(LoggerContext context) {
     this.defaultLoggerContext = context;
   }
   
+  @Override
   public LoggerContext getLoggerContext() {
     return getDefaultLoggerContext();
   }
 
+  @Override
   public LoggerContext getDefaultLoggerContext() {
     return defaultLoggerContext;
   }
 
+  @Override
   public LoggerContext detachLoggerContext(String loggerContextName) {
     return defaultLoggerContext;
   }
   
+  @Override
   public List<String> getContextNames() {
     return Arrays.asList(defaultLoggerContext.getName());
   }
   
+  @Override
   public LoggerContext getLoggerContext(String name) {
     if (defaultLoggerContext.getName().equals(name)) {
       return defaultLoggerContext;
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/sift/AppenderFactoryUsingJoran.java b/logback-android/src/main/java/ch/qos/logback/classic/sift/AppenderFactoryUsingJoran.java
index c06f6b9f89..a77d25b01f 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/sift/AppenderFactoryUsingJoran.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/sift/AppenderFactoryUsingJoran.java
@@ -33,6 +33,7 @@ public class AppenderFactoryUsingJoran extends AbstractAppenderFactoryUsingJoran
     super(eventList, key, parentPropertyMap);
   }
 
+  @Override
   public SiftingJoranConfiguratorBase<ILoggingEvent> getSiftingJoranConfigurator(String discriminatingValue) {
     return new SiftingJoranConfigurator(key, discriminatingValue, parentPropertyMap);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/sift/ContextBasedDiscriminator.java b/logback-android/src/main/java/ch/qos/logback/classic/sift/ContextBasedDiscriminator.java
index a6a422dedc..ebe15fed8d 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/sift/ContextBasedDiscriminator.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/sift/ContextBasedDiscriminator.java
@@ -36,6 +36,7 @@ public class ContextBasedDiscriminator extends AbstractDiscriminator<ILoggingEve
   /**
    * Return the name of the current context name as found in the logging event.
    */
+  @Override
   public String getDiscriminatingValue(ILoggingEvent event) {
     String contextName = event.getLoggerContextVO().getName();
 
@@ -46,6 +47,7 @@ public String getDiscriminatingValue(ILoggingEvent event) {
     }
   }
 
+  @Override
   public String getKey() {
     return KEY;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java b/logback-android/src/main/java/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java
index 7be0e1048a..e73d671adc 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java
@@ -39,6 +39,7 @@ public class MDCBasedDiscriminator extends AbstractDiscriminator<ILoggingEvent>
    * property. If that value is null, then return the value assigned to the
    * DefaultValue property.
    */
+  @Override
   public String getDiscriminatingValue(ILoggingEvent event) {
     // http://jira.qos.ch/browse/LBCLASSIC-213
     Map<String, String> mdcMap = event.getMDCPropertyMap();
@@ -69,6 +70,7 @@ public void start() {
     }
   }
 
+  @Override
   public String getKey() {
     return key;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/sift/SiftAction.java b/logback-android/src/main/java/ch/qos/logback/classic/sift/SiftAction.java
index 7f977be061..693825d6c3 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/sift/SiftAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/sift/SiftAction.java
@@ -50,6 +50,7 @@ public void end(InterpretationContext ic, String name) throws ActionException {
     }
   }
 
+  @Override
   public void inPlay(SaxEvent event) {
     seList.add(event);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/sift/SiftingAppender.java b/logback-android/src/main/java/ch/qos/logback/classic/sift/SiftingAppender.java
index 22bd73369e..6bc1bf038d 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/sift/SiftingAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/sift/SiftingAppender.java
@@ -48,6 +48,7 @@ public void setDiscriminator(Discriminator<ILoggingEvent> discriminator) {
     super.setDiscriminator(discriminator);
   }
 
+  @Override
   protected boolean eventMarksEndOfLife(ILoggingEvent event) {
     List<Marker> markers = event.getMarkers();
     if(markers == null)
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java b/logback-android/src/main/java/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java
index 42d84e5887..708acb683a 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java
@@ -68,6 +68,7 @@ protected void buildInterpreter() {
   }
 
   @SuppressWarnings("unchecked")
+  @Override
   public Appender<ILoggingEvent> getAppender() {
     Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap();
     HashMap<String, Appender<?>> appenderMap = (HashMap<String, Appender<?>>) omap.get(ActionConst.APPENDER_BAG);
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/spi/ILoggingEvent.java b/logback-android/src/main/java/ch/qos/logback/classic/spi/ILoggingEvent.java
index 55c7ba1e69..9a0796c8b0 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/spi/ILoggingEvent.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/spi/ILoggingEvent.java
@@ -98,6 +98,7 @@ default List<Marker> getMarkerList() {
   Map<String, String> getMdc();
   long getTimeStamp();
 
+  @Override
   void prepareForDeferredProcessing();
 
 }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/spi/LoggerComparator.java b/logback-android/src/main/java/ch/qos/logback/classic/spi/LoggerComparator.java
index b46a615927..fd2e58c230 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/spi/LoggerComparator.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/spi/LoggerComparator.java
@@ -24,6 +24,7 @@ public class LoggerComparator implements Comparator<Logger>, Serializable {
 
   private static final long serialVersionUID = 1L;
 
+  @Override
   public int compare(Logger l1, Logger l2) {
     if (l1.getName().equals(l2.getName())) {
       return 0;
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java b/logback-android/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java
index 6346047d3c..5122eb6e1d 100755
--- a/logback-android/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java
@@ -143,14 +143,17 @@ public void setArgumentArray(Object[] argArray) {
     this.argumentArray = argArray;
   }
 
+  @Override
   public Object[] getArgumentArray() {
     return this.argumentArray;
   }
 
+  @Override
   public Level getLevel() {
     return level;
   }
 
+  @Override
   public String getLoggerName() {
     return loggerName;
   }
@@ -159,6 +162,7 @@ public void setLoggerName(String loggerName) {
     this.loggerName = loggerName;
   }
 
+  @Override
   public String getThreadName() {
     if (threadName == null) {
       threadName = (Thread.currentThread()).getName();
@@ -181,6 +185,7 @@ public void setThreadName(String threadName) throws IllegalStateException {
    * Returns the throwable information contained within this event. May be
    * <code>null</code> if there is no such information.
    */
+  @Override
   public IThrowableProxy getThrowableProxy() {
     return throwableProxy;
   }
@@ -204,6 +209,7 @@ public void setThrowableProxy(ThrowableProxy tp) {
    * Note that due to performance concerns, this method does NOT extract caller
    * data. It is the responsibility of the caller to extract caller information.
    */
+  @Override
   public void prepareForDeferredProcessing() {
     this.getFormattedMessage();
     this.getThreadName();
@@ -211,6 +217,7 @@ public void prepareForDeferredProcessing() {
     this.getMDCPropertyMap();
   }
 
+  @Override
   public LoggerContextVO getLoggerContextVO() {
     return loggerContextVO;
   }
@@ -219,6 +226,7 @@ public void setLoggerContextRemoteView(LoggerContextVO loggerContextVO) {
     this.loggerContextVO = loggerContextVO;
   }
 
+  @Override
   public String getMessage() {
     return message;
   }
@@ -231,6 +239,7 @@ public void setMessage(String message) {
     this.message = message;
   }
 
+  @Override
   public long getTimeStamp() {
     return timeStamp;
   }
@@ -256,6 +265,7 @@ public void setLevel(Level level) {
    * information.
    * </p>
    */
+  @Override
   public StackTraceElement[] getCallerData() {
     if (callerDataArray == null) {
       callerDataArray = CallerData.extract(new Throwable(), fqnOfLoggerClass,
@@ -264,6 +274,7 @@ public StackTraceElement[] getCallerData() {
     return callerDataArray;
   }
 
+  @Override
   public boolean hasCallerData() {
     return (callerDataArray != null);
   }
@@ -272,6 +283,7 @@ public void setCallerData(StackTraceElement[] callerDataArray) {
     this.callerDataArray = callerDataArray;
   }
 
+  @Override
   public List<Marker> getMarkers() {
     return markers;
   }
@@ -289,6 +301,7 @@ public long getContextBirthTime() {
   }
 
   // lazy computation as suggested in LOGBACK-495
+  @Override
   public String getFormattedMessage() {
     if (formattedMessage != null) {
       return formattedMessage;
@@ -303,6 +316,7 @@ public String getFormattedMessage() {
     return formattedMessage;
   }
 
+  @Override
   public Map<String, String> getMDCPropertyMap() {
     // populate mdcPropertyMap if null
     if (mdcPropertyMap == null) {
@@ -339,6 +353,7 @@ public void setMDCPropertyMap(Map<String, String> map) {
    *
    * @deprecated Replaced by [@link #getMDCPropertyMap}
    */
+  @Override
   public Map<String, String> getMdc() {
     return getMDCPropertyMap();
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/spi/LoggingEventVO.java b/logback-android/src/main/java/ch/qos/logback/classic/spi/LoggingEventVO.java
index 18e7157355..709c497061 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/spi/LoggingEventVO.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/spi/LoggingEventVO.java
@@ -82,26 +82,32 @@ public static LoggingEventVO build(ILoggingEvent le) {
     return ledo;
   }
 
+  @Override
   public String getThreadName() {
     return threadName;
   }
 
+  @Override
   public LoggerContextVO getLoggerContextVO() {
     return loggerContextVO;
   }
 
+  @Override
   public String getLoggerName() {
     return loggerName;
   }
 
+  @Override
   public Level getLevel() {
     return level;
   }
 
+  @Override
   public String getMessage() {
     return message;
   }
 
+  @Override
   public String getFormattedMessage() {
     if (formattedMessage != null) {
       return formattedMessage;
@@ -117,26 +123,32 @@ public String getFormattedMessage() {
     return formattedMessage;
   }
 
+  @Override
   public Object[] getArgumentArray() {
     return argumentArray;
   }
 
+  @Override
   public IThrowableProxy getThrowableProxy() {
     return throwableProxy;
   }
 
+  @Override
   public StackTraceElement[] getCallerData() {
     return callerDataArray;
   }
 
+  @Override
   public boolean hasCallerData() {
     return callerDataArray != null;
   }
 
+  @Override
   public List<Marker> getMarkers() {
     return markers;
   }
 
+  @Override
   public long getTimeStamp() {
     return timeStamp;
   }
@@ -149,13 +161,16 @@ public LoggerContextVO getContextLoggerRemoteView() {
     return loggerContextVO;
   }
 
+  @Override
   public Map<String, String> getMDCPropertyMap() {
     return mdcPropertyMap;
   }
+  @Override
   public Map<String, String> getMdc() {
     return mdcPropertyMap;
   }
   
+  @Override
   public void prepareForDeferredProcessing() {
   }
 
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/spi/ThrowableProxy.java b/logback-android/src/main/java/ch/qos/logback/classic/spi/ThrowableProxy.java
index df62f6febb..4d7b53f0fe 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/spi/ThrowableProxy.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/spi/ThrowableProxy.java
@@ -109,6 +109,7 @@ public Throwable getThrowable() {
     return throwable;
   }
 
+  @Override
   public String getMessage() {
     return message;
   }
@@ -118,14 +119,17 @@ public String getMessage() {
    * 
    * @see ch.qos.logback.classic.spi.IThrowableProxy#getClassName()
    */
+  @Override
   public String getClassName() {
     return className;
   }
 
+  @Override
   public StackTraceElementProxy[] getStackTraceElementProxyArray() {
     return stackTraceElementProxyArray;
   }
 
+  @Override
   public int getCommonFrames() {
     return commonFrames;
   }
@@ -135,10 +139,12 @@ public int getCommonFrames() {
    * 
    * @see ch.qos.logback.classic.spi.IThrowableProxy#getCause()
    */
+  @Override
   public IThrowableProxy getCause() {
     return cause;
   }
 
+  @Override
   public IThrowableProxy[] getSuppressed() {
     return suppressed;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyVO.java b/logback-android/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyVO.java
index a8ceb3efcb..0361b0283a 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyVO.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyVO.java
@@ -30,26 +30,32 @@ public class ThrowableProxyVO implements IThrowableProxy, Serializable {
   private IThrowableProxy[] suppressed;
 
 
+  @Override
   public String getMessage() {
     return message;
   }
   
+  @Override
   public String getClassName() {
     return className;
   }
 
+  @Override
   public int getCommonFrames() {
     return commonFramesCount;
   }
 
+  @Override
   public IThrowableProxy getCause() {
     return cause;
   }
   
+  @Override
   public StackTraceElementProxy[] getStackTraceElementProxyArray() {
     return stackTraceElementProxyArray;
   }
 
+  @Override
   public IThrowableProxy[] getSuppressed() {
     return suppressed;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java b/logback-android/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java
index 9f22048c2d..1281e2bc1f 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java
@@ -57,6 +57,7 @@ int getMessageCountAndThenIncrement(String msg) {
 
   // called indirectly by get() or put() which are already supposed to be
   // called from within a synchronized block
+  @Override
   protected boolean removeEldestEntry(Map.Entry<String, Integer> eldest) {
     return (size() > cacheSize);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/turbo/MDCFilter.java b/logback-android/src/main/java/ch/qos/logback/classic/turbo/MDCFilter.java
index d1fb47bdb6..3d917eb8b0 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/turbo/MDCFilter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/turbo/MDCFilter.java
@@ -75,8 +75,8 @@ public FilterReply decide(List<Marker> markers, Logger logger, Level level, Stri
       return FilterReply.NEUTRAL;
     }
 
-    String value = MDC.get(MDCKey);
-    if (this.value.equals(value)) {
+    String mdcValue = MDC.get(MDCKey);
+    if (value.equals(mdcValue)) {
       return onMatch;
     }
     return onMismatch;
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java b/logback-android/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java
index 55ab1352c2..30571e1e21 100755
--- a/logback-android/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java
@@ -183,6 +183,7 @@ public void setRefreshPeriod(long refreshPeriod) {
   }
 
   class ReconfiguringThread implements Runnable {
+    @Override
     public void run() {
       if (mainConfigurationURL == null) {
         addInfo("Due to missing top level configuration file, skipping reconfiguration");
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java b/logback-android/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java
index bdfe2e6760..1e1b75fc17 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/turbo/TurboFilter.java
@@ -57,14 +57,17 @@ public abstract class TurboFilter extends ContextAwareBase implements LifeCycle
   public abstract FilterReply decide(List<Marker> markers, Logger logger,
                                      Level level, String format, Object[] params, Throwable t);
 
+  @Override
   public void start() {
     this.start = true;
   }
 
+  @Override
   public boolean isStarted() {
     return this.start;
   }
 
+  @Override
   public void stop() {
     this.start = false;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java b/logback-android/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java
index f5044bd6d9..77c20a9ee0 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java
@@ -62,7 +62,7 @@ private URL findConfigFileFromSystemProperties(boolean updateStatus) {
         File file = new File(logbackConfigFile);
         if (file.exists() && file.isFile()) {
           if (updateStatus) {
-            statusOnResourceSearch(logbackConfigFile, this.classLoader, logbackConfigFile);
+            statusOnResourceSearch(logbackConfigFile, logbackConfigFile);
           }
           result = file.toURI().toURL();
         } else {
@@ -78,7 +78,7 @@ private URL findConfigFileFromSystemProperties(boolean updateStatus) {
         }
       } finally {
         if (updateStatus) {
-          statusOnResourceSearch(logbackConfigFile, this.classLoader, result != null ? result.toString() : null);
+          statusOnResourceSearch(logbackConfigFile, result != null ? result.toString() : null);
         }
       }
     }
@@ -104,7 +104,7 @@ private URL getResource(String filename, ClassLoader myClassLoader, boolean upda
       if (url != null) {
         resourcePath = filename;
       }
-      statusOnResourceSearch(filename, myClassLoader, resourcePath);
+      statusOnResourceSearch(filename, resourcePath);
     }
     return url;
   }
@@ -149,7 +149,7 @@ public void autoConfig() throws JoranException {
   /**
    * Adds a status message for the result of the resource search
    */
-  private void statusOnResourceSearch(String resourceName, ClassLoader classLoader, String path) {
+  private void statusOnResourceSearch(String resourceName, String path) {
     StatusManager sm = loggerContext.getStatusManager();
     if (path == null) {
       sm.add(new InfoStatus("Could NOT find resource [" + resourceName + "]",
diff --git a/logback-android/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java b/logback-android/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java
index 029615d055..7251cd14c3 100644
--- a/logback-android/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java
+++ b/logback-android/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java
@@ -96,6 +96,7 @@ private Map<String, String> duplicateAndInsertNewMap(Map<String, String> oldMap)
    *
    * @throws IllegalArgumentException in case the "key" parameter is null
    */
+  @Override
   public void put(String key, String val) throws IllegalArgumentException {
     if (key == null) {
       throw new IllegalArgumentException("key cannot be null");
@@ -115,6 +116,7 @@ public void put(String key, String val) throws IllegalArgumentException {
   /**
    * Remove the the context identified by the <code>key</code> parameter.
    */
+  @Override
   public void remove(String key) {
     if (key == null) {
       return;
@@ -136,6 +138,7 @@ public void remove(String key) {
   /**
    * Clear all entries in the MDC.
    */
+  @Override
   public void clear() {
     lastOperation.set(WRITE_OPERATION);
     copyOnThreadLocal.remove();
@@ -144,6 +147,7 @@ public void clear() {
   /**
    * Get the context identified by the <code>key</code> parameter.
    */
+  @Override
   public String get(String key) {
     final Map<String, String> map = copyOnThreadLocal.get();
     if ((map != null) && (key != null)) {
@@ -180,6 +184,7 @@ public Set<String> getKeys() {
    * Return a copy of the current thread's context map. Returned value may be
    * null.
    */
+  @Override
   public Map<String, String> getCopyOfContextMap() {
     Map<String, String> hashMap = copyOnThreadLocal.get();
     if (hashMap == null) {
@@ -189,6 +194,7 @@ public Map<String, String> getCopyOfContextMap() {
     }
   }
 
+  @Override
   public void setContextMap(Map<String, String> contextMap) {
     lastOperation.set(WRITE_OPERATION);
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/AppenderBase.java b/logback-android/src/main/java/ch/qos/logback/core/AppenderBase.java
index ebaf2d5643..d289b1bcdb 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/AppenderBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/AppenderBase.java
@@ -49,6 +49,7 @@ abstract public class AppenderBase<E> extends ContextAwareBase implements
 
   private FilterAttachableImpl<E> fai = new FilterAttachableImpl<E>();
 
+  @Override
   public String getName() {
     return name;
   }
@@ -58,6 +59,7 @@ public String getName() {
 
   static final int ALLOWED_REPEATS = 5;
 
+  @Override
   public synchronized void doAppend(E eventObject) {
     // WARNING: The guard check MUST be the first statement in the
     // doAppend() method.
@@ -100,38 +102,47 @@ public synchronized void doAppend(E eventObject) {
   /**
    * Set the name of this appender.
    */
+  @Override
   public void setName(String name) {
     this.name = name;
   }
 
+  @Override
   public void start() {
     started = true;
   }
 
+  @Override
   public void stop() {
     started = false;
   }
 
+  @Override
   public boolean isStarted() {
     return started;
   }
 
+  @Override
   public String toString() {
     return this.getClass().getName() + "[" + name + "]";
   }
 
+  @Override
   public void addFilter(Filter<E> newFilter) {
     fai.addFilter(newFilter);
   }
 
+  @Override
   public void clearAllFilters() {
     fai.clearAllFilters();
   }
 
+  @Override
   public List<Filter<E>> getCopyOfAttachedFiltersList() {
     return fai.getCopyOfAttachedFiltersList();
   }
 
+  @Override
   public FilterReply getFilterChainDecision(E event) {
     return fai.getFilterChainDecision(event);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/AsyncAppenderBase.java b/logback-android/src/main/java/ch/qos/logback/core/AsyncAppenderBase.java
index 1fffc30259..05cb7a64c5 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/AsyncAppenderBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/AsyncAppenderBase.java
@@ -244,6 +244,7 @@ public int getRemainingCapacity() {
 
 
 
+  @Override
   public void addAppender(Appender<E> newAppender) {
     if (appenderCount == 0) {
       appenderCount++;
@@ -255,32 +256,39 @@ public void addAppender(Appender<E> newAppender) {
     }
   }
 
+  @Override
   public Iterator<Appender<E>> iteratorForAppenders() {
     return aai.iteratorForAppenders();
   }
 
+  @Override
   public Appender<E> getAppender(String name) {
     return aai.getAppender(name);
   }
 
+  @Override
   public boolean isAttached(Appender<E> eAppender) {
     return aai.isAttached(eAppender);
   }
 
+  @Override
   public void detachAndStopAllAppenders() {
     aai.detachAndStopAllAppenders();
   }
 
+  @Override
   public boolean detachAppender(Appender<E> eAppender) {
     return aai.detachAppender(eAppender);
   }
 
+  @Override
   public boolean detachAppender(String name) {
     return aai.detachAppender(name);
   }
 
   class Worker extends Thread {
 
+    @Override
     public void run() {
       AsyncAppenderBase<E> parent = AsyncAppenderBase.this;
       AppenderAttachableImpl<E> aai = parent.aai;
diff --git a/logback-android/src/main/java/ch/qos/logback/core/BasicStatusManager.java b/logback-android/src/main/java/ch/qos/logback/core/BasicStatusManager.java
index 804e768511..4c35623be8 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/BasicStatusManager.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/BasicStatusManager.java
@@ -58,6 +58,7 @@ public class BasicStatusManager implements StatusManager {
    * @param newStatus
    *                the status message to add
    */
+  @Override
   public void add(Status newStatus) {
     // LBCORE-72: fire event before the count check
     fireStatusAddEvent(newStatus);
@@ -77,6 +78,7 @@ public void add(Status newStatus) {
 
   }
 
+  @Override
   public List<Status> getCopyOfStatusList() {
     synchronized (statusListLock) {
       List<Status> tList = new ArrayList<Status>(statusList);
@@ -93,6 +95,7 @@ private void fireStatusAddEvent(Status status) {
     }
   }
 
+  @Override
   public void clear() {
     synchronized (statusListLock) {
       count = 0;
@@ -105,6 +108,7 @@ public int getLevel() {
     return level;
   }
 
+  @Override
   public int getCount() {
     return count;
   }
@@ -113,6 +117,7 @@ public int getCount() {
    * This implementation does not allow duplicate installations of OnConsoleStatusListener
    * @param listener
    */
+  @Override
   public boolean add(StatusListener listener) {
     synchronized (statusListenerListLock) {
       if (listener instanceof OnConsoleStatusListener) {
@@ -135,6 +140,7 @@ private boolean checkForPresence(List<StatusListener> statusListenerList, Class<
     return false;
   }
 
+  @Override
   public boolean addUniquely(StatusListener newListener, Object origin) {
     for (StatusListener listener : getCopyOfStatusListenerList()) {
       if (listener.getClass().isInstance(newListener)) {
@@ -147,12 +153,14 @@ public boolean addUniquely(StatusListener newListener, Object origin) {
     return true;
   }
 
+  @Override
   public void remove(StatusListener listener) {
     synchronized (statusListenerListLock) {
       statusListenerList.remove(listener);
     }
   }
 
+  @Override
   public List<StatusListener> getCopyOfStatusListenerList() {
     synchronized (statusListenerListLock) {
       return new ArrayList<StatusListener>(statusListenerList);
diff --git a/logback-android/src/main/java/ch/qos/logback/core/Context.java b/logback-android/src/main/java/ch/qos/logback/core/Context.java
index 1c65ec0dde..56df06c1c4 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/Context.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/Context.java
@@ -61,6 +61,7 @@ public interface Context extends PropertyContainer {
    * @param key the key of the property
    * @return the associated string value
    */
+  @Override
   String getProperty(String key);
 
   /**
@@ -76,6 +77,7 @@ public interface Context extends PropertyContainer {
    * @return the property map copy
    * @since 0.9.20
    */
+  @Override
   Map<String, String> getCopyOfPropertyMap();
 
   /**
diff --git a/logback-android/src/main/java/ch/qos/logback/core/ContextBase.java b/logback-android/src/main/java/ch/qos/logback/core/ContextBase.java
index 40b865cdc9..d4dfa6af79 100755
--- a/logback-android/src/main/java/ch/qos/logback/core/ContextBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/ContextBase.java
@@ -56,6 +56,7 @@ public ContextBase() {
     initCollisionMaps();
   }
 
+  @Override
   public StatusManager getStatusManager() {
     return sm;
   }
@@ -78,10 +79,12 @@ public void setStatusManager(StatusManager statusManager) {
     this.sm = statusManager;
   }
 
+  @Override
   public Map<String, String> getCopyOfPropertyMap() {
     return new HashMap<String, String>(propertyMap);
   }
 
+  @Override
   public void putProperty(String key, String val) {
     this.propertyMap.put(key, val);
   }
@@ -98,6 +101,7 @@ protected void initCollisionMaps() {
    * @param key the property's key
    * @return the string value associated with the key
    */
+  @Override
   public String getProperty(String key) {
     if (CONTEXT_NAME_KEY.equals(key))
       return getName();
@@ -105,10 +109,12 @@ public String getProperty(String key) {
     return (String) this.propertyMap.get(key);
   }
 
+  @Override
   public Object getObject(String key) {
     return objectMap.get(key);
   }
 
+  @Override
   public void putObject(String key, Object value) {
     objectMap.put(key, value);
   }
@@ -117,10 +123,12 @@ public void removeObject(String key) {
     objectMap.remove(key);
   }
 
+  @Override
   public String getName() {
     return name;
   }
 
+  @Override
   public void start() {
     // We'd like to create the executor service here, but we can't;
     // ContextBase has not always implemented LifeCycle and there are *many*
@@ -128,6 +136,7 @@ public void start() {
     started = true;
   }
 
+  @Override
   public void stop() {
     // We don't check "started" here, because the executor service uses
     // lazy initialization, rather than being created in the start method
@@ -135,6 +144,7 @@ public void stop() {
     started = false;
   }
 
+  @Override
   public boolean isStarted() {
     return started;
   }
@@ -156,6 +166,7 @@ public void reset() {
    *
    * @throws IllegalStateException if the context already has a name, other than "default".
    */
+  @Override
   public void setName(String name) throws IllegalStateException {
     if (name != null && name.equals(this.name)) {
       return; // idempotent naming
@@ -168,10 +179,12 @@ public void setName(String name) throws IllegalStateException {
     }
   }
 
+  @Override
   public long getBirthTime() {
     return birthTime;
   }
 
+  @Override
   public Object getConfigurationLock() {
     return configurationLock;
   }
@@ -212,6 +225,7 @@ private void removeShutdownHook() {
     }
   }
 
+  @Override
   public void register(LifeCycle component) {
     getLifeCycleManager().register(component);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/FileAppender.java b/logback-android/src/main/java/ch/qos/logback/core/FileAppender.java
index f887ba3e4e..97ef4f2988 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/FileAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/FileAppender.java
@@ -107,6 +107,7 @@ public String getFile() {
    * {@link #openFile} is called with the values of <b>File</b> and
    * <b>Append</b> properties.
    */
+  @Override
   public void start() {
     int errors = 0;
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/LayoutBase.java b/logback-android/src/main/java/ch/qos/logback/core/LayoutBase.java
index 33ecb3608e..579cfe8783 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/LayoutBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/LayoutBase.java
@@ -26,42 +26,52 @@ abstract public class LayoutBase<E> extends ContextAwareBase implements Layout<E
   String presentationHeader;
   String presentationFooter;
   
+  @Override
   public void setContext(Context context) {
     this.context = context;
   }
 
+  @Override
   public Context getContext() {
     return this.context;
   }
 
+  @Override
   public void start() {
     started = true;
   }
 
+  @Override
   public void stop() {
     started = false;
   }
   
+  @Override
   public boolean isStarted() {
     return started;
   }
   
+  @Override
   public String getFileHeader() {
     return fileHeader;
   }
   
+  @Override
   public String getPresentationHeader() {
     return presentationHeader;
   }
   
+  @Override
   public String getPresentationFooter() {
     return presentationFooter;
   }
   
+  @Override
   public String getFileFooter() {
     return fileFooter;
   }
 
+  @Override
   public String getContentType() {
     return "text/plain";
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/OutputStreamAppender.java b/logback-android/src/main/java/ch/qos/logback/core/OutputStreamAppender.java
index 801e3f3384..cc1191e936 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/OutputStreamAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/OutputStreamAppender.java
@@ -69,6 +69,7 @@ public OutputStream getOutputStream() {
    * Checks that requires parameters are set and if everything is in order,
    * activates this appender.
    */
+  @Override
   public void start() {
     int errors = 0;
     if (this.encoder == null) {
@@ -114,6 +115,7 @@ protected void append(E eventObject) {
    * <p>
    * Stopped appenders cannot be reused.
    */
+  @Override
   public void stop() {
     lock.lock();
     try {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/UnsynchronizedAppenderBase.java b/logback-android/src/main/java/ch/qos/logback/core/UnsynchronizedAppenderBase.java
index 94f27989ec..55ed38b964 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/UnsynchronizedAppenderBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/UnsynchronizedAppenderBase.java
@@ -52,6 +52,7 @@ abstract public class UnsynchronizedAppenderBase<E> extends ContextAwareBase imp
 
   private FilterAttachableImpl<E> fai = new FilterAttachableImpl<E>();
 
+  @Override
   public String getName() {
     return name;
   }
@@ -61,6 +62,7 @@ public String getName() {
 
   static final int ALLOWED_REPEATS = 3;
 
+  @Override
   public void doAppend(E eventObject) {
     // WARNING: The guard check MUST be the first statement in the
     // doAppend() method.
@@ -103,38 +105,47 @@ public void doAppend(E eventObject) {
   /**
    * Set the name of this appender.
    */
+  @Override
   public void setName(String name) {
     this.name = name;
   }
 
+  @Override
   public void start() {
     started = true;
   }
 
+  @Override
   public void stop() {
     started = false;
   }
 
+  @Override
   public boolean isStarted() {
     return started;
   }
 
+  @Override
   public String toString() {
     return this.getClass().getName() + "[" + name + "]";
   }
 
+  @Override
   public void addFilter(Filter<E> newFilter) {
     fai.addFilter(newFilter);
   }
 
+  @Override
   public void clearAllFilters() {
     fai.clearAllFilters();
   }
 
+  @Override
   public List<Filter<E>> getCopyOfAttachedFiltersList() {
     return fai.getCopyOfAttachedFiltersList();
   }
 
+  @Override
   public FilterReply getFilterChainDecision(E event) {
     return fai.getFilterChainDecision(event);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/boolex/EventEvaluatorBase.java b/logback-android/src/main/java/ch/qos/logback/core/boolex/EventEvaluatorBase.java
index d1c88449c0..576fc343e7 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/boolex/EventEvaluatorBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/boolex/EventEvaluatorBase.java
@@ -23,10 +23,12 @@ abstract public class EventEvaluatorBase<E> extends ContextAwareBase implements
   String name;
   boolean started;
 
+  @Override
   public String getName() {
     return name;
   }
 
+  @Override
   public void setName(String name) {
     if (this.name != null) {
       throw new IllegalStateException("name has been already set");
@@ -34,14 +36,17 @@ public void setName(String name) {
     this.name = name;
   }
   
+  @Override
   public boolean isStarted() {
     return started;
   }
 
+  @Override
   public void start() {
     started = true;
   }
 
+  @Override
   public void stop() {
     started = false;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/encoder/EncoderBase.java b/logback-android/src/main/java/ch/qos/logback/core/encoder/EncoderBase.java
index 07abe192d6..3a8f1cc399 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/encoder/EncoderBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/encoder/EncoderBase.java
@@ -21,14 +21,17 @@ abstract public class EncoderBase<E> extends ContextAwareBase implements Encoder
 
   protected boolean started;
   
+  @Override
   public boolean isStarted() {
     return started;
   }
   
+  @Override
   public void start() {
     started = true;
   }
 
+  @Override
   public void stop() {
     started = false;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/encoder/LayoutWrappingEncoder.java b/logback-android/src/main/java/ch/qos/logback/core/encoder/LayoutWrappingEncoder.java
index 6a9e4ec52e..5eb3110924 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/encoder/LayoutWrappingEncoder.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/encoder/LayoutWrappingEncoder.java
@@ -113,15 +113,18 @@ private byte[] convertToBytes(String s) {
     }
   }
 
+  @Override
   public byte[] encode(E event) {
     String txt = layout.doLayout(event);
     return convertToBytes(txt);
   }
 
+  @Override
   public boolean isStarted() {
     return false;
   }
 
+  @Override
   public void start() {
     if (immediateFlush != null) {
       if (parent instanceof OutputStreamAppender) {
@@ -136,6 +139,7 @@ public void start() {
     started = true;
   }
 
+  @Override
   public void stop() {
     started = false;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java b/logback-android/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java
index 8f4890e346..d09d062f5f 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java
@@ -57,6 +57,7 @@ public void setEvaluator(EventEvaluator<E> evaluator) {
     this.evaluator = evaluator;
   }
 
+  @Override
   public FilterReply decide(E event) {
     // let us not throw an exception
     // see also bug #17.
diff --git a/logback-android/src/main/java/ch/qos/logback/core/filter/Filter.java b/logback-android/src/main/java/ch/qos/logback/core/filter/Filter.java
index da2169f7d3..f3a2adbaf6 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/filter/Filter.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/filter/Filter.java
@@ -36,14 +36,17 @@ public abstract class Filter<E> extends ContextAwareBase implements LifeCycle {
 
   boolean start = false;
 
+  @Override
   public void start() {
     this.start = true;
   }
 
+  @Override
   public boolean isStarted() {
     return this.start;
   }
 
+  @Override
   public void stop() {
     this.start = false;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/hook/DefaultShutdownHook.java b/logback-android/src/main/java/ch/qos/logback/core/hook/DefaultShutdownHook.java
index 6ca9276321..bfcc7e4606 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/hook/DefaultShutdownHook.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/hook/DefaultShutdownHook.java
@@ -48,6 +48,7 @@ public void setDelay(Duration delay) {
         this.delay = delay;
     }
 
+    @Override
     public void run() {
         if (delay.getMilliseconds() > 0) {
             addInfo("Sleeping for " + delay);
diff --git a/logback-android/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java b/logback-android/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java
index 65788c17b8..72c7019862 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java
@@ -188,6 +188,7 @@ public String getFileHeader() {
     return sbuf.toString();
   }
 
+  @Override
   public String getPresentationHeader() {
     StringBuilder sbuf = new StringBuilder();
     sbuf.append("<hr/>");
@@ -229,6 +230,7 @@ private void buildHeaderRowForTable(StringBuilder sbuf) {
     sbuf.append(LINE_SEPARATOR);
   }
 
+  @Override
   public String getPresentationFooter() {
     StringBuilder sbuf = new StringBuilder();
     sbuf.append("</table>");
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/AbstractEventEvaluatorAction.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/AbstractEventEvaluatorAction.java
index 4cbb6e3e88..765511e6f8 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/AbstractEventEvaluatorAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/AbstractEventEvaluatorAction.java
@@ -22,7 +22,6 @@
 import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.boolex.EventEvaluator;
 import ch.qos.logback.core.joran.spi.InterpretationContext;
-import ch.qos.logback.core.spi.LifeCycle;
 import ch.qos.logback.core.util.OptionHelper;
 
 abstract public class AbstractEventEvaluatorAction extends Action {
@@ -33,6 +32,7 @@ abstract public class AbstractEventEvaluatorAction extends Action {
   /**
    * Instantiates an evaluator of the given class and sets its name.
    */
+  @Override
   public void begin(InterpretationContext ec, String name, Attributes attributes) {
     // Let us forget about previous errors (in this instance)
     inError = false;
@@ -88,15 +88,14 @@ public void begin(InterpretationContext ec, String name, Attributes attributes)
    * evaluator options.
    */
   @SuppressWarnings("unchecked")
+  @Override
   public void end(InterpretationContext ec, String e) {
     if (inError) {
       return;
     }
 
-    if (evaluator instanceof LifeCycle) {
-      ((LifeCycle) evaluator).start();
-      addInfo("Starting evaluator named [" + evaluator.getName() + "]");
-    }
+    evaluator.start();
+    addInfo("Starting evaluator named [" + evaluator.getName() + "]");
 
     Object o = ec.peekObject();
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/AbstractIncludeAction.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/AbstractIncludeAction.java
index dc156376d0..da8ae1281e 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/AbstractIncludeAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/AbstractIncludeAction.java
@@ -107,11 +107,8 @@ private boolean checkAttributes(Attributes attributes) {
     } else if (count > 1) {
       optionalWarning(String.format("Only one of \"%1$s\", \"%2$s\" or \"%3$s\" attributes should be set.", FILE_ATTR, RESOURCE_ATTR, URL_ATTR), null);
       return false;
-    } else if (count == 1) {
-      return true;
     }
-    throw new IllegalStateException("Count value [" + count
-            + "] is not expected");
+    return true;
   }
 
   private URL attributeToURL(String urlAttribute) {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/Action.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/Action.java
index 37df121bcb..187fb514bd 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/Action.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/Action.java
@@ -80,6 +80,7 @@ public void body(InterpretationContext ic, String body)
   public abstract void end(InterpretationContext ic, String name)
       throws ActionException;
 
+  @Override
   public String toString() {
     return this.getClass().getName();
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java
index 3a415d60f9..4d7cc71475 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java
@@ -22,7 +22,6 @@
 import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.joran.spi.ActionException;
 import ch.qos.logback.core.joran.spi.InterpretationContext;
-import ch.qos.logback.core.spi.LifeCycle;
 import ch.qos.logback.core.util.OptionHelper;
 
 public class AppenderAction<E> extends Action {
@@ -36,6 +35,7 @@ public class AppenderAction<E> extends Action {
    * appender bag.
    */
   @SuppressWarnings("unchecked")
+  @Override
   public void begin(InterpretationContext ec, String localName,
       Attributes attributes) throws ActionException {
     // We are just beginning, reset variables
@@ -96,14 +96,13 @@ private void warnDeprecated(String className) {
    * Once the children elements are also parsed, now is the time to activate the
    * appender options.
    */
+  @Override
   public void end(InterpretationContext ec, String name) {
     if (inError) {
       return;
     }
 
-    if (appender instanceof LifeCycle) {
-      ((LifeCycle) appender).start();
-    }
+    appender.start();
 
     Object o = ec.peekObject();
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java
index 0cda1079fe..a435b757f6 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java
@@ -30,6 +30,7 @@ public class AppenderRefAction<E> extends Action {
   boolean inError = false;
 
   @SuppressWarnings("unchecked")
+  @Override
   public void begin(InterpretationContext ec, String tagName, Attributes attributes) {
     // Let us forget about previous errors (in this object)
     inError = false;
@@ -78,6 +79,7 @@ public void begin(InterpretationContext ec, String tagName, Attributes attribute
     appenderAttachable.addAppender(appender);
   }
 
+  @Override
   public void end(InterpretationContext ec, String n) {
   }
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java
index 2fe2156faf..904bfb4c33 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java
@@ -35,6 +35,7 @@ public class ConversionRuleAction extends Action {
    *
    */
   @SuppressWarnings("unchecked")
+  @Override
   public void begin(InterpretationContext ec, String localName, Attributes attributes) {
     // Let us forget about previous errors (in this object)
     inError = false;
@@ -81,6 +82,7 @@ public void begin(InterpretationContext ec, String localName, Attributes attribu
    * Once the children elements are also parsed, now is the time to activate
    * the appender options.
    */
+  @Override
   public void end(InterpretationContext ec, String n) {
   }
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/DefinePropertyAction.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/DefinePropertyAction.java
index 27c87bf613..e15405079e 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/DefinePropertyAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/DefinePropertyAction.java
@@ -38,6 +38,7 @@ public class DefinePropertyAction extends Action {
   PropertyDefiner definer;
   boolean inError;
 
+  @Override
   public void begin(InterpretationContext ec, String localName,
       Attributes attributes) throws ActionException {
     // reset variables
@@ -91,6 +92,7 @@ public void begin(InterpretationContext ec, String localName,
    * Now property definer is initialized by all properties and we can put
    * property value to context
    */
+  @Override
   public void end(InterpretationContext ec, String name) {
     if (inError) {
       return;
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/NOPAction.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/NOPAction.java
index 2c35323b2f..019d9275f5 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/NOPAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/NOPAction.java
@@ -30,10 +30,12 @@
  */
 public class NOPAction extends Action {
   
+  @Override
   public void begin(InterpretationContext ec, String name, Attributes attributes) {
   }
 
 
+  @Override
   public void end(InterpretationContext ec, String name) {
   }
 }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java
index ab2d358c4e..04cb81f455 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java
@@ -42,6 +42,7 @@ public class NestedBasicPropertyIA extends ImplicitAction {
   // be followed by the corresponding pop.
   Stack<IADataForBasicProperty> actionDataStack = new Stack<IADataForBasicProperty>();
 
+  @Override
   public boolean isApplicable(ElementPath elementPath, Attributes attributes,
       InterpretationContext ec) {
     // System.out.println("in NestedSimplePropertyIA.isApplicable [" + pattern +
@@ -79,11 +80,13 @@ public boolean isApplicable(ElementPath elementPath, Attributes attributes,
     }
   }
 
+  @Override
   public void begin(InterpretationContext ec, String localName,
       Attributes attributes) {
     // NOP
   }
 
+  @Override
   public void body(InterpretationContext ec, String body) {
 
     String finalBody = ec.subst(body);
@@ -102,6 +105,7 @@ public void body(InterpretationContext ec, String body) {
     }
   }
 
+  @Override
   public void end(InterpretationContext ec, String tagName) {
     // pop the action data object pushed in isApplicable() method call
     actionDataStack.pop();
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.java
index de9afaf73f..7a566f6640 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.java
@@ -46,6 +46,7 @@ public class NestedComplexPropertyIA extends ImplicitAction {
   // be followed by a corresponding pop.
   Stack<IADataForComplexProperty> actionDataStack = new Stack<IADataForComplexProperty>();
 
+  @Override
   public boolean isApplicable(ElementPath elementPath, Attributes attributes,
       InterpretationContext ic) {
 
@@ -84,6 +85,7 @@ public boolean isApplicable(ElementPath elementPath, Attributes attributes,
     }
   }
 
+  @Override
   public void begin(InterpretationContext ec, String localName,
       Attributes attributes) {
     // LogLog.debug("in NestComponentIA begin method");
@@ -141,6 +143,7 @@ public void begin(InterpretationContext ec, String localName,
 
   }
 
+  @Override
   public void end(InterpretationContext ec, String tagName) {
 
     // pop the action data object pushed in isApplicable() method call
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/NewRuleAction.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/NewRuleAction.java
index 30fdcb0a88..49e7fe46b6 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/NewRuleAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/NewRuleAction.java
@@ -28,6 +28,7 @@ public class NewRuleAction extends Action {
   /**
    * Instantiates an layout of the given class and sets its name.
    */
+  @Override
   public void begin(InterpretationContext ec, String localName, Attributes attributes) {
     // Let us forget about previous errors (in this object)
     inError = false;
@@ -66,6 +67,7 @@ public void begin(InterpretationContext ec, String localName, Attributes attribu
    * Once the children elements are also parsed, now is the time to activate the
    * appender options.
    */
+  @Override
   public void end(InterpretationContext ec, String n) {
   }
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/ParamAction.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/ParamAction.java
index 0a8afa20b4..e0704cd41b 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/ParamAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/ParamAction.java
@@ -28,6 +28,7 @@ public class ParamAction extends Action {
   static String NO_VALUE = "No "+VALUE_ATTRIBUTE+" attribute in <param> element";
   boolean inError = false;
 
+  @Override
   public void begin(
     InterpretationContext ec, String localName, Attributes attributes) {
     String name = attributes.getValue(NAME_ATTRIBUTE);
@@ -61,6 +62,7 @@ public void begin(
     propSetter.setProperty(name, value);
   }
 
+  @Override
   public void end(InterpretationContext ec, String localName) {
   }
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java
index f47355a97c..db084c1853 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java
@@ -54,6 +54,7 @@ public class PropertyAction extends Action {
    * all the properties found in the given file.
    * 
    */
+  @Override
   public void begin(InterpretationContext ec, String localName,
       Attributes attributes) {
 
@@ -144,6 +145,7 @@ boolean checkValueNameAttributesSanity(Attributes attributes) {
         .isEmpty(file) && OptionHelper.isEmpty(resource)));
   }
 
+  @Override
   public void end(InterpretationContext ec, String name) {
   }
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/action/StatusListenerAction.java b/logback-android/src/main/java/ch/qos/logback/core/joran/action/StatusListenerAction.java
index c43ba380a5..34af34a5b6 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/action/StatusListenerAction.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/action/StatusListenerAction.java
@@ -32,6 +32,7 @@ public class StatusListenerAction extends Action {
   Boolean effectivelyAdded = null;
   StatusListener statusListener = null;
 
+  @Override
   public void begin(InterpretationContext ec, String name, Attributes attributes) throws ActionException {
     inError = false;
     effectivelyAdded = null;
@@ -64,6 +65,7 @@ public void begin(InterpretationContext ec, String name, Attributes attributes)
   public void finish(InterpretationContext ec) {
   }
 
+  @Override
   public void end(InterpretationContext ec, String e) {
     if (inError) {
       return;
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java b/logback-android/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java
index 6a84cd8ca3..a5d14115ec 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java
@@ -105,6 +105,7 @@ private Driver buildPullParser() throws JoranException {
     }
   }
 
+  @Override
   public void startDocument() {
   }
 
@@ -112,10 +113,12 @@ public Locator getLocator() {
     return locator;
   }
 
+  @Override
   public void setDocumentLocator(Locator l) {
     locator = l;
   }
 
+  @Override
   public void startElement(String namespaceURI, String localName, String qName,
       Attributes atts) {
 
@@ -127,6 +130,7 @@ public void startElement(String namespaceURI, String localName, String qName,
         atts, getLocator()));
   }
 
+  @Override
   public void characters(char[] ch, int start, int length) {
     String bodyStr = new String(ch, start, length);
     SaxEvent lastEvent = getLastEvent();
@@ -154,6 +158,7 @@ SaxEvent getLastEvent() {
     return saxEventList.get(size - 1);
   }
 
+  @Override
   public void endElement(String namespaceURI, String localName, String qName) {
     String q = qName == null || qName.length() == 0 ? localName : qName;
     saxEventList
@@ -169,53 +174,65 @@ String getTagName(String localName, String qName) {
     return tagName;
   }
 
+  @Override
   public void error(SAXParseException spe) throws SAXException {
     addError(XML_PARSING +" - Parsing error on line " + spe.getLineNumber() + " and column "
         + spe.getColumnNumber(), spe);
   }
 
+  @Override
   public void fatalError(SAXParseException spe) throws SAXException {
     addError(XML_PARSING +" - Parsing fatal error on line " + spe.getLineNumber()
         + " and column " + spe.getColumnNumber(), spe);
   }
 
+  @Override
   public void warning(SAXParseException spe) throws SAXException {
     addWarn(XML_PARSING +" - Parsing warning on line " + spe.getLineNumber() + " and column "
         + spe.getColumnNumber(), spe);
   }
 
+  @Override
   public void addError(String msg) {
     cai.addError(msg);
   }
 
+  @Override
   public void addError(String msg, Throwable ex) {
     cai.addError(msg, ex);
   }
 
+  @Override
   public void addInfo(String msg) {
     cai.addInfo(msg);
   }
 
+  @Override
   public void addInfo(String msg, Throwable ex) {
     cai.addInfo(msg, ex);
   }
 
+  @Override
   public void addStatus(Status status) {
     cai.addStatus(status);
   }
 
+  @Override
   public void addWarn(String msg) {
     cai.addWarn(msg);
   }
 
+  @Override
   public void addWarn(String msg, Throwable ex) {
     cai.addWarn(msg, ex);
   }
 
+  @Override
   public Context getContext() {
     return cai.getContext();
   }
 
+  @Override
   public void setContext(Context context) {
     cai.setContext(context);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java b/logback-android/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java
index d0ae94010c..e11c6314b6 100755
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java
@@ -19,6 +19,7 @@
 import ch.qos.logback.core.spi.ContextAwareBase;
 
 import java.io.File;
+import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.util.ArrayList;
@@ -91,11 +92,15 @@ public boolean changeDetected() {
     //return (lastModified != fileToScan.lastModified() && lastModified != SENTINEL);
   }
 
-  @SuppressWarnings("deprecation")
   File convertToFile(URL url) {
     String protocol = url.getProtocol();
     if ("file".equals(protocol)) {
-      return new File(URLDecoder.decode(url.getFile()));
+      try {
+        return new File(URLDecoder.decode(url.getFile(), "UTF-8"));
+      } catch (UnsupportedEncodingException e) {
+        // unreachable: every Java platform supports UTF-8
+        throw new IllegalStateException(e);
+      }
     } else {
       addInfo("URL [" + url + "] is not of type file");
       return null;
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/spi/ElementPath.java b/logback-android/src/main/java/ch/qos/logback/core/joran/spi/ElementPath.java
index 1e8064e5f5..96866a3779 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/spi/ElementPath.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/spi/ElementPath.java
@@ -91,6 +91,20 @@ private boolean equalityCheck(String x, String y) {
     return x.equalsIgnoreCase(y);
   }
 
+  // consistent with equalityCheck(): String.equalsIgnoreCase() compares
+  // characters after folding each one through upper and then lower case
+  @Override
+  public int hashCode() {
+    int h = 1;
+    for (String part : partList) {
+      for (int i = 0; i < part.length(); i++) {
+        h = 31 * h + Character.toLowerCase(Character.toUpperCase(part.charAt(i)));
+      }
+      h = 31 * h + part.length();
+    }
+    return h;
+  }
+
   public List<String> getCopyOfPartList() {
     return new ArrayList<String>(partList);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java b/logback-android/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java
index 1bfcc2fd54..4f216cf480 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java
@@ -65,6 +65,7 @@ public DefaultNestedComponentRegistry getDefaultNestedComponentRegistry() {
     return defaultNestedComponentRegistry;
   }
 
+  @Override
   public Map<String, String> getCopyOfPropertyMap() {
     return new HashMap<String, String>(propertiesMap);
   }
@@ -150,6 +151,7 @@ public void addSubstitutionProperties(Properties props) {
    * If a key is found in propertiesMap then return it. Otherwise, delegate to
    * the context.
    */
+  @Override
   public String getProperty(String key) {
     String v = propertiesMap.get(key);
     if (v != null) {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java b/logback-android/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java
index f25cb6aaaf..1078d95a00 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java
@@ -129,11 +129,10 @@ public void startDocument() {
 
   public void startElement(StartEvent se) {
     setDocumentLocator(se.getLocator());
-    startElement(se.namespaceURI, se.localName, se.qName, se.attributes);
+    startElement(se.localName, se.qName, se.attributes);
   }
 
-  private void startElement(String namespaceURI, String localName,
-      String qName, Attributes atts) {
+  private void startElement(String localName, String qName, Attributes atts) {
 
     String tagName = getTagName(localName, qName);
     elementPath.push(tagName);
@@ -182,10 +181,10 @@ public void characters(BodyEvent be) {
 
   public void endElement(EndEvent endEvent) {
     setDocumentLocator(endEvent.locator);
-    endElement(endEvent.namespaceURI, endEvent.localName, endEvent.qName);
+    endElement(endEvent.localName, endEvent.qName);
   }
 
-  private void endElement(String namespaceURI, String localName, String qName) {
+  private void endElement(String localName, String qName) {
     // given that an action list is always pushed for every startElement, we
     // need
     // to always pop for every endElement
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java b/logback-android/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java
index ba12989e86..8079a3cbd7 100755
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java
@@ -49,6 +49,7 @@ public SimpleRuleStore(Context context) {
    * Add a new rule, i.e. a pattern, action pair to the rule store. <p> Note
    * that the added action's LoggerRepository will be set in the process.
    */
+  @Override
   public void addRule(ElementSelector elementSelector, Action action) {
     action.setContext(context);
 
@@ -62,6 +63,7 @@ public void addRule(ElementSelector elementSelector, Action action) {
     a4p.add(action);
   }
 
+  @Override
   public void addRule(ElementSelector elementSelector, String actionClassName) {
     Action action = null;
 
@@ -83,6 +85,7 @@ public void addRule(ElementSelector elementSelector, String actionClassName) {
   // if no suffix match, check for prefix match, i.e. matches for x/*
   // match for x/y/* has higher priority than matches for x/*
 
+  @Override
   public List<Action> matchActions(ElementPath elementPath) {
     List<Action> actionList;
 
@@ -198,6 +201,7 @@ List<Action> middleMatch(ElementPath path) {
   }
   
 
+  @Override
   public String toString() {
     final String TAB = "  ";
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/util/PropertySetter.java b/logback-android/src/main/java/ch/qos/logback/core/joran/util/PropertySetter.java
index b312581d97..2b8b4759d8 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/util/PropertySetter.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/util/PropertySetter.java
@@ -281,8 +281,7 @@ public void addComplexProperty(String name, Object complexProperty) {
     // first let us use the addXXX method
     if (adderMethod != null) {
       Class<?>[] paramTypes = adderMethod.getParameterTypes();
-      if (!isSanityCheckSuccessful(name, adderMethod, paramTypes,
-          complexProperty)) {
+      if (!isSanityCheckSuccessful(name, paramTypes, complexProperty)) {
         return;
       }
       invokeMethodWithSingleParameterOnThisObject(adderMethod, complexProperty);
@@ -319,7 +318,7 @@ public void addBasicProperty(String name, String strValue) {
     }
 
     Class<?>[] paramTypes = adderMethod.getParameterTypes();
-    isSanityCheckSuccessful(name, adderMethod, paramTypes, strValue);
+    isSanityCheckSuccessful(name, paramTypes, strValue);
 
     Object arg;
     try {
@@ -355,7 +354,7 @@ public void setComplexProperty(String name, Object complexProperty) {
 
     Class<?>[] paramTypes = setter.getParameterTypes();
 
-    if (!isSanityCheckSuccessful(name, setter, paramTypes, complexProperty)) {
+    if (!isSanityCheckSuccessful(name, paramTypes, complexProperty)) {
       return;
     }
     try {
@@ -367,8 +366,8 @@ public void setComplexProperty(String name, Object complexProperty) {
     }
   }
 
-  private boolean isSanityCheckSuccessful(String name, Method method,
-      Class<?>[] params, Object complexProperty) {
+  private boolean isSanityCheckSuccessful(String name, Class<?>[] params,
+      Object complexProperty) {
     Class<?> ccc = complexProperty.getClass();
     if (params.length != 1) {
       addError("Wrong number of parameters in setter method for property ["
@@ -442,7 +441,7 @@ Method getRelevantMethod(String name, AggregationType aggregationType) {
     return relevantMethod;
   }
 
-  <T extends Annotation> T getAnnotation(String name, Class<T> annonationClass,
+  <T extends Annotation> T getAnnotation(Class<T> annonationClass,
       Method relevantMethod) {
 
     if (relevantMethod != null) {
@@ -453,15 +452,14 @@ <T extends Annotation> T getAnnotation(String name, Class<T> annonationClass,
   }
 
   Class<?> getDefaultClassNameByAnnonation(String name, Method relevantMethod) {
-    DefaultClass defaultClassAnnon = getAnnotation(name, DefaultClass.class,
-        relevantMethod);
+    DefaultClass defaultClassAnnon = getAnnotation(DefaultClass.class, relevantMethod);
     if (defaultClassAnnon != null) {
       return defaultClassAnnon.value();
     }
     return null;
   }
 
-  Class<?> getByConcreteType(String name, Method relevantMethod) {
+  Class<?> getByConcreteType(Method relevantMethod) {
 
     Class<?> paramType = getParameterClassForMethod(relevantMethod);
     if (paramType == null) {
@@ -494,7 +492,7 @@ public Class<?> getClassNameViaImplicitRules(String name,
     if (byAnnotation != null) {
       return byAnnotation;
     }
-    return getByConcreteType(name, relevantMethod);
+    return getByConcreteType(relevantMethod);
   }
 
 }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/joran/util/StringToObjectConverter.java b/logback-android/src/main/java/ch/qos/logback/core/joran/util/StringToObjectConverter.java
index 6622c98165..6f462b87d8 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/joran/util/StringToObjectConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/joran/util/StringToObjectConverter.java
@@ -78,7 +78,7 @@ public static Object convertArg(ContextAware ca, String val, Class<?> type) {
         return Boolean.FALSE;
       }
     } else if (type.isEnum()) {
-      return convertToEnum(ca, v, (Class<? extends Enum<?>>) type);
+      return convertToEnum(v, (Class<? extends Enum<?>>) type);
     } else if (StringToObjectConverter.followsTheValueOfConvention(type)) {
       return convertByValueOfMethod(ca, type, v);
     } else if (isOfTypeCharset(type)) {
@@ -136,7 +136,7 @@ private static Object convertByValueOfMethod(ContextAware ca, Class<?> type,
   }
 
   @SuppressWarnings("unchecked")
-  private static Object convertToEnum(ContextAware ca, String val,
+  private static Object convertToEnum(String val,
       Class<? extends Enum> enumType) {
     return Enum.valueOf(enumType, val);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/AbstractSSLSocketAppender.java b/logback-android/src/main/java/ch/qos/logback/core/net/AbstractSSLSocketAppender.java
index e3702d6677..8f664cc345 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/AbstractSSLSocketAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/AbstractSSLSocketAppender.java
@@ -74,6 +74,7 @@ public void start() {
    * @return SSL configuration; if no configuration has been set, a
    *    default configuration is returned
    */
+  @Override
   public SSLConfiguration getSsl() {
     if (ssl == null) {
       ssl = new SSLConfiguration();
@@ -85,6 +86,7 @@ public SSLConfiguration getSsl() {
    * Sets the SSL configuration.
    * @param ssl the SSL configuration to set
    */
+  @Override
   public void setSsl(SSLConfiguration ssl) {
     this.ssl = ssl;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/AbstractSocketAppender.java b/logback-android/src/main/java/ch/qos/logback/core/net/AbstractSocketAppender.java
index f1c5791b60..86e4278f5c 100755
--- a/logback-android/src/main/java/ch/qos/logback/core/net/AbstractSocketAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/AbstractSocketAppender.java
@@ -113,6 +113,7 @@ protected AbstractSocketAppender() {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void start() {
     if (isStarted()) return;
     int errorCount = 0;
@@ -155,6 +156,7 @@ private synchronized void submitDispatchTask() {
     if (taskSubmitted) return;
     taskSubmitted = true;
     task = getContext().getScheduledExecutorService().submit(new Runnable() {
+      @Override
       public void run() {
         resolveHostAndDispatchEvents();
       }
@@ -200,7 +202,7 @@ private void resolveHostAndDispatchEvents() {
     // this appender. Retry with the reconnection delay until resolved.
     try {
       while (!resolveRemoteHost()) {
-        long delayMs = (reconnectionDelay != null) ? reconnectionDelay.getMilliseconds() : 0;
+        long delayMs = getReconnectionDelayMillis();
         if (delayMs <= 0) {
           addError(peerId + "gave up resolving host (reconnectionDelay is zero)");
           return;
@@ -211,10 +213,14 @@ private void resolveHostAndDispatchEvents() {
       addInfo("shutting down before host resolution completed");
       return;
     }
-    connector = createConnector(address, port, 0, reconnectionDelay.getMilliseconds());
+    connector = createConnector(address, port, 0, getReconnectionDelayMillis());
     connectSocketAndDispatchEvents();
   }
 
+  private long getReconnectionDelayMillis() {
+    return (reconnectionDelay != null) ? reconnectionDelay.getMilliseconds() : 0;
+  }
+
   private boolean resolveRemoteHost() {
     try {
       address = InetAddress.getByName(remoteHost);
@@ -291,6 +297,7 @@ private void tryReAddingEventToFrontOfQueue(E event) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void connectionFailed(SocketConnector connector, Exception ex) {
     if (ex instanceof InterruptedException) {
       addInfo("connector interrupted");
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/DefaultSocketConnector.java b/logback-android/src/main/java/ch/qos/logback/core/net/DefaultSocketConnector.java
index 2092ca2824..2b3c4257ed 100755
--- a/logback-android/src/main/java/ch/qos/logback/core/net/DefaultSocketConnector.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/DefaultSocketConnector.java
@@ -70,6 +70,7 @@ public DefaultSocketConnector(InetAddress address, int port,
   /**
    * Loops until the desired connection is established and returns the resulting connector.
    */
+  @Override
   public Socket call() throws InterruptedException {
     useDefaultsForMissingFields();
     Socket socket = createSocket();
@@ -102,6 +103,7 @@ private void useDefaultsForMissingFields() {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void setExceptionHandler(ExceptionHandler exceptionHandler) {
     this.exceptionHandler = exceptionHandler;
   }
@@ -109,6 +111,7 @@ public void setExceptionHandler(ExceptionHandler exceptionHandler) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void setSocketFactory(SocketFactory socketFactory) {
     this.socketFactory = socketFactory;
   }
@@ -118,6 +121,7 @@ public void setSocketFactory(SocketFactory socketFactory) {
    */
   private static class ConsoleExceptionHandler implements ExceptionHandler {
 
+    @Override
     public void connectionFailed(SocketConnector connector, Exception ex) {
       System.out.println(ex);
     }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/LoginAuthenticator.java b/logback-android/src/main/java/ch/qos/logback/core/net/LoginAuthenticator.java
index b6e758c3be..ec22e2ce9a 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/LoginAuthenticator.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/LoginAuthenticator.java
@@ -31,6 +31,7 @@ public class LoginAuthenticator extends Authenticator {
     this.password = password;
   }
   
+  @Override
   public PasswordAuthentication getPasswordAuthentication() {
     return new PasswordAuthentication(username, password);
 }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java b/logback-android/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java
index 2e498c6be4..3d0a5c261e 100755
--- a/logback-android/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java
@@ -108,6 +108,7 @@ public abstract class SMTPAppenderBase<E> extends AppenderBase<E> {
   /**
    * Start the appender
    */
+  @Override
   public void start() {
 
     if (cbTracker == null) {
@@ -174,6 +175,7 @@ private Session buildSessionFromProperties() {
    * Perform SMTPAppender specific appending actions, delegating some of them to
    * a subclass and checking if the event triggers an e-mail to be sent.
    */
+  @Override
   protected void append(E eventObject) {
 
     if (!checkEntryConditions()) {
@@ -258,6 +260,7 @@ public boolean checkEntryConditions() {
     return true;
   }
 
+  @Override
   synchronized public void stop() {
     this.started = false;
   }
@@ -648,6 +651,7 @@ class SenderRunnable implements Runnable {
       this.e = e;
     }
 
+    @Override
     public void run() {
       sendBuffer(cyclicBuffer, e);
     }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/SSLSocketAppenderBase.java b/logback-android/src/main/java/ch/qos/logback/core/net/SSLSocketAppenderBase.java
index f4d9dff8c3..f887200768 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/SSLSocketAppenderBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/SSLSocketAppenderBase.java
@@ -68,6 +68,7 @@ public void start() {
    * @return SSL configuration; if no configuration has been set, a
    *    default configuration is returned
    */
+  @Override
   public SSLConfiguration getSsl() {
     if (ssl == null) {
       ssl = new SSLConfiguration();
@@ -79,6 +80,7 @@ public SSLConfiguration getSsl() {
    * Sets the SSL configuration.
    * @param ssl the SSL configuration to set
    */
+  @Override
   public void setSsl(SSLConfiguration ssl) {
     this.ssl = ssl;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/SocketConnector.java b/logback-android/src/main/java/ch/qos/logback/core/net/SocketConnector.java
index f4700dc3f9..e2fe4dec0b 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/SocketConnector.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/SocketConnector.java
@@ -44,6 +44,7 @@ public interface ExceptionHandler {
    * @return the connected socket
    * @throws InterruptedException the running connection thread was cancelled
    */
+  @Override
   Socket call() throws InterruptedException;
 
   /**
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/SocketConnectorBase.java b/logback-android/src/main/java/ch/qos/logback/core/net/SocketConnectorBase.java
index 1e23287c84..82240a3870 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/SocketConnectorBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/SocketConnectorBase.java
@@ -138,6 +138,7 @@ public Socket awaitConnection(long delay) throws InterruptedException {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void setExceptionHandler(ExceptionHandler exceptionHandler) {
     this.exceptionHandler = exceptionHandler;
   }
@@ -145,6 +146,7 @@ public void setExceptionHandler(ExceptionHandler exceptionHandler) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void setSocketFactory(SocketFactory socketFactory) {
     this.socketFactory = socketFactory;
   }
@@ -154,6 +156,7 @@ public void setSocketFactory(SocketFactory socketFactory) {
    */
   private static class ConsoleExceptionHandler implements ExceptionHandler {
 
+    @Override
     public void connectionFailed(SocketConnector connector, Exception ex) {
       System.out.println(ex);
     }
@@ -173,6 +176,7 @@ public FixedDelay(int initialDelay, int retryDelay) {
       this.retryDelay = retryDelay;
     }
 
+    @Override
     public int nextDelay() {
       int delay = nextDelay;
       nextDelay = retryDelay;
@@ -181,6 +185,7 @@ public int nextDelay() {
 
   }
 
+  @Override
   public Socket call() throws InterruptedException {
     // TODO Auto-generated method stub
     return null;
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/SyslogAppenderBase.java b/logback-android/src/main/java/ch/qos/logback/core/net/SyslogAppenderBase.java
index f935c439ff..28596691c1 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/SyslogAppenderBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/SyslogAppenderBase.java
@@ -49,6 +49,7 @@ public abstract class SyslogAppenderBase<E> extends AppenderBase<E> {
   int maxMessageSize;
   Charset charset;
 
+  @Override
   public void start() {
     int errorCount = 0;
     if (facilityStr == null) {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/SyslogOutputStream.java b/logback-android/src/main/java/ch/qos/logback/core/net/SyslogOutputStream.java
index 35c5b4d344..669063c1fb 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/SyslogOutputStream.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/SyslogOutputStream.java
@@ -48,10 +48,12 @@ public SyslogOutputStream(String syslogHost, int port) throws UnknownHostExcepti
     this.ds = new DatagramSocket();
   }
 
+  @Override
   public void write(byte[] byteArray, int offset, int len) throws IOException {
     baos.write(byteArray, offset, len);
   }
 
+  @Override
   public void flush() throws IOException {
     byte[] bytes = baos.toByteArray();
     DatagramPacket packet = new DatagramPacket(bytes, bytes.length, address,
@@ -75,6 +77,7 @@ public void flush() throws IOException {
   
   }
 
+  @Override
   public void close() {
     if (ds != null) {
       ds.close();
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/server/AbstractServerSocketAppender.java b/logback-android/src/main/java/ch/qos/logback/core/net/server/AbstractServerSocketAppender.java
index bd84c490de..9826c5fb2c 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/server/AbstractServerSocketAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/server/AbstractServerSocketAppender.java
@@ -102,6 +102,7 @@ protected void append(E event) {
     postProcessEvent(event);
     final Serializable serEvent = getPST().transform(event);
     runner.accept(new ClientVisitor<RemoteReceiverClient>() {
+      @Override
       public void visit(RemoteReceiverClient client) {
         client.offer(serEvent);
       }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/server/Client.java b/logback-android/src/main/java/ch/qos/logback/core/net/server/Client.java
index d24ffe287b..b66727c721 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/server/Client.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/server/Client.java
@@ -54,5 +54,6 @@ public interface Client extends Runnable, Closeable {
    * permitted to propagate any {@link IOException} that occurs when closing
    * the underlying resource(s).
    */
+  @Override
   void close();
 }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/server/ConcurrentServerRunner.java b/logback-android/src/main/java/ch/qos/logback/core/net/server/ConcurrentServerRunner.java
index 73ae59eeb4..049742a073 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/server/ConcurrentServerRunner.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/server/ConcurrentServerRunner.java
@@ -74,6 +74,7 @@ public ConcurrentServerRunner(ServerListener<T> listener, Executor executor) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isRunning() {
     return running;
   }
@@ -85,9 +86,11 @@ protected void setRunning(boolean running) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void stop() throws IOException {
     listener.close();
     accept(new ClientVisitor<T>() {
+      @Override
       public void visit(T client) {
         client.close();
       }
@@ -97,6 +100,7 @@ public void visit(T client) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void accept(ClientVisitor<T> visitor) {
     Collection<T> clients = copyClients();
     for (T client : clients) {
@@ -128,6 +132,7 @@ private Collection<T> copyClients() {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void run() {
     setRunning(true);
     try {
@@ -212,6 +217,7 @@ public ClientWrapper(T client) {
       this.delegate = client;
     }
 
+    @Override
     public void run() {
       addClient(delegate);
       try {
@@ -222,6 +228,7 @@ public void run() {
       }
     }
 
+    @Override
     public void close() {
       delegate.close();
     }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverServerRunner.java b/logback-android/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverServerRunner.java
index eb852354d8..ee40127a78 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverServerRunner.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverServerRunner.java
@@ -36,7 +36,7 @@ class RemoteReceiverServerRunner
    *    clients
    * @param executor that will be used to execute asynchronous tasks
    *    on behalf of the runner.
-   * @param queueSize size of the event queue that will be maintained for
+   * @param clientQueueSize size of the event queue that will be maintained for
    *    each client
    */
   public RemoteReceiverServerRunner(
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverStreamClient.java b/logback-android/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverStreamClient.java
index 3c42210d36..044004843a 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverStreamClient.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverStreamClient.java
@@ -71,6 +71,7 @@ public RemoteReceiverStreamClient(String id, Socket socket) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void setQueue(BlockingQueue<Serializable> queue) {
     this.queue = queue;
   }
@@ -78,6 +79,7 @@ public void setQueue(BlockingQueue<Serializable> queue) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean offer(Serializable event) {
     if (queue == null) {
       throw new IllegalStateException("client has no event queue");
@@ -88,6 +90,7 @@ public boolean offer(Serializable event) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void close() {
     if (socket == null) return;
     CloseUtil.closeQuietly(socket);
@@ -96,6 +99,7 @@ public void close() {
   /**
    * {@inheritDoc}
    */
+  @Override
   public void run() {
     addInfo(clientId + "connected");
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/server/SSLServerSocketAppenderBase.java b/logback-android/src/main/java/ch/qos/logback/core/net/server/SSLServerSocketAppenderBase.java
index 35bd13041b..1601ee0693 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/server/SSLServerSocketAppenderBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/server/SSLServerSocketAppenderBase.java
@@ -64,6 +64,7 @@ public void start() {
    * @return SSL configuration; if no configuration has been set, a
    *    default configuration is returned
    */
+  @Override
   public SSLConfiguration getSsl() {
     if (ssl == null) {
       ssl = new SSLConfiguration();
@@ -75,6 +76,7 @@ public SSLConfiguration getSsl() {
    * Sets the SSL configuration.
    * @param ssl the SSL configuration to set
    */
+  @Override
   public void setSsl(SSLConfiguration ssl) {
     this.ssl = ssl;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/server/ServerListener.java b/logback-android/src/main/java/ch/qos/logback/core/net/server/ServerListener.java
index 905f3f816c..dd87cb6e2f 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/server/ServerListener.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/server/ServerListener.java
@@ -63,6 +63,7 @@ public interface ServerListener<T extends Client> extends Closeable {
    * permitted to propagate any {@link IOException} that occurs when closing
    * the underlying resource(s).
    */
+  @Override
   void close();
 
 }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/server/ServerSocketAppenderBase.java b/logback-android/src/main/java/ch/qos/logback/core/net/server/ServerSocketAppenderBase.java
index dd31e912d7..6c21cc4ccb 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/server/ServerSocketAppenderBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/server/ServerSocketAppenderBase.java
@@ -103,6 +103,7 @@ protected void append(E event) {
     postProcessEvent(event);
     final Serializable serEvent = getPST().transform(event);
     runner.accept(new ClientVisitor<RemoteReceiverClient>() {
+      @Override
       public void visit(RemoteReceiverClient client) {
         client.offer(serEvent);
       }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/server/ServerSocketListener.java b/logback-android/src/main/java/ch/qos/logback/core/net/server/ServerSocketListener.java
index 20d7f0514e..74791b30cb 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/server/ServerSocketListener.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/server/ServerSocketListener.java
@@ -43,6 +43,7 @@ public ServerSocketListener(ServerSocket serverSocket) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public T acceptClient() throws IOException {
     Socket socket = serverSocket.accept();
     return createClient(
@@ -62,6 +63,7 @@ protected abstract T createClient(String id, Socket socket)
   /**
    * {@inheritDoc}
    */
+  @Override
   public void close() {
     CloseUtil.closeQuietly(serverSocket);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurableServerSocket.java b/logback-android/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurableServerSocket.java
index ef5b39470f..0fd828231d 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurableServerSocket.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurableServerSocket.java
@@ -33,34 +33,42 @@ public SSLConfigurableServerSocket(SSLServerSocket delegate) {
     this.delegate = delegate;
   }
 
+  @Override
   public String[] getDefaultProtocols() {
     return delegate.getEnabledProtocols();
   }
 
+  @Override
   public String[] getSupportedProtocols() {
     return delegate.getSupportedProtocols();
   }
 
+  @Override
   public void setEnabledProtocols(String[] protocols) {
     delegate.setEnabledProtocols(protocols);
   }
 
+  @Override
   public String[] getDefaultCipherSuites() {
     return delegate.getEnabledCipherSuites();
   }
 
+  @Override
   public String[] getSupportedCipherSuites() {
     return delegate.getSupportedCipherSuites();
   }
 
+  @Override
   public void setEnabledCipherSuites(String[] suites) {
     delegate.setEnabledCipherSuites(suites);
   }
 
+  @Override
   public void setNeedClientAuth(boolean state) {
     delegate.setNeedClientAuth(state);
   }
 
+  @Override
   public void setWantClientAuth(boolean state) {
     delegate.setWantClientAuth(state);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurableSocket.java b/logback-android/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurableSocket.java
index 97eefe283f..596a9d9c2f 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurableSocket.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/net/ssl/SSLConfigurableSocket.java
@@ -34,34 +34,42 @@ public SSLConfigurableSocket(SSLSocket delegate) {
     this.delegate = delegate;
   }
 
+  @Override
   public String[] getDefaultProtocols() {
     return delegate.getEnabledProtocols();
   }
 
+  @Override
   public String[] getSupportedProtocols() {
     return delegate.getSupportedProtocols();
   }
 
+  @Override
   public void setEnabledProtocols(String[] protocols) {
     delegate.setEnabledProtocols(protocols);
   }
 
+  @Override
   public String[] getDefaultCipherSuites() {
     return delegate.getEnabledCipherSuites();
   }
 
+  @Override
   public String[] getSupportedCipherSuites() {
     return delegate.getSupportedCipherSuites();
   }
 
+  @Override
   public void setEnabledCipherSuites(String[] suites) {
     delegate.setEnabledCipherSuites(suites);
   }
 
+  @Override
   public void setNeedClientAuth(boolean state) {
     delegate.setNeedClientAuth(state);
   }
 
+  @Override
   public void setWantClientAuth(boolean state) {
     delegate.setWantClientAuth(state);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/CompositeConverter.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/CompositeConverter.java
index 81a2f4ab7d..28a44f4036 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/CompositeConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/CompositeConverter.java
@@ -19,6 +19,7 @@ abstract public class CompositeConverter<E> extends DynamicConverter<E> {
 
   Converter<E> childConverter;
 
+  @Override
   public String convert(E event) {
     StringBuilder buf = new StringBuilder();
 
@@ -39,6 +40,7 @@ public void setChildConverter(Converter<E> child) {
     childConverter = child;
   }
 
+  @Override
   public String toString() {
     StringBuilder buf = new StringBuilder();
     buf.append("CompositeConverter<");
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/DynamicConverter.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/DynamicConverter.java
index d71b405017..2cd92adb70 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/DynamicConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/DynamicConverter.java
@@ -42,14 +42,17 @@ abstract public class DynamicConverter<E> extends FormattingConverter<E>
    * components, the trivial implementation found in this abstract class will be
    * sufficient.
    */
+  @Override
   public void start() {
     started = true;
   }
 
+  @Override
   public void stop() {
     started = false;
   }
 
+  @Override
   public boolean isStarted() {
     return started;
   }
@@ -76,38 +79,47 @@ protected List<String> getOptionList() {
     return optionList;
   }
 
+  @Override
   public void setContext(Context context) {
     cab.setContext(context);
   }
 
+  @Override
   public Context getContext() {
     return cab.getContext();
   }
 
+  @Override
   public void addStatus(Status status) {
     cab.addStatus(status);
   }
 
+  @Override
   public void addInfo(String msg) {
     cab.addInfo(msg);
   }
 
+  @Override
   public void addInfo(String msg, Throwable ex) {
     cab.addInfo(msg, ex);
   }
 
+  @Override
   public void addWarn(String msg) {
     cab.addWarn(msg);
   }
 
+  @Override
   public void addWarn(String msg, Throwable ex) {
     cab.addWarn(msg, ex);
   }
 
+  @Override
   public void addError(String msg) {
     cab.addError(msg);
   }
 
+  @Override
   public void addError(String msg, Throwable ex) {
     cab.addError(msg, ex);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/FormatInfo.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/FormatInfo.java
index 90e4a692e5..c4e071fc50 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/FormatInfo.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/FormatInfo.java
@@ -128,6 +128,7 @@ public void setLeftTruncate(boolean leftTruncate) {
     this.leftTruncate = leftTruncate;
   }
 
+  @Override
   public boolean equals(Object o) {
     if (this == o) {
       return true;
@@ -150,6 +151,7 @@ public int hashCode() {
     return result;
   }
 
+  @Override
   public String toString() {
     return "FormatInfo(" + min + ", " + max + ", " + leftPad + ", "
         + leftTruncate + ")";
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/LiteralConverter.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/LiteralConverter.java
index b4dfc49356..03700bfd2b 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/LiteralConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/LiteralConverter.java
@@ -23,6 +23,7 @@ public LiteralConverter(String literal) {
     this.literal = literal;
   }
 
+  @Override
   public String convert(E o) {
     return literal;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java
index 09bdd5ebde..7525aa7f1f 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java
@@ -76,6 +76,7 @@ public Map<String, String> getEffectiveConverterMap() {
     return effectiveMap;
   }
 
+  @Override
   public void start() {
     if(pattern == null || pattern.length() == 0) {
       addError("Empty or null pattern.");
@@ -134,6 +135,7 @@ public void setPattern(String pattern) {
     this.pattern = pattern;
   }
 
+  @Override
   public String toString() {
     return this.getClass().getName() + "(\"" + getPattern() + "\")";
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java
index a0f19a4760..22908d46c1 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java
@@ -24,6 +24,7 @@ public class ReplacingCompositeConverter<E> extends CompositeConverter<E> {
   String regex;
   String replacement;
 
+  @Override
   public void start() {
     final List<String> optionList = getOptionList();
     if (optionList == null) {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/CompositeNode.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/CompositeNode.java
index c1f6fb725a..b89344c2c1 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/CompositeNode.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/CompositeNode.java
@@ -31,6 +31,7 @@ public void setChildNode(Node childNode) {
     this.childNode = childNode;
   }
 
+  @Override
   public boolean equals(Object o) {
     if(!super.equals(o)) {
       return false;
@@ -49,6 +50,7 @@ public int hashCode() {
     return super.hashCode();
   }
 
+  @Override
   public String toString() {
     StringBuilder buf = new StringBuilder();
     if(childNode != null) {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/FormattingNode.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/FormattingNode.java
index 71a1e2905b..b8453474a4 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/FormattingNode.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/FormattingNode.java
@@ -37,6 +37,7 @@ public void setFormatInfo(FormatInfo formatInfo) {
     this.formatInfo = formatInfo;
   }
 
+  @Override
   public boolean equals(Object o) {
     if (!super.equals(o)) {
       return false;
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/Node.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/Node.java
index e8ab263003..d996ad4364 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/Node.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/Node.java
@@ -55,6 +55,7 @@ public void setNext(Node next) {
     this.next = next;
   }
 
+  @Override
   public boolean equals(Object o) {
     if (this == o) {
       return true;
@@ -84,6 +85,7 @@ String printNext() {
     }
   }
 
+  @Override
   public String toString() {
     StringBuffer buf = new StringBuffer();
     switch (type) {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java
index 3237e5208a..e974f80af2 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java
@@ -51,7 +51,7 @@ public class Parser<E> extends ContextAwareBase {
   public final static Map<String, String> DEFAULT_COMPOSITE_CONVERTER_MAP = new HashMap<String, String>();
   public final static String REPLACE_CONVERTER_WORD = "replace";
   static {
-    DEFAULT_COMPOSITE_CONVERTER_MAP.put(Token.BARE_COMPOSITE_KEYWORD_TOKEN.getValue().toString(),
+    DEFAULT_COMPOSITE_CONVERTER_MAP.put(Token.BARE_COMPOSITE_KEYWORD_TOKEN.getValue(),
             IdentityCompositeConverter.class.getName());
     DEFAULT_COMPOSITE_CONVERTER_MAP.put(REPLACE_CONVERTER_WORD,
              ReplacingCompositeConverter.class.getName());
@@ -165,7 +165,7 @@ FormattingNode C() throws ScanException {
       return SINGLE();
     case Token.COMPOSITE_KEYWORD:
       advanceTokenPointer();
-      return COMPOSITE(t.getValue().toString());
+      return COMPOSITE(t.getValue());
     default:
       throw new IllegalStateException("Unexpected token " + t);
     }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/SimpleKeywordNode.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/SimpleKeywordNode.java
index f29529d570..a28fdb0a4a 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/SimpleKeywordNode.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/SimpleKeywordNode.java
@@ -37,6 +37,7 @@ public void setOptions(List<String> optionList) {
     this.optionList = optionList;
   }
 
+  @Override
   public boolean equals(Object o) {
     if (!super.equals(o)) {
       return false;
@@ -56,6 +57,7 @@ public int hashCode() {
     return super.hashCode();
   }
 
+  @Override
   public String toString() {
     StringBuilder buf = new StringBuilder();
     if (optionList == null) {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/Token.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/Token.java
index 63eed75a93..89aa48b347 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/Token.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/Token.java
@@ -75,6 +75,7 @@ public List<String> getOptionsList() {
     return optionsList;
   }
 
+  @Override
   public String toString() {
     String typeStr = null;
     switch (type) {
@@ -111,6 +112,7 @@ public String toString() {
     }
   }
 
+  @Override
   public int hashCode() {
     int result;
     result = type;
@@ -119,6 +121,7 @@ public int hashCode() {
   }
 
 
+  @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof Token)) return false;
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/TokenStream.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/TokenStream.java
index 10ff6d3b43..7b95c9db5c 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/TokenStream.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/parser/TokenStream.java
@@ -90,7 +90,7 @@ List<Token> tokenize() throws ScanException {
           handleFormatModifierState(c, tokenList, buf);
           break;
         case OPTION_STATE:
-          processOption(c, tokenList, buf);
+          processOption(c, tokenList);
           break;
         case KEYWORD_STATE:
           handleKeywordState(c, tokenList, buf);
@@ -141,7 +141,7 @@ private void handleRightParenthesisState(char c, List<Token> tokenList, StringBu
     }
   }
 
-  private void processOption(char c, List<Token> tokenList, StringBuffer buf) throws ScanException {
+  private void processOption(char c, List<Token> tokenList) throws ScanException {
     OptionTokenizer ot = new OptionTokenizer(this);
     ot.tokenize(c, tokenList);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/util/AlmostAsIsEscapeUtil.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/util/AlmostAsIsEscapeUtil.java
index 3818c2c17c..08f41d77d5 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/util/AlmostAsIsEscapeUtil.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/util/AlmostAsIsEscapeUtil.java
@@ -40,6 +40,7 @@ public class AlmostAsIsEscapeUtil extends RestrictedEscapeUtil {
    * Note that this method assumes that it is called after the escape character
    * has been consumed.
    */
+  @Override
   public void escape(String escapeChars, StringBuffer buf, char next,
       int pointer) {
     super.escape(""+CoreConstants.PERCENT_CHAR+CoreConstants.RIGHT_PARENTHESIS_CHAR, buf, next, pointer);
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/util/AsIsEscapeUtil.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/util/AsIsEscapeUtil.java
index 4ff8ba5f35..b36a7df881 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/util/AsIsEscapeUtil.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/util/AsIsEscapeUtil.java
@@ -26,6 +26,7 @@ public class AsIsEscapeUtil implements IEscapeUtil {
    * Note that this method assumes that it is called after the escape character
    * has been consumed.
    */
+  @Override
   public void escape(String escapeChars, StringBuffer buf, char next,
                      int pointer) {
     // restitute the escape char (because it was consumed
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/util/RegularEscapeUtil.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/util/RegularEscapeUtil.java
index b0133fca95..8c206ff10d 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/util/RegularEscapeUtil.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/util/RegularEscapeUtil.java
@@ -22,6 +22,7 @@
  */
 public class RegularEscapeUtil implements IEscapeUtil {
 
+  @Override
   public void escape(String escapeChars, StringBuffer buf, char next,
       int pointer) {
     if (escapeChars.indexOf(next) >= 0) {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/pattern/util/RestrictedEscapeUtil.java b/logback-android/src/main/java/ch/qos/logback/core/pattern/util/RestrictedEscapeUtil.java
index a7872fc5da..7dc9076ce4 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/pattern/util/RestrictedEscapeUtil.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/pattern/util/RestrictedEscapeUtil.java
@@ -22,6 +22,7 @@
  */
 public class RestrictedEscapeUtil implements IEscapeUtil {
 
+  @Override
   public void escape(String escapeChars, StringBuffer buf, char next,
                      int pointer) {
     if (escapeChars.indexOf(next) >= 0) {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/property/FileExistsPropertyDefiner.java b/logback-android/src/main/java/ch/qos/logback/core/property/FileExistsPropertyDefiner.java
index 11854375f5..425d02af95 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/property/FileExistsPropertyDefiner.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/property/FileExistsPropertyDefiner.java
@@ -52,6 +52,7 @@ public void setPath(String path) {
    *
    * @return "true"|"false" depending on the existence of file
    */
+  @Override
   public String getPropertyValue() {
     if (OptionHelper.isEmpty(path)) {
       addError("The \"path\" property must be set.");
diff --git a/logback-android/src/main/java/ch/qos/logback/core/property/ResourceExistsPropertyDefiner.java b/logback-android/src/main/java/ch/qos/logback/core/property/ResourceExistsPropertyDefiner.java
index 96fd580b7c..d7b9637472 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/property/ResourceExistsPropertyDefiner.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/property/ResourceExistsPropertyDefiner.java
@@ -55,6 +55,7 @@ public void setResource(String resource) {
    *
    * @return "true"|"false" depending on the availability of resource on the classpath
    */
+  @Override
   public String getPropertyValue() {
     if (OptionHelper.isEmpty(resourceStr)) {
       addError("The \"resource\" property must be set.");
diff --git a/logback-android/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java b/logback-android/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java
index c7971ea841..fffd6e449b 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java
@@ -30,11 +30,13 @@ public class CyclicBufferAppender<E> extends AppenderBase<E> {
   CyclicBuffer<E> cb;
   int maxSize = 512;
 
+  @Override
   public void start() {
     cb = new CyclicBuffer<E>(maxSize);
     super.start();
   }
 
+  @Override
   public void stop() {
     cb = null;
     super.stop();
diff --git a/logback-android/src/main/java/ch/qos/logback/core/recovery/ResilientOutputStreamBase.java b/logback-android/src/main/java/ch/qos/logback/core/recovery/ResilientOutputStreamBase.java
index 3ba8ae827d..47a9b12962 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/recovery/ResilientOutputStreamBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/recovery/ResilientOutputStreamBase.java
@@ -42,6 +42,7 @@ private boolean isPresumedInError() {
     return (recoveryCoordinator != null && !presumedClean);
   }
 
+  @Override
   public void write(byte b[], int off, int len) {
     if (isPresumedInError()) {
       if (!recoveryCoordinator.isTooSoon()) {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java
index 5b41d8b128..b6e031f865 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java
@@ -49,6 +49,7 @@ public void start() {
     started = true;
   }
 
+  @Override
   public boolean isTriggeringEvent(File activeFile, final E event) {
     long time = getCurrentTime();
     if (time >= nextCheck) {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java
index 5880a509a0..0357409679 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java
@@ -53,6 +53,7 @@ public FixedWindowRollingPolicy() {
     maxIndex = 7;
   }
 
+  @Override
   public void start() {
     util.setContext(this.context);
 
@@ -123,6 +124,7 @@ private String transformFileNamePatternFromInt2Date(String fileNamePatternStr) {
     return stemOfFileNamePattern.replace("%i", "%d{"+ZIP_ENTRY_DATE_PATTERN+"}");
   }
 
+  @Override
   public void rollover() throws RolloverFailure {
 
     // Inside this method it is guaranteed that the hereto active log file is
@@ -167,6 +169,7 @@ public void rollover() throws RolloverFailure {
   /**
    * Return the value of the parent's RawFile property.
    */
+  @Override
   public String getActiveFileName() {
     return getParentsRawFileProperty();
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java
index 7566784178..ec3d0ffe1f 100755
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java
@@ -49,6 +49,7 @@ public class RollingFileAppender<E> extends FileAppender<E> {
   static private String RFA_LATE_FILE_URL = CODES_URL + "#rfa_file_after";
   static private String MORE_INFO_PREFIX = "For more information, please visit ";
 
+  @Override
   public void start() {
     if (triggeringPolicy == null) {
       addWarn("No TriggeringPolicy was set for the RollingFileAppender named "
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java
index 72e45a0571..c69928db40 100755
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java
@@ -68,22 +68,27 @@ public String getFileNamePattern() {
     return fileNamePatternStr;
   }
 
+  @Override
   public CompressionMode getCompressionMode() {
     return compressionMode;
   }
 
+  @Override
   public boolean isStarted() {
     return started;
   }
 
+  @Override
   public void start() {
     started = true;
   }
 
+  @Override
   public void stop() {
     started = false;
   }
 
+  @Override
   public void setParent(FileAppender<?> appender) {
     this.parent = appender;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java
index d6e7cf43d2..517987e337 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java
@@ -43,6 +43,7 @@ public class SizeBasedTriggeringPolicy<E> extends TriggeringPolicyBase<E> {
   public SizeBasedTriggeringPolicy() {
   }
 
+  @Override
   public boolean isTriggeringEvent(final File activeFile, final E event) {
     return (activeFile.length() >= maxFileSize.getSize());
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java
index 82be8faee0..25d3ae884f 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java
@@ -45,10 +45,12 @@ abstract public class TimeBasedFileNamingAndTriggeringPolicyBase<E> extends
 
   protected boolean errorFree = true;
 
+  @Override
   public boolean isStarted() {
     return started;
   }
 
+  @Override
   public void start() {
     DateTokenConverter<Object> dtc = tbrp.fileNamePattern.getPrimaryDateTokenConverter();
     if (dtc == null) {
@@ -91,6 +93,7 @@ public void start() {
     computeNextCheck();
   }
 
+  @Override
   public void stop() {
     started = false;
   }
@@ -109,18 +112,22 @@ public void setDateInCurrentPeriod(Date _dateInCurrentPeriod) {
     this.dateInCurrentPeriod = _dateInCurrentPeriod;
   }
 
+  @Override
   public String getElapsedPeriodsFileName() {
     return elapsedPeriodsFileName;
   }
 
+  @Override
   public String getCurrentPeriodsFileNameWithoutCompressionSuffix() {
     return tbrp.fileNamePatternWithoutCompSuffix.convert(dateInCurrentPeriod);
   }
 
+  @Override
   public void setCurrentTime(long timeInMillis) {
     artificialCurrentTime = timeInMillis;
   }
 
+  @Override
   public long getCurrentTime() {
     // if time is forced return the time set by user
     if (artificialCurrentTime >= 0) {
@@ -130,11 +137,13 @@ public long getCurrentTime() {
     }
   }
 
+  @Override
   public void setTimeBasedRollingPolicy(TimeBasedRollingPolicy<E> _tbrp) {
     this.tbrp = _tbrp;
 
   }
 
+  @Override
   public ArchiveRemover getArchiveRemover() {
     return archiveRemover;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java
index 0f00398444..b749989d8f 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java
@@ -59,6 +59,7 @@ public class TimeBasedRollingPolicy<E> extends RollingPolicyBase implements
 
   boolean cleanHistoryOnStart = false;
 
+  @Override
   public void start() {
     // set the LR for our utility object
     renameUtil.setContext(this.context);
@@ -157,6 +158,7 @@ public TimeBasedFileNamingAndTriggeringPolicy<E> getTimeBasedFileNamingAndTrigge
     return timeBasedFileNamingAndTriggeringPolicy;
   }
 
+  @Override
   public void rollover() throws RolloverFailure {
 
     // when rollover is called the elapsed period's file has
@@ -213,6 +215,7 @@ Future<?> renameRawAndAsyncCompress(String nameOfCompressedFile, String innerEnt
    * the change of the file name.
    *
    */
+  @Override
   public String getActiveFileName() {
     String parentsRawFileProperty = getParentsRawFileProperty();
     if (parentsRawFileProperty != null) {
@@ -223,6 +226,7 @@ public String getActiveFileName() {
     }
   }
 
+  @Override
   public boolean isTriggeringEvent(File activeFile, final E event) {
     return timeBasedFileNamingAndTriggeringPolicy.isTriggeringEvent(activeFile, event);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/TriggeringPolicyBase.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/TriggeringPolicyBase.java
index 25a21bdd77..3d16ad59e0 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/TriggeringPolicyBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/TriggeringPolicyBase.java
@@ -29,14 +29,17 @@ abstract public class TriggeringPolicyBase<E> extends ContextAwareBase implement
   
   private boolean start;
 
+  @Override
   public void start() {
     start = true;
   }
 
+  @Override
   public void stop() {
     start = false;
   }
 
+  @Override
   public boolean isStarted() {
     return start;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java
index 08b3fa795e..74ac5b57e1 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java
@@ -201,10 +201,12 @@ private void gzCompress(String nameOfFile2gz, String nameOfgzedFile) {
     File tmpFile = new File(nameOfgzedFile + TMP_SUFFIX);
     boolean streamed = false;
     BufferedInputStream bis = null;
+    FileOutputStream fos = null;
     GZIPOutputStream gzos = null;
     try {
       bis = new BufferedInputStream(new FileInputStream(nameOfFile2gz));
-      gzos = new GZIPOutputStream(new FileOutputStream(tmpFile));
+      fos = new FileOutputStream(tmpFile);
+      gzos = new GZIPOutputStream(fos);
       byte[] inbuf = new byte[BUFFER_SIZE];
       int n;
 
@@ -216,6 +218,7 @@ private void gzCompress(String nameOfFile2gz, String nameOfgzedFile) {
       // counts as a failed compression
       gzos.close();
       gzos = null;
+      fos = null;
       bis.close();
       bis = null;
       streamed = true;
@@ -225,6 +228,8 @@ private void gzCompress(String nameOfFile2gz, String nameOfgzedFile) {
     } finally {
       closeQuietly(bis);
       closeQuietly(gzos);
+      // gzos is null if its constructor threw, leaving fos open
+      closeQuietly(fos);
     }
 
     finishCompression(file2gz, tmpFile, gzedFile, streamed);
@@ -343,6 +348,7 @@ class CompressionRunnable implements Runnable {
       this.innerEntryName = innerEntryName;
     }
 
+    @Override
     public void run() {
       Compressor.this.compress(nameOfFile2Compress, nameOfCompressedFile, innerEntryName);
     }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/DateParser.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/DateParser.java
index 549d36fda7..62b1e79e69 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/DateParser.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/DateParser.java
@@ -37,6 +37,7 @@ Date parseDate(String dateString) throws ParseException {
     return this.dateFormatter.parse(dateString);
   }
 
+  @Override
   public Date parseFilename(String filename) {
     Date date = null;
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java
index e30007801c..adf2ad937b 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java
@@ -44,6 +44,7 @@ public class DateTokenConverter<E> extends DynamicConverter<E> implements MonoTy
   // is this token converter primary or auxiliary? Only the primary converter
   // determines the rolling period
   private boolean primary = true;
+  @Override
   public void start() {
     this.datePattern = getFirstOption();
     if (this.datePattern == null) {
@@ -72,6 +73,7 @@ public String convert(Date date) {
     return cdf.format(date.getTime());
   }
 
+  @Override
   public String convert(Object o) {
     if (o == null) {
       throw new IllegalArgumentException("Null argument forbidden");
@@ -94,6 +96,7 @@ public TimeZone getTimeZone() {
     return timeZone;
   }
 
+  @Override
   public boolean isApplicable(Object o) {
     return (o instanceof Date);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/DefaultFileProvider.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/DefaultFileProvider.java
index 0e4f7bd45a..db24fd4c79 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/DefaultFileProvider.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/DefaultFileProvider.java
@@ -19,26 +19,32 @@
 import java.io.FilenameFilter;
 
 public class DefaultFileProvider implements FileProvider {
+  @Override
   public File[] listFiles(File dir, FilenameFilter filter) {
     return dir.listFiles(filter);
   }
 
+  @Override
   public String[] list(File dir, FilenameFilter filter) {
     return dir.list(filter);
   }
 
+  @Override
   public boolean deleteFile(File file) {
     return file.delete();
   }
 
+  @Override
   public long length(File file) {
     return file.length();
   }
 
+  @Override
   public boolean exists(File file) {
     return file.exists();
   }
 
+  @Override
   public boolean isDirectory(File file) {
     return file.isDirectory();
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java
index 6c38409a54..9c0e5c08b9 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java
@@ -51,6 +51,7 @@ public static File[] filesInFolderMatchingStemRegex(File file,
       return new File[0];
     }
     return file.listFiles(new FilenameFilter() {
+      @Override
       public boolean accept(File dir, String name) {
         return name.matches(stemRegex);
       }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/FileFinder.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/FileFinder.java
index 560cacb82b..432b4c742d 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/FileFinder.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/FileFinder.java
@@ -176,10 +176,12 @@ class LiteralPathPart extends PathPart {
     super(part);
   }
 
+  @Override
   boolean matches(File file) {
     return file.getName().equals(part);
   }
 
+  @Override
   List<File> listFiles(FileProvider fileProvider) {
     return listFiles(fileProvider, part);
   }
@@ -193,10 +195,12 @@ class RegexPathPart extends PathPart {
     pattern = Pattern.compile(part);
   }
 
+  @Override
   boolean matches(File file) {
     return pattern.matcher(file.getName()).find();
   }
 
+  @Override
   List<File> listFiles(FileProvider fileProvider) {
     return listFiles(fileProvider, ".");
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java
index 7fd68a12a4..a9be349f91 100755
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java
@@ -76,9 +76,10 @@ void parse() {
   }
 
   String escapeRightParantesis(String in) {
-    return pattern.replace(")", "\\)");
+    return in.replace(")", "\\)");
   }
 
+  @Override
   public String toString() {
     return pattern;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/IntParser.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/IntParser.java
index 3e35c835c4..a15402847a 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/IntParser.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/IntParser.java
@@ -28,6 +28,7 @@ class IntParser implements FilenameParser<Integer> {
     this.pathPattern = Pattern.compile(pathRegexString);
   }
 
+  @Override
   public Integer parseFilename(String filename) {
     Integer intValue = -1;
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java
index 3b9210206f..a9d1c4528c 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java
@@ -42,6 +42,7 @@ public String convert(int i) {
     return sbuf.append(s).toString();
   }
 
+  @Override
   public String convert(Object o) {
     if(o == null) {
       throw new IllegalArgumentException("Null argument forbidden");
@@ -53,6 +54,7 @@ public String convert(Object o) {
     throw new IllegalArgumentException("Cannot convert "+o+" of type"+o.getClass().getName());
   }
 
+  @Override
   public boolean isApplicable(Object o) {
     return (o instanceof Integer);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java
index 53da3eec69..a6a9c5e3b0 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java
@@ -50,6 +50,7 @@ public TimeBasedArchiveRemover(FileNamePattern fileNamePattern, RollingCalendar
     this.fileSorter = new FileSorter(dateParser, new IntParser(fileNamePattern));
   }
 
+  @Override
   public void clean(final Date now) {
     List<String> files = this.findFiles();
     List<String> expiredFiles = this.filterFiles(files, this.createExpiredFileFilter(now));
@@ -132,18 +133,22 @@ private void capTotalSize(List<String> filenames) {
     addInfo("Removed  "+ new FileSize(totalRemoved) + " of files");
   }
 
+  @Override
   public void setMaxHistory(int maxHistory) {
     this.maxHistory = maxHistory;
   }
 
+  @Override
   public void setTotalSizeCap(long totalSizeCap) {
     this.totalSizeCap = totalSizeCap;
   }
 
+  @Override
   public String toString() {
     return "c.q.l.core.rolling.helper.TimeBasedArchiveRemover";
   }
 
+  @Override
   public Future<?> cleanAsynchronously(Date now) {
     ArchiveRemoverRunnable runnable = new ArchiveRemoverRunnable(now);
     ExecutorService executorService = context.getScheduledExecutorService();
diff --git a/logback-android/src/main/java/ch/qos/logback/core/sift/AbstractAppenderFactoryUsingJoran.java b/logback-android/src/main/java/ch/qos/logback/core/sift/AbstractAppenderFactoryUsingJoran.java
index 16dd1a58c8..fcbb3854b7 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/sift/AbstractAppenderFactoryUsingJoran.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/sift/AbstractAppenderFactoryUsingJoran.java
@@ -47,6 +47,7 @@ List<SaxEvent> removeSiftElement(List<SaxEvent> eventList) {
 
   public abstract SiftingJoranConfiguratorBase<E> getSiftingJoranConfigurator(String k);
 
+  @Override
   public Appender<E> buildAppender(Context context, String discriminatingValue) throws JoranException {
     SiftingJoranConfiguratorBase<E> sjc = getSiftingJoranConfigurator(discriminatingValue);
     sjc.setContext(context);
diff --git a/logback-android/src/main/java/ch/qos/logback/core/sift/AbstractDiscriminator.java b/logback-android/src/main/java/ch/qos/logback/core/sift/AbstractDiscriminator.java
index 41e1853588..0ed20dd5d1 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/sift/AbstractDiscriminator.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/sift/AbstractDiscriminator.java
@@ -27,14 +27,17 @@ public abstract class AbstractDiscriminator<E> extends ContextAwareBase implemen
 
   protected boolean started;
 
+  @Override
   public void start() {
     started = true;
   }
 
+  @Override
   public void stop() {
     started = false;
   }
 
+  @Override
   public boolean isStarted() {
     return started;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/sift/DefaultDiscriminator.java b/logback-android/src/main/java/ch/qos/logback/core/sift/DefaultDiscriminator.java
index ae06fd9615..400586ef42 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/sift/DefaultDiscriminator.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/sift/DefaultDiscriminator.java
@@ -23,10 +23,12 @@ public class DefaultDiscriminator<E> extends AbstractDiscriminator<E> {
 
   static public final String DEFAULT = "default";
 
+  @Override
   public String getDiscriminatingValue(E e) {
     return DEFAULT;
   }
 
+  @Override
   public String getKey() {
     return DEFAULT;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java b/logback-android/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java
index 0308cf3557..1d42c60ce9 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java
@@ -69,8 +69,7 @@ public void start() {
     if (discriminator == null) {
       addError("Missing discriminator. Aborting");
       errors++;
-    }
-    if (!discriminator.isStarted()) {
+    } else if (!discriminator.isStarted()) {
       addError("Discriminator has not started successfully. Aborting");
       errors++;
     }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/sift/SiftingJoranConfiguratorBase.java b/logback-android/src/main/java/ch/qos/logback/core/sift/SiftingJoranConfiguratorBase.java
index da9f971f62..98572b1fcd 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/sift/SiftingJoranConfiguratorBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/sift/SiftingJoranConfiguratorBase.java
@@ -83,6 +83,7 @@ protected void oneAndOnlyOneCheck(Map<?, ?> appenderMap) {
     }
   }
 
+  @Override
   public void doConfigure(final List<SaxEvent> eventList) throws JoranException {
     super.doConfigure(eventList);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/spi/AbstractComponentTracker.java b/logback-android/src/main/java/ch/qos/logback/core/spi/AbstractComponentTracker.java
index 5c0a434456..61ae9952ad 100755
--- a/logback-android/src/main/java/ch/qos/logback/core/spi/AbstractComponentTracker.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/spi/AbstractComponentTracker.java
@@ -77,6 +77,7 @@ abstract public class AbstractComponentTracker<C> implements ComponentTracker<C>
   protected abstract boolean isComponentStale(C c);
 
 
+  @Override
   public int getComponentCount() {
     return liveMap.size() + lingerersMap.size();
   }
@@ -105,6 +106,7 @@ private Entry<C> getFromEitherMap(String key) {
    * @return {@inheritDoc}
    *
    */
+  @Override
   public synchronized C find(String key) {
     Entry<C> entry = getFromEitherMap(key);
     if (entry == null) return null;
@@ -120,6 +122,7 @@ public synchronized C find(String key) {
    * @param timestamp {@inheritDoc}
    * @return {@inheritDoc}
    */
+  @Override
   public synchronized C getOrCreate(String key, long timestamp) {
     Entry<C> entry = getFromEitherMap(key);
     if (entry == null) {
@@ -138,6 +141,7 @@ public synchronized C getOrCreate(String key, long timestamp) {
    *
    * @param key
    */
+  @Override
   public void endOfLife(String key) {
     Entry<C> entry = liveMap.remove(key);
     if (entry == null)
@@ -151,6 +155,7 @@ public void endOfLife(String key) {
    *
    * @param now
    */
+  @Override
   public synchronized void removeStaleComponents(long now) {
     if (isTooSoonForRemovalIteration(now)) return;
     removeExcedentComponents();
@@ -187,17 +192,20 @@ private void genericStaleComponentRemover(LinkedHashMap<String, Entry<C>> map, l
   }
 
   private RemovalPredicator<C> byExcedent = new RemovalPredicator<C>() {
+    @Override
     public boolean isSlatedForRemoval(Entry<C> entry, long timestamp) {
       return (liveMap.size() > maxComponents);
     }
   };
 
   private RemovalPredicator<C> byTimeout = new RemovalPredicator<C>() {
+    @Override
     public boolean isSlatedForRemoval(Entry<C> entry, long timestamp) {
       return isEntryStale(entry, timestamp);
     }
   };
   private RemovalPredicator<C> byLingering = new RemovalPredicator<C>() {
+    @Override
     public boolean isSlatedForRemoval(Entry<C> entry, long timestamp) {
       return isEntryDoneLingering(entry, timestamp);
     }
@@ -225,12 +233,14 @@ private boolean isEntryDoneLingering(Entry<C> entry, long now) {
     return ((entry.timestamp + LINGERING_TIMEOUT) < now);
   }
 
+  @Override
   public Set<String> allKeys() {
     HashSet<String> allKeys = new HashSet<String>(liveMap.keySet());
     allKeys.addAll(lingerersMap.keySet());
     return allKeys;
   }
 
+  @Override
   public Collection<C> allComponents() {
     List<C> allComponents = new ArrayList<C>();
     for (Entry<C> e : liveMap.values())
diff --git a/logback-android/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java b/logback-android/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java
index 8719fe40f7..7b7950a1ab 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java
@@ -35,6 +35,7 @@ public class AppenderAttachableImpl<E> implements AppenderAttachable<E> {
    * Attach an appender. If the appender is already in the list in won't be
    * added again.
    */
+  @Override
   public void addAppender(Appender<E> newAppender) {
     if (newAppender == null) {
       throw new IllegalArgumentException("Null argument disallowed");
@@ -62,6 +63,7 @@ public int appendLoopOnAppenders(E e) {
    *
    * @return Iterator An iterator of attached appenders.
    */
+  @Override
   public Iterator<Appender<E>> iteratorForAppenders() {
     return appenderList.iterator();
   }
@@ -72,6 +74,7 @@ public Iterator<Appender<E>> iteratorForAppenders() {
    * <p> Return the appender with that name if in the list. Return null
    * otherwise.
    */
+  @Override
   public Appender<E> getAppender(String name) {
     if (name == null) {
       return null;
@@ -90,6 +93,7 @@ public Appender<E> getAppender(String name) {
    *
    * @since 1.2
    */
+  @Override
   public boolean isAttached(Appender<E> appender) {
     if (appender == null) {
       return false;
@@ -103,6 +107,7 @@ public boolean isAttached(Appender<E> appender) {
   /**
    * Remove and processPriorToRemoval all previously attached appenders.
    */
+  @Override
   public void detachAndStopAllAppenders() {
     for (Appender<E> a : appenderList) {
       a.stop();
@@ -116,6 +121,7 @@ public void detachAndStopAllAppenders() {
    * Remove the appender passed as parameter form the list of attached
    * appenders.
    */
+  @Override
   public boolean detachAppender(Appender<E> appender) {
     if (appender == null) {
       return false;
@@ -129,6 +135,7 @@ public boolean detachAppender(Appender<E> appender) {
    * Remove the appender with the name passed as parameter form the list of
    * appenders.
    */
+  @Override
   public boolean detachAppender(String name) {
     if (name == null) {
       return false;
diff --git a/logback-android/src/main/java/ch/qos/logback/core/spi/ContextAwareBase.java b/logback-android/src/main/java/ch/qos/logback/core/spi/ContextAwareBase.java
index 114b524c52..2d133b1fbb 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/spi/ContextAwareBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/spi/ContextAwareBase.java
@@ -40,6 +40,7 @@ public ContextAwareBase(ContextAware declaredOrigin) {
     this.declaredOrigin = declaredOrigin;
   }
 
+  @Override
   public void setContext(Context context) {
     if (this.context == null) {
       this.context = context;
@@ -48,6 +49,7 @@ public void setContext(Context context) {
     }
   }
 
+  @Override
   public Context getContext() {
     return this.context;
   }
@@ -69,6 +71,7 @@ protected Object getDeclaredOrigin() {
     return declaredOrigin;
   }
 
+  @Override
   public void addStatus(Status status) {
     if (context == null) {
       if (noContextWarning++ == 0) {
@@ -82,26 +85,32 @@ public void addStatus(Status status) {
     }
   }
 
+  @Override
   public void addInfo(String msg) {
     addStatus(new InfoStatus(msg, getDeclaredOrigin()));
   }
 
+  @Override
   public void addInfo(String msg, Throwable ex) {
     addStatus(new InfoStatus(msg, getDeclaredOrigin(), ex));
   }
 
+  @Override
   public void addWarn(String msg) {
     addStatus(new WarnStatus(msg, getDeclaredOrigin()));
   }
 
+  @Override
   public void addWarn(String msg, Throwable ex) {
     addStatus(new WarnStatus(msg, getDeclaredOrigin(), ex));
   }
 
+  @Override
   public void addError(String msg) {
     addStatus(new ErrorStatus(msg, getDeclaredOrigin()));
   }
 
+  @Override
   public void addError(String msg, Throwable ex) {
     addStatus(new ErrorStatus(msg, getDeclaredOrigin(), ex));
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/spi/ContextAwareImpl.java b/logback-android/src/main/java/ch/qos/logback/core/spi/ContextAwareImpl.java
index 9a49d72e45..32792e6fc8 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/spi/ContextAwareImpl.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/spi/ContextAwareImpl.java
@@ -45,6 +45,7 @@ protected Object getOrigin() {
     return origin;
   }
   
+  @Override
   public void setContext(Context context) {
     if (this.context == null) {
       this.context = context;
@@ -53,6 +54,7 @@ public void setContext(Context context) {
     }
   }
 
+  @Override
   public Context getContext() {
     return this.context;
   }
@@ -64,10 +66,11 @@ public StatusManager getStatusManager() {
     return context.getStatusManager();
   }
 
+  @Override
   public void addStatus(Status status) {
     if (context == null) {
       if (noContextWarning++ == 0) {
-        System.out.println("LOGBACK: No context given for " + this);
+        System.out.println("LOGBACK: No context given for " + origin);
       }
       return;
     }
@@ -77,26 +80,32 @@ public void addStatus(Status status) {
     }
   }
 
+  @Override
   public void addInfo(String msg) {
     addStatus(new InfoStatus(msg, getOrigin()));
   }
 
+  @Override
   public void addInfo(String msg, Throwable ex) {
     addStatus(new InfoStatus(msg, getOrigin(), ex));
   }
 
+  @Override
   public void addWarn(String msg) {
     addStatus(new WarnStatus(msg, getOrigin()));
   }
 
+  @Override
   public void addWarn(String msg, Throwable ex) {
     addStatus(new WarnStatus(msg, getOrigin(), ex));
   }
 
+  @Override
   public void addError(String msg) {
     addStatus(new ErrorStatus(msg, getOrigin()));
   }
 
+  @Override
   public void addError(String msg, Throwable ex) {
     addStatus(new ErrorStatus(msg, getOrigin(), ex));
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java b/logback-android/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java
index 3ee6470b62..9be80f9b08 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/spi/FilterAttachableImpl.java
@@ -34,6 +34,7 @@ final public class FilterAttachableImpl<E> implements FilterAttachable<E> {
   /**
    * Add a filter to end of the filter list.
    */
+  @Override
   public void addFilter(Filter<E> newFilter) {
     filterList.add(newFilter);
   }
@@ -41,6 +42,7 @@ public void addFilter(Filter<E> newFilter) {
   /**
    * Clear the filter chain
    */
+  @Override
   public void clearAllFilters() {
     filterList.clear();
   }
@@ -50,6 +52,7 @@ public void clearAllFilters() {
    * ACCEPT or DENY, then that value is returned. If all of the filters return
    * NEUTRAL, then NEUTRAL is returned.
    */
+  @Override
   public FilterReply getFilterChainDecision(E event) {
     final Filter<E>[] filterArrray = filterList.asTypedArray();
     final int len = filterArrray.length;
@@ -65,6 +68,7 @@ public FilterReply getFilterChainDecision(E event) {
     return FilterReply.NEUTRAL;
   }
 
+  @Override
   public List<Filter<E>> getCopyOfAttachedFiltersList() {
     return new ArrayList<Filter<E>>(filterList);
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/spi/ScanException.java b/logback-android/src/main/java/ch/qos/logback/core/spi/ScanException.java
index d7a8edb5c6..86c582842d 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/spi/ScanException.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/spi/ScanException.java
@@ -19,19 +19,12 @@ public class ScanException extends Exception {
 
   private static final long serialVersionUID = -3132040414328475658L;
 
-  Throwable cause;
-
   public ScanException(String msg) {
     super(msg);
   }
 
   public ScanException(String msg, Throwable rootCause) {
-    super(msg);
-    this.cause = rootCause;
-  }
-
-  public Throwable getCause() {
-   return cause;
+    super(msg, rootCause);
   }
 }
 
diff --git a/logback-android/src/main/java/ch/qos/logback/core/status/OnPrintStreamStatusListenerBase.java b/logback-android/src/main/java/ch/qos/logback/core/status/OnPrintStreamStatusListenerBase.java
index e9bb247c31..8491e860ee 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/status/OnPrintStreamStatusListenerBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/status/OnPrintStreamStatusListenerBase.java
@@ -55,6 +55,7 @@ private void print(Status status) {
     getPrintStream().print(sb);
   }
 
+  @Override
   public void addStatusEvent(Status status) {
     if (!isStarted)
       return;
@@ -87,6 +88,7 @@ private boolean isElapsedTimeLongerThanThreshold(long now, long timestamp) {
    * Invoking the start method can cause the instance to print status messages created less than
    * value of retrospectiveThresold.
    */
+  @Override
   public void start() {
     isStarted = true;
     if (retrospectiveThresold > 0) {
@@ -110,10 +112,12 @@ public long getRetrospective() {
     return retrospectiveThresold;
   }
 
+  @Override
   public void stop() {
     isStarted = false;
   }
 
+  @Override
   public boolean isStarted() {
     return isStarted;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/status/StatusBase.java b/logback-android/src/main/java/ch/qos/logback/core/status/StatusBase.java
index d0032ec264..0436e378fa 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/status/StatusBase.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/status/StatusBase.java
@@ -42,6 +42,7 @@ abstract public class StatusBase implements Status {
     this.date = System.currentTimeMillis();
   }
 
+  @Override
   public synchronized void add(Status child) {
     if (child == null) {
       throw new NullPointerException("Null values are not valid Status.");
@@ -52,10 +53,12 @@ public synchronized void add(Status child) {
     childrenList.add(child);
   }
 
+  @Override
   public synchronized boolean hasChildren() {
     return ((childrenList != null) && (childrenList.size() > 0));
   }
 
+  @Override
   public synchronized Iterator<Status> iterator() {
     if (childrenList != null) {
       return childrenList.iterator();
@@ -64,6 +67,7 @@ public synchronized Iterator<Status> iterator() {
     }
   }
 
+  @Override
   public synchronized boolean remove(Status statusToRemove) {
     if (childrenList == null) {
       return false;
@@ -72,6 +76,7 @@ public synchronized boolean remove(Status statusToRemove) {
     return childrenList.remove(statusToRemove);
   }
 
+  @Override
   public int getLevel() {
     return level;
   }
@@ -80,6 +85,7 @@ public int getLevel() {
   // cyclic status arrangements are like to cause deadlocks
   // when this method is called from different thread on
   // different status objects lying on the same cycle
+  @Override
   public synchronized int getEffectiveLevel() {
     int result = level;
     int effLevel;
@@ -96,18 +102,22 @@ public synchronized int getEffectiveLevel() {
     return result;
   }
 
+  @Override
   public String getMessage() {
     return message;
   }
 
+  @Override
   public Object getOrigin() {
     return origin;
   }
 
+  @Override
   public Throwable getThrowable() {
     return throwable;
   }
 
+  @Override
   public Long getDate() {
     return date;
   }
diff --git a/logback-android/src/main/java/ch/qos/logback/core/util/ExecutorServiceUtil.java b/logback-android/src/main/java/ch/qos/logback/core/util/ExecutorServiceUtil.java
index 2c539aa571..08cb301be7 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/util/ExecutorServiceUtil.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/util/ExecutorServiceUtil.java
@@ -40,6 +40,7 @@ public class ExecutorServiceUtil {
     private final ThreadFactory defaultFactory = Executors.defaultThreadFactory();
     private final AtomicInteger threadNumber = new AtomicInteger(1);
 
+    @Override
     public Thread newThread(Runnable r) {
       Thread thread = defaultFactory.newThread(r);
       if (!thread.isDaemon()) {
diff --git a/logback-android/src/main/java/ch/qos/logback/core/util/FixedDelay.java b/logback-android/src/main/java/ch/qos/logback/core/util/FixedDelay.java
index d5843c941f..ebfdb6a49f 100755
--- a/logback-android/src/main/java/ch/qos/logback/core/util/FixedDelay.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/util/FixedDelay.java
@@ -51,6 +51,7 @@ public FixedDelay(int delay) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public long nextDelay() {
     long delay = nextDelay;
     nextDelay = subsequentDelay;
diff --git a/logback-android/src/main/java/ch/qos/logback/core/util/Loader.java b/logback-android/src/main/java/ch/qos/logback/core/util/Loader.java
index 1bdd8856fc..c712692e36 100644
--- a/logback-android/src/main/java/ch/qos/logback/core/util/Loader.java
+++ b/logback-android/src/main/java/ch/qos/logback/core/util/Loader.java
@@ -47,6 +47,7 @@ public class Loader {
 
     HAS_GET_CLASS_LOADER_PERMISSION =
             AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+              @Override
               public Boolean run() {
                 try {
                   AccessController.checkPermission(
@@ -161,6 +162,7 @@ public static ClassLoader getClassLoaderAsPrivileged(final Class<?> clazz) {
     else
       return AccessController.doPrivileged(
               new PrivilegedAction<ClassLoader>() {
+                @Override
                 public ClassLoader run() {
                   return clazz.getClassLoader();
                 }
diff --git a/logback-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/logback-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
index aeacfd8f38..e02aaa9bb0 100644
--- a/logback-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
+++ b/logback-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
@@ -99,6 +99,7 @@ public void initialize() {
     }
   }
 
+  @Override
   public ILoggerFactory getLoggerFactory() {
     if (!initialized) {
       return defaultLoggerContext;
diff --git a/logback-android/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/logback-android/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
index ac83f26ce2..805ef81b45 100644
--- a/logback-android/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
+++ b/logback-android/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
@@ -47,6 +47,7 @@ public static StaticMarkerBinder getSingleton() {
    * Currently this method always returns an instance of 
    * {@link BasicMarkerFactory}.
    */
+  @Override
   public IMarkerFactory getMarkerFactory() {
     return markerFactory;
   }
@@ -55,6 +56,7 @@ public IMarkerFactory getMarkerFactory() {
    * Currently, this method returns the class name of
    * {@link BasicMarkerFactory}.
    */
+  @Override
   public String getMarkerFactoryClassStr() {
     return BasicMarkerFactory.class.getName();
   }
diff --git a/logback-android/src/test/java/ch/qos/logback/core/joran/spi/ElementPathTest.java b/logback-android/src/test/java/ch/qos/logback/core/joran/spi/ElementPathTest.java
new file mode 100644
index 0000000000..c3dc764d07
--- /dev/null
+++ b/logback-android/src/test/java/ch/qos/logback/core/joran/spi/ElementPathTest.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright 2019 Anthony Trinh
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ch.qos.logback.core.joran.spi;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import org.junit.Test;
+
+public class ElementPathTest {
+
+  @Test
+  public void pathsEqualIgnoringCaseHaveEqualHashCodes() {
+    ElementPath lower = new ElementPath("configuration/appender");
+    ElementPath mixed = new ElementPath("Configuration/APPENDER");
+
+    assertEquals(lower, mixed);
+    assertEquals(lower.hashCode(), mixed.hashCode());
+  }
+
+  @Test
+  public void differentPathsAreNotEqual() {
+    assertNotEquals(new ElementPath("a/b"), new ElementPath("a/c"));
+    assertNotEquals(new ElementPath("a/b"), new ElementPath("ab"));
+  }
+}
diff --git a/logback-android/src/test/java/ch/qos/logback/core/sift/SiftingAppenderBaseTest.java b/logback-android/src/test/java/ch/qos/logback/core/sift/SiftingAppenderBaseTest.java
new file mode 100644
index 0000000000..314dbec8ba
--- /dev/null
+++ b/logback-android/src/test/java/ch/qos/logback/core/sift/SiftingAppenderBaseTest.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2019 Anthony Trinh
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ch.qos.logback.core.sift;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+import ch.qos.logback.core.ContextBase;
+import ch.qos.logback.core.status.Status;
+import ch.qos.logback.core.status.StatusUtil;
+
+public class SiftingAppenderBaseTest {
+
+  private final ContextBase context = new ContextBase();
+
+  private final SiftingAppenderBase<Object> appender = new SiftingAppenderBase<Object>() {
+    @Override
+    protected long getTimestamp(Object event) {
+      return 0;
+    }
+
+    @Override
+    protected boolean eventMarksEndOfLife(Object event) {
+      return false;
+    }
+  };
+
+  @Test
+  public void startWithoutDiscriminatorReportsAnErrorInsteadOfThrowing() {
+    appender.setContext(context);
+
+    appender.start();
+
+    assertFalse(appender.isStarted());
+    assertEquals(Status.ERROR, new StatusUtil(context).getHighestLevel(0));
+  }
+}
diff --git a/scripts/check-architecture-docs.sh b/scripts/check-architecture-docs.sh
index 8e589aafd7..4023770683 100755
--- a/scripts/check-architecture-docs.sh
+++ b/scripts/check-architecture-docs.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
-# docs/architecture/components.md claims to catalogue every Java package in the
-# library. A catalogue with a hole in it reads as complete, so the next reader
+# docs/architecture/components.md claims to catalogue every package in the
+# library, Java or Kotlin. A catalogue with a hole in it reads as complete, so the next reader
 # concludes the package they cannot find does not exist. This makes the hole a
 # failing check instead.
 #
@@ -18,7 +18,8 @@ set -euo pipefail
 
 cd "$(dirname "$0")/.."
 
-SRC=logback-android/src/main/java
+# The upstream logback port is Java; the Android layer is Kotlin (#388).
+SRCS="logback-android/src/main/java logback-android/src/main/kotlin"
 CATALOGUE=docs/architecture/components.md
 
 # Keep in step with docs/architecture/README.md §4.
@@ -30,7 +31,7 @@ ch/qos/logback/core/net/ssl
 
 status=0
 
-packages=$(find "$SRC" -name '*.java' -exec dirname {} \; | sed "s|^$SRC/||" | sort -u)
+packages=$(for src in $SRCS; do find "$src" \( -name '*.java' -o -name '*.kt' \) -exec dirname {} \; | sed "s|^$src/||"; done | sort -u)
 catalogued=$(sed -n 's/^### `\([^`]*\)`.*/\1/p' "$CATALOGUE" | sort -u)
 
 missing=$(comm -23 <(echo "$packages") <(echo "$catalogued"))
@@ -43,19 +44,19 @@ if [ -n "$missing" ]; then
 fi
 
 if [ -n "$stale" ]; then
-  echo "$CATALOGUE: entries for packages that no longer exist under $SRC:"
+  echo "$CATALOGUE: entries for packages that no longer exist under $SRCS:"
   echo "$stale" | sed 's/^/  /'
   status=1
 fi
 
-core_to_classic=$(grep -rl 'import ch\.qos\.logback\.classic' "$SRC/ch/qos/logback/core" || true)
+core_to_classic=$(for src in $SRCS; do grep -rl 'import ch\.qos\.logback\.classic' "$src/ch/qos/logback/core" || true; done)
 if [ -n "$core_to_classic" ]; then
   echo "core must not depend on classic (docs/architecture/README.md §4):"
   echo "$core_to_classic" | sed 's/^/  /'
   status=1
 fi
 
-android_users=$({ grep -rlE '^import (static )?android\.' "$SRC" || true; } | xargs -r -n1 dirname | sed "s|^$SRC/||" | sort -u)
+android_users=$(for src in $SRCS; do { grep -rlE '^import (static )?android\.' "$src" || true; } | xargs -r -n1 dirname | sed "s|^$src/||"; done | sort -u)
 unexpected=$(comm -23 <(echo "$android_users") <(echo "$ANDROID_PACKAGES" | sed '/^$/d' | sort -u))
 if [ -n "$unexpected" ]; then
   echo "android.* imported outside the packages allowed in docs/architecture/README.md §4:"