[jasperreports] 01/01: Imported Debian patch 6.1.1+dfsg-1

Markus Koschany apo-guest at moszumanska.debian.org
Mon Oct 19 17:31:42 UTC 2015


This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository jasperreports.

commit 46b8499df792e4d175589fec3d82209b9bbfd354
Merge: c12d5b3 bcc602f
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Oct 19 17:59:03 2015 +0200

    Imported Debian patch 6.1.1+dfsg-1

 ._license.txt                                      |   Bin 0 -> 185 bytes
 .classpath                                         |    99 +-
 .gitignore                                         |     3 +
 .settings/org.eclipse.jdt.core.prefs               |    40 +-
 build.xml                                          |   290 +-
 changes.txt                                        |   492 +-
 debian/changelog                                   |    36 +-
 debian/control                                     |   108 +-
 debian/copyright                                   |    52 +-
 debian/libjasperreports-java-doc.install           |     3 +-
 debian/libjasperreports-java.jlibs                 |     2 +
 debian/maven.ignoreRules                           |    14 +-
 debian/maven.properties                            |     5 +
 debian/maven.rules                                 |    31 +-
 debian/orig-tar.exclude                            |     2 +-
 debian/orig-tar.sh                                 |     4 +-
 debian/patches/01_disable_deprecation_warning.diff |    17 -
 debian/patches/02_use_debian_asm.diff              |    27 -
 debian/patches/06_configure_javaflow.diff          |    35 -
 .../patches/07_exclude_barcode4j_and_barbecue.diff |   270 -
 debian/patches/08_no_maxmemory_for_javadoc.diff    |    16 -
 debian/patches/09_use_commons_codec.diff           |   122 -
 debian/patches/10_disable_fonts.diff               |    17 -
 debian/patches/12_samples.diff                     |    16 -
 debian/patches/14_velocity.diff                    |    45 -
 debian/patches/16_eclipse_compiler_updater.diff    |    17 -
 debian/patches/17_batik_18.diff                    |    11 -
 debian/patches/batik-1.8.patch                     |    24 +
 debian/patches/build.patch                         |    82 +
 debian/patches/commons-codec-Base64.patch          |   142 +
 .../patches/exclude-barcode4j-and-barbecue.patch   |   356 +
 debian/patches/series                              |    15 +-
 debian/rules                                       |    38 +-
 debian/source/lintian-overrides                    |     6 +
 docs/JasperReports-Ultimate-Guide-3.pdf            |   Bin 0 -> 1674640 bytes
 docs/components.schema.reference.xsl               |   554 +
 docs/config.reference.xml                          |  2723 ++++-
 docs/config.reference.xsl                          |    75 +-
 docs/sample.reference.xml                          |    48 +-
 docs/sample.reference.xsl                          |    24 +-
 docs/sample.xsl                                    |    25 +-
 docs/schema.reference.xsl                          |   210 +-
 license.txt                                        | 10592 ++++++++++++++++++-
 pom.xml                                            |   197 +-
 readme.txt                                         |     2 +-
 src/META-INF/MANIFEST.MF                           |   104 +-
 src/default.jasperreports.properties               |    93 +-
 src/jasperreports_extension.properties             |   134 +-
 src/jasperreports_messages.properties              |   545 +
 .../sf/jasperreports/ant/JRAntApiWriteTask.java    |    70 +-
 src/net/sf/jasperreports/ant/JRAntCompileTask.java |    79 +-
 .../sf/jasperreports/ant/JRAntDecompileTask.java   |    60 +-
 src/net/sf/jasperreports/ant/JRAntUpdateTask.java  |    69 +-
 .../sf/jasperreports/ant/JRAntXmlExportTask.java   |    64 +-
 src/net/sf/jasperreports/ant/JRBaseAntTask.java    |    49 +
 src/net/sf/jasperreports/ant/UpdaterElement.java   |     5 +-
 src/net/sf/jasperreports/ant/package-info.java     |   138 +
 src/net/sf/jasperreports/ant/package.html          |    13 -
 src/net/sf/jasperreports/charts/ChartContext.java  |     9 +-
 src/net/sf/jasperreports/charts/ChartTheme.java    |    23 +-
 .../sf/jasperreports/charts/ChartThemeBundle.java  |     3 +-
 src/net/sf/jasperreports/charts/JRAreaPlot.java    |     7 +-
 src/net/sf/jasperreports/charts/JRBar3DPlot.java   |    27 +-
 src/net/sf/jasperreports/charts/JRBarPlot.java     |    27 +-
 src/net/sf/jasperreports/charts/JRBubblePlot.java  |    46 +-
 .../sf/jasperreports/charts/JRCandlestickPlot.java |    13 +-
 .../jasperreports/charts/JRCategoryAxisFormat.java |     3 +-
 .../sf/jasperreports/charts/JRCategoryDataset.java |    10 +-
 .../sf/jasperreports/charts/JRCategoryPlot.java    |    17 +-
 .../sf/jasperreports/charts/JRCategorySeries.java  |    23 +-
 src/net/sf/jasperreports/charts/JRChartAxis.java   |     5 +-
 .../sf/jasperreports/charts/JRCommonLinePlot.java  |    20 +-
 src/net/sf/jasperreports/charts/JRDataRange.java   |     3 +-
 .../sf/jasperreports/charts/JRGanttDataset.java    |    10 +-
 src/net/sf/jasperreports/charts/JRGanttSeries.java |    19 +-
 .../sf/jasperreports/charts/JRHighLowDataset.java  |    31 +-
 src/net/sf/jasperreports/charts/JRHighLowPlot.java |    12 +-
 src/net/sf/jasperreports/charts/JRItemLabel.java   |    17 +-
 src/net/sf/jasperreports/charts/JRLinePlot.java    |     5 +-
 src/net/sf/jasperreports/charts/JRMeterPlot.java   |    22 +-
 .../sf/jasperreports/charts/JRMultiAxisPlot.java   |    11 +-
 src/net/sf/jasperreports/charts/JRPie3DPlot.java   |    28 +-
 src/net/sf/jasperreports/charts/JRPieDataset.java  |    16 +-
 src/net/sf/jasperreports/charts/JRPiePlot.java     |    24 +-
 src/net/sf/jasperreports/charts/JRPieSeries.java   |    16 +-
 src/net/sf/jasperreports/charts/JRScatterPlot.java |    20 +-
 .../sf/jasperreports/charts/JRThermometerPlot.java |     9 +-
 .../sf/jasperreports/charts/JRTimeAxisFormat.java  |     3 +-
 .../jasperreports/charts/JRTimePeriodDataset.java  |    14 +-
 .../jasperreports/charts/JRTimePeriodSeries.java   |    18 +-
 src/net/sf/jasperreports/charts/JRTimeSeries.java  |    21 +-
 .../jasperreports/charts/JRTimeSeriesDataset.java  |    25 +-
 .../sf/jasperreports/charts/JRTimeSeriesPlot.java  |    32 +-
 .../sf/jasperreports/charts/JRValueAxisFormat.java |     3 +-
 .../sf/jasperreports/charts/JRValueDataset.java    |     3 +-
 .../sf/jasperreports/charts/JRValueDisplay.java    |     6 +-
 src/net/sf/jasperreports/charts/JRXAxisFormat.java |     3 +-
 src/net/sf/jasperreports/charts/JRXyDataset.java   |    10 +-
 src/net/sf/jasperreports/charts/JRXySeries.java    |    24 +-
 src/net/sf/jasperreports/charts/JRXyzDataset.java  |    11 +-
 src/net/sf/jasperreports/charts/JRXyzSeries.java   |    22 +-
 src/net/sf/jasperreports/charts/JRYAxisFormat.java |     3 +-
 .../jasperreports/charts/base/JRBaseAreaPlot.java  |    11 +-
 .../jasperreports/charts/base/JRBaseBar3DPlot.java |    15 +-
 .../jasperreports/charts/base/JRBaseBarPlot.java   |    19 +-
 .../charts/base/JRBaseBubblePlot.java              |    12 +-
 .../charts/base/JRBaseCandlestickPlot.java         |    13 +-
 .../charts/base/JRBaseCategoryDataset.java         |     3 +-
 .../charts/base/JRBaseCategorySeries.java          |     3 +-
 .../jasperreports/charts/base/JRBaseChartAxis.java |    14 +-
 .../jasperreports/charts/base/JRBaseDataRange.java |     5 +-
 .../charts/base/JRBaseGanttDataset.java            |     3 +-
 .../charts/base/JRBaseGanttSeries.java             |     3 +-
 .../charts/base/JRBaseHighLowDataset.java          |     3 +-
 .../charts/base/JRBaseHighLowPlot.java             |    15 +-
 .../jasperreports/charts/base/JRBaseItemLabel.java |    13 +-
 .../jasperreports/charts/base/JRBaseLinePlot.java  |    15 +-
 .../jasperreports/charts/base/JRBaseMeterPlot.java |    21 +-
 .../charts/base/JRBaseMultiAxisPlot.java           |    25 +-
 .../jasperreports/charts/base/JRBasePie3DPlot.java |    14 +-
 .../charts/base/JRBasePieDataset.java              |     3 +-
 .../jasperreports/charts/base/JRBasePiePlot.java   |    11 +-
 .../jasperreports/charts/base/JRBasePieSeries.java |     3 +-
 .../charts/base/JRBaseScatterPlot.java             |    15 +-
 .../charts/base/JRBaseThermometerPlot.java         |     6 +-
 .../charts/base/JRBaseTimePeriodDataset.java       |     3 +-
 .../charts/base/JRBaseTimePeriodSeries.java        |     3 +-
 .../charts/base/JRBaseTimeSeries.java              |     3 +-
 .../charts/base/JRBaseTimeSeriesDataset.java       |     3 +-
 .../charts/base/JRBaseTimeSeriesPlot.java          |    15 +-
 .../charts/base/JRBaseValueDataset.java            |     3 +-
 .../charts/base/JRBaseValueDisplay.java            |    13 +-
 .../jasperreports/charts/base/JRBaseXyDataset.java |     3 +-
 .../jasperreports/charts/base/JRBaseXySeries.java  |    10 +-
 .../charts/base/JRBaseXyzDataset.java              |     3 +-
 .../jasperreports/charts/base/JRBaseXyzSeries.java |     3 +-
 .../sf/jasperreports/charts/base/package-info.java |    27 +
 src/net/sf/jasperreports/charts/base/package.html  |    13 -
 .../charts/design/JRDesignAreaPlot.java            |     3 +-
 .../charts/design/JRDesignBar3DPlot.java           |     3 +-
 .../charts/design/JRDesignBarPlot.java             |     3 +-
 .../charts/design/JRDesignBubblePlot.java          |     3 +-
 .../charts/design/JRDesignCandlestickPlot.java     |     3 +-
 .../charts/design/JRDesignCategoryDataset.java     |     3 +-
 .../charts/design/JRDesignCategoryPlot.java        |     3 +-
 .../charts/design/JRDesignCategorySeries.java      |     3 +-
 .../charts/design/JRDesignChartAxis.java           |    12 +-
 .../charts/design/JRDesignDataRange.java           |     3 +-
 .../charts/design/JRDesignGanttDataset.java        |     3 +-
 .../charts/design/JRDesignGanttSeries.java         |     3 +-
 .../charts/design/JRDesignHighLowDataset.java      |     3 +-
 .../charts/design/JRDesignHighLowPlot.java         |     3 +-
 .../charts/design/JRDesignItemLabel.java           |     3 +-
 .../charts/design/JRDesignLinePlot.java            |     3 +-
 .../charts/design/JRDesignMeterPlot.java           |    26 +-
 .../charts/design/JRDesignMultiAxisPlot.java       |    36 +-
 .../charts/design/JRDesignPie3DPlot.java           |     3 +-
 .../charts/design/JRDesignPieDataset.java          |     4 +-
 .../charts/design/JRDesignPiePlot.java             |     3 +-
 .../charts/design/JRDesignPieSeries.java           |     3 +-
 .../charts/design/JRDesignScatterPlot.java         |     3 +-
 .../charts/design/JRDesignThermometerPlot.java     |     3 +-
 .../charts/design/JRDesignTimePeriodDataset.java   |     3 +-
 .../charts/design/JRDesignTimePeriodSeries.java    |     3 +-
 .../charts/design/JRDesignTimeSeries.java          |     3 +-
 .../charts/design/JRDesignTimeSeriesDataset.java   |     3 +-
 .../charts/design/JRDesignTimeSeriesPlot.java      |     3 +-
 .../charts/design/JRDesignValueDataset.java        |     5 +-
 .../charts/design/JRDesignValueDisplay.java        |     3 +-
 .../charts/design/JRDesignXyDataset.java           |     3 +-
 .../charts/design/JRDesignXySeries.java            |    16 +-
 .../charts/design/JRDesignXyzDataset.java          |     3 +-
 .../charts/design/JRDesignXyzSeries.java           |     3 +-
 .../jasperreports/charts/design/package-info.java  |    27 +
 .../sf/jasperreports/charts/design/package.html    |    13 -
 .../jasperreports/charts/fill/JRFillAreaPlot.java  |     4 +-
 .../jasperreports/charts/fill/JRFillBar3DPlot.java |     3 +-
 .../jasperreports/charts/fill/JRFillBarPlot.java   |     3 +-
 .../charts/fill/JRFillBubblePlot.java              |     3 +-
 .../charts/fill/JRFillCandlestickPlot.java         |     3 +-
 .../charts/fill/JRFillCategoryDataset.java         |    11 +-
 .../charts/fill/JRFillCategorySeries.java          |     3 +-
 .../jasperreports/charts/fill/JRFillChartAxis.java |    12 +-
 .../jasperreports/charts/fill/JRFillDataRange.java |     3 +-
 .../charts/fill/JRFillGanttDataset.java            |     5 +-
 .../charts/fill/JRFillGanttSeries.java             |     3 +-
 .../charts/fill/JRFillHighLowDataset.java          |    39 +-
 .../charts/fill/JRFillHighLowPlot.java             |     3 +-
 .../jasperreports/charts/fill/JRFillItemLabel.java |     9 +-
 .../jasperreports/charts/fill/JRFillLinePlot.java  |     3 +-
 .../jasperreports/charts/fill/JRFillMeterPlot.java |    11 +-
 .../charts/fill/JRFillMultiAxisPlot.java           |    15 +-
 .../jasperreports/charts/fill/JRFillPie3DPlot.java |     3 +-
 .../charts/fill/JRFillPieDataset.java              |    35 +-
 .../jasperreports/charts/fill/JRFillPiePlot.java   |     3 +-
 .../jasperreports/charts/fill/JRFillPieSeries.java |     3 +-
 .../charts/fill/JRFillScatterPlot.java             |     3 +-
 .../charts/fill/JRFillThermometerPlot.java         |     3 +-
 .../charts/fill/JRFillTimePeriodDataset.java       |    11 +-
 .../charts/fill/JRFillTimePeriodSeries.java        |     3 +-
 .../charts/fill/JRFillTimeSeries.java              |     3 +-
 .../charts/fill/JRFillTimeSeriesDataset.java       |    11 +-
 .../charts/fill/JRFillTimeSeriesPlot.java          |     3 +-
 .../charts/fill/JRFillValueDataset.java            |     3 +-
 .../charts/fill/JRFillValueDisplay.java            |     9 +-
 .../jasperreports/charts/fill/JRFillXyDataset.java |     8 +-
 .../jasperreports/charts/fill/JRFillXySeries.java  |    13 +-
 .../charts/fill/JRFillXyzDataset.java              |    13 +-
 .../jasperreports/charts/fill/JRFillXyzSeries.java |     3 +-
 .../sf/jasperreports/charts/fill/package-info.java |    27 +
 src/net/sf/jasperreports/charts/fill/package.html  |    13 -
 src/net/sf/jasperreports/charts/package-info.java  |   200 +
 src/net/sf/jasperreports/charts/package.html       |    13 -
 .../charts/type/AxisPositionEnum.java              |    16 +-
 src/net/sf/jasperreports/charts/type/EdgeEnum.java |    16 +-
 .../jasperreports/charts/type/MeterShapeEnum.java  |    16 +-
 .../charts/type/PlotOrientationEnum.java           |    30 +-
 .../jasperreports/charts/type/ScaleTypeEnum.java   |    46 +-
 .../jasperreports/charts/type/TimePeriodEnum.java  |    27 +-
 .../charts/type/ValueLocationEnum.java             |    16 +-
 .../sf/jasperreports/charts/type/package-info.java |    27 +
 .../util/AbstractChartRenderableFactory.java       |    52 +
 .../util/CategoryChartHyperlinkProvider.java       |     3 +-
 .../charts/util/CategoryLabelGenerator.java        |     3 +-
 .../charts/util/ChartHyperlinkProvider.java        |     3 +-
 .../charts/util/ChartRenderableFactory.java        |    52 +
 .../charts/util/ChartRendererFactory.java          |    13 +-
 .../sf/jasperreports/charts/util/ChartUtil.java    |   347 +-
 .../charts/util/DefaultXYZDataset.java             |     3 +-
 .../charts/util/DrawChartRenderer.java             |    24 +-
 .../charts/util/DrawChartRendererFactory.java      |    11 +-
 .../charts/util/HighLowChartHyperlinkProvider.java |     3 +-
 .../charts/util/ImageChartRendererFactory.java     |    21 +-
 .../sf/jasperreports/charts/util/JRAxisFormat.java |     3 +-
 .../jasperreports/charts/util/JRMeterInterval.java |     3 +-
 .../util/MultiAxisChartHyperlinkProvider.java      |     3 +-
 .../charts/util/PieChartHyperlinkProvider.java     |     3 +-
 .../charts/util/PieLabelGenerator.java             |     7 +-
 .../charts/util/SvgChartRendererFactory.java       |    11 +-
 .../util/TimePeriodChartHyperlinkProvider.java     |     3 +-
 .../util/TimePeriodDatasetLabelGenerator.java      |     3 +-
 .../util/TimeSeriesChartHyperlinkProvider.java     |     3 +-
 .../charts/util/TimeSeriesLabelGenerator.java      |     3 +-
 .../charts/util/XYChartHyperlinkProvider.java      |     5 +-
 .../charts/util/XYDatasetLabelGenerator.java       |     3 +-
 .../sf/jasperreports/charts/util/XYZElement.java   |     3 +-
 .../sf/jasperreports/charts/util/package-info.java |    27 +
 src/net/sf/jasperreports/charts/util/package.html  |    13 -
 .../charts/xml/JRAreaChartFactory.java             |     8 +-
 .../charts/xml/JRAreaPlotFactory.java              |     3 +-
 .../charts/xml/JRBar3DChartFactory.java            |     3 +-
 .../charts/xml/JRBar3DPlotFactory.java             |     3 +-
 .../charts/xml/JRBarChartFactory.java              |     3 +-
 .../jasperreports/charts/xml/JRBarPlotFactory.java |     3 +-
 .../charts/xml/JRBubbleChartFactory.java           |     3 +-
 .../charts/xml/JRBubblePlotFactory.java            |     3 +-
 .../charts/xml/JRCandlestickChartFactory.java      |     3 +-
 .../charts/xml/JRCandlestickPlotFactory.java       |     3 +-
 .../charts/xml/JRCategoryDatasetFactory.java       |     3 +-
 .../charts/xml/JRCategorySeriesFactory.java        |     3 +-
 .../charts/xml/JRChartAxisFactory.java             |     4 +-
 .../charts/xml/JRDataRangeFactory.java             |     3 +-
 .../charts/xml/JRGanttChartFactory.java            |     3 +-
 .../charts/xml/JRGanttDatasetFactory.java          |     3 +-
 .../charts/xml/JRGanttSeriesFactory.java           |     3 +-
 .../charts/xml/JRHighLowChartFactory.java          |     3 +-
 .../charts/xml/JRHighLowDatasetFactory.java        |     3 +-
 .../charts/xml/JRHighLowPlotFactory.java           |     3 +-
 .../charts/xml/JRItemLabelFactory.java             |     3 +-
 .../charts/xml/JRLineChartFactory.java             |     3 +-
 .../charts/xml/JRLinePlotFactory.java              |     3 +-
 .../charts/xml/JRMeterChartFactory.java            |     3 +-
 .../charts/xml/JRMeterIntervalFactory.java         |     3 +-
 .../charts/xml/JRMeterPlotFactory.java             |    10 +-
 .../charts/xml/JRMultiAxisChartFactory.java        |     3 +-
 .../charts/xml/JRMultiAxisPlotFactory.java         |     3 +-
 .../charts/xml/JRPie3DChartFactory.java            |     3 +-
 .../charts/xml/JRPie3DPlotFactory.java             |     3 +-
 .../charts/xml/JRPieChartFactory.java              |     3 +-
 .../charts/xml/JRPieDatasetFactory.java            |     3 +-
 .../jasperreports/charts/xml/JRPiePlotFactory.java |     3 +-
 .../charts/xml/JRPieSeriesFactory.java             |     3 +-
 .../charts/xml/JRScatterChartFactory.java          |     3 +-
 .../charts/xml/JRScatterPlotFactory.java           |     3 +-
 .../charts/xml/JRStackedAreaChartFactory.java      |     3 +-
 .../charts/xml/JRStackedBar3DChartFactory.java     |     3 +-
 .../charts/xml/JRStackedBarChartFactory.java       |     3 +-
 .../charts/xml/JRThermometerChartFactory.java      |     3 +-
 .../charts/xml/JRThermometerPlotFactory.java       |    10 +-
 .../charts/xml/JRTimePeriodDatasetFactory.java     |     3 +-
 .../charts/xml/JRTimePeriodSeriesFactory.java      |     3 +-
 .../charts/xml/JRTimeSeriesChartFactory.java       |     3 +-
 .../charts/xml/JRTimeSeriesDatasetFactory.java     |     3 +-
 .../charts/xml/JRTimeSeriesFactory.java            |     3 +-
 .../charts/xml/JRTimeSeriesPlotFactory.java        |     3 +-
 .../charts/xml/JRValueDatasetFactory.java          |     3 +-
 .../charts/xml/JRValueDisplayFactory.java          |     3 +-
 .../charts/xml/JRXyAreaChartFactory.java           |     3 +-
 .../charts/xml/JRXyBarChartFactory.java            |     3 +-
 .../charts/xml/JRXyDatasetFactory.java             |     3 +-
 .../charts/xml/JRXyLineChartFactory.java           |     3 +-
 .../charts/xml/JRXySeriesFactory.java              |    12 +-
 .../charts/xml/JRXyzDatasetFactory.java            |     3 +-
 .../charts/xml/JRXyzSeriesFactory.java             |     3 +-
 .../sf/jasperreports/charts/xml/package-info.java  |    27 +
 src/net/sf/jasperreports/charts/xml/package.html   |    13 -
 .../jasperreports/compilers/GroovyEvaluator.java   |   184 +
 .../sf/jasperreports/compilers/JRBshCompiler.java  |    49 +-
 .../sf/jasperreports/compilers/JRBshEvaluator.java |    33 +-
 .../sf/jasperreports/compilers/JRBshGenerator.java |     3 +-
 .../jasperreports/compilers/JRGroovyCompiler.java  |    50 +-
 .../jasperreports/compilers/JRGroovyGenerator.java |   150 +-
 .../compilers/JavaScriptCallableThisDecorator.java |    52 +
 .../compilers/JavaScriptClassCompiler.java         |   322 +
 .../compilers/JavaScriptClassLoader.java           |   137 +
 .../compilers/JavaScriptCompileData.java           |    22 +-
 .../compilers/JavaScriptCompiledData.java          |   167 +
 .../compilers/JavaScriptCompiledEvaluator.java     |   169 +
 .../compilers/JavaScriptCompiler.java              |   110 +-
 .../compilers/JavaScriptCompilerBase.java          |   244 +
 .../compilers/JavaScriptEvaluator.java             |   270 +-
 .../compilers/JavaScriptEvaluatorScope.java        |   297 +
 .../compilers/JavaScriptFunctionsObject.java       |   220 +
 .../sf/jasperreports/compilers/package-info.java   |    84 +
 .../components/AbstractComponentXmlWriter.java     |   141 +
 .../components/BaseElementHtmlHandler.java         |     3 +-
 .../ComponentsExtensionsRegistryFactory.java       |    83 +-
 .../components/ComponentsManager.java              |    41 +
 .../ComponentsXmlDigesterConfigurer.java           |   478 +
 .../components/ComponentsXmlHandler.java           |   595 --
 .../components/ComponentsXmlWriter.java            |   598 ++
 .../components/barbecue/BarbecueCompiler.java      |     3 +-
 .../components/barbecue/BarbecueComponent.java     |     3 +-
 .../barbecue/BarbecueDesignConverter.java          |     5 +-
 .../components/barbecue/BarbecueFillComponent.java |     8 +-
 .../components/barbecue/BarbecueFillFactory.java   |     3 +-
 .../components/barbecue/BarbecueRenderer.java      |    23 +-
 .../components/barbecue/BarbecueStyleResolver.java |     3 +-
 .../components/barbecue/BarcodeInfo.java           |     3 +-
 .../components/barbecue/BarcodeProvider.java       |     3 +-
 .../components/barbecue/BarcodeProviders.java      |    19 +-
 .../components/barbecue/BaseBarcodeProvider.java   |     3 +-
 .../barbecue/StandardBarbecueComponent.java        |     4 +-
 .../components/barbecue/package-info.java          |    76 +
 .../barcode4j/AbstractBarcodeEvaluator.java        |   139 +-
 .../components/barcode4j/Barcode4jComponent.java   |   233 +
 .../components/barcode4j/BarcodeCompiler.java      |     3 +-
 .../components/barcode4j/BarcodeComponent.java     |   120 +-
 .../barcode4j/BarcodeDesignConverter.java          |    19 +-
 .../barcode4j/BarcodeDesignEvaluator.java          |    57 +-
 .../components/barcode4j/BarcodeEvaluator.java     |    29 +-
 .../barcode4j/BarcodeExpressionCollector.java      |    20 +-
 .../components/barcode4j/BarcodeFillComponent.java |    30 +-
 .../components/barcode4j/BarcodeFillFactory.java   |     3 +-
 .../components/barcode4j/BarcodeImageProducer.java |    14 +-
 .../barcode4j/BarcodeRasterizedImageProducer.java  |    29 +-
 .../barcode4j/BarcodeSVGImageProducer.java         |    20 +-
 .../components/barcode4j/BarcodeUtils.java         |    92 +-
 .../components/barcode4j/BarcodeVerifier.java      |    42 +-
 .../components/barcode4j/BarcodeVisitor.java       |     6 +-
 .../components/barcode4j/BarcodeXmlWriter.java     |   119 +-
 .../components/barcode4j/CodabarComponent.java     |     5 +-
 .../components/barcode4j/Code128Component.java     |     5 +-
 .../components/barcode4j/Code39Component.java      |     5 +-
 .../barcode4j/CompiledBarcodeFactory.java          |    25 +-
 .../components/barcode4j/DataMatrixComponent.java  |     9 +-
 .../components/barcode4j/EAN128Component.java      |    31 +-
 .../components/barcode4j/EAN13Component.java       |     5 +-
 .../components/barcode4j/EAN8Component.java        |     5 +-
 .../barcode4j/ErrorCorrectionLevelEnum.java        |   118 +
 .../barcode4j/FourStateBarcodeComponent.java       |     9 +-
 .../barcode4j/Interleaved2Of5Component.java        |     5 +-
 .../components/barcode4j/OrientationEnum.java      |    98 +
 .../components/barcode4j/PDF417Component.java      |     5 +-
 .../components/barcode4j/POSTNETComponent.java     |     5 +-
 .../components/barcode4j/QRCodeBean.java           |    56 +
 .../components/barcode4j/QRCodeComponent.java      |    75 +
 .../components/barcode4j/QRCodeImageProducer.java  |    47 +
 .../barcode4j/QRCodeRasterizedImageProducer.java   |   117 +
 .../barcode4j/QRCodeSVGImageProducer.java          |   183 +
 .../barcode4j/RoyalMailCustomerComponent.java      |     3 +-
 .../components/barcode4j/TextPositionEnum.java     |    75 +
 .../components/barcode4j/UPCAComponent.java        |     5 +-
 .../components/barcode4j/UPCEComponent.java        |     5 +-
 .../barcode4j/USPSIntelligentMailComponent.java    |     3 +-
 .../barcode4j/UniformBarcodeVisitor.java           |    13 +-
 .../components/barcode4j/package-info.java         |   137 +
 .../components/charts/AbstractChartCustomizer.java |     3 +-
 .../components/charts/ChartComponent.java          |     7 +-
 .../components/charts/ChartCustomizer.java         |     3 +-
 .../components/charts/ChartDataset.java            |     3 +-
 .../jasperreports/components/charts/ChartPlot.java |     3 +-
 .../components/charts/ChartSettings.java           |     3 +-
 .../components/charts/ChartSettingsXmlFactory.java |     3 +-
 .../components/charts/FillChartSettings.java       |    11 +-
 .../components/charts/package-info.java            |    28 +
 src/net/sf/jasperreports/components/components.xsd |   298 +-
 .../components/headertoolbar/HeaderLabelUtil.java  |   192 +
 .../HeaderToolbarConditionalStyleProvider.java     |   161 +
 ...arConditionalStyleProviderExtensionFactory.java |    49 +
 ...aderToolbarConditionalStyleProviderFactory.java |    59 +
 .../headertoolbar/HeaderToolbarElement.java        |    76 +
 .../headertoolbar/HeaderToolbarElementUtils.java   |   576 +
 .../HeaderToolbarParameterContributor.java         |    81 +
 ...oolbarParameterContributorExtensionFactory.java |    49 +
 .../HeaderToolbarParameterContributorFactory.java  |    62 +
 .../actions/AbstractVerifiableTableAction.java     |   104 +
 .../headertoolbar/actions/BaseColumnData.java      |    54 +
 .../actions/ConditionalFormattingAction.java       |   201 +
 .../actions/ConditionalFormattingCommand.java      |    95 +
 .../actions/ConditionalFormattingData.java         |   149 +
 .../actions/EditTextElementAction.java             |   164 +
 .../actions/EditTextElementCommand.java            |   129 +
 .../headertoolbar/actions/EditTextElementData.java |   192 +
 .../headertoolbar/actions/FilterAction.java        |   168 +
 .../headertoolbar/actions/FormatCondition.java     |   150 +
 .../actions/HideUnhideColumnCommand.java           |    84 +
 .../actions/HideUnhideColumnData.java              |    54 +
 .../actions/HideUnhideColumnsAction.java           |    72 +
 .../actions/HideUnhideColumnsCommand.java          |    73 +
 .../headertoolbar/actions/MoveColumnAction.java    |    76 +
 .../headertoolbar/actions/MoveColumnCommand.java   |   115 +
 .../headertoolbar/actions/MoveColumnData.java      |    54 +
 .../headertoolbar/actions/MoveElementCommand.java  |    57 +
 .../headertoolbar/actions/ResizeColumnAction.java  |    76 +
 .../headertoolbar/actions/ResizeColumnCommand.java |   282 +
 .../headertoolbar/actions/ResizeColumnData.java    |    70 +
 .../actions/ResizeElementCommand.java              |    57 +
 .../actions/SimpleMoveColumnCommand.java           |    80 +
 .../actions/SimpleResizeColumnCommand.java         |    60 +
 .../headertoolbar/actions/SortAction.java          |    80 +
 .../headertoolbar/actions/messages.properties      |    34 +
 .../headertoolbar/actions/package-info.java        |    28 +
 .../headertoolbar/json/ColumnFormatting.java       |    94 +
 .../json/HeaderToolbarElementJsonHandler.java      |   980 ++
 .../headertoolbar/json/package-info.java           |    28 +
 .../resources/HeaderToolbarElementJsonTemplate.vm  |    77 +
 .../components/headertoolbar/messages.properties   |    59 +
 .../components/headertoolbar/package-info.java     |    28 +
 .../headertoolbar/resources/images/delete_edit.gif |   Bin 0 -> 952 bytes
 .../headertoolbar/resources/images/filter.png      |   Bin 0 -> 285 bytes
 .../headertoolbar/resources/images/filter_over.png |   Bin 0 -> 445 bytes
 .../resources/images/filter_wrong.png              |   Bin 0 -> 396 bytes
 .../headertoolbar/resources/images/format.png      |   Bin 0 -> 625 bytes
 .../resources/images/format/add_dec.png            |   Bin 0 -> 798 bytes
 .../resources/images/format/currency.png           |   Bin 0 -> 870 bytes
 .../resources/images/format/percentage.png         |   Bin 0 -> 643 bytes
 .../resources/images/format/remove_dec.png         |   Bin 0 -> 805 bytes
 .../resources/images/format/thousands_sep.png      |   Bin 0 -> 456 bytes
 .../resources/images/jive/action.over.png          |   Bin 0 -> 152 bytes
 .../headertoolbar/resources/images/jive/action.png |   Bin 0 -> 152 bytes
 .../resources/images/jive/action.pressed.png       |   Bin 0 -> 169 bytes
 .../resources/images/jive/action.primary.over.png  |   Bin 0 -> 183 bytes
 .../resources/images/jive/action.primary.png       |   Bin 0 -> 175 bytes
 .../images/jive/action.primary.pressed.png         |   Bin 0 -> 171 bytes
 .../jive/button_column_formatting_sprite.png       |   Bin 0 -> 1105 bytes
 .../images/jive/button_formatting_sprite.png       |   Bin 0 -> 14614 bytes
 .../resources/images/jive/column.header.png        |   Bin 0 -> 965 bytes
 .../images/jive/column_toolbar_buttons_sprite.png  |   Bin 0 -> 2030 bytes
 .../images/jive/dialog_button_capsule_sprite.png   |   Bin 0 -> 3645 bytes
 .../resources/images/jive/dragMarker.png           |   Bin 0 -> 1284 bytes
 .../resources/images/jive/fontColor.png            |   Bin 0 -> 559 bytes
 .../resources/images/jive/foobar.bg.png            |   Bin 0 -> 956 bytes
 .../images/jive/iv_format_button_sprite.png        |   Bin 0 -> 3614 bytes
 .../headertoolbar/resources/images/sort_asc.png    |   Bin 0 -> 206 bytes
 .../resources/images/sort_asc_over.png             |   Bin 0 -> 398 bytes
 .../headertoolbar/resources/images/sort_desc.png   |   Bin 0 -> 207 bytes
 .../resources/images/sort_desc_over.png            |   Bin 0 -> 391 bytes
 .../resources/images/style/align_center.png        |   Bin 0 -> 481 bytes
 .../resources/images/style/align_left.png          |   Bin 0 -> 413 bytes
 .../resources/images/style/align_right.png         |   Bin 0 -> 421 bytes
 .../headertoolbar/resources/images/style/bold.png  |   Bin 0 -> 578 bytes
 .../resources/images/style/italic.png              |   Bin 0 -> 494 bytes
 .../resources/images/style/underline.png           |   Bin 0 -> 548 bytes
 .../components/headertoolbar/resources/jive.vm.css |   672 ++
 .../headertoolbar/resources/require/jive.column.js |   204 +
 .../headertoolbar/resources/require/jive.i18n.tmpl |    53 +
 .../resources/require/jive.interactive.column.js   |  1678 +++
 .../headertoolbar/resources/require/jive.js        |  1529 +++
 .../headertoolbar/resources/require/jive.table.js  |    76 +
 .../resources/require/jive.templates.tmpl          |   162 +
 .../components/iconlabel/ContainerFillEnum.java    |    80 +
 .../components/iconlabel/IconLabelComponent.java   |   370 +
 .../iconlabel/IconLabelComponentCompiler.java      |    56 +
 .../IconLabelComponentDesignConverter.java         |    68 +
 .../iconlabel/IconLabelComponentDigester.java      |    85 +
 .../iconlabel/IconLabelComponentFactory.java       |    57 +
 .../iconlabel/IconLabelComponentFill.java          |   835 ++
 .../iconlabel/IconLabelComponentFillFactory.java   |    52 +
 .../iconlabel/IconLabelComponentManager.java       |    41 +
 .../iconlabel/IconLabelComponentUtil.java          |   278 +
 .../iconlabel/IconLabelComponentXmlWriter.java     |   110 +
 .../iconlabel/IconLabelDirectionEnum.java          |    70 +
 .../components/iconlabel/IconLabelElement.java     |    41 +
 .../iconlabel/IconLabelElementCsvHandler.java      |    74 +
 .../iconlabel/IconLabelElementDocxHandler.java     |    74 +
 .../IconLabelElementGraphics2DHandler.java         |   109 +
 .../iconlabel/IconLabelElementHtmlHandler.java     |   145 +
 .../IconLabelElementJExcelApiHandler.java          |    78 +
 .../iconlabel/IconLabelElementOdsHandler.java      |    76 +
 .../iconlabel/IconLabelElementOdtHandler.java      |    73 +
 .../iconlabel/IconLabelElementPdfHandler.java      |    92 +
 .../iconlabel/IconLabelElementPptxHandler.java     |    98 +
 .../iconlabel/IconLabelElementRtfHandler.java      |   100 +
 .../iconlabel/IconLabelElementXlsHandler.java      |    75 +
 .../iconlabel/IconLabelElementXlsxHandler.java     |    83 +
 .../iconlabel/IconLabelElementXmlHandler.java      |   105 +
 .../components/iconlabel/IconPositionEnum.java     |    70 +
 .../components/iconlabel/IconTextFieldFactory.java |    46 +
 .../iconlabel/LabelTextFieldFactory.java           |    46 +
 .../components/iconlabel/package-info.java         |    28 +
 .../components/list/BaseFillList.java              |    19 +-
 .../components/list/BaseListContents.java          |     3 +-
 .../components/list/DesignListContents.java        |     3 +-
 .../components/list/FillDatasetRun.java            |    61 +-
 .../components/list/FillListContents.java          |     8 +-
 .../components/list/FillListFactory.java           |     6 +-
 .../components/list/HorizontalFillList.java        |    48 +-
 .../components/list/ListComponent.java             |     6 +-
 .../components/list/ListComponentCompiler.java     |     3 +-
 .../components/list/ListContents.java              |     3 +-
 .../components/list/ListDesignConverter.java       |     4 +-
 .../components/list/StandardListComponent.java     |    15 +-
 .../components/list/UnusedSpaceImageRenderer.java  |    20 +-
 .../components/list/VerticalFillList.java          |    20 +-
 .../components/list/package-info.java              |    64 +
 src/net/sf/jasperreports/components/map/Item.java  |    47 +
 .../sf/jasperreports/components/map/ItemData.java  |    60 +
 .../components/map/ItemDataXmlFactory.java         |    39 +
 .../components/map/ItemDatasetFactory.java         |    42 +
 .../jasperreports/components/map/ItemProperty.java |    61 +
 .../components/map/ItemPropertyXmlFactory.java     |    57 +
 .../components/map/ItemXmlFactory.java             |    44 +
 .../jasperreports/components/map/MapCompiler.java  |   207 +-
 .../jasperreports/components/map/MapComponent.java |   169 +-
 .../components/map/MapDesignConverter.java         |     3 +-
 .../components/map/MapElementDocxHandler.java      |    18 +-
 .../map/MapElementGraphics2DHandler.java           |    17 +-
 .../components/map/MapElementHtmlHandler.java      |   159 +-
 .../components/map/MapElementImageProvider.java    |   174 +-
 .../components/map/MapElementJExcelApiHandler.java |     7 +-
 .../components/map/MapElementJsonHandler.java      |    94 +
 .../components/map/MapElementOdsHandler.java       |    25 +-
 .../components/map/MapElementOdtHandler.java       |    13 +-
 .../components/map/MapElementPdfHandler.java       |     7 +-
 .../components/map/MapElementPptxHandler.java      |    14 +-
 .../components/map/MapElementRtfHandler.java       |     7 +-
 .../components/map/MapElementXlsHandler.java       |     7 +-
 .../components/map/MapElementXlsxHandler.java      |    11 +-
 .../components/map/MapElementXmlHandler.java       |     7 +-
 .../components/map/MapFillComponent.java           |   129 -
 .../components/map/MapFillFactory.java             |    54 -
 .../components/map/MapPrintElement.java            |   108 +-
 .../components/map/MapXmlFactory.java              |   109 +
 .../sf/jasperreports/components/map/Marker.java    |    49 +
 .../components/map/MarkerDataset.java              |    40 +
 .../components/map/MarkerDatasetXmlFactory.java    |    43 +
 .../components/map/MarkerProperty.java             |    33 +
 .../components/map/MarkerPropertyXmlFactory.java   |    58 +
 .../components/map/MarkerXmlFactory.java           |    45 +
 .../jasperreports/components/map/StandardItem.java |   109 +
 .../components/map/StandardItemData.java           |   198 +
 .../components/map/StandardItemProperty.java       |   126 +
 .../components/map/StandardMapComponent.java       |   348 +-
 .../components/map/StandardMarker.java             |   109 +
 .../components/map/StandardMarkerDataset.java      |   233 +
 .../components/map/StandardMarkerProperty.java     |   127 +
 .../components/map/fill/FillContextProvider.java   |    35 +
 .../components/map/fill/FillItem.java              |   128 +
 .../components/map/fill/FillItemData.java          |   153 +
 .../components/map/fill/FillItemDataset.java       |   133 +
 .../components/map/fill/FillMarker.java            |   137 +
 .../components/map/fill/FillPlaceItem.java         |   192 +
 .../components/map/fill/FillPlaceItemData.java     |    51 +
 .../components/map/fill/FillStyleItem.java         |    87 +
 .../components/map/fill/FillStyleItemData.java     |    51 +
 .../components/map/fill/MapFillComponent.java      |   472 +
 .../components/map/fill/MapFillFactory.java        |    54 +
 .../components/map/fill/MarkerFillDatasetRun.java  |    59 +
 .../components/map/fill/package-info.java          |    27 +
 .../jasperreports/components/map/package-info.java |    28 +
 .../jasperreports/components/map/resources/map.js  |    19 -
 .../map/resources/require/jasperreports-map.js     |   158 +
 .../resources/templates/MapElementHtmlTemplate.vm  |   180 +-
 .../resources/templates/MapElementJsonTemplate.vm  |    14 +
 .../components/map/type/MapImageTypeEnum.java      |    90 +
 .../components/map/type/MapScaleEnum.java          |    75 +
 .../components/map/type/MapTypeEnum.java           |    80 +
 .../components/map/type/package-info.java          |    27 +
 .../jasperreports/components/messages.properties   |     5 +
 .../sf/jasperreports/components/package-info.java  |   175 +
 .../components/sort/AbstractFieldComparator.java   |    11 +-
 .../components/sort/FieldBooleanComparator.java    |    62 +
 .../components/sort/FieldComparatorFactory.java    |     9 +-
 .../components/sort/FieldDateComparator.java       |    41 +-
 .../jasperreports/components/sort/FieldFilter.java |    92 +-
 .../components/sort/FieldNumberComparator.java     |    42 +-
 .../components/sort/FieldTextComparator.java       |    33 +-
 .../sort/FilterTypeBooleanOperatorsEnum.java       |    76 +
 .../sort/FilterTypeBooleanOperatorsEnum.properties |     4 +
 .../sort/FilterTypeDateOperatorsEnum.java          |    66 +-
 .../sort/FilterTypeDateOperatorsEnum.properties    |    16 +-
 .../sort/FilterTypeNumericOperatorsEnum.java       |    66 +-
 .../sort/FilterTypeNumericOperatorsEnum.properties |    16 +-
 .../sort/FilterTypeTextOperatorsEnum.java          |    66 +-
 .../sort/FilterTypeTextOperatorsEnum.properties    |    16 +-
 .../components/sort/FilterTypesEnum.java           |    58 +-
 .../components/sort/SortComponent.java             |   106 +-
 .../components/sort/SortComponentCompiler.java     |     3 +-
 .../sort/SortComponentDesignConverter.java         |     3 +-
 .../components/sort/SortComponentDigester.java     |     7 +-
 .../components/sort/SortComponentFill.java         |    16 +-
 .../components/sort/SortComponentFillFactory.java  |     3 +-
 .../sort/SortComponentSymbolFactory.java           |    15 +-
 .../sort/SortComponentSymbolFontFactory.java       |     3 +-
 .../components/sort/SortComponentXmlWriter.java    |   127 +-
 .../jasperreports/components/sort/SortElement.java |    13 +-
 .../components/sort/SortElementHtmlHandler.java    |   365 +-
 .../components/sort/SortElementJsonHandler.java    |   302 +
 .../components/sort/SortElementUtils.java          |     7 +-
 .../components/sort/SortParameterContributor.java  |    14 +-
 .../SortParameterContributorExtensionFactory.java  |     3 +-
 .../sort/SortParameterContributorFactory.java      |     3 +-
 .../sort/actions/AddSortFieldCommand.java          |    81 +
 .../components/sort/actions/FilterAction.java      |    90 +
 .../components/sort/actions/FilterCommand.java     |   143 +
 .../components/sort/actions/FilterData.java        |   127 +
 .../sort/actions/RemoveSortFieldCommand.java       |    89 +
 .../components/sort/actions/SortAction.java        |    89 +
 .../components/sort/actions/SortCommand.java       |   153 +
 .../components/sort/actions/SortData.java          |    73 +
 .../components/sort/actions/package-info.java      |    28 +
 .../components/sort/package-info.java              |    28 +
 .../sort/resources/SortElementHtmlTemplate.vm      |    70 +-
 .../sort/resources/SortElementJsonTemplate.vm      |    31 +
 .../sort/resources/jive.filterDialog.tmpl          |    11 +
 .../sort/resources/jive.interactive.sort.js        |   249 +
 .../components/sort/resources/jive.sort.js         |    83 +
 .../components/sort/resources/jive.sort.vm.css     |   115 +
 .../components/sort/resources/sort.js              |   336 -
 .../components/spiderchart/FillSpiderChart.java    |    50 +-
 .../components/spiderchart/FillSpiderDataset.java  |    10 +-
 .../components/spiderchart/FillSpiderPlot.java     |     3 +-
 .../spiderchart/SpiderChartCompiler.java           |     4 +-
 .../spiderchart/SpiderChartComponent.java          |    15 +-
 .../spiderchart/SpiderChartDesignConverter.java    |    17 +-
 .../spiderchart/SpiderChartDigester.java           |     4 +-
 .../spiderchart/SpiderChartFillFactory.java        |     3 +-
 .../spiderchart/SpiderChartRendererEvaluator.java  |    48 +-
 .../spiderchart/SpiderChartSharedBean.java         |     3 +-
 .../spiderchart/SpiderChartXmlFactory.java         |     3 +-
 .../spiderchart/SpiderChartXmlWriter.java          |   106 +-
 .../components/spiderchart/SpiderDataset.java      |     3 +-
 .../spiderchart/SpiderDatasetXmlFactory.java       |     3 +-
 .../components/spiderchart/SpiderPlot.java         |     3 +-
 .../spiderchart/SpiderPlotXmlFactory.java          |     3 +-
 .../spiderchart/StandardChartSettings.java         |    26 +-
 .../spiderchart/StandardSpiderDataset.java         |    18 +-
 .../components/spiderchart/StandardSpiderPlot.java |     3 +-
 .../components/spiderchart/package-info.java       |    28 +
 .../spiderchart/type/SpiderRotationEnum.java       |    47 +-
 .../spiderchart/type/TableOrderEnum.java           |    47 +-
 .../components/spiderchart/type/package-info.java  |    28 +
 .../jasperreports/components/table/BaseColumn.java |    10 +-
 .../sf/jasperreports/components/table/Cell.java    |     6 +-
 .../sf/jasperreports/components/table/Column.java  |     3 +-
 .../table/ColumnExpressionCollector.java           |     5 +-
 .../components/table/ColumnFactory.java            |     3 +-
 .../components/table/ColumnGroup.java              |     3 +-
 .../components/table/ColumnVisitor.java            |     3 +-
 .../components/table/CompiledCell.java             |    35 +-
 .../jasperreports/components/table/DesignCell.java |    33 +-
 .../components/table/FillTableFactory.java         |     6 +-
 .../jasperreports/components/table/GroupCell.java  |     3 +-
 .../components/table/StandardBaseColumn.java       |   166 +-
 .../components/table/StandardColumn.java           |     3 +-
 .../components/table/StandardColumnGroup.java      |     3 +-
 .../components/table/StandardGroupCell.java        |     3 +-
 .../components/table/StandardTable.java            |    19 +-
 .../components/table/StandardTableFactory.java     |     3 +-
 .../components/table/TableCompiler.java            |     3 +-
 .../components/table/TableComponent.java           |    11 +-
 .../components/table/TableDesignConverter.java     |     8 +-
 .../table/TableReportContextXmlRule.java           |     9 +-
 .../components/table/WhenNoDataTypeTableEnum.java  |    52 +-
 .../table/fill/BuiltinExpressionEvaluator.java     |    10 +-
 .../fill/BuiltinExpressionEvaluatorDecorator.java  |    14 +-
 .../fill/BuiltinExpressionEvaluatorFactory.java    |    79 +
 .../BuiltinFillExpressionEvaluatorDecorator.java   |    72 +
 .../table/fill/ConstantBuiltinExpression.java      |    10 +-
 .../table/fill/DatasetCloneObjectFactory.java      |     3 +-
 .../components/table/fill/FillColumn.java          |    31 +-
 .../FillExpressionEvaluatorDatasetAdapter.java     |   102 +
 .../components/table/fill/FillTable.java           |   207 +-
 .../components/table/fill/FillTableSubreport.java  |    66 +-
 .../table/fill/SubreportReturnValueAdapter.java    |   100 +
 .../components/table/fill/TableJasperReport.java   |    71 +
 .../components/table/fill/TableReport.java         |   888 +-
 .../table/fill/TableReportBaseObjectFactory.java   |    12 +-
 .../table/fill/TableReportCompileData.java         |    17 +-
 .../components/table/fill/TableReportDataset.java  |    10 +-
 .../components/table/fill/TableReportGroup.java    |    17 +-
 .../table/fill/TableReportScriptlet.java           |     3 +-
 .../components/table/fill/TableSubreport.java      |    46 +-
 .../table/fill/TableSubreportParameter.java        |     3 +-
 .../components/table/fill/package-info.java        |    27 +
 .../components/table/package-info.java             |    81 +
 .../table/util/ColumnElementsVisitor.java          |   112 +
 .../components/table/util/TableUtil.java           |   191 +-
 .../components/table/util/package-info.java        |    27 +
 .../crosstabs/CrosstabColumnCell.java              |    41 +
 .../crosstabs/CrosstabDeepVisitor.java             |   131 +
 .../sf/jasperreports/crosstabs/JRCellContents.java |    17 +-
 src/net/sf/jasperreports/crosstabs/JRCrosstab.java |    35 +-
 .../jasperreports/crosstabs/JRCrosstabBucket.java  |    22 +-
 .../sf/jasperreports/crosstabs/JRCrosstabCell.java |     3 +-
 .../crosstabs/JRCrosstabColumnGroup.java           |    23 +-
 .../jasperreports/crosstabs/JRCrosstabDataset.java |     3 +-
 .../jasperreports/crosstabs/JRCrosstabGroup.java   |     5 +-
 .../jasperreports/crosstabs/JRCrosstabMeasure.java |     3 +-
 .../crosstabs/JRCrosstabParameter.java             |     3 +-
 .../crosstabs/JRCrosstabRowGroup.java              |     3 +-
 .../crosstabs/base/BaseCrosstabColumnCell.java     |    95 +
 .../crosstabs/base/CrosstabBaseCloneFactory.java   |    67 +
 .../crosstabs/base/CrosstabBaseCloneable.java      |    34 +
 .../crosstabs/base/JRBaseCellContents.java         |    32 +-
 .../crosstabs/base/JRBaseCrosstab.java             |   114 +-
 .../crosstabs/base/JRBaseCrosstabBucket.java       |    37 +-
 .../crosstabs/base/JRBaseCrosstabCell.java         |     3 +-
 .../crosstabs/base/JRBaseCrosstabColumnGroup.java  |    22 +-
 .../crosstabs/base/JRBaseCrosstabDataset.java      |     3 +-
 .../crosstabs/base/JRBaseCrosstabGroup.java        |    14 +-
 .../crosstabs/base/JRBaseCrosstabMeasure.java      |    38 +-
 .../crosstabs/base/JRBaseCrosstabParameter.java    |     3 +-
 .../crosstabs/base/JRBaseCrosstabRowGroup.java     |     4 +-
 .../jasperreports/crosstabs/base/package-info.java |    27 +
 .../crosstabs/design/DesignCrosstabColumnCell.java |    91 +
 .../crosstabs/design/JRCrosstabOrigin.java         |     5 +-
 .../crosstabs/design/JRDesignCellContents.java     |    37 +-
 .../crosstabs/design/JRDesignCrosstab.java         |   211 +-
 .../crosstabs/design/JRDesignCrosstabBucket.java   |    32 +-
 .../crosstabs/design/JRDesignCrosstabCell.java     |     3 +-
 .../design/JRDesignCrosstabColumnGroup.java        |    44 +-
 .../crosstabs/design/JRDesignCrosstabDataset.java  |     5 +-
 .../crosstabs/design/JRDesignCrosstabGroup.java    |     3 +-
 .../crosstabs/design/JRDesignCrosstabMeasure.java  |     3 +-
 .../design/JRDesignCrosstabParameter.java          |     3 +-
 .../crosstabs/design/JRDesignCrosstabRowGroup.java |     4 +-
 .../crosstabs/design/package-info.java             |    27 +
 .../crosstabs/fill/BucketExpressionOrderer.java    |    72 +
 .../crosstabs/fill/BucketOrderer.java              |    44 +
 .../crosstabs/fill/IconLabelFillObjectFactory.java |    60 +
 .../fill/JRCrosstabExpressionEvaluator.java        |    16 +-
 .../crosstabs/fill/JRFillCrosstabCell.java         |     3 +-
 .../crosstabs/fill/JRFillCrosstabColumnGroup.java  |    19 +-
 .../crosstabs/fill/JRFillCrosstabGroup.java        |     3 +-
 .../crosstabs/fill/JRFillCrosstabMeasure.java      |     3 +-
 .../fill/JRFillCrosstabObjectFactory.java          |     3 +-
 .../crosstabs/fill/JRFillCrosstabParameter.java    |     3 +-
 .../crosstabs/fill/JRFillCrosstabRowGroup.java     |     3 +-
 .../crosstabs/fill/JRPercentageCalculator.java     |     3 +-
 .../fill/JRPercentageCalculatorFactory.java        |    24 +-
 .../fill/calculation/ArbitraryRankComparator.java  |    17 +-
 .../fill/calculation/BucketDefinition.java         |   129 +-
 .../calculation/BucketValueOrderDecorator.java     |    55 +
 .../crosstabs/fill/calculation/BucketingData.java  |    49 +
 .../fill/calculation/BucketingService.java         |   930 +-
 .../fill/calculation/BucketingServiceContext.java  |    44 +
 .../fill/calculation/ColumnValueInfo.java          |    72 +
 .../fill/calculation/CrosstabBucketingService.java |   710 ++
 .../crosstabs/fill/calculation/CrosstabCell.java   |     3 +-
 .../DefaultBucketValueOrderDecorator.java          |    83 +
 .../crosstabs/fill/calculation/HeaderCell.java     |     3 +-
 .../fill/calculation/MeasureDefinition.java        |     5 +-
 .../fill/calculation/OrderByColumnInfo.java        |    70 +
 .../fill/calculation/OrderByColumnOrderer.java     |   143 +
 .../crosstabs/fill/calculation/package-info.java   |    27 +
 .../jasperreports/crosstabs/fill/package-info.java |    27 +
 .../CrosstabInteractiveJsonHandler.java            |   102 +
 .../interactive/CrosstabOrderAttributes.java       |   148 +
 .../crosstabs/interactive/DataColumnInfo.java      |    75 +
 .../interactive/RowGroupInteractiveInfo.java       |    62 +
 .../crosstabs/interactive/SortByColumnAction.java  |    88 +
 .../crosstabs/interactive/SortByColumnCommand.java |   122 +
 .../crosstabs/interactive/SortByColumnData.java    |    82 +
 .../crosstabs/interactive/SortRowGroupAction.java  |    83 +
 .../crosstabs/interactive/SortRowGroupCommand.java |   105 +
 .../crosstabs/interactive/SortRowGroupData.java    |    68 +
 .../interactive/jive.crosstab.interactive.js       |   919 ++
 .../crosstabs/interactive/jive.crosstab.js         |   103 +
 .../interactive/jive.crosstab.templates.styles.css |   110 +
 .../interactive/jive.crosstab.templates.tmpl       |     6 +
 .../crosstabs/interactive/package-info.java        |    27 +
 .../sf/jasperreports/crosstabs/package-info.java   |   323 +
 .../crosstabs/type/CrosstabColumnPositionEnum.java |    16 +-
 .../crosstabs/type/CrosstabPercentageEnum.java     |    16 +-
 .../crosstabs/type/CrosstabRowPositionEnum.java    |    16 +-
 .../crosstabs/type/CrosstabTotalPositionEnum.java  |    16 +-
 .../jasperreports/crosstabs/type/package-info.java |    27 +
 .../crosstabs/xml/JRCellContentsFactory.java       |     3 +-
 .../xml/JRCrosstabBucketExpressionFactory.java     |     3 +-
 .../crosstabs/xml/JRCrosstabBucketFactory.java     |     8 +-
 .../crosstabs/xml/JRCrosstabCellFactory.java       |     3 +-
 .../xml/JRCrosstabColumnGroupFactory.java          |     4 +-
 .../crosstabs/xml/JRCrosstabDatasetFactory.java    |     3 +-
 .../crosstabs/xml/JRCrosstabFactory.java           |     4 +-
 .../crosstabs/xml/JRCrosstabGroupFactory.java      |     3 +-
 .../xml/JRCrosstabMeasureExpressionFactory.java    |     3 +-
 .../crosstabs/xml/JRCrosstabMeasureFactory.java    |     3 +-
 .../crosstabs/xml/JRCrosstabParameterFactory.java  |     3 +-
 .../JRCrosstabParameterValueExpressionFactory.java |     3 +-
 .../crosstabs/xml/JRCrosstabRowGroupFactory.java   |     3 +-
 .../jasperreports/crosstabs/xml/package-info.java  |    27 +
 .../data/AbstractClasspathAwareDataAdapter.java    |     3 +-
 .../AbstractClasspathAwareDataAdapterService.java  |    73 +-
 .../sf/jasperreports/data/AbstractDataAdapter.java |     3 +-
 .../data/AbstractDataAdapterService.java           |    29 +-
 .../data/BuiltinDataFileServiceFactory.java        |    61 +
 .../jasperreports/data/ClassNameFieldHandler.java  |     7 +-
 .../data/ClasspathAwareDataAdapter.java            |     3 +-
 src/net/sf/jasperreports/data/DataAdapter.java     |    17 +-
 ...ameterContributorExtensionsRegistryFactory.java |    17 +-
 .../DataAdapterParameterContributorFactory.java    |    18 +-
 .../sf/jasperreports/data/DataAdapterService.java  |     8 +-
 .../data/DataAdapterServiceFactory.java            |     9 +-
 .../jasperreports/data/DataAdapterServiceUtil.java |    53 +-
 src/net/sf/jasperreports/data/DataFile.java        |    34 +
 .../sf/jasperreports/data/DataFileConnection.java  |    38 +
 .../sf/jasperreports/data/DataFileResolver.java    |    67 +
 src/net/sf/jasperreports/data/DataFileService.java |    39 +
 .../jasperreports/data/DataFileServiceFactory.java |    37 +
 src/net/sf/jasperreports/data/DataFileStream.java  |   104 +
 .../data/DataFileStreamConnection.java             |    53 +
 src/net/sf/jasperreports/data/DataFileUtils.java   |    65 +
 .../jasperreports/data/DataSourceCollection.java   |   109 +
 .../sf/jasperreports/data/DataSourceProvider.java  |    37 +
 ...ataAdapterServiceExtensionsRegistryFactory.java |     3 +-
 .../data/DefaultDataAdapterServiceFactory.java     |   101 +-
 src/net/sf/jasperreports/data/FileDataAdapter.java |    36 +
 .../sf/jasperreports/data/LocaleFieldHandler.java  |     5 +-
 .../jasperreports/data/RepositoryDataLocation.java |    34 +
 .../data/RepositoryDataLocationService.java        |    66 +
 .../data/RewindableDataSourceCollection.java       |    69 +
 .../data/RewindableDataSourceProvider.java         |    36 +
 .../data/StandardRepositoryDataLocation.java       |    70 +
 .../data/StandardRepositoryDataLocation.xml        |    11 +
 .../jasperreports/data/TimeZoneFieldHandler.java   |     8 +-
 src/net/sf/jasperreports/data/XmlUtil.java         |   443 -
 .../jasperreports/data/bean/BeanDataAdapter.java   |     3 +-
 .../data/bean/BeanDataAdapterImpl.java             |     3 +-
 .../data/bean/BeanDataAdapterService.java          |    35 +-
 .../sf/jasperreports/data/bean/package-info.java   |    27 +
 .../sf/jasperreports/data/cache/ArrayStore.java    |    40 +
 .../jasperreports/data/cache/BigDecimalStore.java  |   100 +
 .../jasperreports/data/cache/BigDecimalValues.java |   113 +
 .../jasperreports/data/cache/BigIntegerStore.java  |   190 +
 .../jasperreports/data/cache/BlockColumnStore.java |    99 +
 .../data/cache/BlockColumnValues.java              |   141 +
 .../sf/jasperreports/data/cache/BooleanStore.java  |   162 +
 .../sf/jasperreports/data/cache/BooleanValues.java |   117 +
 .../data/cache/BufferColumnStore.java              |    36 +
 .../jasperreports/data/cache/ByteArrayValues.java  |    99 +
 .../sf/jasperreports/data/cache/CachedDataset.java |    40 +
 .../jasperreports/data/cache/ColumnCacheData.java  |    44 +
 .../data/cache/ColumnDataCacheHandler.java         |   375 +
 .../data/cache/ColumnDataSnapshot.java             |   124 +
 .../sf/jasperreports/data/cache/ColumnStore.java   |    38 +
 .../sf/jasperreports/data/cache/ColumnValues.java  |    36 +
 .../data/cache/ColumnValuesDataSource.java         |   123 +
 .../data/cache/ColumnValuesIterator.java           |    38 +
 .../data/cache/ConstantColumnValue.java            |    76 +
 .../jasperreports/data/cache/DataCacheHandler.java |    53 +
 .../sf/jasperreports/data/cache/DataRecorder.java  |    44 +
 .../sf/jasperreports/data/cache/DataSnapshot.java  |    39 +
 .../data/cache/DataSnapshotException.java          |    60 +
 .../jasperreports/data/cache/DatasetRecorder.java  |    46 +
 src/net/sf/jasperreports/data/cache/DateStore.java |    92 +
 .../jasperreports/data/cache/DoubleArrayStore.java |   161 +
 .../data/cache/DoubleArrayValues.java              |    90 +
 .../data/cache/EmptyColumnValues.java              |    88 +
 .../jasperreports/data/cache/FloatArrayStore.java  |   161 +
 .../jasperreports/data/cache/FloatArrayValues.java |    90 +
 .../data/cache/IndexColumnValueIterator.java       |    57 +
 .../jasperreports/data/cache/IntArrayValues.java   |   100 +
 .../jasperreports/data/cache/LongArrayStore.java   |   291 +
 .../jasperreports/data/cache/LongArrayValues.java  |   100 +
 .../jasperreports/data/cache/NullableValues.java   |   124 +
 .../cache/NumberToBigIntegerOffsetTransformer.java |    58 +
 .../data/cache/NumberToBigIntegerTransformer.java  |    67 +
 .../data/cache/NumberToByteTransformer.java        |    66 +
 .../data/cache/NumberToCharTransformer.java        |    66 +
 .../data/cache/NumberToDateTransformer.java        |    67 +
 .../data/cache/NumberToIntegerTransformer.java     |    66 +
 .../data/cache/NumberToLongTransformer.java        |    66 +
 .../data/cache/NumberToSQLDateTransformer.java     |    67 +
 .../data/cache/NumberToSQLTimeTransformer.java     |    67 +
 .../data/cache/NumberToShortTransformer.java       |    66 +
 .../data/cache/NumberValuesUtils.java              |   106 +
 .../jasperreports/data/cache/ObjectArrayStore.java |   179 +
 .../data/cache/ObjectArrayValues.java              |    88 +
 .../data/cache/PopulatedSnapshotCacheHandler.java  |    59 +
 .../data/cache/RunLengthColumnValues.java          |   141 +
 .../jasperreports/data/cache/RunLengthStore.java   |   155 +
 .../jasperreports/data/cache/ShortArrayValues.java |   100 +
 .../data/cache/SingleColumnValueIterator.java      |    67 +
 .../data/cache/SingleObjectValue.java              |    66 +
 .../data/cache/StandardCachedDataset.java          |    65 +
 .../data/cache/StandardColumnCacheData.java        |   168 +
 .../jasperreports/data/cache/TimestampStore.java   |    98 +
 .../jasperreports/data/cache/TimestampValues.java  |   114 +
 .../data/cache/TransformedColumnValues.java        |    99 +
 .../jasperreports/data/cache/TypedColumnStore.java |   185 +
 .../sf/jasperreports/data/cache/ValueLength.java   |    71 +
 .../jasperreports/data/cache/ValueTransformer.java |    36 +
 .../sf/jasperreports/data/cache/package-info.java  |    27 +
 .../sf/jasperreports/data/csv/CsvDataAdapter.java  |    30 +-
 .../data/csv/CsvDataAdapterImpl-603.xml            |    41 +
 .../data/csv/CsvDataAdapterImpl-610.xml            |    44 +
 .../jasperreports/data/csv/CsvDataAdapterImpl.java |    66 +-
 .../jasperreports/data/csv/CsvDataAdapterImpl.xml  |    14 +-
 .../data/csv/CsvDataAdapterService.java            |   178 +-
 .../sf/jasperreports/data/csv/package-info.java    |    27 +
 .../data/ds/DataSourceDataAdapter.java             |     3 +-
 .../data/ds/DataSourceDataAdapterImpl.java         |     3 +-
 .../data/ds/DataSourceDataAdapterService.java      |    50 +-
 src/net/sf/jasperreports/data/ds/package-info.java |    27 +
 .../jasperreports/data/ejbql/EjbqlDataAdapter.java |    37 +
 .../data/ejbql/EjbqlDataAdapterImpl.java           |    43 +
 .../data/ejbql/EjbqlDataAdapterImpl.xml            |    17 +
 .../data/ejbql/EjbqlDataAdapterService.java        |   116 +
 .../sf/jasperreports/data/ejbql/package-info.java  |    27 +
 .../jasperreports/data/empty/EmptyDataAdapter.java |     3 +-
 .../data/empty/EmptyDataAdapterImpl.java           |     3 +-
 .../data/empty/EmptyDataAdapterService.java        |    18 +-
 .../sf/jasperreports/data/empty/package-info.java  |    27 +
 .../jasperreports/data/excel/ExcelDataAdapter.java |    36 +
 .../data/excel/ExcelDataAdapterImpl-603.xml        |    41 +
 .../data/excel/ExcelDataAdapterImpl-610.xml        |    44 +
 .../data/excel/ExcelDataAdapterImpl.java           |    42 +
 .../data/excel/ExcelDataAdapterImpl.xml            |    50 +
 .../data/excel/ExcelDataAdapterService.java        |    96 +
 .../jasperreports/data/excel/ExcelFormatEnum.java  |    75 +
 .../data/excel/ExcelFormatFieldHandler.java        |    83 +
 .../sf/jasperreports/data/excel/package-info.java  |    27 +
 .../hibernate/HibernateConnectionProvider.java     |   199 +
 .../data/hibernate/HibernateDataAdapter.java       |    45 +
 .../data/hibernate/HibernateDataAdapterImpl.java   |    61 +
 .../data/hibernate/HibernateDataAdapterImpl.xml    |    23 +
 .../hibernate/HibernateDataAdapterService.java     |   159 +
 .../jasperreports/data/hibernate/package-info.java |    27 +
 .../spring/SpringHibernateDataAdapter.java         |    43 +
 .../spring/SpringHibernateDataAdapterImpl.java     |    52 +
 .../spring/SpringHibernateDataAdapterImpl.xml      |    20 +
 .../spring/SpringHibernateDataAdapterService.java  |   132 +
 .../data/hibernate/spring/package-info.java        |    27 +
 .../data/http/HttpDataConnection.java              |   136 +
 .../jasperreports/data/http/HttpDataLocation.java  |    48 +
 .../jasperreports/data/http/HttpDataService.java   |   349 +
 .../data/http/HttpLocationParameter.java           |    82 +
 .../sf/jasperreports/data/http/RequestMethod.java  |    40 +
 .../data/http/RequestMethodFieldHandler.java       |    66 +
 .../data/http/StandardHttpDataLocation.java        |   124 +
 .../data/http/StandardHttpDataLocation.xml         |    36 +
 .../jasperreports/data/jdbc/JdbcDataAdapter.java   |     3 +-
 .../data/jdbc/JdbcDataAdapterImpl.java             |     3 +-
 .../data/jdbc/JdbcDataAdapterImpl.xml              |     2 +-
 .../data/jdbc/JdbcDataAdapterService.java          |    71 +-
 .../sf/jasperreports/data/jdbc/package-info.java   |    27 +
 .../jasperreports/data/jndi/JndiDataAdapter.java   |     3 +-
 .../data/jndi/JndiDataAdapterImpl.java             |     3 +-
 .../data/jndi/JndiDataAdapterService.java          |    18 +-
 .../sf/jasperreports/data/jndi/package-info.java   |    27 +
 .../jasperreports/data/json/JsonDataAdapter.java   |    72 +
 .../data/json/JsonDataAdapterImpl-603.xml          |    35 +
 .../data/json/JsonDataAdapterImpl.java             |   126 +
 .../data/json/JsonDataAdapterImpl.xml              |    38 +
 .../data/json/JsonDataAdapterService.java          |   148 +
 .../sf/jasperreports/data/json/package-info.java   |    27 +
 .../data/mondrian/MondrianDataAdapter.java         |    36 +
 .../data/mondrian/MondrianDataAdapterImpl.java     |    47 +
 .../data/mondrian/MondrianDataAdapterImpl.xml      |    54 +
 .../data/mondrian/MondrianDataAdapterService.java  |    91 +
 .../data/mondrian/SimpleSQLDataSource.java         |    82 +
 .../jasperreports/data/mondrian/package-info.java  |    27 +
 src/net/sf/jasperreports/data/package-info.java    |    27 +
 .../provider/DataSourceProviderDataAdapter.java    |     3 +-
 .../DataSourceProviderDataAdapterImpl.java         |     3 +-
 .../DataSourceProviderDataAdapterService.java      |    56 +-
 .../jasperreports/data/provider/package-info.java  |    27 +
 .../data/qe/QueryExecuterDataAdapter.java          |     3 +-
 .../data/qe/QueryExecuterDataAdapterImpl.java      |     3 +-
 .../data/qe/QueryExecuterDataAdapterService.java   |    18 +-
 src/net/sf/jasperreports/data/qe/package-info.java |    27 +
 .../data/xls/AbstractXlsDataAdapterService.java    |   248 +
 .../data/xls/JxlDataAdapterService.java            |    80 +
 .../sf/jasperreports/data/xls/XlsDataAdapter.java  |    31 +-
 .../data/xls/XlsDataAdapterImpl-603.xml            |    38 +
 .../data/xls/XlsDataAdapterImpl-610.xml            |    41 +
 .../jasperreports/data/xls/XlsDataAdapterImpl.java |    66 +-
 .../jasperreports/data/xls/XlsDataAdapterImpl.xml  |    16 +-
 .../data/xls/XlsDataAdapterService.java            |   118 +-
 .../sf/jasperreports/data/xls/package-info.java    |    27 +
 .../jasperreports/data/xlsx/XlsxDataAdapter.java   |    36 +-
 .../data/xlsx/XlsxDataAdapterImpl-603.xml          |    38 +
 .../data/xlsx/XlsxDataAdapterImpl-610.xml          |    41 +
 .../data/xlsx/XlsxDataAdapterImpl.java             |    73 +-
 .../data/xlsx/XlsxDataAdapterImpl.xml              |    16 +-
 .../data/xlsx/XlsxDataAdapterService.java          |   115 +-
 .../sf/jasperreports/data/xlsx/package-info.java   |    27 +
 .../data/xml/RemoteXmlDataAdapter.java             |     4 +-
 .../data/xml/RemoteXmlDataAdapterImpl.java         |     8 +-
 .../data/xml/RemoteXmlDataAdapterImpl.xml          |     7 +-
 .../data/xml/RemoteXmlDataAdapterService.java      |    50 +-
 .../sf/jasperreports/data/xml/XmlDataAdapter.java  |    18 +-
 .../data/xml/XmlDataAdapterImpl-603.xml            |    38 +
 .../jasperreports/data/xml/XmlDataAdapterImpl.java |    45 +-
 .../jasperreports/data/xml/XmlDataAdapterImpl.xml  |    12 +-
 .../data/xml/XmlDataAdapterService.java            |    47 +-
 .../sf/jasperreports/data/xml/package-info.java    |    27 +
 .../jasperreports/data/xmla/XmlaDataAdapter.java   |    60 +
 .../data/xmla/XmlaDataAdapterImpl.java             |    98 +
 .../data/xmla/XmlaDataAdapterImpl.xml              |    41 +
 .../data/xmla/XmlaDataAdapterService.java          |   219 +
 .../sf/jasperreports/data/xmla/package-info.java   |    27 +
 .../sf/jasperreports/engine/BookmarkHelper.java    |   266 +
 .../sf/jasperreports/engine/BookmarkIterator.java  |    76 +
 .../sf/jasperreports/engine/CommonReturnValue.java |    62 +
 .../engine/CompositeDatasetFilter.java             |    11 +-
 src/net/sf/jasperreports/engine/DatasetFilter.java |     3 +-
 src/net/sf/jasperreports/engine/Deduplicable.java  |     3 +-
 .../engine/DefaultJasperReportsContext.java        |   308 +
 .../sf/jasperreports/engine/ElementDecorator.java  |    15 +-
 .../sf/jasperreports/engine/ElementsVisitor.java   |    41 +
 .../sf/jasperreports/engine/EvaluationType.java    |     3 +-
 .../engine/ExpressionReturnValue.java              |    40 +
 .../jasperreports/engine/ImageMapRenderable.java   |    55 +
 .../engine/JRAbstractChartCustomizer.java          |     3 +-
 .../jasperreports/engine/JRAbstractExporter.java   |  1218 +--
 .../engine/JRAbstractObjectFactory.java            |     3 +-
 .../jasperreports/engine/JRAbstractRenderer.java   |    61 +-
 .../jasperreports/engine/JRAbstractScriptlet.java  |    33 +-
 .../engine/JRAbstractSvgRenderer.java              |    72 +-
 src/net/sf/jasperreports/engine/JRAlignment.java   |    37 +-
 src/net/sf/jasperreports/engine/JRAnchor.java      |    12 +-
 src/net/sf/jasperreports/engine/JRBand.java        |    82 +-
 src/net/sf/jasperreports/engine/JRBox.java         |     3 +-
 .../sf/jasperreports/engine/JRBoxContainer.java    |     3 +-
 .../sf/jasperreports/engine/JRBoxPenProvider.java  |     3 +-
 src/net/sf/jasperreports/engine/JRBreak.java       |    48 +-
 src/net/sf/jasperreports/engine/JRChart.java       |    21 +-
 .../sf/jasperreports/engine/JRChartCustomizer.java |     3 +-
 .../sf/jasperreports/engine/JRChartDataset.java    |     3 +-
 src/net/sf/jasperreports/engine/JRChartPlot.java   |     5 +-
 src/net/sf/jasperreports/engine/JRChild.java       |     3 +-
 src/net/sf/jasperreports/engine/JRCloneable.java   |     3 +-
 .../sf/jasperreports/engine/JRCommonElement.java   |    54 +-
 .../engine/JRCommonGraphicElement.java             |    18 +-
 src/net/sf/jasperreports/engine/JRCommonImage.java |    89 +-
 .../sf/jasperreports/engine/JRCommonRectangle.java |    12 +-
 src/net/sf/jasperreports/engine/JRCommonText.java  |    72 +-
 .../jasperreports/engine/JRComponentElement.java   |     4 +-
 .../jasperreports/engine/JRConditionalStyle.java   |     3 +-
 src/net/sf/jasperreports/engine/JRConstants.java   |    66 +-
 src/net/sf/jasperreports/engine/JRDataSource.java  |     7 +-
 .../jasperreports/engine/JRDataSourceProvider.java |     3 +-
 src/net/sf/jasperreports/engine/JRDataset.java     |    52 +-
 .../jasperreports/engine/JRDatasetParameter.java   |     3 +-
 src/net/sf/jasperreports/engine/JRDatasetRun.java  |    37 +-
 .../jasperreports/engine/JRDefaultScriptlet.java   |     3 +-
 .../engine/JRDefaultStyleProvider.java             |     3 +-
 src/net/sf/jasperreports/engine/JRElement.java     |   203 +-
 .../sf/jasperreports/engine/JRElementDataset.java  |     3 +-
 .../sf/jasperreports/engine/JRElementGroup.java    |    19 +-
 src/net/sf/jasperreports/engine/JREllipse.java     |     8 +-
 .../sf/jasperreports/engine/JREmptyDataSource.java |    10 +-
 src/net/sf/jasperreports/engine/JREvaluation.java  |    88 +
 src/net/sf/jasperreports/engine/JRException.java   |   126 +-
 src/net/sf/jasperreports/engine/JRExporter.java    |    36 +-
 .../jasperreports/engine/JRExporterParameter.java  |   118 +-
 src/net/sf/jasperreports/engine/JRExpression.java  |   120 +-
 .../sf/jasperreports/engine/JRExpressionChunk.java |     3 +-
 .../engine/JRExpressionCollector.java              |   334 +-
 src/net/sf/jasperreports/engine/JRField.java       |    51 +-
 src/net/sf/jasperreports/engine/JRFont.java        |    35 +-
 src/net/sf/jasperreports/engine/JRFrame.java       |    38 +-
 .../sf/jasperreports/engine/JRGenericElement.java  |    96 +-
 .../engine/JRGenericElementParameter.java          |     3 +-
 .../jasperreports/engine/JRGenericElementType.java |     3 +-
 .../engine/JRGenericPrintElement.java              |     3 +-
 .../sf/jasperreports/engine/JRGraphicElement.java  |     3 +-
 src/net/sf/jasperreports/engine/JRGroup.java       |   108 +-
 src/net/sf/jasperreports/engine/JRHyperlink.java   |   180 +-
 .../sf/jasperreports/engine/JRHyperlinkHelper.java |    28 +-
 .../jasperreports/engine/JRHyperlinkParameter.java |     3 +-
 .../sf/jasperreports/engine/JRIdentifiable.java    |    40 +
 src/net/sf/jasperreports/engine/JRImage.java       |   127 +-
 .../sf/jasperreports/engine/JRImageAlignment.java  |    66 +
 .../jasperreports/engine/JRImageMapRenderer.java   |     4 +-
 .../sf/jasperreports/engine/JRImageRenderer.java   |   313 +-
 src/net/sf/jasperreports/engine/JRLine.java        |    22 +-
 src/net/sf/jasperreports/engine/JRLineBox.java     |    28 +-
 src/net/sf/jasperreports/engine/JROrigin.java      |     4 +-
 src/net/sf/jasperreports/engine/JRParagraph.java   |    62 +-
 .../jasperreports/engine/JRParagraphContainer.java |     3 +-
 src/net/sf/jasperreports/engine/JRParameter.java   |   196 +-
 src/net/sf/jasperreports/engine/JRPart.java        |    73 +
 src/net/sf/jasperreports/engine/JRPen.java         |    21 +-
 .../sf/jasperreports/engine/JRPenContainer.java    |     3 +-
 src/net/sf/jasperreports/engine/JRPrintAnchor.java |     3 +-
 .../jasperreports/engine/JRPrintAnchorIndex.java   |     3 +-
 .../sf/jasperreports/engine/JRPrintElement.java    |    24 +-
 .../engine/JRPrintElementContainer.java            |     3 +-
 .../jasperreports/engine/JRPrintElementIndex.java  |     3 +-
 .../sf/jasperreports/engine/JRPrintEllipse.java    |     3 +-
 src/net/sf/jasperreports/engine/JRPrintFrame.java  |     3 +-
 .../engine/JRPrintGraphicElement.java              |     3 +-
 .../sf/jasperreports/engine/JRPrintHyperlink.java  |     5 +-
 .../engine/JRPrintHyperlinkParameter.java          |    28 +-
 .../engine/JRPrintHyperlinkParameters.java         |    33 +-
 src/net/sf/jasperreports/engine/JRPrintImage.java  |    19 +-
 .../sf/jasperreports/engine/JRPrintImageArea.java  |    34 +-
 .../engine/JRPrintImageAreaHyperlink.java          |     5 +-
 src/net/sf/jasperreports/engine/JRPrintLine.java   |     3 +-
 src/net/sf/jasperreports/engine/JRPrintPage.java   |     3 +-
 .../sf/jasperreports/engine/JRPrintRectangle.java  |     3 +-
 src/net/sf/jasperreports/engine/JRPrintText.java   |    24 +-
 .../jasperreports/engine/JRPropertiesHolder.java   |     3 +-
 .../sf/jasperreports/engine/JRPropertiesMap.java   |    39 +-
 .../sf/jasperreports/engine/JRPropertiesUtil.java  |   938 ++
 .../jasperreports/engine/JRPropertyExpression.java |     5 +-
 src/net/sf/jasperreports/engine/JRQuery.java       |     7 +-
 src/net/sf/jasperreports/engine/JRQueryChunk.java  |    14 +-
 src/net/sf/jasperreports/engine/JRRectangle.java   |     3 +-
 src/net/sf/jasperreports/engine/JRRenderable.java  |    47 +-
 src/net/sf/jasperreports/engine/JRReport.java      |   252 +-
 .../sf/jasperreports/engine/JRReportTemplate.java  |     5 +-
 .../engine/JRResultSetDataSource.java              |   175 +-
 .../engine/JRRewindableDataSource.java             |     3 +-
 .../jasperreports/engine/JRRuntimeException.java   |   127 +-
 src/net/sf/jasperreports/engine/JRScriptlet.java   |     3 +-
 .../jasperreports/engine/JRScriptletException.java |    18 +-
 src/net/sf/jasperreports/engine/JRSection.java     |   107 +-
 .../sf/jasperreports/engine/JRSimpleTemplate.java  |    11 +-
 src/net/sf/jasperreports/engine/JRSortField.java   |    27 +-
 src/net/sf/jasperreports/engine/JRStaticText.java  |    11 +-
 src/net/sf/jasperreports/engine/JRStyle.java       |   253 +-
 .../sf/jasperreports/engine/JRStyleContainer.java  |     3 +-
 src/net/sf/jasperreports/engine/JRStyleSetter.java |     3 +-
 .../engine/JRStyledTextAttributeSelector.java      |   115 +-
 src/net/sf/jasperreports/engine/JRSubreport.java   |   218 +-
 .../jasperreports/engine/JRSubreportParameter.java |     3 +-
 .../engine/JRSubreportReturnValue.java             |    64 +-
 src/net/sf/jasperreports/engine/JRTemplate.java    |    91 +-
 .../jasperreports/engine/JRTemplateReference.java  |     3 +-
 .../sf/jasperreports/engine/JRTextAlignment.java   |    66 +
 src/net/sf/jasperreports/engine/JRTextElement.java |    20 +-
 src/net/sf/jasperreports/engine/JRTextField.java   |   202 +-
 .../sf/jasperreports/engine/JRValueParameter.java  |     3 +-
 src/net/sf/jasperreports/engine/JRVariable.java    |   181 +-
 .../sf/jasperreports/engine/JRVirtualizable.java   |     3 +-
 .../engine/JRVirtualizationHelper.java             |    41 +-
 src/net/sf/jasperreports/engine/JRVirtualizer.java |     3 +-
 src/net/sf/jasperreports/engine/JRVisitable.java   |     3 +-
 src/net/sf/jasperreports/engine/JRVisitor.java     |     3 +-
 .../engine/JRWrappingSvgRenderer.java              |    56 +-
 .../jasperreports/engine/JasperCompileManager.java |   521 +-
 .../jasperreports/engine/JasperExportManager.java  |   302 +-
 .../sf/jasperreports/engine/JasperFillManager.java |   535 +-
 src/net/sf/jasperreports/engine/JasperPrint.java   |   193 +-
 .../jasperreports/engine/JasperPrintManager.java   |   316 +-
 src/net/sf/jasperreports/engine/JasperReport.java  |    17 +-
 .../jasperreports/engine/JasperReportsContext.java |    80 +
 .../sf/jasperreports/engine/JasperRunManager.java  |   574 +-
 .../jasperreports/engine/ParameterContributor.java |     8 +-
 .../engine/ParameterContributorContext.java        |    32 +-
 .../engine/ParameterContributorFactory.java        |     3 +-
 src/net/sf/jasperreports/engine/PrintBookmark.java |    48 +
 .../sf/jasperreports/engine/PrintElementId.java    |   108 +
 .../jasperreports/engine/PrintElementVisitor.java  |     3 +-
 .../sf/jasperreports/engine/PrintPageFormat.java   |    71 +
 src/net/sf/jasperreports/engine/PrintPart.java     |    37 +
 src/net/sf/jasperreports/engine/PrintParts.java    |    55 +
 src/net/sf/jasperreports/engine/Renderable.java    |    83 +
 .../sf/jasperreports/engine/RenderableUtil.java    |   440 +
 src/net/sf/jasperreports/engine/ReportContext.java |     5 +-
 src/net/sf/jasperreports/engine/ReturnValue.java   |    34 +
 .../engine/SimpleJasperReportsContext.java         |   301 +
 .../engine/SimplePrintPageFormat.java              |   159 +
 .../sf/jasperreports/engine/SimplePrintPart.java   |    82 +
 .../jasperreports/engine/SimpleReportContext.java  |    71 +
 src/net/sf/jasperreports/engine/TabStop.java       |     3 +-
 .../jasperreports/engine/VariableReturnValue.java  |    42 +
 .../jasperreports/engine/analytics/data/Axis.java  |    53 +
 .../engine/analytics/data/AxisLevel.java           |    50 +
 .../engine/analytics/data/AxisLevelNode.java       |    46 +
 .../analytics/data/MappedPropertyValues.java       |    78 +
 .../engine/analytics/data/Measure.java             |    38 +
 .../engine/analytics/data/MeasureValue.java        |    38 +
 .../engine/analytics/data/MultiAxisDataSource.java |    42 +
 .../engine/analytics/data/PropertyValues.java      |    38 +
 .../engine/analytics/data/StandardAxisLevel.java   |   112 +
 .../engine/analytics/data/StandardMeasure.java     |    73 +
 .../analytics/data/StandardMeasureValue.java       |    78 +
 .../engine/analytics/dataset/BaseDataAxis.java     |    95 +
 .../analytics/dataset/BaseDataAxisLevel.java       |    96 +
 .../analytics/dataset/BaseDataLevelBucket.java     |   185 +
 .../dataset/BaseDataLevelBucketProperty.java       |    85 +
 .../engine/analytics/dataset/BaseDataMeasure.java  |   191 +
 .../analytics/dataset/BaseMultiAxisData.java       |   175 +
 .../analytics/dataset/BaseMultiAxisDataset.java    |    50 +
 .../engine/analytics/dataset/BucketOrder.java      |   125 +
 .../engine/analytics/dataset/DataAxis.java         |    41 +
 .../engine/analytics/dataset/DataAxisLevel.java    |    41 +
 .../engine/analytics/dataset/DataLevelBucket.java  |   112 +
 .../analytics/dataset/DataLevelBucketProperty.java |    39 +
 .../engine/analytics/dataset/DataMeasure.java      |    52 +
 .../engine/analytics/dataset/DesignDataAxis.java   |    83 +
 .../analytics/dataset/DesignDataAxisLevel.java     |    81 +
 .../analytics/dataset/DesignDataLevelBucket.java   |   182 +
 .../dataset/DesignDataLevelBucketProperty.java     |    84 +
 .../analytics/dataset/DesignDataMeasure.java       |   107 +
 .../analytics/dataset/DesignMultiAxisData.java     |    99 +
 .../analytics/dataset/DesignMultiAxisDataset.java  |    49 +
 .../analytics/dataset/FillMultiAxisData.java       |    54 +
 .../analytics/dataset/FillMultiAxisDataset.java    |   119 +
 .../engine/analytics/dataset/MultiAxisData.java    |    45 +
 .../analytics/dataset/MultiAxisDataService.java    |   796 ++
 .../engine/analytics/dataset/MultiAxisDataset.java |    36 +
 .../engine/base/BaseCommonReturnValue.java         |   122 +
 .../engine/base/BaseExpressionReturnValue.java     |    77 +
 .../engine/base/BasePrintBookmark.java             |   113 +
 .../jasperreports/engine/base/BaseReturnValue.java |    73 +
 .../sf/jasperreports/engine/base/JRBaseBand.java   |    52 +-
 .../sf/jasperreports/engine/base/JRBaseBox.java    |     3 +-
 .../engine/base/JRBaseBoxBottomPen.java            |     3 +-
 .../engine/base/JRBaseBoxLeftPen.java              |     3 +-
 .../sf/jasperreports/engine/base/JRBaseBoxPen.java |     3 +-
 .../engine/base/JRBaseBoxRightPen.java             |     3 +-
 .../jasperreports/engine/base/JRBaseBoxTopPen.java |     3 +-
 .../sf/jasperreports/engine/base/JRBaseBreak.java  |     4 +-
 .../sf/jasperreports/engine/base/JRBaseChart.java  |    29 +-
 .../engine/base/JRBaseChartDataset.java            |     3 +-
 .../jasperreports/engine/base/JRBaseChartPlot.java |    12 +-
 .../engine/base/JRBaseComponentElement.java        |    18 +-
 .../engine/base/JRBaseConditionalStyle.java        |    20 +-
 .../jasperreports/engine/base/JRBaseDataset.java   |    17 +-
 .../engine/base/JRBaseDatasetParameter.java        |     3 +-
 .../engine/base/JRBaseDatasetRun.java              |    63 +-
 .../jasperreports/engine/base/JRBaseElement.java   |    34 +-
 .../engine/base/JRBaseElementDataset.java          |    14 +-
 .../engine/base/JRBaseElementGroup.java            |     9 +-
 .../jasperreports/engine/base/JRBaseEllipse.java   |     3 +-
 .../engine/base/JRBaseExpression.java              |     3 +-
 .../engine/base/JRBaseExpressionChunk.java         |     3 +-
 .../sf/jasperreports/engine/base/JRBaseField.java  |     3 +-
 .../sf/jasperreports/engine/base/JRBaseFont.java   |    92 +-
 .../sf/jasperreports/engine/base/JRBaseFrame.java  |    20 +-
 .../engine/base/JRBaseGenericElement.java          |     4 +-
 .../engine/base/JRBaseGenericElementParameter.java |     3 +-
 .../engine/base/JRBaseGenericPrintElement.java     |     3 +-
 .../engine/base/JRBaseGraphicElement.java          |     4 +-
 .../sf/jasperreports/engine/base/JRBaseGroup.java  |    12 +-
 .../jasperreports/engine/base/JRBaseHyperlink.java |    12 +-
 .../engine/base/JRBaseHyperlinkParameter.java      |     3 +-
 .../sf/jasperreports/engine/base/JRBaseImage.java  |   144 +-
 .../sf/jasperreports/engine/base/JRBaseLine.java   |     4 +-
 .../jasperreports/engine/base/JRBaseLineBox.java   |     3 +-
 .../engine/base/JRBaseObjectFactory.java           |   251 +-
 .../jasperreports/engine/base/JRBaseParagraph.java |     3 +-
 .../jasperreports/engine/base/JRBaseParameter.java |     3 +-
 .../sf/jasperreports/engine/base/JRBasePart.java   |   193 +
 .../sf/jasperreports/engine/base/JRBasePen.java    |     4 +-
 .../engine/base/JRBasePrintElement.java            |    40 +-
 .../engine/base/JRBasePrintEllipse.java            |     3 +-
 .../engine/base/JRBasePrintFrame.java              |     4 +-
 .../engine/base/JRBasePrintGraphicElement.java     |     4 +-
 .../engine/base/JRBasePrintHyperlink.java          |     4 +-
 .../engine/base/JRBasePrintImage.java              |   152 +-
 .../jasperreports/engine/base/JRBasePrintLine.java |     4 +-
 .../jasperreports/engine/base/JRBasePrintPage.java |     6 +-
 .../engine/base/JRBasePrintRectangle.java          |     3 +-
 .../jasperreports/engine/base/JRBasePrintText.java |   236 +-
 .../engine/base/JRBasePropertyExpression.java      |     6 +-
 .../sf/jasperreports/engine/base/JRBaseQuery.java  |     3 +-
 .../engine/base/JRBaseQueryChunk.java              |    13 +-
 .../jasperreports/engine/base/JRBaseRectangle.java |     3 +-
 .../sf/jasperreports/engine/base/JRBaseReport.java |   106 +-
 .../engine/base/JRBaseReportTemplate.java          |     3 +-
 .../jasperreports/engine/base/JRBaseScriptlet.java |     3 +-
 .../jasperreports/engine/base/JRBaseSection.java   |    25 +-
 .../jasperreports/engine/base/JRBaseSortField.java |     4 +-
 .../engine/base/JRBaseStaticText.java              |     3 +-
 .../sf/jasperreports/engine/base/JRBaseStyle.java  |   295 +-
 .../jasperreports/engine/base/JRBaseSubreport.java |    23 +-
 .../engine/base/JRBaseSubreportParameter.java      |     3 +-
 .../engine/base/JRBaseSubreportReturnValue.java    |    35 +-
 .../engine/base/JRBaseTextElement.java             |   192 +-
 .../jasperreports/engine/base/JRBaseTextField.java |    17 +-
 .../jasperreports/engine/base/JRBaseVariable.java  |     4 +-
 src/net/sf/jasperreports/engine/base/JRBoxPen.java |     3 +-
 .../engine/base/JRVirtualPrintPage.java            |    65 +-
 .../engine/base/StandardPrintParts.java            |   134 +
 .../engine/base/VirtualElementsData.java           |   114 +-
 .../engine/base/VirtualizableElementList.java      |   321 +-
 .../engine/base/VirtualizablePageElements.java     |    36 +
 .../sf/jasperreports/engine/base/package-info.java |    29 +
 src/net/sf/jasperreports/engine/base/package.html  |    13 -
 .../engine/component/BaseComponentContext.java     |     3 +-
 .../engine/component/BaseFillComponent.java        |    26 +-
 .../jasperreports/engine/component/Component.java  |     3 +-
 .../engine/component/ComponentCompiler.java        |     3 +-
 .../engine/component/ComponentContext.java         |     3 +-
 .../engine/component/ComponentDesignConverter.java |     3 +-
 .../engine/component/ComponentFillFactory.java     |     3 +-
 .../engine/component/ComponentKey.java             |     3 +-
 .../engine/component/ComponentManager.java         |    15 +-
 .../engine/component/ComponentXmlWriter.java       |    15 +-
 .../engine/component/ComponentsBundle.java         |     5 +-
 .../engine/component/ComponentsEnvironment.java    |   105 +-
 .../engine/component/ComponentsXmlParser.java      |     3 +-
 .../ConditionalStyleAwareFillComponent.java        |    40 +
 .../engine/component/ContextAwareComponent.java    |     3 +-
 .../engine/component/DefaultComponentManager.java  |    22 +-
 .../component/DefaultComponentXmlParser.java       |     3 +-
 .../engine/component/DefaultComponentsBundle.java  |    11 +-
 .../engine/component/FillComponent.java            |     3 +-
 .../engine/component/FillContext.java              |    19 +-
 .../engine/component/FillPrepareResult.java        |     3 +-
 .../engine/component/StretchableFillComponent.java |    38 +
 .../engine/component/XmlDigesterConfigurer.java    |     3 +-
 .../engine/component/package-info.java             |    27 +
 .../engine/convert/ChartConverter.java             |    22 +-
 .../engine/convert/ComponentElementConverter.java  |    17 +-
 .../engine/convert/ConvertChartContext.java        |    18 +-
 .../engine/convert/ConvertVisitor.java             |    14 +-
 .../engine/convert/CrosstabConverter.java          |    29 +-
 .../engine/convert/ElementConverter.java           |     7 +-
 .../engine/convert/ElementIconConverter.java       |    14 +-
 .../engine/convert/EllipseConverter.java           |     3 +-
 .../engine/convert/FrameConverter.java             |     3 +-
 .../engine/convert/GenericElementConverter.java    |     3 +-
 .../engine/convert/ImageConverter.java             |    28 +-
 .../engine/convert/LineConverter.java              |     3 +-
 .../engine/convert/RectangleConverter.java         |     3 +-
 .../engine/convert/ReportConverter.java            |    87 +-
 .../engine/convert/StaticTextConverter.java        |     6 +-
 .../engine/convert/SubreportConverter.java         |     3 +-
 .../engine/convert/TextElementConverter.java       |    58 +-
 .../engine/convert/TextFieldConverter.java         |     6 +-
 .../engine/data/AbstractPoiXlsDataSource.java      |   491 +
 .../engine/data/AbstractXlsDataSource.java         |   194 +
 .../engine/data/AbstractXmlDataSource.java         |     3 +-
 .../jasperreports/engine/data/ExcelDataSource.java |   202 +
 .../engine/data/IndexedDataSource.java             |    48 +
 .../engine/data/JRAbstractBeanDataSource.java      |    31 +-
 .../data/JRAbstractBeanDataSourceProvider.java     |    11 +-
 .../engine/data/JRAbstractTextDataSource.java      |    74 +-
 .../engine/data/JRBeanArrayDataSource.java         |    12 +-
 .../engine/data/JRBeanCollectionDataSource.java    |    12 +-
 .../jasperreports/engine/data/JRCsvDataSource.java |   139 +-
 .../engine/data/JRCsvDataSourceProvider.java       |    10 +-
 .../engine/data/JRHibernateAbstractDataSource.java |    36 +-
 .../engine/data/JRHibernateIterateDataSource.java  |     3 +-
 .../engine/data/JRHibernateListDataSource.java     |     3 +-
 .../engine/data/JRHibernateScrollDataSource.java   |     3 +-
 .../jasperreports/engine/data/JRJpaDataSource.java |    16 +-
 .../engine/data/JRMapArrayDataSource.java          |     3 +-
 .../engine/data/JRMapCollectionDataSource.java     |     3 +-
 .../engine/data/JRSortableDataSource.java          |    23 +-
 .../engine/data/JRTableModelDataSource.java        |     9 +-
 .../jasperreports/engine/data/JRXlsDataSource.java |   265 +-
 .../engine/data/JRXlsxDataSource.java              |   346 +-
 .../jasperreports/engine/data/JRXmlDataSource.java |   230 +-
 .../engine/data/JaxenXmlDataSource.java            |    18 +-
 src/net/sf/jasperreports/engine/data/JsonData.java |    39 +
 .../engine/data/JsonDataCollection.java            |    55 +
 .../jasperreports/engine/data/JsonDataSource.java  |   471 +
 .../engine/data/JsonDataSourceProvider.java        |    63 +
 .../engine/data/ListOfArrayDataSource.java         |    25 +-
 .../engine/data/TextDataSourceAttributes.java      |   112 +
 .../engine/data/XalanXmlDataSource.java            |    18 +-
 .../jasperreports/engine/data/XlsDataSource.java   |   110 +
 .../sf/jasperreports/engine/data/package-info.java |   369 +
 src/net/sf/jasperreports/engine/data/package.html  |    13 -
 .../engine/design/DesignCommonReturnValue.java     |   111 +
 .../engine/design/DesignExpressionReturnValue.java |    80 +
 .../engine/design/DesignReturnValue.java           |    76 +
 .../engine/design/DesignStyleContainer.java        |     3 +-
 .../engine/design/JRAbstractClassCompiler.java     |    23 +-
 .../engine/design/JRAbstractCompiler.java          |    70 +-
 .../engine/design/JRAbstractJavaCompiler.java      |    36 +-
 .../design/JRAbstractMultiClassCompiler.java       |    22 +-
 .../design/JRAbstractSingleClassCompiler.java      |    20 +-
 .../engine/design/JRClassCompiler.java             |     3 +-
 .../engine/design/JRClassGenerator.java            |   216 +-
 .../engine/design/JRCompilationSourceCode.java     |     3 +-
 .../engine/design/JRCompilationUnit.java           |     3 +-
 .../sf/jasperreports/engine/design/JRCompiler.java |   107 +-
 .../design/JRDefaultCompilationSourceCode.java     |     3 +-
 .../jasperreports/engine/design/JRDesignBand.java  |    95 +-
 .../jasperreports/engine/design/JRDesignBreak.java |     4 +-
 .../jasperreports/engine/design/JRDesignChart.java |    33 +-
 .../engine/design/JRDesignChartDataset.java        |     3 +-
 .../engine/design/JRDesignComponentElement.java    |    26 +-
 .../engine/design/JRDesignConditionalStyle.java    |     3 +-
 .../engine/design/JRDesignDataset.java             |   153 +-
 .../engine/design/JRDesignDatasetParameter.java    |     3 +-
 .../engine/design/JRDesignDatasetRun.java          |    65 +-
 .../engine/design/JRDesignElement.java             |    23 +-
 .../engine/design/JRDesignElementDataset.java      |     5 +-
 .../engine/design/JRDesignElementGroup.java        |    10 +-
 .../engine/design/JRDesignEllipse.java             |     3 +-
 .../engine/design/JRDesignExpression.java          |   236 +-
 .../engine/design/JRDesignExpressionChunk.java     |     3 +-
 .../jasperreports/engine/design/JRDesignField.java |     3 +-
 .../jasperreports/engine/design/JRDesignFont.java  |     3 +-
 .../jasperreports/engine/design/JRDesignFrame.java |    35 +-
 .../engine/design/JRDesignGenericElement.java      |     4 +-
 .../design/JRDesignGenericElementParameter.java    |     3 +-
 .../engine/design/JRDesignGraphicElement.java      |     4 +-
 .../jasperreports/engine/design/JRDesignGroup.java |     3 +-
 .../engine/design/JRDesignHyperlink.java           |    18 +-
 .../engine/design/JRDesignHyperlinkParameter.java  |     3 +-
 .../jasperreports/engine/design/JRDesignImage.java |   148 +-
 .../jasperreports/engine/design/JRDesignLine.java  |     4 +-
 .../engine/design/JRDesignParameter.java           |     9 +-
 .../jasperreports/engine/design/JRDesignPart.java  |   119 +
 .../engine/design/JRDesignPropertyExpression.java  |     3 +-
 .../jasperreports/engine/design/JRDesignQuery.java |    79 +-
 .../engine/design/JRDesignQueryChunk.java          |    18 +-
 .../engine/design/JRDesignRectangle.java           |     3 +-
 .../engine/design/JRDesignReportTemplate.java      |     3 +-
 .../engine/design/JRDesignScriptlet.java           |     3 +-
 .../engine/design/JRDesignSection.java             |    87 +-
 .../engine/design/JRDesignSortField.java           |     3 +-
 .../engine/design/JRDesignStaticText.java          |     3 +-
 .../jasperreports/engine/design/JRDesignStyle.java |     5 +-
 .../engine/design/JRDesignSubreport.java           |    29 +-
 .../engine/design/JRDesignSubreportParameter.java  |     3 +-
 .../design/JRDesignSubreportReturnValue.java       |    11 +-
 .../engine/design/JRDesignTextElement.java         |   186 +-
 .../engine/design/JRDesignTextField.java           |    24 +-
 .../engine/design/JRDesignVariable.java            |     5 +-
 .../engine/design/JRJavacCompiler.java             |    26 +-
 .../engine/design/JRJdk13Compiler.java             |    27 +-
 .../jasperreports/engine/design/JRJdtCompiler.java |   614 +-
 .../engine/design/JRJikesCompiler.java             |    94 -
 .../engine/design/JRMultiClassCompiler.java        |     3 +-
 .../engine/design/JRReportCompileData.java         |    21 +-
 .../engine/design/JRSourceCompileTask.java         |     9 +-
 .../engine/design/JRValidationException.java       |     3 +-
 .../engine/design/JRValidationFault.java           |     3 +-
 .../sf/jasperreports/engine/design/JRVerifier.java |   288 +-
 .../jasperreports/engine/design/JasperDesign.java  |   109 +-
 .../design/events/CollectionChangeListener.java    |     3 +-
 .../design/events/CollectionElementAddedEvent.java |     3 +-
 .../events/CollectionElementRemovedEvent.java      |     3 +-
 .../design/events/CollectionListenerAdapter.java   |     3 +-
 .../design/events/JRChangeEventsSupport.java       |     3 +-
 .../design/events/JRPropertyChangeSupport.java     |     3 +-
 .../design/events/PropagationChangeListener.java   |     3 +-
 .../jasperreports/engine/design/package-info.java  |    30 +
 .../sf/jasperreports/engine/design/package.html    |    13 -
 .../sf/jasperreports/engine/dtds/jasperprint.xsd   |    77 +
 .../sf/jasperreports/engine/dtds/jasperreport.xsd  |   644 +-
 .../jasperreports/engine/dtds/jaspertemplate.dtd   |     4 +
 .../engine/export/AbstractExporterNature.java      |    90 +
 .../engine/export/AbstractHtmlExporter.java        |   191 +
 .../engine/export/AbstractPdfTextRenderer.java     |   136 +
 .../engine/export/AbstractTextRenderer.java        |    37 +-
 .../engine/export/AwtTextRenderer.java             |    29 +-
 src/net/sf/jasperreports/engine/export/Cut.java    |    67 +-
 .../sf/jasperreports/engine/export/CutsInfo.java   |   128 +-
 .../engine/export/DefaultElementHandlerBundle.java |    10 +-
 .../export/DefaultExporterFilterFactory.java       |    29 +-
 .../export/DefaultHyperlinkProducerFactory.java    |    21 +-
 .../DefaultHyperlinkTargetProducerFactory.java     |    21 +-
 .../engine/export/ElementGridCell.java             |   128 +-
 .../engine/export/ElementKeyExporterFilter.java    |    32 +-
 .../export/ElementKeyExporterFilterFactory.java    |    53 +-
 .../engine/export/ElementReplacementGridCell.java  |    89 +
 .../engine/export/ElementWrapper.java              |    98 -
 .../jasperreports/engine/export/EmptyGridCell.java |    52 +-
 .../engine/export/ExporterFilter.java              |     3 +-
 .../engine/export/ExporterFilterContainer.java     |    23 +-
 .../engine/export/ExporterFilterFactory.java       |     3 +-
 .../engine/export/ExporterFilterFactoryUtil.java   |    25 +-
 .../engine/export/ExporterNature.java              |    40 +-
 .../engine/export/FileHtmlResourceHandler.java     |   125 +
 .../engine/export/FlashHtmlHandler.java            |     5 +-
 .../engine/export/FlashPrintElement.java           |    44 +-
 .../sf/jasperreports/engine/export/FontKey.java    |    99 -
 .../engine/export/GenericElementCsvHandler.java    |    44 +
 .../export/GenericElementGraphics2DHandler.java    |     3 +-
 .../engine/export/GenericElementHandler.java       |     3 +-
 .../engine/export/GenericElementHandlerBundle.java |     3 +-
 .../export/GenericElementHandlerEnviroment.java    |    85 +-
 .../engine/export/GenericElementHtmlHandler.java   |     3 +-
 .../export/GenericElementJExcelApiHandler.java     |    16 +-
 .../GenericElementJExcelApiMetadataHandler.java    |     5 +-
 .../engine/export/GenericElementJsonHandler.java   |    45 +
 .../engine/export/GenericElementPdfHandler.java    |     3 +-
 .../export/GenericElementReportTransformer.java    |    40 +-
 .../engine/export/GenericElementRtfHandler.java    |     3 +-
 .../engine/export/GenericElementTransformer.java   |     3 +-
 .../export/GenericElementTransformerContext.java   |     6 +-
 .../engine/export/GenericElementXlsHandler.java    |     3 +-
 .../export/GenericElementXlsMetadataHandler.java   |    71 +
 .../engine/export/GenericElementXmlHandler.java    |     3 +-
 .../export/GenericElementsFilterDecorator.java     |    74 +
 src/net/sf/jasperreports/engine/export/Grid.java   |    88 +
 .../jasperreports/engine/export/GridCellSize.java  |    88 +
 .../jasperreports/engine/export/GridCellStyle.java |    93 +
 .../sf/jasperreports/engine/export/GridRow.java    |    56 +
 .../jasperreports/engine/export/HtmlExporter.java  |  2630 +++++
 .../HtmlExporterHyperlinkProducerAdapter.java      |     6 +-
 .../sf/jasperreports/engine/export/HtmlFont.java   |   261 +
 .../jasperreports/engine/export/HtmlFontUtil.java  |   142 +
 .../engine/export/HtmlResourceHandler.java         |    42 +
 .../engine/export/HyperlinkURLResolver.java        |    36 +
 .../jasperreports/engine/export/HyperlinkUtil.java |    75 +
 .../engine/export/JExcelApiExporter.java           |  1287 ++-
 .../engine/export/JExcelApiExporterContext.java    |     5 +-
 .../engine/export/JExcelApiExporterNature.java     |    31 +-
 .../engine/export/JExcelApiExporterParameter.java  |    14 +-
 .../engine/export/JExcelApiLocalHyperlinkInfo.java |    90 +
 .../engine/export/JExcelApiMetadataExporter.java   |  1071 +-
 .../engine/export/JRAbstractCsvExporter.java       |   281 +-
 .../jasperreports/engine/export/JRCsvExporter.java |   169 +-
 .../engine/export/JRCsvExporterContext.java        |    35 +
 .../engine/export/JRCsvExporterNature.java         |    83 +-
 .../engine/export/JRCsvExporterParameter.java      |    30 +-
 .../engine/export/JRCsvMetadataExporter.java       |   331 +-
 .../export/JRCsvMetadataExporterParameter.java     |    56 +-
 .../engine/export/JRExportProgressMonitor.java     |     3 +-
 .../engine/export/JRExporterContext.java           |    45 +-
 .../engine/export/JRExporterGridCell.java          |   116 +-
 .../engine/export/JRGraphics2DExporter.java        |   330 +-
 .../engine/export/JRGraphics2DExporterContext.java |     3 +-
 .../export/JRGraphics2DExporterParameter.java      |    26 +-
 .../jasperreports/engine/export/JRGridLayout.java  |   603 +-
 .../engine/export/JRHtmlExporter.java              |  1484 ++-
 .../engine/export/JRHtmlExporterConfiguration.java |    61 +
 .../engine/export/JRHtmlExporterContext.java       |    12 +-
 .../engine/export/JRHtmlExporterHelper.java        |     6 +-
 .../engine/export/JRHtmlExporterNature.java        |    75 +-
 .../engine/export/JRHtmlExporterParameter.java     |   138 +-
 .../engine/export/JRHtmlReportConfiguration.java   |    65 +
 .../engine/export/JRHyperlinkProducer.java         |     3 +-
 .../engine/export/JRHyperlinkProducerFactory.java  |     5 +-
 .../export/JRHyperlinkProducerMapFactory.java      |     3 +-
 .../engine/export/JRHyperlinkTargetProducer.java   |     3 +-
 .../export/JRHyperlinkTargetProducerFactory.java   |     3 +-
 .../JRHyperlinkTargetProducerMapFactory.java       |     3 +-
 .../engine/export/JROriginExporterFilter.java      |   155 +-
 .../export/JROriginExporterFilterFactory.java      |    30 +-
 .../jasperreports/engine/export/JRPdfExporter.java |  1596 +--
 .../engine/export/JRPdfExporterContext.java        |     7 +-
 .../engine/export/JRPdfExporterParameter.java      |   292 +-
 .../engine/export/JRPdfExporterTagHelper.java      |   183 +-
 .../engine/export/JRPrintServiceExporter.java      |   317 +-
 .../export/JRPrintServiceExporterParameter.java    |    19 +-
 .../jasperreports/engine/export/JRRtfExporter.java |   988 +-
 .../engine/export/JRRtfExporterContext.java        |     6 +-
 .../engine/export/JRTextExporter.java              |   436 +-
 .../engine/export/JRTextExporterContext.java       |    36 +
 .../engine/export/JRTextExporterParameter.java     |    54 +-
 .../engine/export/JRXhtmlExporter.java             |  1423 +--
 .../engine/export/JRXlsAbstractExporter.java       |  1610 +--
 .../engine/export/JRXlsAbstractExporterNature.java |   253 +-
 .../export/JRXlsAbstractExporterParameter.java     |   219 +-
 .../export/JRXlsAbstractMetadataExporter.java      |   365 +-
 .../JRXlsAbstractMetadataExporterParameter.java    |    56 +-
 .../jasperreports/engine/export/JRXlsExporter.java |  1584 +--
 .../engine/export/JRXlsExporterContext.java        |     6 +-
 .../engine/export/JRXlsExporterNature.java         |    28 +-
 .../engine/export/JRXlsExporterParameter.java      |     7 +-
 .../engine/export/JRXlsMetadataExporter.java       |  2257 ++++
 .../engine/export/JRXlsMetadataExporterNature.java |    59 +
 .../engine/export/JRXml4SwfExporter.java           |    39 +-
 .../jasperreports/engine/export/JRXmlExporter.java |   570 +-
 .../engine/export/JRXmlExporterContext.java        |     6 +-
 .../engine/export/JRXmlExporterParameter.java      |    18 +-
 .../jasperreports/engine/export/JsonExporter.java  |   567 +
 .../engine/export/JsonExporterContext.java         |    36 +
 .../engine/export/JsonExporterParameter.java       |    53 +
 .../engine/export/JsonMetadataExporter.java        |  1301 +++
 .../sf/jasperreports/engine/export/LengthUtil.java |     3 +-
 .../engine/export/MapHtmlResourceHandler.java      |   107 +
 .../engine/export/MatcherExportFilterMapping.java  |    95 +
 ...portFilterMappingExtensionsRegistryFactory.java |   109 +
 .../engine/export/MatcherExporterFilter.java       |   131 +
 .../export/MatcherExporterFilterFactory.java       |    44 +
 .../engine/export/OccupiedGridCell.java            |    37 +-
 .../sf/jasperreports/engine/export/PdfFont.java    |    88 -
 .../engine/export/PdfTextRenderer.java             |   125 +-
 .../engine/export/PrintElementIndex.java           |    66 +
 .../engine/export/ResetableExporterFilter.java     |     3 +-
 .../engine/export/SimplePdfTextRenderer.java       |   140 +
 .../engine/export/XlsRowLevelInfo.java             |     5 +-
 .../engine/export/data/BooleanTextValue.java       |     3 +-
 .../engine/export/data/DateTextValue.java          |     3 +-
 .../engine/export/data/NumberTextValue.java        |     3 +-
 .../engine/export/data/StringTextValue.java        |     3 +-
 .../engine/export/data/TextValue.java              |     3 +-
 .../engine/export/data/TextValueHandler.java       |     3 +-
 .../engine/export/data/package-info.java           |    27 +
 .../engine/export/draw/BoxDrawer.java              |    24 +-
 .../engine/export/draw/DrawVisitor.java            |    11 +-
 .../engine/export/draw/ElementDrawer.java          |    58 +-
 .../engine/export/draw/EllipseDrawer.java          |    47 +-
 .../engine/export/draw/FrameDrawer.java            |    63 +-
 .../engine/export/draw/ImageDrawer.java            |    46 +-
 .../engine/export/draw/LineDrawer.java             |    24 +-
 .../jasperreports/engine/export/draw/Offset.java   |     3 +-
 .../engine/export/draw/PrintDrawVisitor.java       |    50 +-
 .../engine/export/draw/RectangleDrawer.java        |    47 +-
 .../engine/export/draw/TextDrawer.java             |    18 +-
 .../engine/export/draw/package-info.java           |    27 +
 .../engine/export/legacy/BorderOffset.java         |   127 -
 .../engine/export/oasis/BaseHelper.java            |    89 +
 .../engine/export/oasis/BorderStyle.java           |    10 +-
 .../engine/export/oasis/CellStyle.java             |    40 +-
 .../engine/export/oasis/ColumnStyle.java           |    74 +
 .../engine/export/oasis/ContentBuilder.java        |    54 +-
 .../engine/export/oasis/DocumentBuilder.java       |   304 +
 .../engine/export/oasis/FileBufferedOasisZip.java  |     7 +-
 .../engine/export/oasis/FrameStyle.java            |     6 +-
 .../export/oasis/GenericElementOdsHandler.java     |    17 +-
 .../export/oasis/GenericElementOdtHandler.java     |     5 +-
 .../engine/export/oasis/GraphicStyle.java          |    27 +-
 .../engine/export/oasis/JROdsExporter.java         |   944 +-
 .../engine/export/oasis/JROdsExporterContext.java  |     6 +-
 .../engine/export/oasis/JROdsExporterNature.java   |    57 +-
 .../engine/export/oasis/JROdtExporter.java         |   741 +-
 .../engine/export/oasis/JROdtExporterContext.java  |     6 +-
 .../engine/export/oasis/JROdtExporterNature.java   |    36 +-
 .../export/oasis/JROpenDocumentExporter.java       |  1171 --
 .../export/oasis/JROpenDocumentExporterNature.java |    68 +-
 .../oasis/JROpenDocumentExporterParameter.java     |    69 +
 .../engine/export/oasis/OasisZip.java              |    73 +-
 .../engine/export/oasis/ParagraphStyle.java        |    69 +-
 .../engine/export/oasis/RowStyle.java              |    82 +
 .../jasperreports/engine/export/oasis/Style.java   |     8 +-
 .../engine/export/oasis/StyleBuilder.java          |    94 +-
 .../engine/export/oasis/StyleCache.java            |   152 +-
 .../engine/export/oasis/TableBuilder.java          |   624 +-
 .../engine/export/oasis/TableStyle.java            |   105 +
 .../jasperreports/engine/export/oasis/Utility.java |     3 +-
 .../engine/export/oasis/WriterHelper.java          |    53 +
 .../engine/export/oasis/package-info.java          |    30 +
 .../engine/export/ooxml/BaseHelper.java            |    10 +-
 .../engine/export/ooxml/DocxBorderHelper.java      |     8 +-
 .../engine/export/ooxml/DocxBorderInfo.java        |     3 +-
 .../engine/export/ooxml/DocxCellHelper.java        |    30 +-
 .../engine/export/ooxml/DocxDocumentHelper.java    |    76 +-
 .../engine/export/ooxml/DocxParagraphHelper.java   |    81 +-
 .../engine/export/ooxml/DocxRelsHelper.java        |    43 +-
 .../engine/export/ooxml/DocxRunHelper.java         |   170 +-
 .../engine/export/ooxml/DocxSettingsHelper.java    |    21 +-
 .../engine/export/ooxml/DocxStyleHelper.java       |    85 +-
 .../engine/export/ooxml/DocxTableHelper.java       |    57 +-
 .../jasperreports/engine/export/ooxml/DocxZip.java |     3 +-
 .../export/ooxml/GenericElementDocxHandler.java    |    13 +-
 .../export/ooxml/GenericElementPptxHandler.java    |    13 +-
 .../export/ooxml/GenericElementXlsxHandler.java    |     5 +-
 .../engine/export/ooxml/JRDocxExporter.java        |   968 +-
 .../engine/export/ooxml/JRDocxExporterContext.java |     3 +-
 .../engine/export/ooxml/JRDocxExporterNature.java  |    27 +-
 .../export/ooxml/JRDocxExporterParameter.java      |    45 +-
 .../ooxml/JROfficeOpenXmlExporterNature.java       |    62 +-
 .../engine/export/ooxml/JRPptxExporter.java        |   631 +-
 .../engine/export/ooxml/JRPptxExporterContext.java |     7 +-
 .../engine/export/ooxml/JRXlsxExporter.java        |   718 +-
 .../engine/export/ooxml/JRXlsxExporterContext.java |     7 +-
 .../engine/export/ooxml/JRXlsxExporterNature.java  |    24 +-
 .../export/ooxml/PptxContentTypesHelper.java       |     9 +-
 .../export/ooxml/PptxPresentationHelper.java       |    10 +-
 .../export/ooxml/PptxPresentationRelsHelper.java   |     9 +-
 .../engine/export/ooxml/PptxRunHelper.java         |    59 +-
 .../engine/export/ooxml/PptxSlideHelper.java       |     9 +-
 .../engine/export/ooxml/PptxSlideRelsHelper.java   |     8 +-
 .../jasperreports/engine/export/ooxml/PptxZip.java |     3 +-
 .../engine/export/ooxml/XlsxBorderHelper.java      |    23 +-
 .../engine/export/ooxml/XlsxBorderInfo.java        |     3 +-
 .../engine/export/ooxml/XlsxCellHelper.java        |   232 +-
 .../export/ooxml/XlsxContentTypesHelper.java       |    33 +-
 .../engine/export/ooxml/XlsxDrawingHelper.java     |     9 +-
 .../engine/export/ooxml/XlsxDrawingRelsHelper.java |     8 +-
 .../engine/export/ooxml/XlsxFontHelper.java        |    59 +-
 .../engine/export/ooxml/XlsxFontInfo.java          |     9 +-
 .../engine/export/ooxml/XlsxFormatHelper.java      |     9 +-
 .../engine/export/ooxml/XlsxFormatInfo.java        |     3 +-
 .../engine/export/ooxml/XlsxParagraphHelper.java   |    18 +-
 .../engine/export/ooxml/XlsxRelsHelper.java        |    22 +-
 .../engine/export/ooxml/XlsxRunHelper.java         |   100 +-
 .../engine/export/ooxml/XlsxSheetHelper.java       |   264 +-
 .../engine/export/ooxml/XlsxSheetRelsHelper.java   |     8 +-
 .../engine/export/ooxml/XlsxStyleHelper.java       |   100 +-
 .../engine/export/ooxml/XlsxStyleInfo.java         |    93 +-
 .../engine/export/ooxml/XlsxWorkbookHelper.java    |    27 +-
 .../jasperreports/engine/export/ooxml/XlsxZip.java |   125 +-
 .../engine/export/ooxml/package-info.java          |    29 +
 .../engine/export/ooxml/type/PaperSizeEnum.java    |   148 +
 .../engine/export/ooxml/type/package-info.java     |    29 +
 .../jasperreports/engine/export/package-info.java  |   346 +
 .../sf/jasperreports/engine/export/package.html    |    13 -
 .../engine/export/tabulator/BaseElementCell.java   |    66 +
 .../engine/export/tabulator/Cell.java              |    36 +
 .../engine/export/tabulator/CellVisitor.java       |    40 +
 .../engine/export/tabulator/Column.java            |    43 +
 .../engine/export/tabulator/DimensionControl.java  |    36 +
 .../engine/export/tabulator/DimensionEntries.java  |   306 +
 .../engine/export/tabulator/DimensionEntry.java    |    76 +
 .../engine/export/tabulator/DimensionRange.java    |    54 +
 .../engine/export/tabulator/ElementCell.java       |    64 +
 .../engine/export/tabulator/EntryIndexes.java      |    66 +
 .../engine/export/tabulator/FrameCell.java         |    57 +
 .../engine/export/tabulator/LayeredCell.java       |    83 +
 .../jasperreports/engine/export/tabulator/Row.java |    74 +
 .../engine/export/tabulator/SplitCell.java         |    68 +
 .../engine/export/tabulator/Table.java             |   137 +
 .../engine/export/tabulator/TableCell.java         |   128 +
 .../engine/export/tabulator/TablePosition.java     |    57 +
 .../engine/export/tabulator/Tabulator.java         |  1096 ++
 .../engine/export/type/ImageAnchorTypeEnum.java    |    86 +
 .../engine/export/type/ZoomTypeEnum.java           |    91 +
 .../engine/export/type/package-info.java           |    28 +
 .../engine/export/zip/AbstractZip.java             |     3 +-
 .../engine/export/zip/EmptyZipEntry.java           |    15 +-
 .../engine/export/zip/ExportZipEntry.java          |     3 +-
 .../engine/export/zip/FileBufferedZip.java         |    19 +-
 .../engine/export/zip/FileBufferedZipEntry.java    |    13 +-
 .../engine/export/zip/package-info.java            |    28 +
 .../engine/fill/AbstractThreadSubreportRunner.java |   240 +
 .../engine/fill/AbstractValueProvider.java         |     3 +-
 .../AbstractVariableReturnValueSourceContext.java  |    88 +
 .../engine/fill/AsynchronousFillHandle.java        |   308 +-
 .../engine/fill/AsynchronousFilllListener.java     |     3 +-
 .../engine/fill/BandReportFillerParent.java        |    44 +
 .../jasperreports/engine/fill/BaseFillHandle.java  |   218 +
 .../engine/fill/BaseReportFiller.java              |   777 ++
 .../engine/fill/BoundActionExecutionContext.java   |    38 +
 .../jasperreports/engine/fill/CachingLineBox.java  |   244 +
 .../engine/fill/CachingParagraph.java              |   271 +
 .../engine/fill/ComplexTextLineWrapper.java        |   230 +
 .../engine/fill/CompositeFillListener.java         |    81 +
 .../engine/fill/DatasetExpressionEvaluator.java    |     6 +-
 .../engine/fill/DatasetFillContext.java            |     3 +-
 .../jasperreports/engine/fill/DatasetSortInfo.java |   122 +
 .../jasperreports/engine/fill/DatasetSortUtil.java |   205 +-
 .../engine/fill/DefaultChartTheme.java             |   241 +-
 .../engine/fill/DefaultPrintElementOriginator.java |    70 +
 .../engine/fill/DelayedFillActions.java            |   619 ++
 .../engine/fill/DynamicPropertiesHolder.java       |    40 +
 .../engine/fill/ElementEvaluationAction.java       |    80 +
 .../engine/fill/EvaluationBoundAction.java         |    36 +
 .../engine/fill/FillContainerContext.java          |    39 +
 .../engine/fill/FillDatasetPosition.java           |   107 +
 .../engine/fill/FillFunctionContext.java           |   103 +
 .../sf/jasperreports/engine/fill/FillHandle.java   |    97 +
 .../sf/jasperreports/engine/fill/FillListener.java |    56 +
 .../sf/jasperreports/engine/fill/FillPageKey.java  |    68 +
 .../engine/fill/FillReturnValues.java              |   238 +
 .../engine/fill/FillStyleProviderContext.java      |   122 +
 .../engine/fill/FillerPageAddedEvent.java          |    49 +
 .../sf/jasperreports/engine/fill/FillerParent.java |    43 +
 .../engine/fill/FillerSubreportParent.java         |   155 +
 .../engine/fill/JRAbstractExtendedIncrementer.java |     3 +-
 .../fill/JRAbstractExtendedIncrementerFactory.java |     5 +-
 .../engine/fill/JRAbstractLRUVirtualizer.java      |   438 +-
 .../sf/jasperreports/engine/fill/JRBaseFiller.java |  1232 +--
 .../fill/JRBigDecimalIncrementerFactory.java       |    46 +-
 .../engine/fill/JRByteIncrementerFactory.java      |     3 +-
 .../sf/jasperreports/engine/fill/JRCalculable.java |     3 +-
 .../sf/jasperreports/engine/fill/JRCalculator.java |    33 +-
 .../sf/jasperreports/engine/fill/JRClonePool.java  |    10 +-
 .../fill/JRComparableIncrementerFactory.java       |     5 +-
 .../engine/fill/JRContinuationSubreportRunner.java |     3 +-
 .../fill/JRContinuationSubreportRunnerFactory.java |     3 +-
 .../engine/fill/JRDefaultIncrementerFactory.java   |     3 +-
 .../JRDistinctCountExtendedIncrementerFactory.java |     3 +-
 .../fill/JRDistinctCountIncrementerFactory.java    |     3 +-
 .../engine/fill/JRDoubleIncrementerFactory.java    |     3 +-
 .../engine/fill/JREvaluationTime.java              |    41 +-
 .../sf/jasperreports/engine/fill/JREvaluator.java  |   116 +-
 .../engine/fill/JRExpressionEvalException.java     |    11 +-
 .../engine/fill/JRExtendedIncrementer.java         |     3 +-
 .../engine/fill/JRExtendedIncrementerFactory.java  |     3 +-
 .../engine/fill/JRFileVirtualizer.java             |    30 +-
 .../sf/jasperreports/engine/fill/JRFillBand.java   |   130 +-
 .../sf/jasperreports/engine/fill/JRFillBreak.java  |    37 +-
 .../engine/fill/JRFillCellContents.java            |   104 +-
 .../sf/jasperreports/engine/fill/JRFillChart.java  |   159 +-
 .../engine/fill/JRFillChartDataset.java            |     3 +-
 .../jasperreports/engine/fill/JRFillChartPlot.java |     8 +-
 .../engine/fill/JRFillCloneFactory.java            |     3 +-
 .../jasperreports/engine/fill/JRFillCloneable.java |     3 +-
 .../engine/fill/JRFillCommonReturnValue.java       |   210 +
 .../engine/fill/JRFillComponentElement.java        |    82 +-
 .../jasperreports/engine/fill/JRFillContext.java   |   206 +-
 .../jasperreports/engine/fill/JRFillCrosstab.java  |  1186 ++-
 .../jasperreports/engine/fill/JRFillDataset.java   |   738 +-
 .../engine/fill/JRFillDatasetRun.java              |   163 +-
 .../engine/fill/JRFillDatasetScriptlet.java        |     3 +-
 .../jasperreports/engine/fill/JRFillElement.java   |   371 +-
 .../engine/fill/JRFillElementContainer.java        |   141 +-
 .../engine/fill/JRFillElementDataset.java          |    20 +-
 .../engine/fill/JRFillElementGroup.java            |    62 +-
 .../jasperreports/engine/fill/JRFillEllipse.java   |     7 +-
 .../engine/fill/JRFillExpressionEvaluator.java     |     3 +-
 .../engine/fill/JRFillExpressionReturnValue.java   |   107 +
 .../sf/jasperreports/engine/fill/JRFillField.java  |     3 +-
 .../sf/jasperreports/engine/fill/JRFillFrame.java  |   118 +-
 .../engine/fill/JRFillGenericElement.java          |     9 +-
 .../engine/fill/JRFillGraphicElement.java          |    32 +-
 .../sf/jasperreports/engine/fill/JRFillGroup.java  |    51 +-
 .../engine/fill/JRFillHyperlinkHelper.java         |    21 +-
 .../sf/jasperreports/engine/fill/JRFillImage.java  |   217 +-
 .../engine/fill/JRFillInterruptedException.java    |    14 +-
 .../sf/jasperreports/engine/fill/JRFillLine.java   |     7 +-
 .../engine/fill/JRFillObjectFactory.java           |   160 +-
 .../jasperreports/engine/fill/JRFillParameter.java |     3 +-
 .../jasperreports/engine/fill/JRFillRectangle.java |     9 +-
 .../engine/fill/JRFillReportTemplate.java          |    29 +-
 .../jasperreports/engine/fill/JRFillScriptlet.java |     3 +-
 .../jasperreports/engine/fill/JRFillSection.java   |    12 +-
 .../engine/fill/JRFillStaticText.java              |    18 +-
 .../jasperreports/engine/fill/JRFillSubreport.java |   567 +-
 .../engine/fill/JRFillSubreportReturnValue.java    |   123 -
 .../engine/fill/JRFillTextElement.java             |   394 +-
 .../jasperreports/engine/fill/JRFillTextField.java |   310 +-
 .../jasperreports/engine/fill/JRFillVariable.java  |     3 +-
 .../engine/fill/JRFillVariableReturnValue.java     |   106 +
 src/net/sf/jasperreports/engine/fill/JRFiller.java |   156 +-
 .../engine/fill/JRFloatIncrementerFactory.java     |     3 +-
 .../engine/fill/JRGzipVirtualizer.java             |    12 +-
 .../engine/fill/JRHorizontalFiller.java            |   169 +-
 .../jasperreports/engine/fill/JRIncrementer.java   |     3 +-
 .../engine/fill/JRIncrementerFactory.java          |     3 +-
 .../engine/fill/JRIncrementerFactoryCache.java     |     5 +-
 .../engine/fill/JRIntegerIncrementerFactory.java   |     3 +-
 .../engine/fill/JRLongIncrementerFactory.java      |     3 +-
 .../jasperreports/engine/fill/JRMeasuredText.java  |    24 +-
 .../engine/fill/JROriginProvider.java              |     3 +-
 .../fill/JRParameterDefaultValuesEvaluator.java    |    34 +-
 .../sf/jasperreports/engine/fill/JRPrintBand.java  |     5 +-
 .../engine/fill/JRReadOnlyPropertyException.java   |     3 +-
 .../engine/fill/JRRecordedValues.java              |    17 +-
 .../fill/JRRecordedValuesGenericPrintElement.java  |    65 +-
 .../engine/fill/JRRecordedValuesPrintElement.java  |     3 +-
 .../engine/fill/JRRecordedValuesPrintImage.java    |    37 +-
 .../engine/fill/JRRecordedValuesPrintText.java     |    41 +-
 .../engine/fill/JRResourcesFillUtil.java           |     7 +-
 .../engine/fill/JRShortIncrementerFactory.java     |     3 +-
 .../engine/fill/JRSubreportRunResult.java          |     3 +-
 .../engine/fill/JRSubreportRunnable.java           |     3 +-
 .../engine/fill/JRSubreportRunner.java             |     3 +-
 .../engine/fill/JRSubreportRunnerFactory.java      |     7 +-
 .../engine/fill/JRSwapFileVirtualizer.java         |    87 +-
 .../engine/fill/JRTemplateElement.java             |    13 +-
 .../engine/fill/JRTemplateEllipse.java             |     3 +-
 .../jasperreports/engine/fill/JRTemplateFrame.java |     4 +-
 .../engine/fill/JRTemplateGenericElement.java      |     3 +-
 .../engine/fill/JRTemplateGenericPrintElement.java |    91 +-
 .../engine/fill/JRTemplateGraphicElement.java      |     4 +-
 .../jasperreports/engine/fill/JRTemplateImage.java |   122 +-
 .../jasperreports/engine/fill/JRTemplateLine.java  |     7 +-
 .../engine/fill/JRTemplatePrintElement.java        |   251 +-
 .../engine/fill/JRTemplatePrintEllipse.java        |    20 +-
 .../engine/fill/JRTemplatePrintFrame.java          |    60 +-
 .../engine/fill/JRTemplatePrintGraphicElement.java |    21 +-
 .../engine/fill/JRTemplatePrintImage.java          |   256 +-
 .../engine/fill/JRTemplatePrintLine.java           |    21 +-
 .../engine/fill/JRTemplatePrintRectangle.java      |    21 +-
 .../engine/fill/JRTemplatePrintText.java           |   368 +-
 .../engine/fill/JRTemplateRectangle.java           |     3 +-
 .../jasperreports/engine/fill/JRTemplateText.java  |   195 +-
 .../jasperreports/engine/fill/JRTextMeasurer.java  |     3 +-
 .../engine/fill/JRTextMeasurerFactory.java         |    10 +-
 .../engine/fill/JRThreadSubreportRunner.java       |   165 +-
 .../fill/JRThreadSubreportRunnerFactory.java       |     3 +-
 .../engine/fill/JRVerticalFiller.java              |   154 +-
 .../engine/fill/JRVirtualizationContext.java       |   289 +-
 .../jasperreports/engine/fill/JRYComparator.java   |    10 +-
 .../jasperreports/engine/fill/JRYXComparator.java  |    10 +-
 .../engine/fill/JasperReportsContextAware.java     |    36 +
 .../engine/fill/PartReportFiller.java              |   715 ++
 .../engine/fill/PrintElementOriginator.java        |    55 +
 .../sf/jasperreports/engine/fill/ReportFiller.java |    53 +
 .../engine/fill/SimpleTextFormat.java              |    43 +-
 .../jasperreports/engine/fill/SimpleTextLine.java  |   116 +
 .../engine/fill/SimpleTextLineWrapper.java         |   942 ++
 .../engine/fill/SortedDataSource.java              |   167 +
 .../fill/StandardBoundActionExecutionContext.java  |    79 +
 .../engine/fill/StoreFactoryVirtualizer.java       |   184 +
 .../engine/fill/StoreVirtualizer.java              |    69 +
 .../sf/jasperreports/engine/fill/TextFormat.java   |     3 +-
 .../jasperreports/engine/fill/TextLayoutLine.java  |    77 +
 src/net/sf/jasperreports/engine/fill/TextLine.java |    44 +
 .../jasperreports/engine/fill/TextLineWrapper.java |    63 +
 .../engine/fill/TextMeasureContext.java            |    48 +
 .../sf/jasperreports/engine/fill/TextMeasurer.java |   601 +-
 .../engine/fill/TextMeasurerFactory.java           |    11 +-
 .../engine/fill/ThreadExecutorSubreportRunner.java |    78 +
 .../fill/ThreadPoolSubreportRunnerFactory.java     |   122 +
 .../engine/fill/VirtualizationListener.java        |     3 +-
 .../fill/VirtualizationObjectInputStream.java      |    54 +
 .../fill/VirtualizationObjectOutputStream.java     |    54 +
 .../fill/VirtualizedPageEvaluationAction.java      |    69 +
 .../engine/fill/VirtualizerStore.java              |    44 +
 .../engine/fill/VirtualizerStoreFactory.java       |    35 +
 .../sf/jasperreports/engine/fill/package-info.java |   262 +
 src/net/sf/jasperreports/engine/fill/package.html  |    13 -
 .../engine/fonts/FontExtensionsRegistry.java       |    14 +-
 .../sf/jasperreports/engine/fonts/FontFace.java    |    30 +-
 .../sf/jasperreports/engine/fonts/FontFamily.java  |    16 +-
 .../sf/jasperreports/engine/fonts/FontInfo.java    |     3 +-
 .../sf/jasperreports/engine/fonts/FontUtil.java    |   421 +
 .../engine/fonts/SimpleFontExtensionHelper.java    |   275 +-
 .../fonts/SimpleFontExtensionsRegistryFactory.java |     9 +-
 .../jasperreports/engine/fonts/SimpleFontFace.java |   229 +-
 .../engine/fonts/SimpleFontFamily.java             |   352 +-
 .../jasperreports/engine/fonts/package-info.java   |   200 +
 src/net/sf/jasperreports/engine/package-info.java  |    30 +
 src/net/sf/jasperreports/engine/package.html       |    14 -
 .../engine/part/BasePartFillComponent.java         |    47 +
 .../engine/part/DefaultPartComponentManager.java   |    90 +
 .../engine/part/DefaultPartComponentsBundle.java   |   108 +
 .../engine/part/DelayedPrintPart.java              |    50 +
 src/net/sf/jasperreports/engine/part/FillPart.java |   139 +
 .../engine/part/FillPartPrintOutput.java           |   207 +
 .../sf/jasperreports/engine/part/FillParts.java    |    65 +
 .../jasperreports/engine/part/FillPrintPart.java   |    61 +
 .../engine/part/FillPrintPartQueue.java            |   172 +
 .../jasperreports/engine/part/FilledPrintPart.java |    45 +
 .../engine/part/FillingPrintPart.java              |    36 +
 .../engine/part/FinalFillingPrintPart.java         |    52 +
 .../jasperreports/engine/part/GroupFillParts.java  |    79 +
 .../jasperreports/engine/part/PartComponent.java   |    38 +
 .../engine/part/PartComponentCompiler.java         |    67 +
 .../engine/part/PartComponentFillFactory.java      |    62 +
 .../engine/part/PartComponentManager.java          |    64 +
 .../engine/part/PartComponentXmlWriter.java        |    64 +
 .../engine/part/PartComponentsBundle.java          |    66 +
 .../engine/part/PartComponentsEnvironment.java     |   168 +
 .../engine/part/PartEvaluationTime.java            |    38 +
 .../engine/part/PartFillComponent.java             |    70 +
 .../jasperreports/engine/part/PartFillContext.java |    45 +
 .../jasperreports/engine/part/PartPrintOutput.java |    57 +
 .../engine/part/StandardPartEvaluationTime.java    |   102 +
 .../jasperreports/engine/print/JRPrinterAWT.java   |    90 +-
 .../jasperreports/engine/print/package-info.java   |    30 +
 src/net/sf/jasperreports/engine/print/package.html |    13 -
 .../engine/query/AbstractQueryExecuterFactory.java |    51 +
 .../engine/query/AbstractXlsQueryExecuter.java     |   348 +
 .../query/AbstractXlsQueryExecuterFactory.java     |   143 +
 .../query/ClauseFunctionParameterHandler.java      |    36 +
 .../DefaultClauseFunctionParameterHandler.java     |    54 +
 .../query/DefaultQueryExecuterFactoryBundle.java   |    46 +-
 .../engine/query/ExcelQueryExecuter.java           |   251 +
 .../engine/query/ExcelQueryExecuterFactory.java    |    87 +
 .../engine/query/JRAbstractQueryExecuter.java      |   316 +-
 .../query/JRAbstractQueryExecuterFactory.java      |    52 +
 .../engine/query/JRClauseFunction.java             |     3 +-
 .../jasperreports/engine/query/JRClauseTokens.java |    20 +-
 .../engine/query/JRCsvQueryExecuter.java           |    54 +-
 .../engine/query/JRCsvQueryExecuterFactory.java    |    41 +-
 .../engine/query/JREmptyQueryExecuter.java         |     3 +-
 .../engine/query/JRHibernateQueryExecuter.java     |   141 +-
 .../query/JRHibernateQueryExecuterFactory.java     |    24 +-
 .../engine/query/JRJdbcQueryExecuter.java          |   338 +-
 .../engine/query/JRJdbcQueryExecuterFactory.java   |    45 +-
 .../engine/query/JRJpaQueryExecuter.java           |    53 +-
 .../engine/query/JRJpaQueryExecuterFactory.java    |    22 +-
 .../engine/query/JRQueryClauseContext.java         |    29 +-
 .../engine/query/JRQueryExecuter.java              |     7 +-
 .../engine/query/JRQueryExecuterFactory.java       |     9 +-
 .../engine/query/JRQueryExecuterFactoryBundle.java |    45 +
 .../engine/query/JRSqlAbstractEqualClause.java     |    19 +-
 .../engine/query/JRSqlAbstractInClause.java        |    22 +-
 .../engine/query/JRSqlBetweenClause.java           |   181 +-
 .../engine/query/JRSqlEqualClause.java             |     3 +-
 .../jasperreports/engine/query/JRSqlInClause.java  |     3 +-
 .../engine/query/JRSqlLessOrGreaterClause.java     |   105 +-
 .../engine/query/JRSqlNotEqualClause.java          |     3 +-
 .../engine/query/JRSqlNotInClause.java             |     3 +-
 .../engine/query/JRXPathQueryExecuter.java         |    85 +-
 .../engine/query/JRXPathQueryExecuterFactory.java  |    46 +-
 .../engine/query/JRXlsQueryExecuter.java           |   202 +-
 .../engine/query/JRXlsQueryExecuterFactory.java    |   130 +-
 .../engine/query/JRXlsxQueryExecuter.java          |   212 +-
 .../engine/query/JRXlsxQueryExecuterFactory.java   |    77 +-
 .../engine/query/JaxenXPathQueryExecuter.java      |    46 +-
 .../query/JaxenXPathQueryExecuterFactory.java      |    19 +-
 .../engine/query/JsonQueryExecuter.java            |   177 +
 .../engine/query/JsonQueryExecuterFactory.java     |   126 +
 .../query/ParameterTypeSelectorClauseFunction.java |   363 +
 .../engine/query/ParameterTypesClauseFunction.java |    38 +
 .../query/ParameterTypesClauseFunctionBundle.java  |    36 +
 .../engine/query/QueryClauseFunctionBundle.java    |    46 +
 .../engine/query/QueryExecuterFactory.java         |   105 +
 .../engine/query/QueryExecuterFactoryBundle.java   |     4 +-
 .../engine/query/SQLBetweenBaseClause.java         |   251 +
 .../engine/query/SQLLessOrGreaterBaseClause.java   |   152 +
 .../query/SQLQueryClauseFunctionsExtensions.java   |   107 +
 .../StandardParameterTypesClauseFunction.java      |    63 +
 .../StandardSingleQueryClauseFunctionBundle.java   |    76 +
 ...gleQueryParameterTypesClauseFunctionBundle.java |    72 +
 .../engine/query/XalanXPathQueryExecuter.java      |    46 +-
 .../query/XalanXPathQueryExecuterFactory.java      |    19 +-
 .../engine/query/XlsQueryExecuter.java             |   100 +
 .../engine/query/XlsQueryExecuterFactory.java      |    80 +
 .../jasperreports/engine/query/package-info.java   |   431 +
 .../engine/scriptlets/DefaultScriptletFactory.java |    17 +-
 .../engine/scriptlets/ScriptletFactory.java        |     3 +-
 .../engine/scriptlets/ScriptletFactoryContext.java |    29 +-
 .../engine/scriptlets/package-info.java            |   144 +
 .../engine/style/PropertyStyleProvider.java        |   568 +
 .../PropertyStyleProviderExtensionFactory.java     |    49 +
 .../engine/style/PropertyStyleProviderFactory.java |    90 +
 .../jasperreports/engine/style/StyleProvider.java  |    54 +
 .../engine/style/StyleProviderContext.java         |    75 +
 .../engine/style/StyleProviderFactory.java         |    43 +
 .../jasperreports/engine/style/package-info.java   |    30 +
 .../sf/jasperreports/engine/type/BandTypeEnum.java |    17 +-
 .../jasperreports/engine/type/BorderSplitType.java |    62 +
 .../jasperreports/engine/type/BreakTypeEnum.java   |    17 +-
 .../jasperreports/engine/type/CalculationEnum.java |    16 +-
 .../sf/jasperreports/engine/type/ColorEnum.java    |    43 +-
 src/net/sf/jasperreports/engine/type/EnumUtil.java |    57 +-
 .../engine/type/EvaluationTimeEnum.java            |    27 +-
 src/net/sf/jasperreports/engine/type/FillEnum.java |    17 +-
 .../engine/type/FooterPositionEnum.java            |    17 +-
 .../engine/type/HorizontalAlignEnum.java           |    43 +-
 .../engine/type/HorizontalImageAlignEnum.java      |    72 +
 .../engine/type/HorizontalPosition.java            |    47 +
 .../engine/type/HorizontalTextAlignEnum.java       |    77 +
 .../engine/type/HyperlinkTargetEnum.java           |    42 +-
 .../engine/type/HyperlinkTypeEnum.java             |    16 +-
 .../jasperreports/engine/type/ImageTypeEnum.java   |   126 +
 .../engine/type/IncrementTypeEnum.java             |    27 +-
 src/net/sf/jasperreports/engine/type/JREnum.java   |    17 +-
 .../engine/type/JsonOperatorEnum.java              |    60 +
 .../engine/type/LineDirectionEnum.java             |    17 +-
 .../jasperreports/engine/type/LineSpacingEnum.java |    17 +-
 .../jasperreports/engine/type/LineStyleEnum.java   |    17 +-
 src/net/sf/jasperreports/engine/type/ModeEnum.java |    17 +-
 .../sf/jasperreports/engine/type/NamedEnum.java    |    35 +
 .../jasperreports/engine/type/NamedValueEnum.java  |    35 +
 .../jasperreports/engine/type/OnErrorTypeEnum.java |    17 +-
 .../jasperreports/engine/type/OrientationEnum.java |    17 +-
 .../sf/jasperreports/engine/type/OverflowType.java |    47 +
 .../engine/type/PartEvaluationTimeType.java        |    65 +
 src/net/sf/jasperreports/engine/type/PenEnum.java  |    17 +-
 .../engine/type/PositionTypeEnum.java              |    17 +-
 .../jasperreports/engine/type/PrintOrderEnum.java  |    17 +-
 .../engine/type/RenderableTypeEnum.java            |   101 +
 .../jasperreports/engine/type/ResetTypeEnum.java   |    25 +-
 .../sf/jasperreports/engine/type/RotationEnum.java |    17 +-
 .../engine/type/RunDirectionEnum.java              |    17 +-
 .../jasperreports/engine/type/ScaleImageEnum.java  |    21 +-
 .../jasperreports/engine/type/SectionTypeEnum.java |    68 +
 .../engine/type/SortFieldTypeEnum.java             |    51 +-
 .../jasperreports/engine/type/SortOrderEnum.java   |    17 +-
 .../jasperreports/engine/type/SplitTypeEnum.java   |    17 +-
 .../jasperreports/engine/type/StretchTypeEnum.java |    17 +-
 .../engine/type/TabStopAlignEnum.java              |    53 +-
 .../engine/type/VerticalAlignEnum.java             |    46 +-
 .../engine/type/VerticalImageAlignEnum.java        |    72 +
 .../engine/type/VerticalTextAlignEnum.java         |    77 +
 .../engine/type/WhenNoDataTypeEnum.java            |    17 +-
 .../engine/type/WhenResourceMissingTypeEnum.java   |    17 +-
 .../sf/jasperreports/engine/type/package-info.java |    30 +
 .../engine/util/AbstractSampleApp.java             |     3 +-
 .../engine/util/AbstractTextMeasurerFactory.java   |    48 +
 .../engine/util/BigDecimalHandler.java             |     3 +-
 .../jasperreports/engine/util/BigDecimalUtils.java |     3 +-
 .../engine/util/BookmarksFlatDataSource.java       |    76 +
 src/net/sf/jasperreports/engine/util/Bounds.java   |   116 +
 .../engine/util/BreakIteratorSplitCharacter.java   |    14 +-
 .../engine/util/ClassLoaderResource.java           |     3 +-
 .../sf/jasperreports/engine/util/ClassUtils.java   |    33 +-
 .../engine/util/CompositeClassloader.java          |    14 +-
 .../util/CompositeExpressionChunkVisitor.java      |    93 +
 .../engine/util/CompositePrintElementVisitor.java  |     3 +-
 .../util/ContextClassLoaderObjectInputStream.java  |    30 +-
 .../engine/util/DeduplicableRegistry.java          |     3 +-
 .../engine/util/DeepPrintElementCounter.java       |     5 +-
 .../engine/util/DeepPrintElementVisitor.java       |     3 +-
 .../engine/util/DefaultFormatFactory.java          |    17 +-
 .../engine/util/DefaultPrintElementVisitor.java    |     3 +-
 .../engine/util/DeflateStreamCompression.java      |    60 +
 .../engine/util/DelegatePropertiesHolder.java      |     3 +-
 .../sf/jasperreports/engine/util/DigestUtils.java  |    89 +
 .../engine/util/DisplayComparableValue.java        |    72 +
 .../sf/jasperreports/engine/util/DisplayValue.java |    80 +
 .../engine/util/DisplayValueLabelComparator.java   |    47 +
 .../engine/util/ElementsVisitorUtils.java          |    70 +
 .../engine/util/ExpressionChunkVisitor.java        |    48 +
 .../engine/util/FileBufferedOutputStream.java      |    15 +-
 .../engine/util/FileBufferedWriter.java            |     3 +-
 .../sf/jasperreports/engine/util/FileResolver.java |     4 +-
 .../sf/jasperreports/engine/util/FlashUtils.java   |     8 +-
 .../jasperreports/engine/util/FormatFactory.java   |     3 +-
 .../sf/jasperreports/engine/util/FormatUtils.java  |    11 +-
 .../jasperreports/engine/util/HyperlinkData.java   |    72 +
 .../util/JEditorPaneHtmlMarkupProcessor.java       |     3 +-
 .../engine/util/JEditorPaneMarkupProcessor.java    |     3 +-
 .../engine/util/JEditorPaneRtfMarkupProcessor.java |     3 +-
 .../engine/util/JRAbstractImageEncoder.java        |    11 +-
 .../sf/jasperreports/engine/util/JRApiWriter.java  |   284 +-
 .../sf/jasperreports/engine/util/JRBoxUtil.java    |    44 +-
 .../jasperreports/engine/util/JRClassLoader.java   |     3 +-
 .../sf/jasperreports/engine/util/JRCloneUtils.java |     3 +-
 .../sf/jasperreports/engine/util/JRColorUtil.java  |   133 +-
 .../engine/util/JRConcurrentSwapFile.java          |    15 +-
 .../sf/jasperreports/engine/util/JRDataUtils.java  |    67 +-
 .../engine/util/JRDateLocaleConverter.java         |     3 +-
 .../engine/util/JRDelegationVisitor.java           |     3 +-
 .../engine/util/JRElementsVisitor.java             |   115 +-
 .../engine/util/JRExpressionUtil.java              |    39 +-
 .../engine/util/JRFloatLocaleConverter.java        |     5 +-
 .../engine/util/JRFontNotFoundException.java       |    13 +-
 .../sf/jasperreports/engine/util/JRFontUtil.java   |    10 +-
 .../engine/util/JRGraphEnvInitializer.java         |    10 +-
 .../jasperreports/engine/util/JRImageEncoder.java  |     6 +-
 .../jasperreports/engine/util/JRImageLoader.java   |   106 +-
 .../jasperreports/engine/util/JRImageReader.java   |     3 +-
 .../engine/util/JRJdk13ImageReader.java            |    10 +-
 .../engine/util/JRJdk14ImageEncoder.java           |    24 +-
 .../engine/util/JRJdk14ImageReader.java            |    10 +-
 src/net/sf/jasperreports/engine/util/JRLoader.java |   505 +-
 .../util/JRPdfaIccProfileNotFoundException.java    |    14 +-
 .../sf/jasperreports/engine/util/JRPenUtil.java    |     9 +-
 .../sf/jasperreports/engine/util/JRProperties.java |   139 +-
 .../engine/util/JRQueryChunkHandler.java           |     6 +-
 .../engine/util/JRQueryExecuterUtils.java          |   123 +-
 .../jasperreports/engine/util/JRQueryParser.java   |    61 +-
 .../jasperreports/engine/util/JRReportUtils.java   |    11 +-
 .../jasperreports/engine/util/JRResourcesUtil.java |   125 +-
 src/net/sf/jasperreports/engine/util/JRSaver.java  |    73 +-
 .../engine/util/JRSingletonCache.java              |    31 +-
 .../sf/jasperreports/engine/util/JRStringUtil.java |   318 +-
 .../jasperreports/engine/util/JRStyleResolver.java |   299 +-
 .../sf/jasperreports/engine/util/JRStyledText.java |   149 +-
 .../engine/util/JRStyledTextParser.java            |    19 +-
 .../engine/util/JRStyledTextUtil.java              |   113 +
 .../sf/jasperreports/engine/util/JRSwapFile.java   |    40 +-
 .../jasperreports/engine/util/JRTextAttribute.java |     8 +-
 .../engine/util/JRTextMeasurerFactory.java         |    48 +
 .../engine/util/JRTextMeasurerUtil.java            |   137 +-
 .../jasperreports/engine/util/JRTypeSniffer.java   |    59 +-
 .../engine/util/JRValueStringUtils.java            |    94 +-
 .../engine/util/JRVisitorSupport.java              |     3 +-
 .../sf/jasperreports/engine/util/JRXmlUtils.java   |   123 +-
 .../engine/util/JRXmlWriteHelper.java              |    41 +-
 .../engine/util/Java14BigDecimalHandler.java       |     3 +-
 .../engine/util/Java15BigDecimalHandler.java       |    10 +-
 .../engine/util/JdkGlyphFixTextMeasurer.java       |    32 +-
 .../util/JdkGlyphFixTextMeasurerFactory.java       |    11 +-
 src/net/sf/jasperreports/engine/util/JsonUtil.java |   194 +
 .../engine/util/LegacyBorderOffsetUpdater.java     |    46 -
 .../sf/jasperreports/engine/util/LinkedMap.java    |    59 +-
 .../engine/util/LocalJasperReportsContext.java     |   161 +
 .../engine/util/LocalizedMessageProvider.java      |    57 +
 .../sf/jasperreports/engine/util/MD5Digest.java    |    70 +
 .../jasperreports/engine/util/MarkupProcessor.java |     3 +-
 .../engine/util/MarkupProcessorFactory.java        |     7 +-
 .../engine/util/MaxFontSizeFinder.java             |    31 +-
 .../jasperreports/engine/util/MessageProvider.java |    44 +
 .../engine/util/MessageProviderFactory.java        |    43 +
 .../sf/jasperreports/engine/util/MessageUtil.java  |    93 +
 .../engine/util/NullOutputStream.java              |    53 +
 .../sf/jasperreports/engine/util/ObjectUtils.java  |    23 +-
 src/net/sf/jasperreports/engine/util/Pair.java     |    13 +-
 .../jasperreports/engine/util/ParagraphUtil.java   |     3 +-
 .../engine/util/ProtectionDomainFactory.java       |     3 +-
 .../jasperreports/engine/util/ReportCreator.java   |     3 +-
 .../jasperreports/engine/util/ReportUpdater.java   |     3 +-
 .../engine/util/ResourceBundleMessageProvider.java |    87 +
 .../util/ResourceBundleMessageProviderFactory.java |    64 +
 .../engine/util/SimpleFileResolver.java            |     3 +-
 .../engine/util/SingleProtectionDomainFactory.java |     3 +-
 .../sf/jasperreports/engine/util/SingleValue.java  |    61 +
 .../jasperreports/engine/util/SortedIntList.java   |   116 +
 .../engine/util/StreamCompression.java             |    39 +
 .../sf/jasperreports/engine/util/StyleUtil.java    |   244 +
 .../engine/util/SwapFileVirtualizerStore.java      |   206 +
 .../util/SwapFileVirtualizerStoreFactory.java      |    86 +
 .../engine/util/ThreadLocalStack.java              |     3 +-
 .../engine/util/UniformElementVisitor.java         |     3 +-
 .../engine/util/UniformPrintElementVisitor.java    |     3 +-
 .../engine/util/ValuePropertiesWrapper.java        |    77 +
 .../util/ValuePropertiesWrapperComparator.java     |    49 +
 .../engine/util/VersionComparator.java             |    79 +
 .../engine/util/VirtualizationSerializer.java      |   137 +
 .../engine/util/WrappingImageMapRenderable.java    |    80 +
 .../engine/util/WrappingRenderable.java            |   122 +
 .../sf/jasperreports/engine/util/XmlNamespace.java |     3 +-
 .../sf/jasperreports/engine/util/package-info.java |    30 +
 src/net/sf/jasperreports/engine/util/package.html  |    13 -
 .../engine/util/xml/JRXPathExecuter.java           |     3 +-
 .../engine/util/xml/JRXPathExecuterFactory.java    |     3 +-
 .../engine/util/xml/JRXPathExecuterUtils.java      |    42 +-
 .../engine/util/xml/JRXmlDocumentProducer.java     |    23 +-
 .../engine/util/xml/JaxenNsAwareXPathExecuter.java |    30 +-
 .../engine/util/xml/JaxenXPathExecuter.java        |    26 +-
 .../engine/util/xml/JaxenXPathExecuterFactory.java |     3 +-
 .../engine/util/xml/XalanNsAwareXPathExecuter.java |    25 +-
 .../engine/util/xml/XalanXPathExecuter.java        |    19 +-
 .../engine/util/xml/XalanXPathExecuterFactory.java |     3 +-
 .../engine/util/xml/package-info.java              |    30 +
 .../virtualization/BigDecimalSerializer.java       |    76 +
 .../virtualization/BigIntegerSerializer.java       |    68 +
 .../engine/virtualization/BooleanSerializer.java   |    76 +
 .../engine/virtualization/ByteSerializer.java      |    63 +
 .../engine/virtualization/DateSerializer.java      |    66 +
 .../virtualization/DefaultSerializerRegistry.java  |   136 +
 .../engine/virtualization/DoubleSerializer.java    |    62 +
 .../virtualization/EvaluationTimeSerializer.java   |   117 +
 .../engine/virtualization/FloatSerializer.java     |    62 +
 .../engine/virtualization/IntegerSerializer.java   |    62 +
 .../engine/virtualization/LongSerializer.java      |    63 +
 .../engine/virtualization/ObjectSerializer.java    |    44 +
 .../virtualization/RecordedValuesSerializer.java   |   131 +
 .../engine/virtualization/ReferenceType.java       |    36 +
 .../virtualization/SerializableSerializer.java     |   135 +
 .../virtualization/SerializationConstants.java     |    77 +
 .../engine/virtualization/SerializationUtils.java  |   124 +
 .../engine/virtualization/SerializerRegistry.java  |    36 +
 .../engine/virtualization/ShortSerializer.java     |    62 +
 .../engine/virtualization/SqlDateSerializer.java   |    66 +
 .../engine/virtualization/StringSerializer.java    |   134 +
 .../engine/virtualization/TimeSerializer.java      |    66 +
 .../engine/virtualization/TimestampSerializer.java |    70 +
 .../engine/virtualization/UUIDSerializer.java      |    66 +
 .../engine/virtualization/VirtualizationInput.java |   168 +
 .../virtualization/VirtualizationOutput.java       |   175 +
 .../virtualization/VirtualizationSerializable.java |    38 +
 .../engine/virtualization/package-info.java        |    30 +
 .../engine/xml/BaseSaxParserFactory.java           |   104 +-
 .../engine/xml/ChartEvaluationGroupReference.java  |     3 +-
 .../engine/xml/ColorPropertyRule.java              |     3 +-
 .../engine/xml/ElementReprintGroupReference.java   |     3 +-
 .../engine/xml/ExpressionReturnValueFactory.java   |    78 +
 .../engine/xml/ImageEvaluationGroupReference.java  |     3 +-
 .../engine/xml/JRAbstractStyleFactory.java         |    54 +-
 .../sf/jasperreports/engine/xml/JRBandFactory.java |     3 +-
 .../sf/jasperreports/engine/xml/JRBaseFactory.java |     5 +-
 .../sf/jasperreports/engine/xml/JRBoxFactory.java  |     3 +-
 .../jasperreports/engine/xml/JRBreakFactory.java   |     3 +-
 .../jasperreports/engine/xml/JRChartFactory.java   |     3 +-
 .../engine/xml/JRChartPlotFactory.java             |     6 +-
 .../engine/xml/JRComponentElementFactory.java      |     3 +-
 .../jasperreports/engine/xml/JRComponentRule.java  |    10 +-
 .../engine/xml/JRConditionalStyleFactory.java      |     3 +-
 .../xml/JRConditionalStyleFillerFactory.java       |     3 +-
 .../jasperreports/engine/xml/JRDatasetFactory.java |    14 +-
 .../engine/xml/JRDatasetRunFactory.java            |    11 +-
 .../JRDatasetRunParameterExpressionFactory.java    |    69 -
 .../engine/xml/JRDatasetRunParameterFactory.java   |     3 +-
 .../xml/JRDefaultValueExpressionFactory.java       |     3 +-
 .../engine/xml/JRElementDatasetFactory.java        |    10 +-
 .../jasperreports/engine/xml/JRElementFactory.java |    10 +-
 .../engine/xml/JRElementGroupFactory.java          |     3 +-
 .../jasperreports/engine/xml/JREllipseFactory.java |     3 +-
 .../engine/xml/JRExpressionFactory.java            |     3 +-
 .../jasperreports/engine/xml/JRFieldFactory.java   |     3 +-
 .../sf/jasperreports/engine/xml/JRFontFactory.java |     5 +-
 .../jasperreports/engine/xml/JRFrameFactory.java   |     3 +-
 .../engine/xml/JRGenericElementFactory.java        |     3 +-
 .../xml/JRGenericElementParameterFactory.java      |     3 +-
 .../engine/xml/JRGenericElementTypeFactory.java    |     3 +-
 .../engine/xml/JRGenericPrintElementFactory.java   |     3 +-
 .../xml/JRGenericPrintElementParameterFactory.java |     3 +-
 .../engine/xml/JRGraphicElementFactory.java        |     3 +-
 .../jasperreports/engine/xml/JRGroupFactory.java   |     3 +-
 .../engine/xml/JRHyperlinkFactory.java             |     3 +-
 .../engine/xml/JRHyperlinkParameterFactory.java    |     3 +-
 .../jasperreports/engine/xml/JRImageFactory.java   |    19 +-
 .../xml/JRInitialValueExpressionFactory.java       |     3 +-
 .../sf/jasperreports/engine/xml/JRLineFactory.java |     3 +-
 .../jasperreports/engine/xml/JROriginFactory.java  |     3 +-
 .../engine/xml/JRParagraphFactory.java             |     3 +-
 .../engine/xml/JRParameterFactory.java             |     3 +-
 .../engine/xml/JRPartComponentRule.java            |    77 +
 .../sf/jasperreports/engine/xml/JRPartFactory.java |    77 +
 .../sf/jasperreports/engine/xml/JRPenFactory.java  |     3 +-
 .../engine/xml/JRPrintElementFactory.java          |    24 +-
 .../engine/xml/JRPrintEllipseFactory.java          |     3 +-
 .../engine/xml/JRPrintFontFactory.java             |    13 +-
 .../engine/xml/JRPrintFrameFactory.java            |     3 +-
 .../engine/xml/JRPrintGraphicElementFactory.java   |     3 +-
 .../xml/JRPrintHyperlinkParameterFactory.java      |     3 +-
 .../xml/JRPrintHyperlinkParameterValueFactory.java |     3 +-
 .../engine/xml/JRPrintImageFactory.java            |    19 +-
 .../engine/xml/JRPrintImageSourceFactory.java      |     3 +-
 .../engine/xml/JRPrintImageSourceObject.java       |    16 +-
 .../engine/xml/JRPrintLineFactory.java             |     3 +-
 .../engine/xml/JRPrintPageFactory.java             |     3 +-
 .../engine/xml/JRPrintRectangleFactory.java        |     3 +-
 .../engine/xml/JRPrintStyleFactory.java            |    10 +-
 .../engine/xml/JRPrintTextFactory.java             |    39 +-
 .../jasperreports/engine/xml/JRPrintXmlLoader.java |   110 +-
 .../engine/xml/JRPropertyDigesterRule.java         |     3 +-
 .../engine/xml/JRPropertyExpressionFactory.java    |     3 +-
 .../jasperreports/engine/xml/JRQueryFactory.java   |     3 +-
 .../engine/xml/JRRectangleFactory.java             |     3 +-
 .../engine/xml/JRReportSaxParserFactory.java       |    59 +-
 .../engine/xml/JRSaxParserFactory.java             |     9 +-
 .../engine/xml/JRScriptletFactory.java             |     3 +-
 .../jasperreports/engine/xml/JRSectionFactory.java |     3 +-
 .../engine/xml/JRSortFieldFactory.java             |     3 +-
 .../engine/xml/JRStaticTextFactory.java            |     3 +-
 .../engine/xml/JRStringExpressionFactory.java      |     3 +-
 .../jasperreports/engine/xml/JRStyleFactory.java   |     3 +-
 .../engine/xml/JRSubreportExpressionFactory.java   |     3 +-
 .../engine/xml/JRSubreportFactory.java             |     3 +-
 .../engine/xml/JRSubreportParameterFactory.java    |     3 +-
 .../engine/xml/JRSubreportReturnValueFactory.java  |     3 +-
 .../engine/xml/JRTemplateStyleFactory.java         |     3 +-
 .../engine/xml/JRTextElementFactory.java           |    19 +-
 .../engine/xml/JRTextFieldFactory.java             |    16 +-
 .../engine/xml/JRVariableExpressionFactory.java    |     3 +-
 .../engine/xml/JRVariableFactory.java              |     3 +-
 .../jasperreports/engine/xml/JRXmlBaseWriter.java  |    94 +-
 .../jasperreports/engine/xml/JRXmlConstants.java   |    49 +-
 .../sf/jasperreports/engine/xml/JRXmlDigester.java |    23 +-
 .../engine/xml/JRXmlDigesterFactory.java           |   611 +-
 .../sf/jasperreports/engine/xml/JRXmlLoader.java   |    84 +-
 .../engine/xml/JRXmlTemplateDigesterFactory.java   |    29 +-
 .../engine/xml/JRXmlTemplateLoader.java            |   118 +-
 .../engine/xml/JRXmlTemplateWriter.java            |     7 +-
 .../sf/jasperreports/engine/xml/JRXmlWriter.java   |  1192 ++-
 .../engine/xml/JasperDesignFactory.java            |    18 +-
 .../engine/xml/JasperPrintFactory.java             |     3 +-
 .../engine/xml/PrintBookmarkFactory.java           |    58 +
 .../jasperreports/engine/xml/PrintPartFactory.java |   104 +
 .../engine/xml/PrintSaxParserFactory.java          |    29 +-
 .../engine/xml/StyleContainerRule.java             |     3 +-
 .../jasperreports/engine/xml/TabStopFactory.java   |     3 +-
 .../xml/TextFieldEvaluationGroupReference.java     |     3 +-
 .../engine/xml/TextLineBreakOffsetsRule.java       |     3 +-
 .../engine/xml/TransformedPropertyRule.java        |     3 +-
 .../jasperreports/engine/xml/UuidPropertyRule.java |    50 +
 .../engine/xml/XmlConstantPropertyRule.java        |    21 +-
 .../engine/xml/XmlGroupReference.java              |     3 +-
 .../engine/xml/XmlHandlerNamespace.java            |     7 +-
 .../engine/xml/XmlLoaderReportContext.java         |     3 +-
 .../jasperreports/engine/xml/XmlValueHandler.java  |     5 +-
 .../engine/xml/XmlValueHandlerUtils.java           |    13 +-
 .../jasperreports/engine/xml/XmlWriterVisitor.java |     3 +-
 .../sf/jasperreports/engine/xml/package-info.java  |    30 +
 src/net/sf/jasperreports/engine/xml/package.html   |    13 -
 .../export/AbstractXlsExporterConfiguration.java   |    97 +
 .../export/AbstractXlsReportConfiguration.java     |   796 ++
 .../export/CommonExportConfiguration.java          |    52 +
 .../CompositeExporterConfigurationFactory.java     |   166 +
 .../export/CsvExporterConfiguration.java           |    97 +
 .../export/CsvMetadataExporterConfiguration.java   |    41 +
 .../export/CsvMetadataReportConfiguration.java     |    88 +
 .../export/CsvReportConfiguration.java             |    40 +
 .../export/DocxExporterConfiguration.java          |    38 +
 .../export/DocxReportConfiguration.java            |   132 +
 .../export/ExportInterruptedException.java         |    46 +
 src/net/sf/jasperreports/export/Exporter.java      |   104 +
 .../export/ExporterConfiguration.java              |    38 +
 src/net/sf/jasperreports/export/ExporterInput.java |    38 +
 .../sf/jasperreports/export/ExporterInputItem.java |    43 +
 .../sf/jasperreports/export/ExporterOutput.java    |    32 +
 .../export/Graphics2DExporterConfiguration.java    |    38 +
 .../export/Graphics2DExporterOutput.java           |    38 +
 .../export/Graphics2DReportConfiguration.java      |    88 +
 .../export/HtmlExporterConfiguration.java          |   126 +
 .../jasperreports/export/HtmlExporterOutput.java   |    48 +
 .../export/HtmlReportConfiguration.java            |   233 +
 .../export/JsonExporterConfiguration.java          |    66 +
 .../export/JsonMetadataReportConfiguration.java    |    73 +
 .../export/JsonReportConfiguration.java            |    47 +
 .../export/JxlExporterConfiguration.java           |    59 +
 .../export/JxlMetadataExporterConfiguration.java   |    37 +
 .../export/JxlMetadataReportConfiguration.java     |    37 +
 .../export/JxlReportConfiguration.java             |    59 +
 .../export/OdsExporterConfiguration.java           |    38 +
 .../export/OdsReportConfiguration.java             |    68 +
 .../export/OdtExporterConfiguration.java           |    38 +
 .../export/OdtReportConfiguration.java             |    82 +
 .../export/OutputStreamExporterOutput.java         |    43 +
 .../export/PdfExporterConfiguration.java           |   478 +
 .../export/PdfReportConfiguration.java             |   227 +
 .../export/PptxExporterConfiguration.java          |    38 +
 .../export/PptxReportConfiguration.java            |    54 +
 .../export/PrintPartUnrollExporterInput.java       |    98 +
 .../export/PrintServiceExporterConfiguration.java  |   112 +
 .../export/PrintServiceReportConfiguration.java    |    38 +
 .../PropertiesDefaultsConfigurationFactory.java    |   270 +
 .../PropertiesExporterConfigurationFactory.java    |   233 +
 .../PropertiesNoDefaultsConfigurationFactory.java  |   240 +
 .../export/ReadOnlyPartJasperPrint.java            |   338 +
 .../export/ReportExportConfiguration.java          |   148 +
 .../export/RtfExporterConfiguration.java           |    38 +
 .../export/RtfReportConfiguration.java             |    54 +
 .../export/SimpleCommonExportConfiguration.java    |    59 +
 .../export/SimpleCsvExporterConfiguration.java     |    90 +
 .../SimpleCsvMetadataExporterConfiguration.java    |    32 +
 .../SimpleCsvMetadataReportConfiguration.java      |    73 +
 .../export/SimpleCsvReportConfiguration.java       |    32 +
 .../export/SimpleDocxExporterConfiguration.java    |    32 +
 .../export/SimpleDocxReportConfiguration.java      |   108 +
 .../export/SimpleExporterConfiguration.java        |    32 +
 .../jasperreports/export/SimpleExporterInput.java  |   201 +
 .../export/SimpleExporterInputItem.java            |    73 +
 .../SimpleGraphics2DExporterConfiguration.java     |    32 +
 .../export/SimpleGraphics2DExporterOutput.java     |    61 +
 .../SimpleGraphics2DReportConfiguration.java       |    90 +
 .../export/SimpleHtmlExporterConfiguration.java    |   109 +
 .../export/SimpleHtmlExporterOutput.java           |   185 +
 .../export/SimpleHtmlReportConfiguration.java      |   195 +
 .../export/SimpleJsonExporterConfiguration.java    |    73 +
 .../SimpleJsonMetadataReportConfiguration.java     |    56 +
 .../export/SimpleJsonReportConfiguration.java      |    56 +
 .../export/SimpleJxlExporterConfiguration.java     |    57 +
 .../SimpleJxlMetadataExporterConfiguration.java    |    57 +
 .../SimpleJxlMetadataReportConfiguration.java      |    57 +
 .../export/SimpleJxlReportConfiguration.java       |    57 +
 .../export/SimpleOdsExporterConfiguration.java     |    32 +
 .../export/SimpleOdsReportConfiguration.java       |    56 +
 .../export/SimpleOdtExporterConfiguration.java     |    32 +
 .../export/SimpleOdtReportConfiguration.java       |    74 +
 .../export/SimpleOutputStreamExporterOutput.java   |   111 +
 .../export/SimplePdfExporterConfiguration.java     |   416 +
 .../export/SimplePdfReportConfiguration.java       |   194 +
 .../export/SimplePptxExporterConfiguration.java    |    32 +
 .../export/SimplePptxReportConfiguration.java      |    57 +
 .../SimplePrintServiceExporterConfiguration.java   |   162 +
 .../SimplePrintServiceReportConfiguration.java     |    33 +
 .../export/SimpleReportExportConfiguration.java    |   196 +
 .../export/SimpleRtfExporterConfiguration.java     |    32 +
 .../export/SimpleRtfReportConfiguration.java       |    57 +
 .../export/SimpleTextExporterConfiguration.java    |    91 +
 .../export/SimpleTextReportConfiguration.java      |   108 +
 .../export/SimpleWriterExporterOutput.java         |   204 +
 .../export/SimpleXlsExporterConfiguration.java     |    38 +
 .../SimpleXlsMetadataExporterConfiguration.java    |    32 +
 .../SimpleXlsMetadataReportConfiguration.java      |    73 +
 .../export/SimpleXlsReportConfiguration.java       |    32 +
 .../export/SimpleXlsxExporterConfiguration.java    |    56 +
 .../export/SimpleXlsxReportConfiguration.java      |    32 +
 .../export/SimpleXmlExporterOutput.java            |   130 +
 .../export/TextExporterConfiguration.java          |    99 +
 .../export/TextReportConfiguration.java            |   136 +
 .../jasperreports/export/WriterExporterOutput.java |    57 +
 .../export/XlsExporterConfiguration.java           |   140 +
 .../export/XlsMetadataExporterConfiguration.java   |    38 +
 .../export/XlsMetadataReportConfiguration.java     |    86 +
 .../export/XlsReportConfiguration.java             |   958 ++
 .../export/XlsxExporterConfiguration.java          |    59 +
 .../export/XlsxReportConfiguration.java            |    38 +
 .../sf/jasperreports/export/XmlExporterOutput.java |    36 +
 .../export/annotations/ExporterParameter.java      |    47 +
 .../export/annotations/ExporterProperty.java       |    47 +
 .../export/annotations/package-info.java           |    29 +
 src/net/sf/jasperreports/export/package-info.java  |   117 +
 .../AbstractParametersExporterOutput.java          |   113 +
 .../parameters/ParameterOverriddenResolver.java    |   248 +
 .../parameters/ParameterOverrideResolver.java      |   220 +
 .../export/parameters/ParameterResolver.java       |    69 +
 .../ParametersExporterConfigurationFactory.java    |   309 +
 .../export/parameters/ParametersExporterInput.java |   132 +
 .../ParametersGraphics2DExporterOutput.java        |    70 +
 .../parameters/ParametersHtmlExporterOutput.java   |   180 +
 .../ParametersOutputStreamExporterOutput.java      |   123 +
 .../parameters/ParametersWriterExporterOutput.java |   196 +
 .../parameters/ParametersXmlExporterOutput.java    |   135 +
 .../export/parameters/package-info.java            |    29 +
 .../export/type/HtmlSizeUnitEnum.java              |    70 +
 .../export/type/PdfPermissionsEnum.java            |   124 +
 .../export/type/PdfPrintScalingEnum.java           |    70 +
 .../jasperreports/export/type/PdfVersionEnum.java  |    90 +
 .../export/type/PdfaConformanceEnum.java           |    75 +
 .../sf/jasperreports/export/type/package-info.java |    29 +
 .../expressions/ExprFunctionsRegistryFactory.java  |    35 +
 .../sf/jasperreports/expressions/package-info.java |    27 +
 .../extensions/DefaultExtensionsRegistry.java      |    30 +-
 .../DefaultExtensionsRegistryFactory.java          |   149 +-
 .../extensions/ExtensionsEnvironment.java          |    18 +-
 .../extensions/ExtensionsRegistry.java             |     3 +-
 .../extensions/ExtensionsRegistryFactory.java      |     3 +-
 .../extensions/ListExtensionRegistry.java          |    62 +
 .../extensions/ListExtensionsRegistry.java         |    73 +
 .../extensions/SingletonExtensionRegistry.java     |     3 +-
 .../extensions/SpringExtensionsRegistry.java       |     5 +-
 .../SpringExtensionsRegistryFactory.java           |    18 +-
 .../sf/jasperreports/extensions/package-info.java  |   138 +
 .../sf/jasperreports/fonts/jasperreports-fonts.xml |    16 +
 .../sf/jasperreports/fonts/pictonic/pictonic.eot   |   Bin 0 -> 1928 bytes
 .../sf/jasperreports/fonts/pictonic/pictonic.svg   |    58 +
 .../sf/jasperreports/fonts/pictonic/pictonic.svgz  |   Bin 0 -> 908 bytes
 .../sf/jasperreports/fonts/pictonic/pictonic.ttf   |   Bin 0 -> 1760 bytes
 .../sf/jasperreports/fonts/pictonic/pictonic.woff  |   Bin 0 -> 1308 bytes
 .../functions/AbstractFunctionSupport.java         |    52 +
 .../jasperreports/functions/FunctionContext.java   |    42 +
 .../jasperreports/functions/FunctionSupport.java   |    33 +
 .../jasperreports/functions/FunctionsBundle.java   |   127 +
 .../functions/FunctionsRegistryFactory.java        |   104 +
 .../sf/jasperreports/functions/FunctionsUtil.java  |   120 +
 .../functions/annotations/Function.java            |    41 +
 .../functions/annotations/FunctionBean.java        |    97 +
 .../functions/annotations/FunctionCategories.java  |    42 +
 .../functions/annotations/FunctionCategory.java    |    41 +
 .../annotations/FunctionCategoryBean.java          |    87 +
 .../annotations/FunctionMessagesBundle.java        |    41 +
 .../functions/annotations/FunctionParameter.java   |    41 +
 .../annotations/FunctionParameterBean.java         |    98 +
 .../functions/annotations/FunctionParameters.java  |    41 +
 .../functions/annotations/FunctionsInfo.java       |   309 +
 .../functions/annotations/package-info.java        |    27 +
 .../sf/jasperreports/functions/package-info.java   |    27 +
 .../jasperreports/governors/GovernorException.java |     7 +-
 .../GovernorExtensionsRegistryFactory.java         |     3 +-
 .../jasperreports/governors/GovernorFactory.java   |    26 +-
 .../jasperreports/governors/MaxPagesGovernor.java  |     9 +-
 .../governors/MaxPagesGovernorException.java       |    10 +-
 .../jasperreports/governors/TimeoutGovernor.java   |     9 +-
 .../governors/TimeoutGovernorException.java        |    10 +-
 .../sf/jasperreports/governors/package-info.java   |    81 +
 .../j2ee/servlets/AbstractXlsServlet.java          |    56 +-
 .../j2ee/servlets/BaseHttpServlet.java             |    13 +-
 .../jasperreports/j2ee/servlets/DocxServlet.java   |    35 +-
 .../jasperreports/j2ee/servlets/ImageServlet.java  |    38 +-
 .../j2ee/servlets/JExcelApiServlet.java            |     8 +-
 .../sf/jasperreports/j2ee/servlets/OdsServlet.java |    35 +-
 .../sf/jasperreports/j2ee/servlets/OdtServlet.java |    35 +-
 .../sf/jasperreports/j2ee/servlets/PdfServlet.java |    35 +-
 .../jasperreports/j2ee/servlets/PptxServlet.java   |    35 +-
 .../sf/jasperreports/j2ee/servlets/RtfServlet.java |    35 +-
 .../sf/jasperreports/j2ee/servlets/XlsServlet.java |     6 +-
 .../jasperreports/j2ee/servlets/XlsxServlet.java   |     6 +-
 .../j2ee/servlets/Xml4SwfServlet.java              |     6 +-
 .../sf/jasperreports/j2ee/servlets/XmlServlet.java |    44 +-
 .../jasperreports/j2ee/servlets/package-info.java  |    27 +
 .../olap/JRMdxQueryExecuterFactory.java            |    20 +-
 .../jasperreports/olap/JRMondrianDataSource.java   |     3 +-
 .../olap/JRMondrianQueryExecuter.java              |   200 +-
 .../olap/JRMondrianQueryExecuterFactory.java       |    16 +-
 .../sf/jasperreports/olap/JROlapDataSource.java    |   125 +-
 .../sf/jasperreports/olap/Olap4jDataSource.java    |    45 +
 .../olap/Olap4jMondrianQueryExecuter.java          |   191 +
 .../olap/Olap4jMondrianQueryExecuterFactory.java   |    73 +
 .../olap/Olap4jQueryExecuterFactory.java           |   103 +
 src/net/sf/jasperreports/olap/mapping/Axis.java    |    10 +-
 .../jasperreports/olap/mapping/AxisPosition.java   |     3 +-
 .../sf/jasperreports/olap/mapping/DataMapping.java |     4 +-
 src/net/sf/jasperreports/olap/mapping/Mapping.java |     3 +-
 .../jasperreports/olap/mapping/MappingLexer.java   |     4 +-
 .../olap/mapping/MappingMetadata.java              |     3 +-
 .../jasperreports/olap/mapping/MappingParser.java  |     3 +-
 .../olap/mapping/MappingParserTokenTypes.java      |     5 +-
 src/net/sf/jasperreports/olap/mapping/Member.java  |     3 +-
 .../sf/jasperreports/olap/mapping/MemberDepth.java |     3 +-
 .../jasperreports/olap/mapping/MemberMapping.java  |     4 +-
 .../jasperreports/olap/mapping/MemberProperty.java |     3 +-
 src/net/sf/jasperreports/olap/mapping/Tuple.java   |     3 +-
 .../sf/jasperreports/olap/mapping/TupleMember.java |     3 +-
 .../jasperreports/olap/mapping/TuplePosition.java  |     3 +-
 src/net/sf/jasperreports/olap/mapping/mapping.g    |    10 +-
 .../jasperreports/olap/mapping/package-info.java   |    27 +
 .../olap/mondrian/JRMondrianAxis.java              |     3 +-
 .../olap/mondrian/JRMondrianCell.java              |     3 +-
 .../olap/mondrian/JRMondrianFactory.java           |     3 +-
 .../olap/mondrian/JRMondrianHierarchy.java         |     3 +-
 .../olap/mondrian/JRMondrianLevel.java             |     3 +-
 .../olap/mondrian/JRMondrianMember.java            |     7 +-
 .../olap/mondrian/JRMondrianResult.java            |     3 +-
 .../olap/mondrian/JRMondrianTuple.java             |     3 +-
 .../jasperreports/olap/mondrian/package-info.java  |    27 +
 .../sf/jasperreports/olap/olap4j/Olap4jCell.java   |    66 +
 .../jasperreports/olap/olap4j/Olap4jFactory.java   |    65 +
 .../jasperreports/olap/olap4j/Olap4jHierarchy.java |    91 +
 .../sf/jasperreports/olap/olap4j/Olap4jLevel.java  |    54 +
 .../sf/jasperreports/olap/olap4j/Olap4jMember.java |    79 +
 .../sf/jasperreports/olap/olap4j/Olap4jResult.java |    79 +
 .../olap/olap4j/Olap4jResultAxis.java              |    96 +
 .../sf/jasperreports/olap/olap4j/Olap4jTuple.java  |    59 +
 .../sf/jasperreports/olap/olap4j/package-info.java |    27 +
 src/net/sf/jasperreports/olap/package-info.java    |    27 +
 .../sf/jasperreports/olap/result/JROlapCell.java   |     3 +-
 .../jasperreports/olap/result/JROlapHierarchy.java |     3 +-
 .../olap/result/JROlapHierarchyLevel.java          |     3 +-
 .../sf/jasperreports/olap/result/JROlapMember.java |     6 +-
 .../olap/result/JROlapMemberTuple.java             |     3 +-
 .../sf/jasperreports/olap/result/JROlapResult.java |     3 +-
 .../olap/result/JROlapResultAxis.java              |     3 +-
 .../sf/jasperreports/olap/result/package-info.java |    27 +
 src/net/sf/jasperreports/olap/xmla/JRXmlaCell.java |     3 +-
 .../jasperreports/olap/xmla/JRXmlaHierarchy.java   |    39 +-
 .../olap/xmla/JRXmlaHierarchyLevel.java            |     3 +-
 .../sf/jasperreports/olap/xmla/JRXmlaMember.java   |     8 +-
 .../jasperreports/olap/xmla/JRXmlaMemberTuple.java |     3 +-
 .../olap/xmla/JRXmlaQueryExecuter.java             |   213 +-
 .../olap/xmla/JRXmlaQueryExecuterFactory.java      |    16 +-
 .../sf/jasperreports/olap/xmla/JRXmlaResult.java   |    11 +-
 .../jasperreports/olap/xmla/JRXmlaResultAxis.java  |     3 +-
 .../olap/xmla/Olap4jXmlaQueryExecuter.java         |   395 +
 .../olap/xmla/Olap4jXmlaQueryExecuterFactory.java  |    63 +
 .../sf/jasperreports/olap/xmla/package-info.java   |    27 +
 .../parts/AbstractPartComponentXmlWriter.java      |   105 +
 .../PartComponentsExtensionsRegistryFactory.java   |    98 +
 .../jasperreports/parts/PartComponentsManager.java |    42 +
 .../parts/PartComponentsXmlDigesterConfigurer.java |    92 +
 .../parts/PartComponentsXmlWriter.java             |   121 +
 .../sf/jasperreports/parts/PartFillerParent.java   |    37 +
 src/net/sf/jasperreports/parts/parts.xsd           |    31 +
 .../parts/subreport/FillSubreportPartFactory.java  |    57 +
 .../subreport/StandardSubreportPartComponent.java  |   313 +
 .../parts/subreport/SubreportFillPart.java         |   389 +
 .../parts/subreport/SubreportPartComponent.java    |    82 +
 .../subreport/SubreportPartComponentCompiler.java  |   113 +
 .../renderers/AwtComponentRenderer.java            |    24 +-
 .../sf/jasperreports/renderers/BatikRenderer.java  |   127 +-
 .../renderers/JCommonDrawableRenderer.java         |    15 +-
 .../renderers/JFreeChartRenderer.java              |     3 +-
 .../renderers/JRAbstractChartImageMapRenderer.java |    76 -
 .../renderers/JRCategoryChartImageMapRenderer.java |    88 -
 .../renderers/JRHighLowChartImageMapRenderer.java  |    88 -
 .../renderers/JRPieChartImageMapRenderer.java      |    90 -
 .../renderers/JRSimpleImageMapRenderer.java        |    12 +-
 .../JRTimePeriodChartImageMapRenderer.java         |    90 -
 .../JRTimeSeriesChartImageMapRenderer.java         |    91 -
 .../renderers/JRXYChartImageMapRenderer.java       |    90 -
 .../sf/jasperreports/renderers/package-info.java   |    30 +
 src/net/sf/jasperreports/renderers/package.html    |    13 -
 .../repo/CastorDataAdapterPersistenceService.java  |    63 +
 .../repo/CastorObjectPersistenceService.java       |    89 +
 src/net/sf/jasperreports/repo/CastorResource.java  |    32 +
 .../sf/jasperreports/repo/DataAdapterResource.java |    49 +
 .../repo/DefaultRepositoryExtensionRegistry.java   |    65 +
 ...DefaultRepositoryExtensionsRegistryFactory.java |    40 +
 ...DefaultRepositoryPersistenceServiceFactory.java |    86 +
 .../repo/DefaultRepositoryService.java             |   185 +-
 ...RepositoryServiceExtensionsRegistryFactory.java |    46 -
 .../repo/DefaultRepositoryServiceFactory.java      |    56 -
 .../FileRepositoryExtensionsRegistryFactory.java   |    45 +
 .../FileRepositoryPersistenceServiceFactory.java   |    86 +
 .../jasperreports/repo/FileRepositoryService.java  |   279 +-
 ...RepositoryServiceExtensionsRegistryFactory.java |    33 +-
 .../repo/FileRepositoryServiceFactory.java         |    56 -
 .../repo/InputStreamPersistenceService.java        |    65 +
 .../sf/jasperreports/repo/InputStreamResource.java |    49 +
 .../sf/jasperreports/repo/JasperDesignCache.java   |   260 +
 .../repo/JasperDesignReportResource.java           |    51 +
 .../repo/JasperDesignReportResourceCache.java      |    79 +
 src/net/sf/jasperreports/repo/ObjectResource.java  |    12 +-
 .../repo/OutputStreamPersistenceService.java       |    65 +
 .../jasperreports/repo/OutputStreamResource.java   |    49 +
 .../sf/jasperreports/repo/PersistenceService.java  |    46 +
 .../repo/PersistenceServiceFactory.java            |    40 +
 src/net/sf/jasperreports/repo/PersistenceUtil.java |    84 +
 src/net/sf/jasperreports/repo/ReportResource.java  |     8 +-
 .../sf/jasperreports/repo/RepositoryContext.java   |    38 -
 .../sf/jasperreports/repo/RepositoryService.java   |    27 +-
 .../repo/RepositoryServiceFactory.java             |    38 -
 src/net/sf/jasperreports/repo/RepositoryUtil.java  |   175 +-
 src/net/sf/jasperreports/repo/Resource.java        |     4 +-
 .../repo/ResourceBundlePersistenceService.java     |    94 +
 .../jasperreports/repo/ResourceBundleResource.java |    49 +
 .../jasperreports/repo/SerializableResource.java   |    34 +
 .../repo/SerializedObjectPersistenceService.java   |   114 +
 .../repo/SerializedReportPersistenceService.java   |    53 +
 .../repo/SimpleRepositoryContext.java              |   119 -
 .../repo/StreamRepositoryService.java              |    46 +
 src/net/sf/jasperreports/repo/package-info.java    |    30 +
 src/net/sf/jasperreports/search/HitTermInfo.java   |    87 +
 .../jasperreports/search/LuceneSimpleAnalyzer.java |    74 +
 .../sf/jasperreports/search/LuceneSpansInfo.java   |    77 +
 src/net/sf/jasperreports/search/LuceneUtil.java    |   416 +
 src/net/sf/jasperreports/search/SpansInfo.java     |    42 +
 src/net/sf/jasperreports/search/package-info.java  |    30 +
 src/net/sf/jasperreports/swing/JRDesignViewer.java |   139 +
 .../swing/JRDesignViewerController.java            |   107 +
 .../jasperreports/swing/JRDesignViewerPanel.java   |    56 +
 .../jasperreports/swing/JRDesignViewerToolbar.java |    45 +
 src/net/sf/jasperreports/swing/JRViewer.java       |   131 +-
 .../sf/jasperreports/swing/JRViewerController.java |    73 +-
 src/net/sf/jasperreports/swing/JRViewerEvent.java  |     3 +-
 .../sf/jasperreports/swing/JRViewerListener.java   |     3 +-
 src/net/sf/jasperreports/swing/JRViewerPanel.java  |   181 +-
 .../sf/jasperreports/swing/JRViewerToolbar.java    |    48 +-
 src/net/sf/jasperreports/swing/package-info.java   |    30 +
 .../types/date/AbstractDateRange.java              |    57 +
 .../sf/jasperreports/types/date/CalendarUnit.java  |    70 +
 src/net/sf/jasperreports/types/date/DateRange.java |    36 +
 .../types/date/DateRangeBaseSQLEqualityClause.java |    87 +
 .../jasperreports/types/date/DateRangeBuilder.java |   228 +
 .../types/date/DateRangeExpression.java            |    43 +
 .../types/date/DateRangeParameterHandler.java      |    74 +
 .../types/date/DateRangeQueryClauseExtensions.java |    84 +
 .../types/date/DateRangeSQLBetweenClause.java      |    83 +
 .../types/date/DateRangeSQLEqualClause.java        |    73 +
 .../date/DateRangeSQLLessOrGreaterClause.java      |    88 +
 .../types/date/DateRangeSQLNotEqualClause.java     |    73 +
 src/net/sf/jasperreports/types/date/FixedDate.java |   117 +
 .../jasperreports/types/date/FixedTimestamp.java   |    68 +
 .../date/InvalidDateRangeExpressionException.java  |    59 +
 .../types/date/RelativeDateRange.java              |   288 +
 .../types/date/RelativeTimestampRange.java         |    57 +
 .../jasperreports/types/date/TimestampRange.java   |    36 +
 .../sf/jasperreports/types/date/package-info.java  |    30 +
 src/net/sf/jasperreports/util/CastorMapping.java   |    90 +
 .../CastorMappingExtensionsRegistryFactory.java    |    86 +
 src/net/sf/jasperreports/util/CastorUtil.java      |   724 ++
 .../util/IdentitySecretsProvider.java              |    43 +
 ...tySecretsProviderExtensionsRegistryFactory.java |    62 +
 .../util/IdentitySecretsProviderFactory.java       |    50 +
 .../sf/jasperreports/util/NoWriteFieldHandler.java |    55 +
 src/net/sf/jasperreports/util/SecretsProvider.java |    48 +
 .../jasperreports/util/SecretsProviderFactory.java |    43 +
 src/net/sf/jasperreports/util/SecretsUtil.java     |    82 +
 src/net/sf/jasperreports/util/package-info.java    |    30 +
 src/net/sf/jasperreports/view/JRDesignViewer.java  |    85 +-
 .../sf/jasperreports/view/JRHyperlinkListener.java |     3 +-
 .../sf/jasperreports/view/JRSaveContributor.java   |    33 +-
 src/net/sf/jasperreports/view/JRViewer.form        |    36 +-
 src/net/sf/jasperreports/view/JRViewer.java        |   447 +-
 .../sf/jasperreports/view/JasperDesignViewer.java  |   146 +-
 src/net/sf/jasperreports/view/JasperViewer.java    |   318 +-
 .../jasperreports/view/SaveContributorUtils.java   |    85 +
 src/net/sf/jasperreports/view/package-info.java    |   121 +
 src/net/sf/jasperreports/view/package.html         |    13 -
 .../view/save/JRCsvSaveContributor.java            |    27 +-
 .../view/save/JRDocxSaveContributor.java           |    27 +-
 .../save/JREmbeddedImagesXmlSaveContributor.java   |    31 +-
 .../view/save/JRHtmlSaveContributor.java           |    29 +-
 .../save/JRMultipleSheetsXlsSaveContributor.java   |    33 +-
 .../view/save/JROdtSaveContributor.java            |    27 +-
 .../view/save/JRPdfSaveContributor.java            |    27 +-
 .../view/save/JRPrintSaveContributor.java          |    18 +-
 .../view/save/JRRtfSaveContributor.java            |    27 +-
 .../view/save/JRSingleSheetXlsSaveContributor.java |    33 +-
 .../view/save/JRXmlSaveContributor.java            |    31 +-
 .../sf/jasperreports/view/save/package-info.java   |    30 +
 src/net/sf/jasperreports/view/save/package.html    |    13 -
 .../jasperreports/web/JRInteractiveException.java  |    60 +
 .../web/JRInteractiveRuntimeException.java         |    56 +
 .../sf/jasperreports/web/WebLocaleResolver.java    |    38 +
 src/net/sf/jasperreports/web/WebReportContext.java |    42 +-
 .../jasperreports/web/actions/AbstractAction.java  |   247 +
 src/net/sf/jasperreports/web/actions/Action.java   |    35 +
 .../jasperreports/web/actions/ActionException.java |    57 +
 .../sf/jasperreports/web/actions/MultiAction.java  |    53 +
 .../sf/jasperreports/web/actions/RedoAction.java   |    48 +
 .../sf/jasperreports/web/actions/SaveAction.java   |    76 +
 .../jasperreports/web/actions/SaveZoomAction.java  |   104 +
 .../jasperreports/web/actions/SaveZoomCommand.java |    69 +
 .../sf/jasperreports/web/actions/SearchAction.java |   102 +
 .../sf/jasperreports/web/actions/SearchData.java   |    69 +
 .../sf/jasperreports/web/actions/UndoAction.java   |    48 +
 .../jasperreports/web/actions/UndoAllAction.java   |    48 +
 .../jasperreports/web/actions/messages.properties  |     1 +
 .../sf/jasperreports/web/actions/package-info.java |    30 +
 src/net/sf/jasperreports/web/commands/Command.java |    38 +
 .../web/commands/CommandException.java             |    57 +
 .../jasperreports/web/commands/CommandStack.java   |    91 +
 .../jasperreports/web/commands/CommandTarget.java  |    57 +
 .../web/commands/MultiActionCommand.java           |    76 +
 .../web/commands/ResetInCacheCommand.java          |    75 +
 .../jasperreports/web/commands/package-info.java   |    30 +
 .../listeners/JasperReportsContextListener.java    |    66 +
 .../jasperreports/web/listeners/package-info.java  |    30 +
 src/net/sf/jasperreports/web/package-info.java     |    30 +
 .../web/servlets/AbstractServlet.java              |    78 +
 .../jasperreports/web/servlets/AbstractViewer.java |   134 -
 .../web/servlets/AsyncJasperPrintAccessor.java     |   405 +
 .../sf/jasperreports/web/servlets/Controller.java  |   215 +
 .../jasperreports/web/servlets/DefaultViewer.java  |    97 -
 .../jasperreports/web/servlets/ImageServlet.java   |   100 +-
 .../web/servlets/JasperPrintAccessor.java          |    68 +
 .../web/servlets/NoDecorationViewer.java           |    93 -
 .../web/servlets/ReportActionServlet.java          |   153 +
 .../web/servlets/ReportContextCreatorServlet.java  |   120 +
 .../web/servlets/ReportExecutionStatus.java        |   163 +
 .../web/servlets/ReportJiveComponentsServlet.java  |   218 +
 .../web/servlets/ReportOutputServlet.java          |   303 +
 .../web/servlets/ReportPageStatus.java             |   107 +
 .../web/servlets/ReportPageStatusServlet.java      |   217 +
 .../jasperreports/web/servlets/ReportServlet.java  |   502 +-
 .../web/servlets/RequirejsConfigServlet.java       |    74 +
 .../web/servlets/ResourceServlet.java              |    47 +-
 .../web/servlets/SimpleJasperPrintAccessor.java    |    74 +
 .../jasperreports/web/servlets/ViewerServlet.java  |   213 +
 .../jasperreports/web/servlets/package-info.java   |    30 +
 .../resources/dashboard/BetweenPagesTemplate.vm    |     0
 .../resources/dashboard/ExceptionTemplate.vm       |    12 -
 .../servlets/resources/dashboard/FooterTemplate.vm |     1 -
 .../servlets/resources/dashboard/HeaderTemplate.vm |    22 -
 .../web/servlets/resources/global.css              |   149 -
 .../jasperreports/web/servlets/resources/global.js |   546 -
 .../servlets/resources/jasperreports-global.css    |    41 +
 .../report/jasperreports-component-registrar.js    |    87 +
 .../report/jasperreports-report-processor.js       |    37 +
 .../require/report/jasperreports-report.js         |   250 +
 .../require/report/jasperreports-status-checker.js |    78 +
 .../resources/require/util/jasperreports-ajax.js   |    31 +
 .../require/util/jasperreports-event-manager.js    |   131 +
 .../resources/require/util/jasperreports-loader.js |   148 +
 .../require/util/jasperreports-url-manager.js      |    34 +
 .../resources/require/util/jasperreports-utils.js  |   307 +
 .../require/viewer/jasperreports-viewer.js         |   416 +
 .../servlets/resources/templates/FooterTemplate.vm |     6 +-
 .../resources/templates/FooterTemplateNoPages.vm   |     2 +
 .../servlets/resources/templates/HeaderTemplate.vm |    36 +-
 .../resources/templates/HeaderTemplateNoPages.vm   |     2 +
 .../resources/templates/RequirejsConfigTemplate.vm |     1 +
 .../web/servlets/resources/viewer/BodyTemplate.vm  |    18 +
 .../servlets/resources/viewer/FooterTemplate.vm    |     7 +
 .../servlets/resources/viewer/HeaderTemplate.vm    |    37 +
 .../web/servlets/resources/viewer/first.GIF        |   Bin 0 -> 925 bytes
 .../web/servlets/resources/viewer/last.GIF         |   Bin 0 -> 924 bytes
 .../web/servlets/resources/viewer/next.GIF         |   Bin 0 -> 913 bytes
 .../web/servlets/resources/viewer/previous.GIF     |   Bin 0 -> 910 bytes
 .../web/servlets/resources/viewer/redo.GIF         |   Bin 0 -> 121 bytes
 .../web/servlets/resources/viewer/save.GIF         |   Bin 0 -> 884 bytes
 .../web/servlets/resources/viewer/undo.GIF         |   Bin 0 -> 124 bytes
 .../web/servlets/resources/viewer/undoall.GIF      |   Bin 0 -> 152 bytes
 .../web/util/AbstractWebResourceHandler.java       |   153 +
 .../jasperreports/web/util/ContentTypeMapping.java |    75 +
 ...ontentTypeMappingExtensionsRegistryFactory.java |    62 +
 .../web/util/DefaultWebRequestContext.java         |    66 +
 .../web/util/DefaultWebResourceHandler.java        |   161 +
 .../web/util/FontWebResourceHandler.java           |   163 +
 .../web/util/ImageWebResourceHandler.java          |   180 +
 .../sf/jasperreports/web/util/JacksonMapping.java  |    77 +
 .../JacksonMappingExtensionsRegistryFactory.java   |    71 +
 src/net/sf/jasperreports/web/util/JacksonUtil.java |   307 +
 .../web/util/JiveWebResourceHandler.java           |    94 +
 .../jasperreports/web/util/LocaleResolverUtil.java |    66 +
 .../web/util/ReportExecutionHyperlinkProducer.java |    60 +-
 .../ReportExecutionHyperlinkProducerFactory.java   |    29 +-
 .../util/ReportInteractionHyperlinkProducer.java   |    61 +
 .../web/util/RequirejsConfigContributor.java       |    36 +
 .../RequirejsConfigContributorSwitchDecorator.java |    92 +
 .../web/util/RequirejsConfigCreator.java           |   140 +
 .../RequirejsConfigTemplateExtensionFactory.java   |   127 +
 .../web/util/RequirejsModuleMapping.java           |    93 +
 ...rejsModuleMappingExtensionsRegistryFactory.java |    77 +
 .../web/util/RequirejsTemplateConfigContext.java   |    73 +
 .../util/RequirejsTemplateConfigContributor.java   |   142 +
 .../jasperreports/web/util/SimpleWebResource.java  |    54 +
 .../sf/jasperreports/web/util/VelocityUtil.java    |    32 +-
 .../web/util/WebHtmlResourceHandler.java           |    69 +
 .../jasperreports/web/util/WebRequestContext.java  |    38 +
 src/net/sf/jasperreports/web/util/WebResource.java |    38 +
 .../jasperreports/web/util/WebResourceHandler.java |    38 +
 ...ebResourceHandlersExtensionRegistryFactory.java |    97 +
 src/net/sf/jasperreports/web/util/WebUtil.java     |   225 +
 .../sf/jasperreports/web/util/package-info.java    |    30 +
 src/org/w3c/tools/codec/package-info.java          |    30 +
 tests/log4j.xml                                    |    22 +
 .../sf/jasperreports/ExpressionParsingTest.java    |    98 +
 .../virtualization/BaseElementsTests.java          |    99 +
 .../virtualization/BaseSerializationTests.java     |   139 +
 .../virtualization/FrameElementTest.java           |    88 +
 .../virtualization/GenericElementTest.java         |   118 +
 .../virtualization/GraphicElementsTest.java        |    80 +
 .../virtualization/ImageElementTest.java           |   259 +
 .../virtualization/IntCompressionTest.java         |   107 +
 .../virtualization/JRValuesSerializationTest.java  |   158 +
 .../virtualization/ReferencesTest.java             |   125 +
 .../jasperreports/virtualization/ReportTest.java   |   188 +
 .../virtualization/TextElementTest.java            |   335 +
 .../virtualization/ValuesSerializationTest.java    |    94 +
 .../virtualization/VirtualElementsDataTest.java    |   168 +
 .../virtualization/repo/FirstJasper.jrxml          |   428 +
 .../jasperreports/virtualization/repo/dukesign.jpg |   Bin 0 -> 4660 bytes
 .../virtualization/repo/jasperreports.png          |   Bin 0 -> 1491 bytes
 .../jasperreports/virtualization/repo/orders.csv   |   831 ++
 .../virtualization/repo/ordersData.xml             |     9 +
 web/assembly.xml                                   |    19 +
 web/webapp/scripts/test.js                         |    23 +
 2880 files changed, 196673 insertions(+), 35744 deletions(-)

diff --cc debian/changelog
index 3e45961,0000000..8e2f3d0
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,191 -1,0 +1,225 @@@
++jasperreports (6.1.1+dfsg-1) unstable; urgency=medium
++
++  * Team upload.
++  * New upstream release.
++  * Switch from cdbs to dh sequencer.
++  * debian/control:
++    - Vcs-Browser: Use https.
++    - Add liblucene4-java to Build-Depends. Suggest liblucene4-java.
++    - Add libhttpclient-java to Build-Depends and suggest it.
++    - Replace libjackson-json-java with libjackson2-* build-dependencies.
++    - Switch from groovy to groovy2. (Closes: #801693)
++    - Use javahelper and maven-repo-helper to install Maven artifacts.
++    - Tighten dependency on libbatik-java to >= 1.8.
++    - wrap-and-sort -sa.
++  * Do not install jasperreports-applet.jar. It is gone.
++  * debian/patches:
++    - Add build.patch which modifies the build.xml file and works around
++      various build issues. The old patches 01, 06 and 12 were merged into this
++      one. It is simpler to maintain.
++    - Rebase 09_use_commons_codec.diff and rename it to
++      commons-codec-Base64.patch.
++    - Rebase 07_exclude_barcode4j_and_barbecue.diff and rename it to
++      exclude-barcode4j-and-barbecue.patch.
++    - Rename 17_batik_18.diff to batik-1.8.patch.
++    - Drop 02_use_debian_asm.diff because this should be fixed in
++      groovy2 if at all.
++    - Drop 08_no_maxmemory_for_javadoc.diff. It is obsolete.
++    - Drop patch 10, 12 and 14 because they appear to be obsolete and building
++      succeeds without them.
++  * Override Lintian warnings: source-is-missing and license-problem-json-evil
++    because they are both false-positives.
++
++ -- Markus Koschany <apo at gambaru.de>  Mon, 19 Oct 2015 17:59:03 +0200
++
 +jasperreports (4.1.3+dfsg-4) unstable; urgency=medium
 +
 +  * Team upload.
 +  [ Emmanuel Bourg ]
 +  * Replaced the dependency on libasm2-java with libasm4-java
 +
 +  [ tony mancill ]
 +  * Moved the package to Git
 +  * Add patch for build against batik 1.8 and depend on batik (>= 1.8)
 +    (Closes: #800807)
 +
 + -- tony mancill <tmancill at debian.org>  Sun, 11 Oct 2015 12:33:15 -0700
 +
 +jasperreports (4.1.3+dfsg-3) unstable; urgency=low
 +
 +  * Team upload.
 +  * Search for jackson-mapper-asl.jar and jackson-core-asl.jar in $CLASSPATH
 +    and adjust debian/rules for the changes in libjackson-json-java.
 +  * Bump Standards-Version to 3.9.5, no changes.
 +  * Use compat level 9 and require debhelper >= 9.
 +
 + -- Markus Koschany <apo at gambaru.de>  Tue, 03 Dec 2013 10:11:43 +0100
 +
 +jasperreports (4.1.3+dfsg-2) unstable; urgency=low
 +
 +  * Team upload.
 +  * Added a patch to compile with ecj 3.8 (addresses part of #713169)
 +  * Enabled OOXML support
 +  * debian/control
 +    - Updated Standards-Version to 3.9.4 (no changes)
 +    - Use canonical URLs for the Vcs-* fields
 +  * debian/copyright:
 +    - Updated the format URI
 +    - Removed the duplicate Copyright field
 +
 + -- Emmanuel Bourg <ebourg at apache.org>  Thu, 11 Jul 2013 15:39:50 +0200
 +
 +jasperreports (4.1.3+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 01 Nov 2011 23:32:32 +0100
 +
 +jasperreports (4.1.2+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - Refresh all debian/patches/*.
 +    - Add Build-Depends on velocity, libcastor-core-java
 +      and libcastor-xml-java.
 +  * Build-Depends and Recommends libapache-poi-java instead of
 +    libjakarta-poi-java (renamed package). (Closes: #642280).
 +  * d/patches/13_disable_ooxml_support.diff: Disable OOXML support in JR since
 +    libapache-poi-java doesn't provide it.
 +  * d/patches/14_velocity.diff: Fix some missing exception not handled by JR.
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 21 Sep 2011 14:06:31 +0200
 +
 +jasperreports (4.0.2+dfsg-2) unstable; urgency=low
 +
 +  [ Miguel Landaeta ]
 +  * Team upload.
-   * Switch dependencies on Spring Framework 2.5 with 3.0. (Closes: #638391). 
++  * Switch dependencies on Spring Framework 2.5 with 3.0. (Closes: #638391).
 +  * Add mh_clean call in clean target.
 +
 +  [ Damien Raude-Morvan ]
 +  * Upload to unstable.
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 20 Aug 2011 13:22:48 +0200
 +
 +jasperreports (4.0.2+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * B-D and Suggests libaspectj-java instead of aspectj (ie. so no JRE
 +    in dependencies graph).
 +  * d/patches/09_use_commons_codec.diff
 +    d/patches/08_no_maxmemory_for_javadoc.diff
 +    d/patches/12_samples.diff: Refreshed.
 +  * Bump Standards-Version to 3.9.2 (no changes needed).
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 08 May 2011 00:05:57 +0200
 +
 +jasperreports (4.0.1+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release: Refreshed all patches.
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 15 Mar 2011 19:58:44 +0100
 +
 +jasperreports (4.0.0+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - d/patches/09_use_commons_codec.diff: Refreshed.
 +    - d/patches/07_exclude_barcode4j_and_barbecue.diff: Refreshed.
 +    - d/patches/12_samples.diff: Refreshed.
 +  * d/copyright: Use DEP-5 format.
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 22 Feb 2011 22:29:56 +0100
 +
 +jasperreports (3.7.4+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - Refresh 07_exclude_barcode4j_and_barbecue.diff patch
 +  * Bump Standards-Version to 3.9.1: no changes needed.
 +  * Drop Depends on JRE: not requested anymore by new Java Policy.
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 27 Jul 2010 15:32:56 +0200
 +
 +jasperreports (3.7.3+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - Refresh all patches
 +  * Bump Standards-Version to 3.9.0 (no changes needed)
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 08 Jul 2010 02:23:43 +0200
 +
 +jasperreports (3.7.2+dfsg-1) unstable; urgency=low
 +
 +  [ Torsten Werner ]
 +  * Change maintainers into Maintainers.
 +
 +  [ Damien Raude-Morvan ]
 +  * New upstream release:
 +    - Drop d/patches/01_exclude_jpa.diff
 +    - Drop d/patches/03_use_pngencoder_from_jcommon.diff
 +    - Refresh others patches
 +  * Switch to 3.0 (quilt) source format:
 +    - d/source/format: Set 3.0 (quilt)
 +    - d/rules: Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk
 +    - d/control: Remove B-D on quilt
 +    - d/README.source: Removed
 +  * Replace d/patches/11_pom.diff by some d/maven.ignoreRules
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 20 Apr 2010 23:50:28 +0200
 +
 +jasperreports (3.7.1+dfsg-2) unstable; urgency=low
 +
 +  * Fix FTBFS: (Closes: #571398)
 +    - debian/control: Build-Depends on rhino
 +      (since OpenJDK now only Recommends it)
 +    - debian/rules: add js.jar to classpath
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 26 Feb 2010 00:13:25 +0100
 +
 +jasperreports (3.7.1+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - Remove debian/patches/12_itext.diff (merged upstream)
 +    - Refresh others patches
 +  * Enable OLAP components:
 +    - Update debian/patches/01_exclude_olap_and_jpa.diff
 +    - debian/control: Build-Depends on libmondrian-java, libolap4j-java,
 +      libantlr-java
 +    - debian/rules: add those libs into DEB_JARS
 +  * Bump Standards-Version to 3.8.4 (no changes needed)
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 06 Feb 2010 22:03:56 +0100
 +
 +jasperreports (3.7.0+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - new patch 12_itext.diff to fix utf32 compatibility
 +  * Depends on libcommons-collection3-java
 +  * Fix debian/maven.rules to transform more dependencies
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Dec 2009 14:13:19 +0100
 +
 +jasperreports (3.6.1+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * debian/patches/11_pom.diff: remove uneeded dependencies removed from
 +    Debian package
 +  * debian/patches/10_disable_fonts.diff: don't build "font" package
 +  * Build-Depends on libcommons-collections3-java instead of
 +    libcommons-collections-java
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 16 Nov 2009 22:38:49 +0100
 +
 +jasperreports (3.6.0+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Refresh all debian/patches
 +  * debian/copyright:
 +    - Change upstream license to LGPLv3
 +  * Update my email address
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 24 Sep 2009 21:17:25 +0200
 +
 +jasperreports (3.5.3+dfsg-1) unstable; urgency=low
 +
 +  * Initial release. (Closes: #281346)
 +
 + -- Damien Raude-Morvan <drazzib at drazzib.com>  Tue, 25 Aug 2009 23:12:16 +0200
diff --cc debian/control
index 89563e7,0000000..3880cd9
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,50 -1,0 +1,108 @@@
 +Source: jasperreports
 +Section: java
 +Priority: optional
 +Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
- Uploaders: Damien Raude-Morvan <drazzib at debian.org>
- Build-Depends: cdbs, debhelper (>= 9), default-jdk, ant
- Build-Depends-Indep: ant-optional, bsh, libasm4-java, groovy, libjcommon-java,
-   libspring-core-java, libspring-beans-java,
-   libcommons-digester-java, libcommons-collections3-java, libcommons-logging-java,
-   libcommons-beanutils-java, libcommons-codec-java, libcommons-javaflow-java,
-   libecj-java, libxalan2-java, libjaxen-java, libxml-commons-external-java,
-   libjexcelapi-java, libapache-poi-java (>= 3.9), libitext-java,
-   libbatik-java (>= 1.8), libjfreechart-java, libhibernate3-java,
-   glassfish-javaee, maven-repo-helper, libmondrian-java, libolap4j-java,
-   libantlr-java, librhino-java, velocity, libcastor-core-java, libcastor-xml-java,
-   libjackson-json-java
++Uploaders:
++ Damien Raude-Morvan <drazzib at debian.org>
++Build-Depends:
++ ant,
++ bsh,
++ debhelper (>= 9),
++ default-jdk,
++ glassfish-javaee,
++ groovy2,
++ javahelper,
++ libantlr-java,
++ libapache-poi-java,
++ libasm4-java,
++ libbatik-java (>= 1.8),
++ libcastor-core-java,
++ libcastor-xml-java,
++ libcommons-beanutils-java,
++ libcommons-codec-java,
++ libcommons-collections3-java,
++ libcommons-digester-java,
++ libcommons-javaflow-java,
++ libcommons-logging-java,
++ libecj-java,
++ libhibernate3-java,
++ libhttpclient-java,
++ libitext-java,
++ libjackson2-annotations-java,
++ libjackson2-core-java,
++ libjackson2-databind-java,
++ libjaxen-java,
++ libjaxp1.3-java,
++ libjcommon-java,
++ libjexcelapi-java,
++ libjfreechart-java,
++ liblucene4-java,
++ libmondrian-java,
++ libolap4j-java,
++ librhino-java,
++ libspring-beans-java,
++ libspring-core-java,
++ libxalan2-java,
++ maven-repo-helper,
++ velocity
 +Standards-Version: 3.9.6
 +Vcs-Git: git://anonscm.debian.org/pkg-java/jasperreports.git
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/jasperreports.git
- Homepage: http://jasperforge.org/jasperreports
++Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jasperreports.git
++Homepage: http://jasperreports.sourceforge.net
 +
 +Package: libjasperreports-java
 +Architecture: all
- Depends: ${misc:Depends},
-   libcommons-digester-java, libcommons-collections3-java, libcommons-logging-java,
-   libcommons-beanutils-java, libcommons-codec-java, libecj-java, libxalan2-java,
-   libjcommon-java
- Recommends: libjexcelapi-java, libapache-poi-java (>= 3.9), libitext-java,
-   libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java, libcastor-core-java, libcastor-xml-java
- Suggests: bsh, libasm4-java, groovy, libmondrian-java, libolap4j-java,
-   libspring-core-java, libspring-beans-java, libantlr-java, velocity,
-   libjackson-json-java
++Depends:
++ libcommons-beanutils-java,
++ libcommons-codec-java,
++ libcommons-collections3-java,
++ libcommons-digester-java,
++ libcommons-logging-java,
++ libecj-java,
++ libjcommon-java,
++ libxalan2-java,
++ ${misc:Depends}
++Recommends:
++ libapache-poi-java,
++ libbatik-java (>= 1.8),
++ libcastor-core-java,
++ libcastor-xml-java,
++ libhibernate3-java,
++ libitext-java,
++ libjexcelapi-java,
++ libjfreechart-java
++Suggests:
++ bsh,
++ groovy2,
++ libantlr-java,
++ libasm4-java,
++ libhttpclient-java,
++ libjackson2-annotations-java,
++ libjackson2-core-java,
++ libjackson2-databind-java,
++ liblucene4-java,
++ libmondrian-java,
++ libolap4j-java,
++ libspring-beans-java,
++ libspring-core-java,
++ velocity
 +Description: Java reporting generator library
 + JasperReports is a Java reporting generator library. XML report templates
 + are used to generate ready to print documents using data from customizable data
 + sources, including JDBC. The output can be delivered to the screen,
 + printer, or stored in PDF, HTML, XLS, CSV, and XML format.
 +
 +Package: libjasperreports-java-doc
 +Architecture: all
 +Section: doc
- Depends: ${misc:Depends}
- Suggests: libjasperreports-java
++Depends:
++ ${misc:Depends}
++Suggests:
++ libjasperreports-java
 +Description: Java reporting generator library - documentation
 + JasperReports is a Java reporting generator library. XML report templates
 + are used to generate ready to print documents using data from customizable data
 + sources, including JDBC. The output can be delivered to the screen,
 + printer, or stored in PDF, HTML, XLS, CSV, and XML format.
 + .
 + This package contains Javadoc API and Schema Reference for JasperReports.
diff --cc debian/copyright
index 98d427a,0000000..d8ccde2
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,60 -1,0 +1,56 @@@
 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 +Upstream-Name: JasperReports
- Upstream-Contact: http://jasperforge.org/index.php?q=project/jasperreports
- Source: http://sourceforge.net/projects/jasperreports/files/jasperreports/
++Source: http://jasperreports.sourceforge.net
 +Comment:
-  The upstream tarball as been stripped to make a DFSG-compliant version.
-  Items removed from upstream :
++ The upstream tarball has been stripped to make a DFSG-compliant version.
++ Items removed from upstream:
 + - all packaged JAR
 + - generated Javadoc
 + - non-DFSG-compliant Base64 encoder/decoder under W3C license
 + Repacking can be done using debian/orig-tar.sh script.
 + Excluded files are listed in debian/orig-tar.exclude.
 +
- 
 +Files: *
- Copyright: 2001-2009, JasperSoft Corporation
++Copyright: 2001-2015, JasperSoft Corporation
 +           2005, Works
 +License: LGPL-3+
-  Unless you have purchased a commercial license agreement from Jaspersoft,
-  the following license terms apply:
-  .
-  This program is part of JasperReports.
-  .
-  JasperReports is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-  .
-  JasperReports is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU Lesser General Public License for more details.
-  .
-  You should have received a copy of the GNU Lesser General Public License
-  along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
-  .
-  The full text of the LGPL 3 license can be found in
-  `/usr/share/common-licenses/LGPL-3' on Debian systems.
 +Comment:
 + Upstreams Authors:
 +    Teodor Danciu <teodord at users.sourceforge.net>
 +    Lucian Chirita <lucianc at users.sourceforge.net>
 +    Sanda Zaharia <shertage at users.sourceforge.net>
 +    Ionut Nedelcu <ionutned at users.sourceforge.net>
 +    Flavius Sana <flavius_sana at users.sourceforge.net>
 +    Peter Severin <peter_p_s at users.sourceforge.net>
 +    Barry Klawans <bklawans at users.sourceforge.net>
 +    Peter Risko <peter at risko.hu>
 +    Michael Guenther <m.guenther at users.sourceforge.net>
 +    Manuel Paul <mpaul at ratundtat.com>
 +    Marcel Overdijk <marceloverdijk at hotmail.com>
 +    Gaganis Giorgos <gaganis at users.sourceforge.net>
 +    John Bindel <jbindel at works.com>
 +    Michael McMahon <Michael.McMahon at activewire.net>
 +
- Files: *
- Copyright: Copyright 2008-2011 Damien Raude-Morvan <drazzib at debian.org>
++Files: debian/*
++Copyright: 2008-2011, Damien Raude-Morvan <drazzib at debian.org>
++           2015,      Markus Koschany <apo at gambaru.de>
++License: LGPL-3+
++
 +License: LGPL-3+
++ This program is part of JasperReports.
++ .
++ JasperReports is free software: you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++ .
++ JasperReports is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU Lesser General Public License for more details.
++ .
++ You should have received a copy of the GNU Lesser General Public License
++ along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
++ .
 + The full text of the LGPL 3 license can be found in
 + `/usr/share/common-licenses/LGPL-3' on Debian systems.
diff --cc debian/libjasperreports-java-doc.install
index 17708a1,0000000..9552595
mode 100644,000000..100644
--- a/debian/libjasperreports-java-doc.install
+++ b/debian/libjasperreports-java-doc.install
@@@ -1,4 -1,0 +1,3 @@@
 +dist/docs/api /usr/share/doc/libjasperreports-java/
- dist/docs/schema.reference.html /usr/share/doc/libjasperreports-java/
 +dist/docs/config.reference.html /usr/share/doc/libjasperreports-java/
- 
++dist/docs/schema.reference.html /usr/share/doc/libjasperreports-java/
diff --cc debian/libjasperreports-java.jlibs
index 0000000,0000000..ec02c58
new file mode 100644
--- /dev/null
+++ b/debian/libjasperreports-java.jlibs
@@@ -1,0 -1,0 +1,2 @@@
++dist/jasperreports-*
++dist/jasperreports-javaflow-*
diff --cc debian/maven.ignoreRules
index 7830248,0000000..767ce2f
mode 100644,000000..100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@@ -1,5 -1,0 +1,9 @@@
- com.keypoint png-encoder * *
- eclipse jdtcore * *
- org.apache.tomcat jasper-jdt * *
- net.sf.barcode4j barcode4j * *
- net.sourceforge.barbecue barbecue * *
++
++com.google.zxing core * * * *
++com.keypoint png-encoder * * * *
++log4j log4j * * * *
++net.sf.barcode4j barcode4j * * * *
++net.sf.jasperreports jasperreports-fonts * * * *
++net.sourceforge.barbecue barbecue * * * *
++org.apache.maven.plugins maven-surefire-plugin * * * *
++org.testng testng * * * *
diff --cc debian/maven.properties
index 0000000,0000000..e593715
new file mode 100644
--- /dev/null
+++ b/debian/maven.properties
@@@ -1,0 -1,0 +1,5 @@@
++# Include here properties to pass to Maven during the build.
++# For example:
++# maven.test.skip=true
++
++maven.test.skip=true
diff --cc debian/maven.rules
index 525ba3c,0000000..9d123f4
mode 100644,000000..100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@@ -1,9 -1,0 +1,22 @@@
- s/ant/org.apache.ant/ * * s/.*/debian/
- junit junit jar s/3\..*/3.x/
- commons-collections commons-collections * s/.*/3.x/
- com.lowagie itext * s/.*/1.4/
- antlr antlr * s/.*/2.x/
- org.springframework * * s/2\..*/2.x/
- javax.servlet servlet-api jar s/.*/2.5/
- s/commons-javaflow/org.apache.commons/ commons-javaflow * s/.*/debian/
- s/javax.xml.soap/axis/ s/saaj-api/axis-saaj/ * s/.*/debian/
++
++antlr antlr jar s/2\..*/2.x/ * *
++com.fasterxml.jackson.core jackson-annotations bundle s/2\..*/2.x/ * *
++com.fasterxml.jackson.core jackson-annotations s/jar/bundle/ s/2\..*/2.x/ * *
++com.fasterxml.jackson.core jackson-core bundle s/2\..*/2.x/ * *
++com.fasterxml.jackson.core jackson-core s/jar/bundle/ s/2\..*/2.x/ * *
++com.fasterxml.jackson.core jackson-databind bundle s/2\..*/2.x/ * *
++com.fasterxml.jackson.core jackson-databind s/jar/bundle/ s/2\..*/2.x/ * *
++commons-beanutils commons-beanutils jar s/.*/debian/ * *
++commons-collections commons-collections jar s/3\..*/3.x/ * *
++net.sf.jasperreports jasperreports jar s/.*/debian/ * *
++s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/ * *
++s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/ * *
++s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
++org.apache.velocity velocity jar s/.*/debian/ * *
++commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
++s/ant/org.apache.ant/ * * s/.*/debian/ * *
++org.codehaus.groovy * * s/.*/2.x/ * *
++s/org.mozilla/rhino/ s/rhino/js/ * s/.*/debian/ * *
++s/org.jfree/jfree/ * * s/.*/debian/ * *
++s/commons-javaflow/org.apache.commons/ * * s/.*/debian/ * *
++
diff --cc debian/orig-tar.exclude
index 1eb1f3f,0000000..1c0c704
mode 100644,000000..100644
--- a/debian/orig-tar.exclude
+++ b/debian/orig-tar.exclude
@@@ -1,5 -1,0 +1,5 @@@
 +lib/*
++demo/*
 +build/*
 +dist/*
- demo/*
 +src/org/w3c/tools/codec/Base64*
diff --cc debian/orig-tar.sh
index a32baf0,0000000..123e3d9
mode 100755,000000..100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@@ -1,19 -1,0 +1,19 @@@
 +#!/bin/sh -e
 +
 +# $2 = version
 +# $3 = file
 +DIR=jasperreports-$2.orig
- TAR=jasperreports_$2+dfsg.orig.tar.gz
++TAR=jasperreports_$2+dfsg.orig.tar.xz
 +
 +# clean up the upstream tarball
 +tar zxf $3
 +mv jasperreports* $DIR
- GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
++GZIP=--best tar caf $TAR -X debian/orig-tar.exclude $DIR
 +rm -rf $DIR
 +
 +# move to directory 'tarballs'
 +if [ -r .svn/deb-layout ]; then
 +  . .svn/deb-layout
 +  mv $TAR $origDir
 +  echo "moved $TAR to $origDir"
 +fi
diff --cc debian/patches/batik-1.8.patch
index 0000000,0000000..384b883
new file mode 100644
--- /dev/null
+++ b/debian/patches/batik-1.8.patch
@@@ -1,0 -1,0 +1,24 @@@
++From: tony mancill <tmancill at debian.org>
++Date: Thu, 15 Oct 2015 19:15:57 +0200
++Subject: batik 1.8
++
++Fix FTBFS with Batik 1.8
++
++Forwarded: not-needed
++---
++ src/net/sf/jasperreports/renderers/BatikRenderer.java | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/src/net/sf/jasperreports/renderers/BatikRenderer.java b/src/net/sf/jasperreports/renderers/BatikRenderer.java
++index 4793320..c6e569a 100644
++--- a/src/net/sf/jasperreports/renderers/BatikRenderer.java
+++++ b/src/net/sf/jasperreports/renderers/BatikRenderer.java
++@@ -53,7 +53,7 @@ import org.apache.batik.bridge.GVTBuilder;
++ import org.apache.batik.bridge.UserAgent;
++ import org.apache.batik.bridge.UserAgentAdapter;
++ import org.apache.batik.bridge.ViewBox;
++-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+++import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
++ import org.apache.batik.dom.svg.SVGDocumentFactory;
++ import org.apache.batik.ext.awt.image.GraphicsUtil;
++ import org.apache.batik.gvt.GraphicsNode;
diff --cc debian/patches/build.patch
index 0000000,0000000..7b9d027
new file mode 100644
--- /dev/null
+++ b/debian/patches/build.patch
@@@ -1,0 -1,0 +1,82 @@@
++From: Markus Koschany <apo at gambaru.de>
++Date: Wed, 14 Oct 2015 17:57:45 +0200
++Subject: build
++
++Disable deprecation warnings. Exclude barcode4j and barbecue. Not available in
++Debian.
++Set fileset dir to /usr/share/java. Do not build fonts and sampleref targets
++because the necessary files were removed because of DFSG-concerns. Also fix an
++javaflow related build issue and include the required class files.
++
++Forwarded: not-needed
++---
++ build.xml | 25 ++++++++++++++++++++-----
++ 1 file changed, 20 insertions(+), 5 deletions(-)
++
++diff --git a/build.xml b/build.xml
++index cfa2166..9eb4b87 100644
++--- a/build.xml
+++++ b/build.xml
++@@ -6,15 +6,17 @@
++ 
++ 	<target name="compile" description="Compiles the java source files of the library.">
++ 		<mkdir dir="./build/classes"/> 
++-		<javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.6" source="1.6" 
+++		<javac destdir="./build/classes" debug="true" optimize="false" deprecation="false" target="1.6" source="1.6" 
++ 				encoding="ISO-8859-1" includeantruntime="false">
++ 			<classpath>
++ 				<pathelement location="./build/classes"/>
++-				<fileset dir="./lib">
+++                <fileset dir="/usr/share/java/">
++ 					<include name="**/*.jar"/>
++ 				</fileset>
++ 			</classpath>
++ 			<src path="./src"/>
+++            <exclude name="**/barcode4j/*.java"/>
+++            <exclude name="**/barbecue/*.java"/>
++ 			<compilerarg value="-Xlint:unchecked"/>
++ 			<compilerarg value="-Xlint:-options"/>
++ 		</javac>
++@@ -64,12 +66,12 @@
++ 		</jar>
++ 	</target>
++ 	
++-	<target name="alljars" depends="jar, javaflow, fonts" description="Builds all JasperReports JAR files."/>
+++	<target name="alljars" depends="jar, javaflow" description="Builds all JasperReports JAR files."/>
++ 
++ 	<target name="javaflow" depends="compile" description="Builds the JavaFlow instrumentated JAR file.">
++ 		<taskdef name="javaflow" classname="org.apache.commons.javaflow.ant.AntRewriteTask">
++ 			<classpath>
++-				<fileset dir="./lib">
+++				<fileset dir="/usr/share/java">
++ 					<include name="**/*.jar"/>
++ 				</fileset>
++ 				<pathelement location="./build/classes"/>
++@@ -95,6 +97,19 @@
++ 			<include name="net/sf/jasperreports/engine/fill/JRSubreportRunnable.class"/>
++ 			<include name="net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.class"/>
++ 			<include name="net/sf/jasperreports/engine/fill/FillerSubreportParent.class"/>
+++			<include name="net/sf/jasperreports/engine/JRStyle.class"/>
+++			<include name="net/sf/jasperreports/engine/JRTemplateReference.class"/>
+++			<include name="net/sf/jasperreports/engine/JRStyleSetter.class"/>
+++			<include name="net/sf/jasperreports/engine/JRVirtualizer.class"/>
+++			<include name="net/sf/jasperreports/engine/base/JRBasePrintPage.class"/>
+++			<include name="net/sf/jasperreports/engine/base/JRVirtualPrintPage.class"/>
+++			<include name="net/sf/jasperreports/engine/util/FormatFactory.class"/>
+++			<include name="net/sf/jasperreports/engine/fill/JRFillBand.class"/>
+++			<include name="net/sf/jasperreports/engine/fill/JRFillGroup.class"/>
+++			<include name="net/sf/jasperreports/engine/fill/JRBaseFiller.class"/>
+++			<include name="net/sf/jasperreports/engine/fill/JRFillReportTemplate.class"/>
+++			<include name="net/sf/jasperreports/engine/fill/JREvaluationTime.class"/>
+++			<include name="net/sf/jasperreports/engine/fill/DatasetExpressionEvaluator.class"/>
++ 		</javaflow>
++ 
++ 		<mkdir dir="./dist"/> 
++@@ -278,6 +293,6 @@
++ 		</copy>
++ 	</target>
++ 	
++-	<target name="docs" depends="preparedocs, javadoc, schemaref, componentschemaref, configref, sampleref" description="Generates all documentation."/>
+++	<target name="docs" depends="preparedocs, javadoc, schemaref, componentschemaref, configref" description="Generates all documentation."/>
++ 
++ </project>
diff --cc debian/patches/commons-codec-Base64.patch
index 0000000,0000000..9d5fff6
new file mode 100644
--- /dev/null
+++ b/debian/patches/commons-codec-Base64.patch
@@@ -1,0 -1,0 +1,142 @@@
++From: Markus Koschany <apo at gambaru.de>
++Date: Wed, 14 Oct 2015 19:01:07 +0200
++Subject: commons codec Base64
++
++Replace non-free W3C Base64 implementation with
++apache.commons.codec.binary.Base64
++
++Forwarded: no
++---
++ .../jasperreports/engine/export/JRXmlExporter.java | 13 ++++-------
++ .../engine/util/JRValueStringUtils.java            | 27 ++++------------------
++ .../engine/xml/JRPrintImageSourceObject.java       | 12 +++-------
++ 3 files changed, 12 insertions(+), 40 deletions(-)
++
++diff --git a/src/net/sf/jasperreports/engine/export/JRXmlExporter.java b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
++index 9d51bb0..ce573e1 100644
++--- a/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
+++++ b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
++@@ -101,8 +101,7 @@ import net.sf.jasperreports.export.ExporterConfiguration;
++ import net.sf.jasperreports.export.ReportExportConfiguration;
++ import net.sf.jasperreports.export.WriterExporterOutput;
++ 
++-import org.w3c.tools.codec.Base64Encoder;
++-
+++import org.apache.commons.codec.binary.Base64;
++ 
++ /**
++  * Exports a JasperReports document to an XML file that contains the same data as a 
++@@ -170,6 +169,7 @@ public class JRXmlExporter extends JRAbstractExporter<ReportExportConfiguration,
++ 	/**
++ 	 *
++ 	 */
+++	private static final String DEFAULT_XML_ENCODING = "UTF-8";
++ 	private static final String XML_EXPORTER_PROPERTIES_PREFIX = JRPropertiesUtil.PROPERTY_PREFIX + "export.xml.";
++ 	
++ 	public static final String EXCEPTION_MESSAGE_KEY_EMBEDDING_IMAGE_ERROR = "export.xml.embedding.image.error";
++@@ -856,14 +856,9 @@ public class JRXmlExporter extends JRAbstractExporter<ReportExportConfiguration,
++ 			{
++ 				try
++ 				{
++-					ByteArrayInputStream bais = new ByteArrayInputStream(renderer.getImageData(jasperReportsContext));
++-					ByteArrayOutputStream baos = new ByteArrayOutputStream();
++-					
++-					Base64Encoder encoder = new Base64Encoder(bais, baos);
++-					encoder.process();
+++					byte[] byteOut = Base64.decodeBase64(renderer.getImageData());
+++					imageSource = new String(byteOut, DEFAULT_XML_ENCODING);
++ 					
++-					String encoding = getExporterOutput().getEncoding();
++-					imageSource = new String(baos.toByteArray(), encoding);
++ 				}
++ 				catch (IOException e)
++ 				{
++diff --git a/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java b/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
++index 5fb14d0..faf2f6c 100644
++--- a/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
+++++ b/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
++@@ -34,10 +34,7 @@ import java.util.Map;
++ 
++ import net.sf.jasperreports.engine.JRRuntimeException;
++ 
++-import org.w3c.tools.codec.Base64Decoder;
++-import org.w3c.tools.codec.Base64Encoder;
++-import org.w3c.tools.codec.Base64FormatException;
++-
+++import org.apache.commons.codec.binary.Base64;
++ 
++ /**
++  * Utility class used to serialize/deserialize value objects to/from String values.
++@@ -525,12 +522,8 @@ public final class JRValueStringUtils
++ 		{
++ 			try
++ 			{
++-				ByteArrayInputStream dataIn = new ByteArrayInputStream(data.getBytes());
++-				ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
++-				Base64Decoder dec = new Base64Decoder(dataIn, bytesOut);
++-				dec.process();
++-				
++-				ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut.toByteArray());
+++				byte[] bytesOut = Base64.decodeBase64(data.getBytes());
+++				ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut);
++ 				ObjectInputStream objectIn = new ObjectInputStream(bytesIn);
++ 				return objectIn.readObject();
++ 			}
++@@ -542,10 +535,6 @@ public final class JRValueStringUtils
++ 			{
++ 				throw new JRRuntimeException(e);
++ 			}
++-			catch (Base64FormatException e)
++-			{
++-				throw new JRRuntimeException(e);
++-			}
++ 		}
++ 
++ 		public String serialize(Object value)
++@@ -556,14 +545,8 @@ public final class JRValueStringUtils
++ 				ObjectOutputStream objectOut = new ObjectOutputStream(bytesOut);
++ 				objectOut.writeObject(value);
++ 				objectOut.close();
++-				
++-				ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut.toByteArray());
++-				ByteArrayOutputStream dataOut = new ByteArrayOutputStream();				
++-				
++-				Base64Encoder enc = new Base64Encoder(bytesIn, dataOut);
++-				enc.process();
++-				
++-				return new String(dataOut.toByteArray(), "UTF-8");
+++				byte[] dataOut = Base64.decodeBase64(bytesOut.toByteArray());
+++				return new String(dataOut, "UTF-8");
++ 			}
++ 			catch (NotSerializableException e)
++ 			{
++diff --git a/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
++index 9886233..00f9526 100644
++--- a/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
+++++ b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
++@@ -32,8 +32,7 @@ import net.sf.jasperreports.engine.JRImageRenderer;
++ import net.sf.jasperreports.engine.JRPrintImage;
++ import net.sf.jasperreports.engine.RenderableUtil;
++ 
++-import org.w3c.tools.codec.Base64Decoder;
++-
+++import org.apache.commons.codec.binary.Base64;
++ 
++ /**
++  * @author Teodor Danciu (teodord at users.sourceforge.net)
++@@ -81,13 +80,8 @@ public class JRPrintImageSourceObject
++ 		{
++ 			try
++ 			{
++-				ByteArrayInputStream bais = new ByteArrayInputStream(imageSource.getBytes("UTF-8"));//FIXMENOW other encodings ?
++-				ByteArrayOutputStream baos = new ByteArrayOutputStream();
++-				
++-				Base64Decoder decoder = new Base64Decoder(bais, baos);
++-				decoder.process();
++-				
++-				printImage.setRenderable(JRImageRenderer.getInstance(baos.toByteArray()));//, JRImage.ON_ERROR_TYPE_ERROR));
+++				byte[] decodedBytes = Base64.decodeBase64(imageSource.getBytes("UTF-8"));
+++				printImage.setRenderer(JRImageRenderer.getInstance(decodedBytes));
++ 			}
++ 			catch (Exception e)
++ 			{
diff --cc debian/patches/exclude-barcode4j-and-barbecue.patch
index 0000000,0000000..7bb7ea8
new file mode 100644
--- /dev/null
+++ b/debian/patches/exclude-barcode4j-and-barbecue.patch
@@@ -1,0 -1,0 +1,356 @@@
++From: Markus Koschany <apo at gambaru.de>
++Date: Sun, 18 Oct 2015 18:52:04 +0200
++Subject: exclude barcode4j and barbecue
++
++Exclude all barcode4j and barbecue code. The build-dependencies are not
++available in Debian.
++
++Forwarded: not-needed
++---
++ .../ComponentsExtensionsRegistryFactory.java       |  22 ---
++ .../ComponentsXmlDigesterConfigurer.java           | 174 ---------------------
++ .../components/ComponentsXmlWriter.java            |  67 --------
++ 3 files changed, 263 deletions(-)
++
++diff --git a/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
++index 3f452f8..d562351 100644
++--- a/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
+++++ b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
++@@ -28,12 +28,6 @@ import java.util.Collections;
++ import java.util.HashMap;
++ import java.util.List;
++ 
++-import net.sf.jasperreports.components.barbecue.BarbecueCompiler;
++-import net.sf.jasperreports.components.barbecue.BarbecueDesignConverter;
++-import net.sf.jasperreports.components.barbecue.BarbecueFillFactory;
++-import net.sf.jasperreports.components.barcode4j.BarcodeCompiler;
++-import net.sf.jasperreports.components.barcode4j.BarcodeDesignConverter;
++-import net.sf.jasperreports.components.barcode4j.BarcodeFillFactory;
++ import net.sf.jasperreports.components.iconlabel.IconLabelComponentCompiler;
++ import net.sf.jasperreports.components.iconlabel.IconLabelComponentDesignConverter;
++ import net.sf.jasperreports.components.iconlabel.IconLabelComponentFillFactory;
++@@ -125,22 +119,6 @@ public class ComponentsExtensionsRegistryFactory implements
++ 		tableManager.setComponentFillFactory(new FillTableFactory());
++ 		componentManagers.put(TABLE_COMPONENT_NAME, tableManager);
++ 		
++-		ComponentsManager barbecueManager = new ComponentsManager();
++-		barbecueManager.setDesignConverter(new BarbecueDesignConverter());
++-		barbecueManager.setComponentCompiler(new BarbecueCompiler());
++-		//barbecueManager.setComponentXmlWriter(xmlHandler);
++-		barbecueManager.setComponentFillFactory(new BarbecueFillFactory());
++-		componentManagers.put(BARBECUE_COMPONENT_NAME, barbecueManager);
++-		
++-		ComponentsManager barcode4jManager = new ComponentsManager();
++-		barcode4jManager.setDesignConverter(new BarcodeDesignConverter());
++-		barcode4jManager.setComponentCompiler(new BarcodeCompiler());
++-		//barcode4jManager.setComponentXmlWriter(xmlHandler);
++-		barcode4jManager.setComponentFillFactory(new BarcodeFillFactory());
++-		for (String name : BARCODE4J_COMPONENT_NAMES)
++-		{
++-			componentManagers.put(name, barcode4jManager);
++-		}
++ 		
++ 		ComponentsManager spiderChartManager = new ComponentsManager();
++ 		spiderChartManager.setDesignConverter(new SpiderChartDesignConverter());
++diff --git a/src/net/sf/jasperreports/components/ComponentsXmlDigesterConfigurer.java b/src/net/sf/jasperreports/components/ComponentsXmlDigesterConfigurer.java
++index 1b9e77e..1f1de23 100644
++--- a/src/net/sf/jasperreports/components/ComponentsXmlDigesterConfigurer.java
+++++ b/src/net/sf/jasperreports/components/ComponentsXmlDigesterConfigurer.java
++@@ -23,25 +23,6 @@
++  */
++ package net.sf.jasperreports.components;
++ 
++-import net.sf.jasperreports.components.barbecue.StandardBarbecueComponent;
++-import net.sf.jasperreports.components.barcode4j.CodabarComponent;
++-import net.sf.jasperreports.components.barcode4j.Code128Component;
++-import net.sf.jasperreports.components.barcode4j.Code39Component;
++-import net.sf.jasperreports.components.barcode4j.DataMatrixComponent;
++-import net.sf.jasperreports.components.barcode4j.EAN128Component;
++-import net.sf.jasperreports.components.barcode4j.EAN13Component;
++-import net.sf.jasperreports.components.barcode4j.EAN8Component;
++-import net.sf.jasperreports.components.barcode4j.ErrorCorrectionLevelEnum;
++-import net.sf.jasperreports.components.barcode4j.Interleaved2Of5Component;
++-import net.sf.jasperreports.components.barcode4j.OrientationEnum;
++-import net.sf.jasperreports.components.barcode4j.PDF417Component;
++-import net.sf.jasperreports.components.barcode4j.POSTNETComponent;
++-import net.sf.jasperreports.components.barcode4j.QRCodeComponent;
++-import net.sf.jasperreports.components.barcode4j.RoyalMailCustomerComponent;
++-import net.sf.jasperreports.components.barcode4j.TextPositionEnum;
++-import net.sf.jasperreports.components.barcode4j.UPCAComponent;
++-import net.sf.jasperreports.components.barcode4j.UPCEComponent;
++-import net.sf.jasperreports.components.barcode4j.USPSIntelligentMailComponent;
++ import net.sf.jasperreports.components.iconlabel.IconLabelComponentDigester;
++ import net.sf.jasperreports.components.list.DesignListContents;
++ import net.sf.jasperreports.components.list.StandardListComponent;
++@@ -87,8 +68,6 @@ public class ComponentsXmlDigesterConfigurer implements XmlDigesterConfigurer
++ 	public void configureDigester(Digester digester)
++ 	{
++ 		addListRules(digester);
++-		addBarbecueRules(digester);
++-		addBarcode4jRules(digester);
++ 		addTableRules(digester);
++ 		SpiderChartDigester.addSpiderChartRules(digester);
++ 		addMapRules(digester);
++@@ -113,159 +92,6 @@ public class ComponentsXmlDigesterConfigurer implements XmlDigesterConfigurer
++ 		digester.addSetNext(listContentsPattern, "setContents");
++ 	}
++ 
++-	@SuppressWarnings("deprecation")
++-	protected void addBarbecueRules(Digester digester)
++-	{
++-		String barcodePattern = "*/componentElement/barbecue";
++-		digester.addObjectCreate(barcodePattern, StandardBarbecueComponent.class);
++-		digester.addSetProperties(barcodePattern,
++-				//properties to be ignored by this rule
++-				new String[]{JRXmlConstants.ATTRIBUTE_evaluationTime, StandardBarbecueComponent.PROPERTY_ROTATION}, 
++-				new String[0]);
++-		digester.addRule(barcodePattern, 
++-				new XmlConstantPropertyRule(
++-						JRXmlConstants.ATTRIBUTE_evaluationTime, "evaluationTimeValue",
++-						EvaluationTimeEnum.values()));
++-		digester.addRule(barcodePattern, 
++-				new XmlConstantPropertyRule(
++-						StandardBarbecueComponent.PROPERTY_ROTATION,
++-						RotationEnum.values()));
++-
++-		String barcodeExpressionPattern = barcodePattern + "/codeExpression";
++-		digester.addFactoryCreate(barcodeExpressionPattern, 
++-				JRExpressionFactory.StringExpressionFactory.class.getName());
++-		digester.addCallMethod(barcodeExpressionPattern, "setText", 0);
++-		digester.addSetNext(barcodeExpressionPattern, "setCodeExpression", 
++-				JRExpression.class.getName());
++-
++-		String applicationIdentifierExpressionPattern = barcodePattern 
++-				+ "/applicationIdentifierExpression";
++-		digester.addFactoryCreate(applicationIdentifierExpressionPattern, 
++-				JRExpressionFactory.StringExpressionFactory.class.getName());
++-		digester.addCallMethod(applicationIdentifierExpressionPattern, "setText", 0);
++-		digester.addSetNext(applicationIdentifierExpressionPattern, 
++-				"setApplicationIdentifierExpression", 
++-				JRExpression.class.getName());
++-	}
++-
++-	protected void addBarcode4jRules(Digester digester)
++-	{
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/Codabar", 
++-				CodabarComponent.class);
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/Code128", 
++-				Code128Component.class);
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/EAN128", 
++-				EAN128Component.class);
++-		addTemplateRules(digester, 
++-				"*/componentElement/EAN128");
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/DataMatrix", 
++-				DataMatrixComponent.class);
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/RoyalMailCustomer", 
++-				RoyalMailCustomerComponent.class);
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/USPSIntelligentMail", 
++-				USPSIntelligentMailComponent.class);
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/Code39", Code39Component.class);
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/Interleaved2Of5", Interleaved2Of5Component.class);
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/UPCA", UPCAComponent.class);
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/UPCE", UPCEComponent.class);
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/EAN13", EAN13Component.class);
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/EAN8", EAN8Component.class);
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/POSTNET", POSTNETComponent.class);
++-		addBaseBarcode4jRules(digester, 
++-				"*/componentElement/PDF417", PDF417Component.class);
++-		addQRCodeRules(digester, 
++-				"*/componentElement/QRCode", QRCodeComponent.class);
++-	}
++-	
++-	protected <T> void addBaseBarcode4jRules(Digester digester, 
++-			String barcodePattern, Class<T> barcodeComponentClass)
++-	{
++-		addBarcodeRules(digester, barcodePattern, barcodeComponentClass);
++-		addPatternExpressionRules(digester, barcodePattern);
++-		
++-		digester.addRule(barcodePattern, 
++-				new XmlConstantPropertyRule(
++-						"orientation", "orientationValue",
++-						OrientationEnum.values()));
++-		digester.addRule(barcodePattern, 
++-				new XmlConstantPropertyRule(
++-						"textPosition", "textPositionValue",
++-						TextPositionEnum.values()));
++-	}
++-	
++-	@SuppressWarnings("deprecation")
++-	protected <T> void addPatternExpressionRules(Digester digester, String barcodePattern)
++-	{
++-		String patternExpressionPattern = barcodePattern + "/patternExpression";
++-		digester.addFactoryCreate(patternExpressionPattern, 
++-				JRExpressionFactory.StringExpressionFactory.class.getName());
++-		digester.addCallMethod(patternExpressionPattern, "setText", 0);
++-		digester.addSetNext(patternExpressionPattern, "setPatternExpression", 
++-				JRExpression.class.getName());
++-	}
++-	
++-	@SuppressWarnings("deprecation")
++-	protected <T> void addBarcodeRules(Digester digester, 
++-			String barcodePattern, Class<T> barcodeComponentClass)
++-	{
++-		digester.addObjectCreate(barcodePattern, barcodeComponentClass);
++-		digester.addSetProperties(barcodePattern,
++-				//properties to be ignored by this rule
++-				new String[]{
++-					JRXmlConstants.ATTRIBUTE_evaluationTime,
++-					"orientation",
++-					"textPosition",
++-					"errorCorrectionLevel"
++-					}, 
++-				new String[0]);
++-		//rule to set evaluation time
++-		digester.addRule(barcodePattern, 
++-				new XmlConstantPropertyRule(
++-						JRXmlConstants.ATTRIBUTE_evaluationTime, "evaluationTimeValue",
++-						EvaluationTimeEnum.values()));
++-		
++-		String codeExpressionPattern = barcodePattern + "/codeExpression";
++-		digester.addFactoryCreate(codeExpressionPattern, 
++-				JRExpressionFactory.StringExpressionFactory.class.getName());
++-		digester.addCallMethod(codeExpressionPattern, "setText", 0);
++-		digester.addSetNext(codeExpressionPattern, "setCodeExpression", 
++-				JRExpression.class.getName());
++-	}
++-
++-	protected <T> void addQRCodeRules(Digester digester, 
++-			String barcodePattern, Class<T> barcodeComponentClass)
++-	{
++-		addBarcodeRules(digester, barcodePattern, barcodeComponentClass);
++-
++-		digester.addRule(barcodePattern, 
++-				new XmlConstantPropertyRule(
++-						"errorCorrectionLevel", "errorCorrectionLevel",
++-						ErrorCorrectionLevelEnum.values()));
++-	}
++-	
++-	@SuppressWarnings("deprecation")
++-	protected void addTemplateRules(Digester digester, String barcodePattern)
++-	{
++-		String templateExpressionPattern = barcodePattern + "/templateExpression";
++-		digester.addFactoryCreate(templateExpressionPattern, 
++-				JRExpressionFactory.StringExpressionFactory.class.getName());
++-		digester.addCallMethod(templateExpressionPattern, "setText", 0);
++-		digester.addSetNext(templateExpressionPattern, "setTemplateExpression", 
++-				JRExpression.class.getName());
++-	}
++ 
++ 	@SuppressWarnings("deprecation")
++ 	protected void addMapRules(Digester digester)
++diff --git a/src/net/sf/jasperreports/components/ComponentsXmlWriter.java b/src/net/sf/jasperreports/components/ComponentsXmlWriter.java
++index bbf7455..7b9a043 100644
++--- a/src/net/sf/jasperreports/components/ComponentsXmlWriter.java
+++++ b/src/net/sf/jasperreports/components/ComponentsXmlWriter.java
++@@ -26,9 +26,6 @@ package net.sf.jasperreports.components;
++ import java.io.IOException;
++ import java.util.List;
++ 
++-import net.sf.jasperreports.components.barbecue.BarbecueComponent;
++-import net.sf.jasperreports.components.barcode4j.BarcodeComponent;
++-import net.sf.jasperreports.components.barcode4j.BarcodeXmlWriter;
++ import net.sf.jasperreports.components.list.ListComponent;
++ import net.sf.jasperreports.components.list.ListContents;
++ import net.sf.jasperreports.components.map.Item;
++@@ -92,19 +89,6 @@ public class ComponentsXmlWriter extends AbstractComponentXmlWriter
++ 		{
++ 			writeTable(componentElement, reportWriter);
++ 		}
++-		else if (component instanceof BarbecueComponent)
++-		{
++-			writeBarbecue(componentElement, reportWriter);
++-		}
++-		else if (component instanceof BarcodeComponent)
++-		{
++-			BarcodeXmlWriter barcodeWriter = new BarcodeXmlWriter(
++-													reportWriter, 
++-													componentElement, 
++-													getVersion(jasperReportsContext, componentElement, reportWriter), 
++-													versionComparator);
++-			barcodeWriter.writeBarcode();
++-		}
++ 		else if (component instanceof SpiderChartComponent)
++ 		{
++ 			SpiderChartXmlWriter spiderChartWriter = new SpiderChartXmlWriter(
++@@ -154,42 +138,6 @@ public class ComponentsXmlWriter extends AbstractComponentXmlWriter
++ 		writer.closeElement();
++ 	}
++ 
++-	protected void writeBarbecue(JRComponentElement componentElement, JRXmlWriter reportWriter) throws IOException
++-	{
++-		Component component = componentElement.getComponent();
++-		BarbecueComponent barcode = (BarbecueComponent) component;
++-		JRXmlWriteHelper writer = reportWriter.getXmlWriteHelper();
++-		ComponentKey componentKey = componentElement.getComponentKey();
++-		
++-		XmlNamespace namespace = new XmlNamespace(
++-				ComponentsExtensionsRegistryFactory.NAMESPACE, 
++-				componentKey.getNamespacePrefix(),
++-				ComponentsExtensionsRegistryFactory.XSD_LOCATION);
++-		
++-		writer.startElement("barbecue", namespace);
++-		
++-		writer.addAttribute("type", barcode.getType());
++-		writer.addAttribute("drawText", barcode.isDrawText());
++-		writer.addAttribute("checksumRequired", barcode.isChecksumRequired());
++-		writer.addAttribute("barWidth", barcode.getBarWidth());
++-		writer.addAttribute("barHeight", barcode.getBarHeight());
++-		if (isNewerVersionOrEqual(componentElement, reportWriter, JRConstants.VERSION_4_0_0))
++-		{
++-			writer.addAttribute("rotation", barcode.getOwnRotation());
++-		}
++-		if (barcode.getEvaluationTimeValue() != EvaluationTimeEnum.NOW)
++-		{
++-			writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationTime, 
++-					barcode.getEvaluationTimeValue());
++-		}
++-		writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationGroup, 
++-				barcode.getEvaluationGroup());
++-
++-		writeExpression("codeExpression", barcode.getCodeExpression(), false, componentElement, reportWriter);
++-		writeExpression("applicationIdentifierExpression", barcode.getApplicationIdentifierExpression(), false, componentElement, reportWriter);
++-		
++-		writer.closeElement();
++-	}
++ 
++ 	protected void writeMap(JRComponentElement componentElement, JRXmlWriter reportWriter) throws IOException
++ 	{
++@@ -574,25 +522,10 @@ public class ComponentsXmlWriter extends AbstractComponentXmlWriter
++ 			{
++ 				return isNewerVersionOrEqual(componentElement, reportWriter, JRConstants.VERSION_3_5_1);
++ 			}
++-			else if(ComponentsExtensionsRegistryFactory.BARBECUE_COMPONENT_NAME.equals(componentKey.getName())
++-					|| isBarcode4jName(componentKey.getName()))
++-			{
++-				return isNewerVersionOrEqual(componentElement, reportWriter, JRConstants.VERSION_3_5_2);
++-			}
++ 		}
++ 
++ 		return true;
++ 	}
++ 	
++ 	
++-	protected boolean isBarcode4jName(String name)
++-	{
++-		for (String barcode4jName : ComponentsExtensionsRegistryFactory.BARCODE4J_COMPONENT_NAMES)
++-		{
++-			if(barcode4jName.equals(name)){
++-				return true;
++-			}
++-		}
++-		return false;
++-	}
++ }
diff --cc debian/patches/series
index 42b9b94,0000000..1a70e46
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,0 +1,4 @@@
- 01_disable_deprecation_warning.diff
- 02_use_debian_asm.diff
- 06_configure_javaflow.diff
- 07_exclude_barcode4j_and_barbecue.diff
- 08_no_maxmemory_for_javadoc.diff
- 09_use_commons_codec.diff
- 10_disable_fonts.diff
- 12_samples.diff
- 14_velocity.diff
- 16_eclipse_compiler_updater.diff
- 17_batik_18.diff
++build.patch
++commons-codec-Base64.patch
++batik-1.8.patch
++exclude-barcode4j-and-barbecue.patch
diff --cc debian/rules
index d06208b,0000000..7c005ae
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,37 -1,0 +1,11 @@@
 +#!/usr/bin/make -f
++export JAVA_HOME=/usr/lib/jvm/default-java
 +
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/ant.mk
++%:
++	dh $@ --parallel --with javahelper,jh_maven_repo_helper --buildsystem=ant
 +
- JAVA_HOME := /usr/lib/jvm/default-java
- ANT_HOME := /usr/share/ant
- 
- DEB_JARS := ant-trax ant-nodeps bsh asm4 groovy jcommon \
-             spring3-core spring3-beans \
-             commons-digester commons-collections3 commons-logging \
-             commons-beanutils commons-codec commons-javaflow \
-             eclipse-ecj xalan2 jaxen xml-apis-ext \
-             jxl poi poi-ooxml itext velocity castor-core castor-xml \
-             batik-all jfreechart hibernate3 \
-             glassfish-javaee mondrian olap4j antlr js \
-             jackson-mapper-asl jackson-core-asl
- 
- DEB_ANT_BUILD_TARGET := jar docs
- DEB_ANT_CLEAN_TARGET := clean
- 
- VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e s/\+dfsg//)
- 
- binary-post-install/libjasperreports-java::
- 	mh_installpoms -plibjasperreports-java
- 	mh_installjar -plibjasperreports-java -l pom.xml dist/jasperreports-$(VERSION).jar
- 	dh_install -plibjasperreports-java dist/jasperreports-applet-$(VERSION).jar /usr/share/java/
- 	dh_link /usr/share/java/jasperreports-applet-$(VERSION).jar /usr/share/java/jasperreports-applet.jar
- 	dh_install -plibjasperreports-java dist/jasperreports-javaflow-$(VERSION).jar /usr/share/java/
- 	dh_link /usr/share/java/jasperreports-javaflow-$(VERSION).jar /usr/share/java/jasperreports-javaflow.jar
- 
- clean::
- 	-rm -rf debian/tmp
- 	mh_clean
++override_dh_auto_build:
++	ant alljars docs
 +
 +get-orig-source:
- 	uscan --force-download --rename
++	uscan --verbose --download-current-version --force-download
diff --cc debian/source/lintian-overrides
index 0000000,0000000..e6013fc
new file mode 100644
--- /dev/null
+++ b/debian/source/lintian-overrides
@@@ -1,0 -1,0 +1,6 @@@
++# False positive. License.txt is detected but all relevant files were already
++# removed.
++license-problem-json-evil
++
++# This is the preferred form of modification and not a minification.
++source-is-missing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jasperreports.git



More information about the pkg-java-commits mailing list