summaryrefslogtreecommitdiff
path: root/reportbuilder/java
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-11 15:58:09 +0200
committerNoel Grandin <noel@peralex.com>2014-08-14 10:59:48 +0200
commitac5954d7c540f34702033d7d951d1d16cb96730a (patch)
tree310ba9698a10c74662de0714db683f932de32b0c /reportbuilder/java
parent89c0a2b2f65beeb6f42d3334662100a13169a8d6 (diff)
java: remove commented out code
Change-Id: I05c907a38b562231e968c17f14e09ef80e0a6ed1
Diffstat (limited to 'reportbuilder/java')
-rw-r--r--reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java2
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java1
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java1
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java1
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java3
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java21
6 files changed, 0 insertions, 29 deletions
diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index bdf03b0323ce..45bfb1b6b7a3 100644
--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -444,8 +444,6 @@ public class SDBCReportDataFactory implements DataSourceFactory
final ArrayList<?> masterValues = (ArrayList<?>) parameters.get(MASTER_VALUES);
if (masterValues != null && !masterValues.isEmpty() && paramDef.parameterIndex.size() != detailColumns.size())
{
- // Vector masterColumns = (Vector) parameters.get("master-columns");
-
// create the new filter
final String quote = connection.getMetaData().getIdentifierQuoteString();
final StringBuffer oldFilter = new StringBuffer();
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java
index 7bbbd7c1ad7f..d6cde5da4776 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java
@@ -125,7 +125,6 @@ public final class SOFormulaParser extends ComponentBase
parserAllOpCodes.put(opCode.Token.OpCode, opCode);
specialOpCodes.add(opCode);
}
- // addOpCodes(names, opCodes,SPECIAL,false);
}
catch (Exception ex)
{
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 6baada276f0c..5cd4470a0d5d 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -127,7 +127,6 @@ public class TableCellLayoutController extends SectionLayoutController
}
catch (final ParseException e)
{
- //LOGGER.debug("Parse Exception", e);
return false;
}
}
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index 8704a4e312cf..e0e4d2d4a34a 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -1054,7 +1054,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
DOMSource source = new DOMSource(document);
transformer.transform(source, result);
- //IOUtils.getInstance().copyStreams(inputStream, outputMetaStream);
outputMetaStream.flush();
outputMetaStream.close();
}
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 44d33cd48bbf..e6c234503c22 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
@@ -215,7 +215,6 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
for (int i = 0; i < rowHeights.size(); i++)
{
len.add(rowHeights.get(i));
- // val += (rowHeights.get(i)).getValue();
}
rowHeights.clear();
@@ -683,8 +682,6 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
// do this after we close the tag
final XmlWriter xmlWriter = getXmlWriter();
- // final Object attribute = attrs.getAttribute(OfficeNamespaces.TABLE_NS,NUMBERCOLUMNSSPANNED);
- // final int span = TextUtilities.parseInt((String) attribute, 0);
final int span = currentSpan;
currentSpan = 0;
for (int i = 1; i < span; i++)
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 266f59eeaed7..f45eca92a47f 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
@@ -250,8 +250,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
currentMasterPage = masterPageFactory.createMasterPage(STANDARD, activePageHeader, activePageFooter);
-// LOGGER.debug("Created a new master-page: " + currentMasterPage.getStyleName());
-
// todo: Store the page-layouts as well.
// The page layouts are derived from a common template, but as the
// header-heights differ, we have to derive these beasts instead
@@ -385,14 +383,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
columns.setAttribute(OfficeNamespaces.STYLE_NS, "column-gap", "0cm");
sectionProperties.addNode(columns);
-// final Section columnSep = new Section();
-// columnSep.setNamespace(OfficeNamespaces.STYLE_NS);
-// columnSep.setType("column-sep");
-// columnSep.setAttribute(OfficeNamespaces.STYLE_NS, "width", "0.035cm");
-// columnSep.setAttribute(OfficeNamespaces.STYLE_NS, "color", "#000000");
-// columnSep.setAttribute(OfficeNamespaces.STYLE_NS, "height", "100%");
-// columns.addNode(columnSep);
-
for (int i = 0; i < columnCount; i++)
{
final Section column = new Section();
@@ -596,8 +586,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
final String varType = (String) attrs.getAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE);
final String newVarName = variablesDeclarations.produceVariable(varName, varType);
attrs.setAttribute(OfficeNamespaces.TEXT_NS, NAME, newVarName);
- // this one must not be written, as the DTD does not declare it.
- // attrs.setAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE, null);
}
}
@@ -605,7 +593,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
{
// This cannot happen as long as the report sections only contain tables. But at some point in the
// future they will be made of paragraphs, and then we are prepared ..
- // LOGGER.debug("Variables-Section in own paragraph " + variables);
StyleUtilities.copyStyle(OfficeToken.PARAGRAPH,
TextRawReportTarget.VARIABLES_HIDDEN_STYLE_WITH_KEEPWNEXT, getStylesCollection(),
@@ -696,7 +683,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
graphicProperties.setAttribute(OfficeNamespaces.STYLE_NS, "flow-with-text", "false");
graphicProperties.setAttribute(OfficeNamespaces.DRAWING_NS, "ole-draw-aspect", "1");
- // attrs.setAttribute(OfficeNamespaces.DRAWING_NS, OfficeToken.STYLE_NAME, predefAutoStyle.getStyleName());
}
}
@@ -711,7 +697,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
&& !isRepeatingSection()
&& ReportTargetUtil.isElementOfType(OfficeNamespaces.TEXT_NS, OfficeToken.P, attrs))
{
- //LOGGER.debug("Variables-Section in existing cell " + variables);
xmlWriter.writeText(variables);
variables = null;
}
@@ -725,7 +710,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
expectedTableRowCount -= 1;
final String rowStyle = (String) attrs.getAttribute(OfficeNamespaces.TABLE_NS, OfficeToken.STYLE_NAME);
final CSSNumericValue rowHeight = computeRowHeight(rowStyle);
- // LOGGER.debug("Adding row-Style: " + rowStyle + " " + rowHeight);
sectionHeight.add(rowHeight);
// process the styles as usual
@@ -810,7 +794,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
else if (isPagebreakPending() && currentRole != OfficeDocumentReportTarget.ROLE_REPEATING_GROUP_HEADER && currentRole != OfficeDocumentReportTarget.ROLE_REPEATING_GROUP_FOOTER)
{
// Derive an automatic style for the pagebreak.
-// LOGGER.debug("Manual pagebreak (within the section): " + getCurrentRole());
breakDefinition = getPagebreakDefinition();
setPagebreakDefinition(null);
masterPageName = createMasterPage(true, true);
@@ -841,7 +824,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
// write a paragraph that uses the VARIABLES_HIDDEN_STYLE as
// primary style. Derive that one and add the manual pagebreak.
// The predefined style already has the 'keep-together' flags set.
-// LOGGER.debug("Variables-Section with new Master-Page " + variables + " " + masterPageName);
final OfficeStyle style = deriveStyle(OfficeToken.PARAGRAPH, TextRawReportTarget.VARIABLES_HIDDEN_STYLE_WITH_KEEPWNEXT);
style.setAttribute(OfficeNamespaces.STYLE_NS, "master-page-name", masterPageName);
@@ -875,7 +857,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
{
// Write a paragraph without adding the pagebreak. We can reuse the global style, but we have to make
// sure that the style is part of the current 'auto-style' collection.
-// LOGGER.debug("Variables-Section " + variables);
StyleUtilities.copyStyle(OfficeToken.PARAGRAPH,
TextRawReportTarget.VARIABLES_HIDDEN_STYLE_WITH_KEEPWNEXT, getStylesCollection(),
@@ -901,7 +882,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
if (masterPageName != null)
{
-// LOGGER.debug("Starting a new MasterPage: " + masterPageName);
// Patch the current styles.
// This usually only happens on Table-Styles or Paragraph-Styles
style.setAttribute(OfficeNamespaces.STYLE_NS, "master-page-name", masterPageName);
@@ -1314,7 +1294,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
{
// This cannot happen as long as the report sections only contain tables. But at some point in the
// future they will be made of paragraphs, and then we are prepared ..
- //LOGGER.debug("Variables-Section " + variables);
final String tag;
if (sectionKeepTogether && expectedTableRowCount > 0)
{