more annotations

src/main/java/org/jfree/chart/LegendItemCollection.java

@@ -44,7 +44,7 @@
  */
 
 package org.jfree.chart;
-/*>>> import org.checkerframework.checker.index.qual.NonNegative; */
+/*>>> import org.checkerframework.checker.index.qual.NonNegative; */
 
 import java.io.Serializable;
 import java.util.Iterator;
@@ -104,7 +104,7 @@ public LegendItem get(/*@NonNegative*/ int index) {
      *
      * @return The item count.
      */
-    public int getItemCount() {
+    public /*@NonNegative*/ int getItemCount() {
         return this.items.size();
     }
 

src/main/java/org/jfree/chart/axis/CyclicNumberAxis.java

@@ -52,6 +52,7 @@
 
 /*>>>
 import org.checkerframework.common.value.qual.ArrayLen;
+import org.checkerframework.checker.index.qual.NonNegative;
  */
 
 import java.awt.BasicStroke;
@@ -480,7 +481,9 @@ protected List refreshTicksHorizontal(Graphics2D g2, Rectangle2D dataArea,
                         && (currentTickValue != cycleBound)) {
                     anchor = isInverted()
                         ? TextAnchor.TOP_RIGHT : TextAnchor.BOTTOM_RIGHT;
-                    result.remove(result.size() - 1);
+                    @SuppressWarnings("index") // If cycled, there must be at least one tick in the results list already
+                    /*@NonNegative*/ int lastTickIndex = result.size() - 1;
+                    result.remove(lastTickIndex);
                     result.add(new CycleBoundTick(
                         this.boundMappedToLastCycle, lastTick.getNumber(),
                         lastTick.getText(), anchor, anchor,
@@ -499,7 +502,9 @@ protected List refreshTicksHorizontal(Graphics2D g2, Rectangle2D dataArea,
                             && (currentTickValue != cycleBound)) {
                         anchor = isInverted()
                             ? TextAnchor.BOTTOM_LEFT : TextAnchor.BOTTOM_RIGHT;
-                        result.remove(result.size() - 1);
+                        @SuppressWarnings("index") // If cycled, there must be at least one tick in the results list already
+                        /*@NonNegative*/ int lastTickIndex = result.size() - 1;
+                        result.remove(lastTickIndex);
                         result.add(new CycleBoundTick(
                             this.boundMappedToLastCycle, lastTick.getNumber(),
                             lastTick.getText(), anchor, anchor,
@@ -517,7 +522,9 @@ protected List refreshTicksHorizontal(Graphics2D g2, Rectangle2D dataArea,
                             && (currentTickValue != cycleBound)) {
                         anchor = isInverted()
                             ? TextAnchor.TOP_LEFT : TextAnchor.TOP_RIGHT;
-                        result.remove(result.size() - 1);
+                        @SuppressWarnings("index") // If cycled, there must be at least one tick in the results list already
+                        /*@NonNegative*/ int lastTickIndex = result.size() - 1;
+                        result.remove(lastTickIndex);
                         result.add(new CycleBoundTick(
                             this.boundMappedToLastCycle, lastTick.getNumber(),
                             lastTick.getText(), anchor, anchor,
@@ -628,7 +635,9 @@ protected List refreshVerticalTicks(Graphics2D g2, Rectangle2D dataArea,
                             && (currentTickValue != cycleBound)) {
                         anchor = isInverted()
                             ? TextAnchor.BOTTOM_LEFT : TextAnchor.BOTTOM_RIGHT;
-                        result.remove(result.size() - 1);
+                        @SuppressWarnings("index") // If cycled, there must be at least one tick in the results list already
+                        /*@NonNegative*/ int lastTickIndex = result.size() - 1;
+                        result.remove(lastTickIndex);
                         result.add(new CycleBoundTick(
                             this.boundMappedToLastCycle, lastTick.getNumber(),
                             lastTick.getText(), anchor, anchor,
@@ -647,7 +656,9 @@ protected List refreshVerticalTicks(Graphics2D g2, Rectangle2D dataArea,
                             && (currentTickValue != cycleBound)) {
                         anchor = isInverted()
                             ? TextAnchor.BOTTOM_RIGHT : TextAnchor.BOTTOM_LEFT;
-                        result.remove(result.size() - 1);
+                        @SuppressWarnings("index") // If cycled, there must be at least one tick in the results list already
+                        /*@NonNegative*/ int lastTickIndex = result.size() - 1;
+                        result.remove(lastTickIndex);
                         result.add(new CycleBoundTick(
                             this.boundMappedToLastCycle, lastTick.getNumber(),
                             lastTick.getText(), anchor, anchor,
@@ -668,7 +679,9 @@ protected List refreshVerticalTicks(Graphics2D g2, Rectangle2D dataArea,
                             && (currentTickValue != cycleBound)) {
                         anchor = isInverted()
                             ? TextAnchor.BOTTOM_RIGHT : TextAnchor.TOP_RIGHT;
-                        result.remove(result.size() - 1);
+                        @SuppressWarnings("index") // If cycled, there must be at least one tick in the results list already
+                        /*@NonNegative*/ int lastTickIndex = result.size() - 1;
+                        result.remove(lastTickIndex);
                         result.add(new CycleBoundTick(
                             this.boundMappedToLastCycle, lastTick.getNumber(),
                             lastTick.getText(), anchor, anchor,
@@ -686,7 +699,9 @@ protected List refreshVerticalTicks(Graphics2D g2, Rectangle2D dataArea,
                             && (currentTickValue != cycleBound)) {
                         anchor = isInverted()
                             ? TextAnchor.BOTTOM_LEFT : TextAnchor.TOP_LEFT;
-                        result.remove(result.size() - 1);
+                        @SuppressWarnings("index") // If cycled, there must be at least one tick in the results list already
+                        /*@NonNegative*/ int lastTickIndex = result.size() - 1;
+                        result.remove(lastTickIndex);
                         result.add(new CycleBoundTick(
                             this.boundMappedToLastCycle, lastTick.getNumber(),
                             lastTick.getText(), anchor, anchor,

src/main/java/org/jfree/chart/entity/XYItemEntity.java

@@ -87,7 +87,7 @@ public class XYItemEntity extends ChartEntity {
      * @param urlText  the URL text for HTML image maps.
      */
     public XYItemEntity(Shape area,
-                        XYDataset dataset, /*@NonNegative*/ int series, int item,
+                        XYDataset dataset, /*@NonNegative*/ int series, /*@NonNegative*/ int item,
                         String toolTipText, String urlText) {
         super(area, toolTipText, urlText);
         this.dataset = dataset;
@@ -145,7 +145,7 @@ public int getItem() {
      *
      * @param item the item index (zero-based).
      */
-    public void setItem(int item) {
+    public void setItem(/*@NonNegative*/ int item) {
         this.item = item;
     }
 

src/main/java/org/jfree/chart/labels/AbstractCategoryItemLabelGenerator.java

@@ -45,6 +45,8 @@
  */
 
 package org.jfree.chart.labels;
+/*>>> import org.checkerframework.common.value.qual.MinLen; */
+/*>>> import org.checkerframework.checker.index.qual.NonNegative; */
 
 import java.io.Serializable;
 import java.text.DateFormat;
@@ -158,7 +160,7 @@ protected AbstractCategoryItemLabelGenerator(String labelFormat,
      *
      * @return The label.
      */
-    public String generateRowLabel(CategoryDataset dataset, int row) {
+    public String generateRowLabel(CategoryDataset dataset, /*@NonNegative*/ int row) {
         return dataset.getRowKey(row).toString();
     }
 
@@ -170,7 +172,7 @@ public String generateRowLabel(CategoryDataset dataset, int row) {
      *
      * @return The label.
      */
-    public String generateColumnLabel(CategoryDataset dataset, int column) {
+    public String generateColumnLabel(CategoryDataset dataset, /*@NonNegative*/ int column) {
         return dataset.getColumnKey(column).toString();
     }
 
@@ -211,7 +213,7 @@ public DateFormat getDateFormat() {
      * @return The label (possibly {@code null}).
      */
     protected String generateLabelString(CategoryDataset dataset,
-                                         int row, int column) {
+                                         int row, /*@NonNegative*/ int column) {
         Args.nullNotPermitted(dataset, "dataset");
         String result;
         Object[] items = createItemArray(dataset, row, column);
@@ -230,8 +232,8 @@ protected String generateLabelString(CategoryDataset dataset,
      *
      * @return The items (never {@code null}).
      */
-    protected Object[] createItemArray(CategoryDataset dataset,
-                                       int row, int column) {
+    protected Object /*@MinLen(4)*/ [] createItemArray(CategoryDataset dataset,
+                                       /*@NonNegative*/ int row, /*@NonNegative*/ int column) {
         Object[] result = new Object[4];
         result[0] = dataset.getRowKey(row).toString();
         result[1] = dataset.getColumnKey(column).toString();

src/main/java/org/jfree/chart/labels/AbstractXYItemLabelGenerator.java

@@ -54,6 +54,7 @@
  */
 
 package org.jfree.chart.labels;
+/*>>> import org.checkerframework.common.value.qual.MinLen; */
 
 /*>>>
 import org.checkerframework.checker.index.qual.NonNegative;
@@ -237,7 +238,7 @@ public DateFormat getYDateFormat() {
      *
      * @return The label (possibly {@code null}).
      */
-    public String generateLabelString(XYDataset dataset, /*@NonNegative*/ int series, int item) {
+    public String generateLabelString(XYDataset dataset, /*@NonNegative*/ int series, /*@NonNegative*/ int item) {
         String result;
         Object[] items = createItemArray(dataset, series, item);
         result = MessageFormat.format(this.formatString, items);
@@ -266,8 +267,8 @@ public String getNullYString() {
      * @return An array of three items from the dataset formatted as
      *         {@code String} objects (never {@code null}).
      */
-    protected Object[] createItemArray(XYDataset dataset, /*@NonNegative*/ int series,
-                                       int item) {
+    protected Object /*@MinLen(3)*/ [] createItemArray(XYDataset dataset, /*@NonNegative*/ int series,
+                                       /*@NonNegative*/ int item) {
         Object[] result = new Object[3];
         result[0] = dataset.getSeriesKey(series).toString();
 

src/main/java/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java

@@ -40,6 +40,7 @@
  */
 
 package org.jfree.chart.labels;
+/*>>> import org.checkerframework.common.value.qual.MinLen; */
 
 /*>>>
 import org.checkerframework.checker.index.qual.NonNegative;
@@ -112,8 +113,8 @@ public BoxAndWhiskerToolTipGenerator(String format,
      * @return The items (never {@code null}).
      */
     @Override
-    protected Object[] createItemArray(CategoryDataset dataset, /*@NonNegative*/ int series,
-                                       int item) {
+    protected Object /*@MinLen(8)*/ [] createItemArray(CategoryDataset dataset, /*@NonNegative*/ int series,
+                                       /*@NonNegative*/ int item) {
         Object[] result = new Object[8];
         result[0] = dataset.getRowKey(series);
         Number y = dataset.getValue(series, item);

src/main/java/org/jfree/chart/labels/BubbleXYItemLabelGenerator.java

@@ -165,7 +165,7 @@ public DateFormat getZDateFormat() {
      * @return The item label (possibly {@code null}).
      */
     @Override
-    public String generateLabel(XYDataset dataset, /*@NonNegative*/ int series, int item) {
+    public String generateLabel(XYDataset dataset, /*@NonNegative*/ int series, /*@NonNegative*/ int item) {
         return generateLabelString(dataset, series, item);
     }
 
@@ -179,7 +179,7 @@ public String generateLabel(XYDataset dataset, /*@NonNegative*/ int series, int
      * @return The label (possibly {@code null}).
      */
     @Override
-    public String generateLabelString(XYDataset dataset, /*@NonNegative*/ int series, int item) {
+    public String generateLabelString(XYDataset dataset, /*@NonNegative*/ int series, /*@NonNegative*/ int item) {
         String result;
         Object[] items;
         if (dataset instanceof XYZDataset) {
@@ -203,7 +203,7 @@ public String generateLabelString(XYDataset dataset, /*@NonNegative*/ int series
      * @return The items (never {@code null}).
      */
     protected Object[] createItemArray(XYZDataset dataset,
-                                       int series, int item) {
+                                       /*@NonNegative*/ int series, /*@NonNegative*/ int item) {
 
         Object[] result = new Object[4];
         result[0] = dataset.getSeriesKey(series).toString();

src/main/java/org/jfree/chart/labels/CategoryItemLabelGenerator.java

@@ -58,6 +58,7 @@
  */
 
 package org.jfree.chart.labels;
+/*>>> import org.checkerframework.checker.index.qual.NonNegative; */
 
 import org.jfree.data.category.CategoryDataset;
 
@@ -80,7 +81,7 @@ public interface CategoryItemLabelGenerator {
      *
      * @return The label.
      */
-    public String generateRowLabel(CategoryDataset dataset, int row);
+    public String generateRowLabel(CategoryDataset dataset, /*@NonNegative*/ int row);
 
     /**
      * Generates a label for the specified row.
@@ -90,7 +91,7 @@ public interface CategoryItemLabelGenerator {
      *
      * @return The label.
      */
-    public String generateColumnLabel(CategoryDataset dataset, int column);
+    public String generateColumnLabel(CategoryDataset dataset, /*@NonNegative*/ int column);
 
     /**
      * Generates a label for the specified item. The label is typically a
@@ -102,6 +103,6 @@ public interface CategoryItemLabelGenerator {
      *
      * @return The label (possibly {@code null}).
      */
-    public String generateLabel(CategoryDataset dataset, int row, int column);
+    public String generateLabel(CategoryDataset dataset, /*@NonNegative*/ int row, /*@NonNegative*/ int column);
 
 }

src/main/java/org/jfree/chart/labels/CategoryToolTipGenerator.java

@@ -40,6 +40,7 @@
  */
 
 package org.jfree.chart.labels;
+/*>>> import org.checkerframework.checker.index.qual.NonNegative; */
 
 import org.jfree.data.category.CategoryDataset;
 
@@ -66,6 +67,6 @@ public interface CategoryToolTipGenerator {
      *
      * @return The tooltip text (possibly {@code null}).
      */
-    public String generateToolTip(CategoryDataset dataset, int row, int column);
+    public String generateToolTip(CategoryDataset dataset, /*@NonNegative*/ int row, /*@NonNegative*/ int column);
 
 }

src/main/java/org/jfree/chart/labels/CustomXYToolTipGenerator.java

@@ -110,7 +110,7 @@ public int getToolTipCount(int list) {
      *
      * @return The tool tip text.
      */
-    public String getToolTipText(/*@NonNegative*/ int series, int item) {
+    public String getToolTipText(/*@NonNegative*/ int series, /*@NonNegative*/ int item) {
 
         String result = null;
 
@@ -145,7 +145,7 @@ public void addToolTipSeries(List toolTips) {
      * @return The tooltip text.
      */
     @Override
-    public String generateToolTip(XYDataset data, /*@NonNegative*/ int series, int item) {
+    public String generateToolTip(XYDataset data, /*@NonNegative*/ int series, /*@NonNegative*/ int item) {
         return getToolTipText(series, item);
     }
 

src/main/java/org/jfree/chart/labels/HighLowItemLabelGenerator.java

@@ -122,7 +122,7 @@ public HighLowItemLabelGenerator(DateFormat dateFormatter,
      * @return The tooltip text.
      */
     @Override
-    public String generateToolTip(XYDataset dataset, /*@NonNegative*/ int series, int item) {
+    public String generateToolTip(XYDataset dataset, /*@NonNegative*/ int series, /*@NonNegative*/ int item) {
         if (!(dataset instanceof OHLCDataset)) {
             return null;
         }

src/main/java/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java

@@ -39,6 +39,8 @@
  */
 
 package org.jfree.chart.labels;
+/*>>> import org.checkerframework.common.value.qual.MinLen; */
+/*>>> import org.checkerframework.checker.index.qual.NonNegative; */
 
 import java.io.Serializable;
 import java.text.DateFormat;
@@ -106,8 +108,8 @@ public IntervalCategoryItemLabelGenerator(String labelFormat,
      * @return The items (never {@code null}).
      */
     @Override
-    protected Object[] createItemArray(CategoryDataset dataset,
-                                       int row, int column) {
+    protected Object /*@MinLen(5)*/ [] createItemArray(CategoryDataset dataset,
+                                       /*@NonNegative*/ int row, /*@NonNegative*/ int column) {
         Object[] result = new Object[5];
         result[0] = dataset.getRowKey(row).toString();
         result[1] = dataset.getColumnKey(column).toString();

src/main/java/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java

@@ -40,6 +40,7 @@
  */
 
 package org.jfree.chart.labels;
+/*>>> import org.checkerframework.checker.index.qual.NonNegative; */
 
 import java.text.DateFormat;
 import java.text.NumberFormat;
@@ -104,7 +105,7 @@ public IntervalCategoryToolTipGenerator(String labelFormat,
      */
     @Override
     protected Object[] createItemArray(CategoryDataset dataset,
-                                       int row, int column) {
+                                       int row, /*@NonNegative*/ int column) {
         Object[] result = new Object[5];
         result[0] = dataset.getRowKey(row).toString();
         result[1] = dataset.getColumnKey(column).toString();

src/main/java/org/jfree/chart/labels/IntervalXYItemLabelGenerator.java

@@ -154,7 +154,7 @@ public IntervalXYItemLabelGenerator(String formatString,
      */
     @Override
     protected Object[] createItemArray(XYDataset dataset, /*@NonNegative*/ int series,
-                                       int item) {
+                                       /*@NonNegative*/ int item) {
 
         IntervalXYDataset intervalDataset = null;
         if (dataset instanceof IntervalXYDataset) {
@@ -239,7 +239,7 @@ protected Object[] createItemArray(XYDataset dataset, /*@NonNegative*/ int serie
      * @return The label text (possibly {@code null}).
      */
     @Override
-    public String generateLabel(XYDataset dataset, /*@NonNegative*/ int series, int item) {
+    public String generateLabel(XYDataset dataset, /*@NonNegative*/ int series, /*@NonNegative*/ int item) {
         return generateLabelString(dataset, series, item);
     }