java: add @Override annotation to overriding methods

Change-Id: I086964c6f6ce52c60c52b6dbc445d3c21d22c80a

69 files changed, 186 insertions, 0 deletions

diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index 5b5704c32cb3..c02406add999 100644
--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -84,6 +84,7 @@ public class SDBCReportDataFactory implements DataSourceFactory
             this.maxRows = maxRows;
         }
 
+        @Override
         public boolean equals(Object obj)
         {
             if (obj == null)
@@ -118,6 +119,7 @@ public class SDBCReportDataFactory implements DataSourceFactory
             return true;
         }
 
+        @Override
         public int hashCode()
         {
             int hash = 3;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java
index c1c6c235483f..b0dd3d637925 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java
@@ -109,6 +109,7 @@ public class StarReportDataFactory implements ReportDataFactory, Cloneable
         }
     }
 
+    @Override
     public Object clone() throws CloneNotSupportedException
     {
         return super.clone();
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
index a7b3e1620152..d7d4e10f097c 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
@@ -49,6 +49,7 @@ public class FixedTextLayoutController
     {
     }
 
+    @Override
     public boolean isValueChanged()
     {
         final FlowController controller = getFlowController();
@@ -57,6 +58,7 @@ public class FixedTextLayoutController
         return reportDataRow.getCursor() == 0;
     }
 
+    @Override
     protected LayoutController delegateContentGeneration(final ReportTarget target)
             throws ReportProcessingException, ReportDataFactoryException,
             DataSourceException
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
index 1c7c9973ac8e..a3c024116fd8 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
@@ -51,6 +51,7 @@ public class FormattedTextLayoutController
     {
     }
 
+    @Override
     public boolean isValueChanged()
     {
         try
@@ -70,6 +71,7 @@ public class FormattedTextLayoutController
         }
     }
 
+    @Override
     protected LayoutController delegateContentGeneration(final ReportTarget target)
             throws ReportProcessingException, ReportDataFactoryException,
             DataSourceException
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java
index bd5d529553d5..31dda966b0ca 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java
@@ -66,6 +66,7 @@ public class ImageElementLayoutController
     {
     }
 
+    @Override
     protected LayoutController delegateContentGeneration(final ReportTarget target)
             throws ReportProcessingException, ReportDataFactoryException,
             DataSourceException
@@ -230,6 +231,7 @@ public class ImageElementLayoutController
         return null;
     }
 
+    @Override
     public boolean isValueChanged()
     {
         final ImageElement imageElement = (ImageElement) getNode();
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ObjectOleLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
index 3a5c31dd1435..58c946878aa2 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
@@ -44,6 +44,7 @@ public class ObjectOleLayoutController extends AbstractReportElementLayoutContro
     {
     }
 
+    @Override
     public boolean isValueChanged()
     {
         final ObjectOleElement element = (ObjectOleElement) getNode();
@@ -68,6 +69,7 @@ public class ObjectOleLayoutController extends AbstractReportElementLayoutContro
         return false;
     }
 
+    @Override
     protected LayoutController delegateContentGeneration(final ReportTarget target) throws ReportProcessingException, ReportDataFactoryException, DataSourceException
     {
         final ObjectOleElement element = (ObjectOleElement) getNode();
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
index 40dd5c0488f6..6c9d5ab2c881 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
@@ -66,6 +66,7 @@ public class OfficeDetailLayoutController extends SectionLayoutController
      * @throws org.jfree.report.ReportDataFactoryException
      *          if a query failed.
      */
+    @Override
     public void initialize(final Object node,
             final FlowController flowController,
             final LayoutController parent)
@@ -90,6 +91,7 @@ public class OfficeDetailLayoutController extends SectionLayoutController
      * @throws org.jfree.report.ReportDataFactoryException
      *          if a query failed.
      */
+    @Override
     protected LayoutController startElement(final ReportTarget target)
             throws DataSourceException, ReportProcessingException, ReportDataFactoryException
     {
@@ -120,6 +122,7 @@ public class OfficeDetailLayoutController extends SectionLayoutController
         return super.startElement(target);
     }
 
+    @Override
     protected void resetSectionForRepeat()
     {
         super.resetSectionForRepeat();
@@ -135,6 +138,7 @@ public class OfficeDetailLayoutController extends SectionLayoutController
      * @return the joined layout controller that incorperates all changes from the
      *         delegate.
      */
+    @Override
     public LayoutController join(final FlowController flowController)
     {
         if (waitForJoin)
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java
index ad402e03a994..42c81a00bd9d 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java
@@ -54,6 +54,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon
     {
     }
 
+    @Override
     public void initialize(final Object node, final FlowController flowController, final LayoutController parent)
             throws DataSourceException, ReportDataFactoryException, ReportProcessingException
     {
@@ -61,6 +62,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon
         state = STATE_PROCESS_VARIABLES;
     }
 
+    @Override
     protected LayoutController processContent(final ReportTarget target)
             throws DataSourceException, ReportProcessingException, ReportDataFactoryException
     {
@@ -80,6 +82,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon
 
     // isDisplayable is private in version 0.9.1, so until the upgrade we keep this copy of the method
     // todo: Delete it unce the sun-cvs contains version 0.9.2.
+    @Override
     protected LayoutController processChild(final SectionLayoutController derived,
             final Node node,
             final FlowController flowController)
@@ -101,6 +104,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon
         }
     }
 
+    @Override
     protected boolean isDisplayable(final Node node) throws DataSourceException
     {
         if (!(node instanceof OfficeGroupSection))
@@ -131,6 +135,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon
         return Boolean.TRUE.equals(result);
     }
 
+    @Override
     protected void resetSectionForRepeat()
     {
         super.resetSectionForRepeat();
@@ -146,6 +151,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon
      * @return the joined layout controller that incorperates all changes from the
      *         delegate.
      */
+    @Override
     public LayoutController join(final FlowController flowController)
     {
         if (waitForJoin)
@@ -159,6 +165,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon
         return super.join(flowController);
     }
 
+    @Override
     protected AttributeMap computeAttributes(final FlowController fc, final Element element, final ReportTarget target)
             throws DataSourceException
     {
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
index 293a6dbdd001..bfe50b844aa4 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
@@ -73,6 +73,7 @@ public class OfficeGroupLayoutController extends SectionLayoutController
      * @throws org.jfree.report.ReportDataFactoryException
      *          if a query failed.
      */
+    @Override
     public void initialize(final Object node,
             final FlowController flowController,
             final LayoutController parent)
@@ -92,6 +93,7 @@ public class OfficeGroupLayoutController extends SectionLayoutController
         repeatFooter = (footer != null && footer.isRepeatSection());
     }
 
+    @Override
     protected LayoutController processContent(final ReportTarget target)
             throws DataSourceException, ReportProcessingException,
             ReportDataFactoryException
@@ -145,6 +147,7 @@ public class OfficeGroupLayoutController extends SectionLayoutController
      * @return the joined layout controller that incorperates all changes from the
      *         delegate.
      */
+    @Override
     public LayoutController join(final FlowController flowController)
     {
         if (waitForJoin)
@@ -183,6 +186,7 @@ public class OfficeGroupLayoutController extends SectionLayoutController
         return variablesCollection;
     }
 
+    @Override
     protected AttributeMap computeAttributes(final FlowController fc, final Element element, final ReportTarget target)
             throws DataSourceException
     {
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
index a709bdce9ec4..4cc7b1691dbb 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
@@ -48,6 +48,7 @@ public class OfficeGroupSectionLayoutController extends SectionLayoutController
     {
     }
 
+    @Override
     protected LayoutController startElement(final ReportTarget target)
             throws DataSourceException, ReportProcessingException, ReportDataFactoryException
     {
@@ -74,6 +75,7 @@ public class OfficeGroupSectionLayoutController extends SectionLayoutController
         return clone;
     }
 
+    @Override
     protected AttributeMap computeAttributes(final FlowController fc,
             final Element element,
             final ReportTarget target)
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java
index 069ec7dfa298..5442c4de30f9 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java
@@ -37,6 +37,7 @@ public class OfficePageSectionLayoutController extends SectionLayoutController
     {
     }
 
+    @Override
     protected AttributeMap computeAttributes(final FlowController flowController, final Element element, final ReportTarget reportTarget) throws DataSourceException
     {
         final AttributeMap map = new AttributeMap(super.computeAttributes(flowController, element, reportTarget));
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
index a9cc10fc8de5..7e258336abc9 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
@@ -78,6 +78,7 @@ public class OfficeReportLayoutController extends ElementLayoutController
      * @throws org.jfree.report.ReportDataFactoryException
      *          if a query failed.
      */
+    @Override
     public void initialize(final Object node, final FlowController flowController,
             final LayoutController parent)
             throws DataSourceException, ReportDataFactoryException,
@@ -104,6 +105,7 @@ public class OfficeReportLayoutController extends ElementLayoutController
      * @throws org.jfree.report.ReportDataFactoryException
      *          if a query failed.
      */
+    @Override
     protected LayoutController processContent(final ReportTarget target)
             throws DataSourceException, ReportProcessingException,
             ReportDataFactoryException
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
index ed5d63887051..b217e223a12e 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
@@ -42,6 +42,7 @@ public class OfficeTableLayoutController extends SectionLayoutController
     {
     }
 
+    @Override
     protected AttributeMap computeAttributes(final FlowController fc, final Element element, final ReportTarget target)
             throws DataSourceException
     {
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
index e610fc421cb7..48180b12405c 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
@@ -65,6 +65,7 @@ public class OfficeTableTemplateLayoutController extends SectionLayoutController
      * @throws org.jfree.report.ReportDataFactoryException
      *          if a query failed.
      */
+    @Override
     public void initialize(final Object node, final FlowController flowController, final LayoutController parent)
             throws DataSourceException, ReportDataFactoryException, ReportProcessingException
     {
@@ -172,6 +173,7 @@ public class OfficeTableTemplateLayoutController extends SectionLayoutController
         }
     }
 
+    @Override
     public Node[] getNodes()
     {
         return nodes;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
index a9e0ef058b38..6baada276f0c 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -56,6 +56,7 @@ public class TableCellLayoutController extends SectionLayoutController
     {
     }
 
+    @Override
     protected AttributeMap computeAttributes(final FlowController fc,
             final Element element,
             final ReportTarget target)
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputResourceKey.java b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputResourceKey.java
index 917b43cc223a..c0ddbe453fc9 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputResourceKey.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputResourceKey.java
@@ -46,6 +46,7 @@ public class InputResourceKey implements Serializable
         return path;
     }
 
+    @Override
     public String toString()
     {
         return "InputResourceKey{" + "inputRepositoryId=" + inputRepositoryId + ", path='" + path + '\'' + '}';
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java
index 5a87a989ad3c..59cedd951902 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java
@@ -69,6 +69,7 @@ public class OfficeStyles extends Element
             return name;
         }
 
+        @Override
         public boolean equals(final Object obj)
         {
             if (this != obj)
@@ -88,6 +89,7 @@ public class OfficeStyles extends Element
             return true;
         }
 
+        @Override
         public int hashCode()
         {
             int result = family.hashCode();
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java
index c4d545c49d85..3f39b3e9359e 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java
@@ -114,6 +114,7 @@ public class ImageProducer
             this.keyData = keyData;
         }
 
+        @Override
         public boolean equals(final Object o)
         {
             if (this != o)
@@ -133,6 +134,7 @@ public class ImageProducer
             return true;
         }
 
+        @Override
         public int hashCode()
         {
             if (hashCode != null)
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index f58cf30c5e4b..5d9e6dba5d4e 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -238,6 +238,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
             this.groupWithRepeatingSection = groupWithRepeatingSection;
         }
 
+        @Override
         public String toString()
         {
             return "GroupContext{" + "parent=" + parent + ", iterationCount=" + iterationCount + ", groupWithRepeatingSection=" + groupWithRepeatingSection + '}';
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportProcessor.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportProcessor.java
index f8256bc6ff57..544b40506a56 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportProcessor.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportProcessor.java
@@ -77,6 +77,7 @@ public class ChartRawReportProcessor extends SinglePassReportProcessor
         this.dataSourceFactory = dataSourceFactory;
     }
 
+    @Override
     protected ReportTarget createReportTarget(final ReportJob job)
             throws ReportProcessingException
     {
@@ -87,6 +88,7 @@ public class ChartRawReportProcessor extends SinglePassReportProcessor
                 inputRepository, outputRepository, targetName, imageService, dataSourceFactory);
     }
 
+    @Override
     public void processReport(final ReportJob job) throws ReportDataFactoryException, DataSourceException,
             ReportProcessingException
     {
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
index 2658942fe33c..05ca93ad990e 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
@@ -62,6 +62,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
         super(reportJob, resourceManager, baseResource, inputRepository, outputRepository, target, imageService, dataSourceFactory);
     }
 
+    @Override
     protected String getTargetMimeType()
     {
         return "application/vnd.oasis.opendocument.chart";
@@ -77,6 +78,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
         return "raw/" + PentahoReportEngineMetaData.OPENDOCUMENT_CHART;
     }
 
+    @Override
     protected void startContent(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException
     {
         inFilterElements = false;
@@ -88,6 +90,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
         ++closeTags;
     }
 
+    @Override
     protected void endContent(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException
     {
         final XmlWriter xmlWriter = getXmlWriter();
@@ -98,15 +101,18 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     protected void startReportSection(final AttributeMap attrs, final int role)
             throws ReportProcessingException
     {
     }
 
+    @Override
     protected void endReportSection(final AttributeMap attrs, final int role)
     {
     }
 
+    @Override
     protected void startOther(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException
     {
         final String namespace = ReportTargetUtil.getNamespaceFromAttribute(attrs);
@@ -129,6 +135,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
         return OfficeToken.TABLE_HEADER_COLUMNS.equals(elementType) || OfficeToken.TABLE_HEADER_ROWS.equals(elementType) || OfficeToken.TABLE_COLUMNS.equals(elementType);
     }
 
+    @Override
     protected void endOther(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException
     {
         if (tableRowsStarted && getCurrentRole() == ROLE_TEMPLATE)
@@ -169,6 +176,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     public void processContent(final DataFlags value)
             throws DataSourceException, ReportProcessingException
     {
@@ -227,6 +235,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
     }
 
 
+    @Override
     public void processText(final String text) throws DataSourceException, ReportProcessingException
     {
         if (inFilterElements && tableCount > 1)
@@ -236,6 +245,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
         super.processText(text);
     }
 
+    @Override
     public void endReport(final ReportStructureRoot report)
             throws DataSourceException, ReportProcessingException
     {
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
index e61194797c70..777fa20e9333 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
@@ -95,6 +95,7 @@ public class SpreadsheetRawReportProcessor extends AbstractReportProcessor
         processReportRun(job, reportTarget);
     }
 
+    @Override
     protected ReportContext createReportContext(final ReportJob job,
             final ReportTarget target)
     {
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
index dbe1f4ce1abb..8c4807c28ddb 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
@@ -134,11 +134,13 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
             }
         }
 
+        @Override
         public boolean equals(final Object obj)
         {
             return obj instanceof ColumnBoundary && ((ColumnBoundary) obj).boundary == boundary;
         }
 
+        @Override
         public int hashCode()
         {
             assert false : "hashCode not designed";
@@ -180,6 +182,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
         oleHandled = false;
     }
 
+    @Override
     public void startOther(final AttributeMap attrs) throws DataSourceException, ReportProcessingException
     {
         if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, OfficeToken.OBJECT_OLE, attrs))
@@ -264,6 +267,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     protected void startReportSection(final AttributeMap attrs, final int role) throws ReportProcessingException
     {
         if ((role == OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_HEADER || role == OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_FOOTER) && (!PageSection.isPrintWithReportHeader(attrs) || !PageSection.isPrintWithReportFooter(attrs)))
@@ -276,6 +280,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     protected void endReportSection(final AttributeMap attrs, final int role) throws IOException, ReportProcessingException
     {
         if ((role == OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_HEADER || role == OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_FOOTER) && (!PageSection.isPrintWithReportHeader(attrs) || !PageSection.isPrintWithReportFooter(attrs)))
@@ -609,6 +614,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     protected void endOther(final AttributeMap attrs) throws DataSourceException, ReportProcessingException
     {
         if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, OfficeToken.OBJECT_OLE, attrs) || oleHandled)
@@ -693,6 +699,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
     }
 
 
+    @Override
     public void processText(final String text) throws DataSourceException, ReportProcessingException
     {
         if (!(isRepeatingSection() || isElementBoundaryCollectionPass()))
@@ -702,6 +709,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     public void processContent(final DataFlags value) throws DataSourceException, ReportProcessingException
     {
         if (!(isRepeatingSection() || isElementBoundaryCollectionPass()))
@@ -716,6 +724,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
         return "spreadsheet";
     }
 
+    @Override
     protected void startContent(final AttributeMap attrs) throws IOException, DataSourceException,
             ReportProcessingException
     {
@@ -795,6 +804,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
         return masterPage.getStyleName();
     }
 
+    @Override
     protected void endContent(final AttributeMap attrs) throws IOException, DataSourceException,
             ReportProcessingException
     {
@@ -807,6 +817,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     public void endReport(final ReportStructureRoot report) throws DataSourceException, ReportProcessingException
     {
         super.endReport(report);
@@ -928,6 +939,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
         return span;
     }
 
+    @Override
     protected String getTargetMimeType()
     {
         return "application/vnd.oasis.opendocument.spreadsheet";
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java
index 82cf13a9a978..5f0bb70a5255 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java
@@ -58,6 +58,7 @@ public class MasterPageFactory
             this.pageFooter = pageFooter;
         }
 
+        @Override
         public boolean equals(final Object o)
         {
             if (this != o)
@@ -89,6 +90,7 @@ public class MasterPageFactory
             return true;
         }
 
+        @Override
         public int hashCode()
         {
             int result = (template != null ? template.hashCode() : 0);
@@ -115,6 +117,7 @@ public class MasterPageFactory
             this.footerHeight = footerHeight;
         }
 
+        @Override
         public boolean equals(final Object o)
         {
             if (this == o)
@@ -143,6 +146,7 @@ public class MasterPageFactory
 
         }
 
+        @Override
         public int hashCode()
         {
             int result;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor.java
index b0dd06eab9ff..8718043bf389 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor.java
@@ -80,6 +80,7 @@ public class TextRawReportProcessor extends SinglePassReportProcessor
         this.dataSourceFactory = dataSourceFactory;
     }
 
+    @Override
     protected ReportTarget createReportTarget(final ReportJob job)
             throws ReportProcessingException
     {
@@ -90,6 +91,7 @@ public class TextRawReportProcessor extends SinglePassReportProcessor
                 inputRepository, outputRepository, targetName, imageService, dataSourceFactory);
     }
 
+    @Override
     protected ReportContext createReportContext(final ReportJob job,
             final ReportTarget target)
     {
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
index 486b62d2eee3..266f59eeaed7 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
@@ -140,6 +140,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
         this.tableLayoutConfig = TABLE_LAYOUT_SINGLE_DETAIL_TABLE;
     }
 
+    @Override
     protected String getTargetMimeType()
     {
         return "application/vnd.oasis.opendocument.text";
@@ -425,6 +426,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
      * @throws org.jfree.report.ReportProcessingException
      *          if some other error occured.
      */
+    @Override
     public void startReport(final ReportStructureRoot report)
             throws DataSourceException, ReportProcessingException
     {
@@ -505,6 +507,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
         return variablesSectionStyle;
     }
 
+    @Override
     protected void startContent(final AttributeMap attrs)
             throws IOException, DataSourceException, ReportProcessingException
     {
@@ -527,6 +530,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
 
     }
 
+    @Override
     protected void startOther(final AttributeMap attrs)
             throws IOException, DataSourceException, ReportProcessingException
     {
@@ -1049,6 +1053,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
 
     }
 
+    @Override
     protected void startReportSection(final AttributeMap attrs, final int role)
             throws ReportProcessingException
     {
@@ -1098,6 +1103,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     protected void startGroup(final AttributeMap attrs)
     {
         super.startGroup(attrs);
@@ -1134,6 +1140,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     protected void startGroupInstance(final AttributeMap attrs)
     {
         if (getGroupContext().isGroupWithRepeatingSection())
@@ -1142,6 +1149,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     protected void endGroup(final AttributeMap attrs)
             throws ReportProcessingException
     {
@@ -1174,6 +1182,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     protected void endReportSection(final AttributeMap attrs, final int role)
             throws IOException, ReportProcessingException
     {
@@ -1234,6 +1243,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
 
     }
 
+    @Override
     public void endReport(final ReportStructureRoot report)
             throws DataSourceException, ReportProcessingException
     {
@@ -1277,6 +1287,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     protected void endOther(final AttributeMap attrs)
             throws IOException, DataSourceException, ReportProcessingException
     {
@@ -1383,6 +1394,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
         }
     }
 
+    @Override
     protected void endGroupBody(final AttributeMap attrs)
             throws IOException
     {
@@ -1396,6 +1408,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
 
     }
 
+    @Override
     protected void endContent(final AttributeMap attrs)
             throws IOException, DataSourceException, ReportProcessingException
     {
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler.java
index c311f45d1390..012daff093d3 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler.java
@@ -41,6 +41,7 @@ public abstract class ElementReadHandler extends AbstractXmlReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs) throws SAXException
     {
         final Element element = getElement();
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
index edcb56cb9f71..c7f04ea8c921 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
@@ -34,6 +34,7 @@ public class OfficeDocumentXmlResourceFactory extends JFreeReportXmlResourceFact
     {
     }
 
+    @Override
     public Class getFactoryType()
     {
         return OfficeDocument.class;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
index 18267f21382f..36ab76e91da8 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
@@ -37,6 +37,7 @@ public class OfficeStylesXmlResourceFactory extends AbstractXmlResourceFactory
     {
     }
 
+    @Override
     protected Configuration getConfiguration()
     {
         return JFreeReportBoot.getInstance().getGlobalConfig();
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler.java
index a7a6e55ceb31..4956dfb7a455 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler.java
@@ -57,6 +57,7 @@ public class ChartReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -84,6 +85,7 @@ public class ChartReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         for (ElementReadHandler handler : children)
@@ -92,6 +94,7 @@ public class ChartReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return element;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler.java
index 693ed0173b79..a3ef5963fd63 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler.java
@@ -55,6 +55,7 @@ public class DataStyleReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -78,6 +79,7 @@ public class DataStyleReadHandler extends ElementReadHandler
      * @param length the length.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     public void characters(final char[] ch, final int start, final int length)
             throws SAXException
     {
@@ -92,6 +94,7 @@ public class DataStyleReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         for (int i = 0; i < children.size(); i++)
@@ -114,6 +117,7 @@ public class DataStyleReadHandler extends ElementReadHandler
         return dataStyle;
     }
 
+    @Override
     public Element getElement()
     {
         return dataStyle;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java
index 291490752619..d4d49fe00c30 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java
@@ -47,6 +47,7 @@ public class ObjectOleReadHandler extends ElementReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs) throws SAXException
     {
         super.startParsing(attrs);
@@ -68,6 +69,7 @@ public class ObjectOleReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return element;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/BodyReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/BodyReadHandler.java
index 0baecda6261d..d7d7fafb8964 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/BodyReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/BodyReadHandler.java
@@ -49,6 +49,7 @@ public class BodyReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri, final String tagName,
             final Attributes atts)
             throws SAXException
@@ -67,6 +68,7 @@ public class BodyReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         if (reportReadHandler != null)
@@ -75,6 +77,7 @@ public class BodyReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return body;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java
index 6557227f8dd7..d9b2d0922282 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java
@@ -65,6 +65,7 @@ public class DocumentContentReadHandler extends AbstractXmlReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs)
             throws SAXException
     {
@@ -158,6 +159,7 @@ public class DocumentContentReadHandler extends AbstractXmlReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -199,6 +201,7 @@ public class DocumentContentReadHandler extends AbstractXmlReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing()
             throws SAXException
     {
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentStylesReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentStylesReadHandler.java
index 958fd896d9ba..70320ce5e671 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentStylesReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentStylesReadHandler.java
@@ -56,6 +56,7 @@ public class DocumentStylesReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -89,6 +90,7 @@ public class DocumentStylesReadHandler extends ElementReadHandler
         return null;
     }
 
+    @Override
     public Element getElement()
     {
         return officeStylesCollection;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
index de13cf10a53a..8f7ae01eb47c 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
@@ -66,6 +66,7 @@ public class FontFaceDeclsReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -90,6 +91,7 @@ public class FontFaceDeclsReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing()
             throws SAXException
     {
@@ -100,6 +102,7 @@ public class FontFaceDeclsReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return fontFaceDecls;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler.java
index 0b2b25430090..5b0065b94f21 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler.java
@@ -67,6 +67,7 @@ public class MasterStylesReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -90,6 +91,7 @@ public class MasterStylesReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing()
             throws SAXException
     {
@@ -106,6 +108,7 @@ public class MasterStylesReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return masterStyles;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
index a15f1610e770..cb70d44364c9 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
@@ -44,6 +44,7 @@ public class ConditionalPrintExpressionReadHandler
         this.element = element;
     }
 
+    @Override
     protected void startParsing(final Attributes attrs) throws SAXException
     {
         super.startParsing(attrs);
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FixedContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FixedContentReadHandler.java
index ab0fc52b1fee..7f5297c129d6 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FixedContentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FixedContentReadHandler.java
@@ -53,6 +53,7 @@ public class FixedContentReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -81,6 +82,7 @@ public class FixedContentReadHandler extends ElementReadHandler
         return null;
     }
 
+    @Override
     public Element getElement()
     {
         return element;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormatConditionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormatConditionReadHandler.java
index cb3fa0a96039..8c3cb6ca9fbf 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormatConditionReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormatConditionReadHandler.java
@@ -48,6 +48,7 @@ public class FormatConditionReadHandler extends AbstractXmlReadHandler
         this.element = element;
     }
 
+    @Override
     protected void startParsing(final Attributes attrs) throws SAXException
     {
         super.startParsing(attrs);
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java
index a1408d20dd52..5a6356abdc8b 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java
@@ -50,6 +50,7 @@ public class FormattedTextReadHandler extends ElementReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs) throws SAXException
     {
         super.startParsing(attrs);
@@ -80,6 +81,7 @@ public class FormattedTextReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -101,6 +103,7 @@ public class FormattedTextReadHandler extends ElementReadHandler
         return null;
     }
 
+    @Override
     public Element getElement()
     {
         return element;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler.java
index b1352d20c909..86194d557d01 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler.java
@@ -50,6 +50,7 @@ public class FunctionReadHandler extends AbstractXmlReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs)
             throws SAXException
     {
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler.java
index 7843d8afd160..642c6ded91dd 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler.java
@@ -66,6 +66,7 @@ public class GroupReadHandler extends ElementReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs) throws SAXException
     {
         super.startParsing(attrs);
@@ -92,6 +93,7 @@ public class GroupReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -137,6 +139,7 @@ public class GroupReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         for (int i = 0; i < functionHandlers.size(); i++)
@@ -170,6 +173,7 @@ public class GroupReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return group;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java
index 2f3d9a1cc433..5a0be92e478a 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java
@@ -54,6 +54,7 @@ public class ImageReadHandler extends ElementReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs) throws SAXException
     {
         super.startParsing(attrs);
@@ -79,6 +80,7 @@ public class ImageReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -111,6 +113,7 @@ public class ImageReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         // if we have static content (as well or only), that one goes into the
@@ -123,6 +126,7 @@ public class ImageReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return contentElement;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler.java
index 7fe32ecc5d70..ba39e7ba0c01 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler.java
@@ -52,6 +52,7 @@ public class MasterDetailReadHandler extends ElementReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs) throws SAXException
     {
         super.startParsing(attrs);
@@ -74,6 +75,7 @@ public class MasterDetailReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -89,6 +91,7 @@ public class MasterDetailReadHandler extends ElementReadHandler
         return null;
     }
 
+    @Override
     public Element getElement()
     {
         return element;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportElementReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportElementReadHandler.java
index c29488435fa3..6e032aaaa501 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportElementReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportElementReadHandler.java
@@ -45,6 +45,7 @@ public class ReportElementReadHandler extends ElementReadHandler
         this.element = element;
     }
 
+    @Override
     public Element getElement()
     {
         return element;
@@ -56,6 +57,7 @@ public class ReportElementReadHandler extends ElementReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs)
             throws SAXException
     {
@@ -74,6 +76,7 @@ public class ReportElementReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportReadHandler.java
index ec270543b904..55b413b5e2e8 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportReadHandler.java
@@ -67,6 +67,7 @@ public class ReportReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -142,6 +143,7 @@ public class ReportReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         if (pageHeader != null)
@@ -196,6 +198,7 @@ public class ReportReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return rootSection;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/RootTableReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/RootTableReadHandler.java
index 54b753b8f630..c7d2aaf37f57 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/RootTableReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/RootTableReadHandler.java
@@ -58,6 +58,7 @@ public class RootTableReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -80,6 +81,7 @@ public class RootTableReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing()
             throws SAXException
     {
@@ -89,6 +91,7 @@ public class RootTableReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return section;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java
index c815a69ba7ae..6698fc5962a9 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java
@@ -60,6 +60,7 @@ public class SubDocumentReadHandler extends NoCDATATextContentReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs) throws SAXException
     {
         if (!ignore)
@@ -76,6 +77,7 @@ public class SubDocumentReadHandler extends NoCDATATextContentReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/FontFaceReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/FontFaceReadHandler.java
index d6f7ed04f78b..6430cf664fe9 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/FontFaceReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/FontFaceReadHandler.java
@@ -39,6 +39,7 @@ public class FontFaceReadHandler extends ElementReadHandler
         this.fontFaceElement = new FontFaceElement();
     }
 
+    @Override
     public Element getElement()
     {
         return fontFaceElement;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/MasterPageReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/MasterPageReadHandler.java
index 993331d02933..82438add799e 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/MasterPageReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/MasterPageReadHandler.java
@@ -62,6 +62,7 @@ public class MasterPageReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -78,6 +79,7 @@ public class MasterPageReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing()
             throws SAXException
     {
@@ -88,6 +90,7 @@ public class MasterPageReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return masterPage;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java
index d6689b179531..0c4a7d20c916 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java
@@ -56,6 +56,7 @@ public class OfficeStyleReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -72,6 +73,7 @@ public class OfficeStyleReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         for (int i = 0; i < children.size(); i++)
@@ -86,6 +88,7 @@ public class OfficeStyleReadHandler extends ElementReadHandler
         return officeStyle;
     }
 
+    @Override
     public Element getElement()
     {
         return officeStyle;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java
index 17e684838bae..6bff691ae801 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java
@@ -60,6 +60,7 @@ public class OfficeStylesReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri, final String tagName,
             final Attributes atts)
             throws SAXException
@@ -96,6 +97,7 @@ public class OfficeStylesReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         for (int i = 0; i < textStyleChildren.size(); i++)
@@ -123,6 +125,7 @@ public class OfficeStylesReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return officeStyles;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler.java
index f0ff7c8f3572..06346e6b02f0 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler.java
@@ -57,6 +57,7 @@ public class PageLayoutReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -73,6 +74,7 @@ public class PageLayoutReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         for (int i = 0; i < children.size(); i++)
@@ -87,6 +89,7 @@ public class PageLayoutReadHandler extends ElementReadHandler
         return pageLayout;
     }
 
+    @Override
     public Element getElement()
     {
         return pageLayout;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler.java
index b50f7f9767e4..667a4964a5da 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler.java
@@ -57,6 +57,7 @@ public class StyleDefinitionReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -73,6 +74,7 @@ public class StyleDefinitionReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing()
             throws SAXException
     {
@@ -83,6 +85,7 @@ public class StyleDefinitionReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return rawSection;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
index 1ce8fd7346e2..dd83d4666c3e 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
@@ -41,6 +41,7 @@ public class TextUnderlineWidthMapper extends OneOfConstantsMapper
         addMapping("thick", BorderWidth.THICK);
     }
 
+    @Override
     public void updateStyle(final String uri,
             final String attrName,
             final String attrValue,
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler.java
index c2cba6187024..5adb6d596005 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler.java
@@ -37,6 +37,7 @@ public class CoveredCellReadHandler extends ElementReadHandler
         coveredCell = new Section();
     }
 
+    @Override
     public Element getElement()
     {
         return coveredCell;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler.java
index ba83447ea4f6..adfc956daebc 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler.java
@@ -36,6 +36,7 @@ public class TableColumnReadHandler extends ElementReadHandler
         tableColumn = new Section();
     }
 
+    @Override
     public Element getElement()
     {
         return tableColumn;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnsReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnsReadHandler.java
index d8e866991053..35da849ce25c 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnsReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnsReadHandler.java
@@ -57,6 +57,7 @@ public class TableColumnsReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -77,6 +78,7 @@ public class TableColumnsReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         for (int i = 0; i < columns.size(); i++)
@@ -86,6 +88,7 @@ public class TableColumnsReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return tableColumns;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableReadHandler.java
index eec0954eeff6..3c8e90f20b09 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableReadHandler.java
@@ -57,6 +57,7 @@ public class TableReadHandler extends ElementReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs)
             throws SAXException
     {
@@ -81,6 +82,7 @@ public class TableReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -119,6 +121,7 @@ public class TableReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         for (int i = 0; i < children.size(); i++)
@@ -128,6 +131,7 @@ public class TableReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return table;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowReadHandler.java
index 413cfaefbb68..2f4bad5a4c40 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowReadHandler.java
@@ -57,6 +57,7 @@ public class TableRowReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -94,6 +95,7 @@ public class TableRowReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         for (int i = 0; i < tableCells.size(); i++)
@@ -109,6 +111,7 @@ public class TableRowReadHandler extends ElementReadHandler
      *
      * @return the object.
      */
+    @Override
     public Element getElement()
     {
         return tableRow;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowsReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowsReadHandler.java
index 019fdbdc8c34..33e253f246bf 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowsReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowsReadHandler.java
@@ -53,6 +53,7 @@ public class TableRowsReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -73,6 +74,7 @@ public class TableRowsReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         for (int i = 0; i < rows.size(); i++)
@@ -82,6 +84,7 @@ public class TableRowsReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return tableRows;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java
index dc6464e7a961..83ab022a1440 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java
@@ -75,6 +75,7 @@ public class NoCDATATextContentReadHandler extends ElementReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs) throws SAXException
     {
         super.startParsing(attrs);
@@ -94,6 +95,7 @@ public class NoCDATATextContentReadHandler extends ElementReadHandler
      * @return the handler or null, if the tagname is invalid.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -157,6 +159,7 @@ public class NoCDATATextContentReadHandler extends ElementReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing() throws SAXException
     {
         for (int i = 0; i < children.size(); i++)
@@ -174,6 +177,7 @@ public class NoCDATATextContentReadHandler extends ElementReadHandler
         }
     }
 
+    @Override
     public Element getElement()
     {
         return section;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler.java
index 08a410a5c7bc..371026905cad 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler.java
@@ -52,6 +52,7 @@ public class TextContentReadHandler extends NoCDATATextContentReadHandler
      * @param length the length.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     public void characters(final char[] ch, final int start, final int length)
             throws SAXException
     {
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler.java
index beb57b2eabb9..5c9050fb2a3a 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler.java
@@ -46,6 +46,7 @@ public class XLinkReadHandler extends AbstractXmlReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs) throws SAXException
     {
         uri = attrs.getValue(OfficeNamespaces.XLINK_NS, "uri");
@@ -65,6 +66,7 @@ public class XLinkReadHandler extends AbstractXmlReadHandler
         return uri;
     }
 
+    @Override
     public String getUri()
     {
         return uri;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey.java
index 605df59aa36a..c55cae1eefe0 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey.java
@@ -72,6 +72,7 @@ public final class StyleMapperKey
         return attributeName;
     }
 
+    @Override
     public boolean equals(final Object o)
     {
         if (this != o)
@@ -101,6 +102,7 @@ public final class StyleMapperKey
         return result;
     }
 
+    @Override
     public int hashCode()
     {
         return hashCode;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory.java
index 5ae6d1a2dd6e..03ce26ffca11 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory.java
@@ -34,6 +34,7 @@ public class StyleMapperXmlResourceFactory extends AbstractXmlResourceFactory
     {
     }
 
+    @Override
     protected Configuration getConfiguration()
     {
         return JFreeReportBoot.getInstance().getGlobalConfig();
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingDocumentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingDocumentReadHandler.java
index e96f89d92fbb..a7ba49b04f51 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingDocumentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingDocumentReadHandler.java
@@ -53,6 +53,7 @@ public class StyleMappingDocumentReadHandler extends AbstractXmlReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected XmlReadHandler getHandlerForChild(final String uri,
             final String tagName,
             final Attributes atts)
@@ -72,6 +73,7 @@ public class StyleMappingDocumentReadHandler extends AbstractXmlReadHandler
      *
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void doneParsing()
             throws SAXException
     {
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingReadHandler.java
index 8c3fbc1ba98e..09a1b13070a5 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingReadHandler.java
@@ -43,6 +43,7 @@ public class StyleMappingReadHandler extends AbstractXmlReadHandler
      * @param attrs the attributes.
      * @throws org.xml.sax.SAXException if there is a parsing error.
      */
+    @Override
     protected void startParsing(final Attributes attrs)
             throws SAXException
     {