From 10039462dfebdf6727529ca38b4105fcd7dd5727 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 18 Dec 2014 11:43:40 +0200 Subject: java: remove more dead code found by looking for unused parameters (in Eclipse) Change-Id: I03cf9bc8312e59747b2d0ac153ee2fc8d76be893 --- .../layoutprocessor/VariablesCollection.java | 5 ---- .../pentaho/output/OfficeDocumentReportTarget.java | 19 ++++----------- .../pentaho/parser/AttributeSpecification.java | 27 ---------------------- 3 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java (limited to 'reportbuilder/java/org') diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java index 308bcd03bcda..4f29d8c87907 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java @@ -41,11 +41,6 @@ public class VariablesCollection private List variables; public VariablesCollection(final String namePrefix) - { - this(namePrefix, null); - } - - private VariablesCollection(final String namePrefix, final VariablesCollection parent) { if (namePrefix == null) { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java index 9caf5ec8bb3a..8518bc619325 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java @@ -527,7 +527,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget if (ReportTargetUtil.isElementOfType(OfficeNamespaces.OFFICE_NS, "body", attrs)) { states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_BODY)); - startBody(attrs); + startBody(); } else { @@ -559,7 +559,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, "report-body", attrs)) { states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_GROUP_BODY)); - startGroupBody(attrs); } else { @@ -675,7 +674,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, "group-body", attrs)) { states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_GROUP_BODY)); - startGroupBody(attrs); } else { @@ -773,7 +771,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget } } - private void startBody(final AttributeMap attrs) + private void startBody() throws IOException { getXmlWriter().writeTag(OfficeNamespaces.OFFICE_NS, "body", XmlWriterSupport.OPEN); @@ -816,10 +814,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget { } - private void startGroupBody(final AttributeMap attrs) - { - } - protected abstract void startOther(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException; @@ -938,7 +932,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget } case OfficeDocumentReportTarget.STATE_IN_GROUP_INSTANCE: { - endGroupInstance(attrs); break; } case OfficeDocumentReportTarget.STATE_IN_GROUP_BODY: @@ -953,7 +946,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget } case OfficeDocumentReportTarget.STATE_IN_BODY: { - endBody(attrs); + endBody(); break; } case OfficeDocumentReportTarget.STATE_IN_DOCUMENT: @@ -987,10 +980,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget { } - private void endGroupInstance(final AttributeMap attrs) - { - } - public int getCurrentRole() { return currentRole; @@ -1017,7 +1006,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget protected abstract void endContent(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException; - private void endBody(final AttributeMap attrs) + private void endBody() throws IOException { getXmlWriter().writeCloseTag(); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java deleted file mode 100644 index 7e60f65998ec..000000000000 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you 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 . - */ -package org.libreoffice.report.pentaho.parser; - -public final class AttributeSpecification -{ - - public AttributeSpecification(String namespaceUrl, String attributName, String mapperImplementation) - { - } - -} -- cgit