Merge branch 'master' into release-6.8.0

TIBCOSoftware · Mar 26, 2019 · 218c2bb · 218c2bb
2 parents 6a9d3c0 + 357cdf1
commit 218c2bb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 41 deletions.
diff --git a/.../chart-themes/src/main/java/net/sf/jasperreports/chartthemes/simple/SimpleChartTheme.java b/.../chart-themes/src/main/java/net/sf/jasperreports/chartthemes/simple/SimpleChartTheme.java
@@ -522,7 +522,6 @@ protected void configurePlot(Plot plot, JRChartPlot jrPlot)
 	 * 						<code>java.text.SimpleDateFormat</code> mask.
 	 * @param verticalTickLabels flag to draw tick labels at 90 degrees
 	 * @param lineColor color to use when drawing the axis line and any tick marks
-	 * @param isRangeAxis used to distinguish between range and domain axis type
 	 */
 	protected void configureAxis(
 			Axis axis,
@@ -556,8 +555,6 @@ protected void configureAxis(
 	 * 						<code>java.text.SimpleDateFormat</code> mask.
 	 * @param verticalTickLabels flag to draw tick labels at 90 degrees
 	 * @param lineColor color to use when drawing the axis line and any tick marks
-	 * @param isRangeAxis used to distinguish between range and domain axis type
-	 * @param timeUnit time unit used to create a DateAxis
 	 */
 	protected void configureAxis(
 			Axis axis,
@@ -897,8 +894,6 @@ protected JFreeChart createBubbleChart() throws JRException
 
 	/**
 	 *
-	 * @param evaluation
-	 * @throws net.sf.jasperreports.engine.JRException
 	 */
 	protected JFreeChart createCandlestickChart() throws JRException
 	{
@@ -945,8 +940,6 @@ protected JFreeChart createCandlestickChart() throws JRException
 
 	/**
 	 *
-	 * @param evaluation
-	 * @throws JRException
 	 */
 	protected JFreeChart createHighLowChart() throws JRException
 	{
@@ -1826,7 +1819,6 @@ protected JFreeChart createGanttChart() throws JRException
 	 * Converts a JasperReport data range into one understood by JFreeChart.
 	 *
 	 * @param dataRange the JasperReport version of the range
-	 * @param evaluation current expression evaluation phase
 	 * @return the JFreeChart version of the range
 	 * @throws JRException thrown when the low value of the range is greater than the
 	 * 						high value
@@ -1846,7 +1838,6 @@ protected Range convertRange(JRDataRange dataRange) throws JRException
 	 * Converts a JasperReports meter interval to one that JFreeChart understands.
 	 *
 	 * @param interval the JasperReports definition of an interval
-	 * @param evaluation current evaluation time
 	 * @return the JFreeChart version of the same interval
 	 * @throws JRException thrown when the interval contains an invalid range
 	 */
@@ -1869,10 +1860,7 @@ protected MeterInterval convertInterval(JRMeterInterval interval) throws JRExcep
 
 	/**
 	 * Build and configure a meter chart.
-	 *
-	 * @param evaluation current expression evaluation phase
-	 * @throws JRException
-	*/
+	 */
 	protected JFreeChart createMeterChart() throws JRException 
 	{
 		JRMeterPlot jrPlot = (JRMeterPlot)getPlot();
@@ -1986,9 +1974,6 @@ else if (shape == MeterShapeEnum.DIAL)
 	 * Build and run a thermometer chart.  JFreeChart thermometer charts have some
 	 * limitations.  They always have a maximum of three ranges, and the colors of those
 	 * ranges seems to be fixed.
-	 *
-	 * @param evaluation current expression evaluation phase
-	 * @throws JRException
 	 */
 	protected JFreeChart createThermometerChart() throws JRException 
 	{

diff --git a/...chart-themes/src/main/java/net/sf/jasperreports/chartthemes/spring/GenericChartTheme.java b/...chart-themes/src/main/java/net/sf/jasperreports/chartthemes/spring/GenericChartTheme.java
@@ -432,7 +432,6 @@ protected void configurePlot(Plot p, JRChartPlot jrPlot)
 	 * @param verticalTickLabels flag to draw tick labels at 90 degrees
 	 * @param lineColor color to use when drawing the axis line and any tick marks
 	 * @param isRangeAxis used to distinguish between range and domain axis type
-	 * @param timeUnit time unit used to create a DateAxis
 	 */
 	protected void configureAxis(
 			Axis axis,
@@ -773,8 +772,6 @@ protected JFreeChart createBubbleChart() throws JRException
 
 	/**
 	 *
-	 * @param evaluation
-	 * @throws net.sf.jasperreports.engine.JRException
 	 */
 	protected JFreeChart createCandlestickChart() throws JRException
 	{
@@ -818,8 +815,6 @@ protected JFreeChart createCandlestickChart() throws JRException
 
 	/**
 	 *
-	 * @param evaluation
-	 * @throws JRException
 	 */
 	protected JFreeChart createHighLowChart() throws JRException
 	{
@@ -1669,7 +1664,6 @@ protected JFreeChart createGanttChart() throws JRException
 	 * Converts a JasperReport data range into one understood by JFreeChart.
 	 *
 	 * @param dataRange the JasperReport version of the range
-	 * @param evaluation current expression evaluation phase
 	 * @return the JFreeChart version of the range
 	 * @throws JRException thrown when the low value of the range is greater than the
 	 * 						high value
@@ -1689,7 +1683,6 @@ protected Range convertRange(JRDataRange dataRange) throws JRException
 	 * Converts a JasperReports meter interval to one that JFreeChart understands.
 	 *
 	 * @param interval the JasperReports definition of an interval
-	 * @param evaluation current evaluation time
 	 * @return the JFreeChart version of the same interval
 	 * @throws JRException thrown when the interval contains an invalid range
 	 */
@@ -1712,10 +1705,7 @@ protected MeterInterval convertInterval(JRMeterInterval interval) throws JRExcep
 
 	/**
 	 * Build and configure a meter chart.
-	 *
-	 * @param evaluation current expression evaluation phase
-	 * @throws JRException
-	*/
+	 */
 	protected JFreeChart createMeterChart() throws JRException 
 	{
 		// Start by creating the plot that will hold the meter
@@ -1834,9 +1824,6 @@ protected JFreeChart createMeterChart() throws JRException
 	 * Build and run a thermometer chart.  JFreeChart thermometer charts have some
 	 * limitations.  They always have a maximum of three ranges, and the colors of those
 	 * ranges seems to be fixed.
-	 *
-	 * @param evaluation current expression evaluation phase
-	 * @throws JRException
 	 */
 	protected JFreeChart createThermometerChart() throws JRException 
 	{

diff --git a/...chart-themes/src/main/java/net/sf/jasperreports/chartthemes/spring/ScaledDialPointer.java b/...chart-themes/src/main/java/net/sf/jasperreports/chartthemes/spring/ScaledDialPointer.java
@@ -90,8 +90,6 @@ public ScaledDialPointer(int scale, Paint fillPaint, Paint outlinePaint ) {
 
 	/**
 	 * Creates a new instance.
-	 *
-	 * @param datasetIndex  the dataset index.
 	 */
 	public ScaledDialPointer(int scale, double widthRadius)
 	{
@@ -117,8 +115,6 @@ public ScaledDialPointer(int datasetIndex, double widthRadius, Paint fillPaint,
 	 *
 	 * @return The paint (never <code>null</code>).
 	 *
-	 * @see #setGradientFillPaint(Paint)
-	 *
 	 * @since 1.0.8
 	 */
 	@Override

diff --git a/...ustom-visualization/src/main/java/net/sf/jasperreports/customvisualization/Processor.java b/...ustom-visualization/src/main/java/net/sf/jasperreports/customvisualization/Processor.java
@@ -48,33 +48,34 @@ public interface Processor
 	 * 
 	 * Input: a Map with the component, the item properties and the series.
 	 * 
-	 * <table>
+	 * <table summary="Properties">
 	 * <tr><th>key</th><th>Type</th><th>Description</th></tr>
 	 * <tr>
 	 *	  <td>Processor.CONF_PRINT_ELEMENT</td>
 	 *	  <td>net.sf.jasperreports.engine.fill.JRTemplateGenericPrintElement</td>
 	 *	  <td>The print element produced by the fill process</td>
-	 * <tr>
+	 * </tr>
 	 * <tr>
 	 *	  <td>Processor.CONF_SERIES</td>
 	 *	  <td>Collection</td>
 	 *	  <td>a collection of series, which are List of Maps.</td>
-	 * <tr>
+	 * </tr>
 	 * <tr>
 	 *	  <td>Processor.CONF_WIDTH</td>
 	 *	  <td>Integer</td>
 	 *	  <td>the element width</td>
-	 * <tr>
+	 * </tr>
 	 * <tr>
 	 *	  <td>Processor.CONF_HEIGHT</td>
 	 *	  <td>Integer</td>
 	 *	  <td>the element height</td>
-	 * <tr>
+	 * </tr>
 	 * <tr>
 	 *	  <td>Processor.CONF_KEY</td>
 	 *	  <td>String</td>
 	 *	  <td>the element key/id to be used in the HTML</td>
-	 * <tr>
+	 * </tr>
+	 * </table>
 	 * 
 	 * 
 	 * Series are represented as lists of Maps. The Map is the record, and contain the

diff --git a/...ation/src/main/java/net/sf/jasperreports/customvisualization/fill/CVFillItemProperty.java b/...ation/src/main/java/net/sf/jasperreports/customvisualization/fill/CVFillItemProperty.java
@@ -94,7 +94,6 @@ public String getEvaluatedValue(JRFillExpressionEvaluator evaluator, byte evalua
 	 * Here we may add a validation handler to validate individual
 	 * properties.... By default we
 	 * 
-	 * @param property
 	 * @param value
 	 * @throws JRException
 	 */