improved work with cell comments

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@517261 13f79535-47bb-0310-9956-ffa450edef68

src/documentation/content/xdocs/hssf/quick-guide.xml

@@ -1130,6 +1130,8 @@
       HSSFRichTextString str = comment.getString();
       String author = comment.getAuthor();
     }
+    //  alternatively you can retrieve cell comments by (row, column)
+    comment = sheet.getCellComment(3, 1);
   </source>
      </section>
      <anchor id="Autofit"/>

src/java/org/apache/poi/hssf/usermodel/HSSFCell.java

@@ -973,18 +973,31 @@ public class HSSFCell
     }
 
     /**
-     * Returns the comment associated with this cell
+     * Returns comment associated with this cell
      *
      * @return comment associated with this cell
      */
      public HSSFComment getCellComment(){
         if (comment == null) {
+            comment = findCellComment(sheet, record.getRow(), record.getColumn());
+        }
+        return comment;
+    }
+
+    /**
+     * Cell comment finder.
+     * Returns cell comment for the specified sheet, row and column.
+     *
+     * @return cell comment or <code>null</code> if not found
+     */
+    protected static HSSFComment findCellComment(Sheet sheet, int row, int column){
+        HSSFComment comment = null;
         HashMap txshapes = new HashMap(); //map shapeId and TextObjectRecord
         for (Iterator it = sheet.getRecords().iterator(); it.hasNext(); ) {
            Record rec = ( Record ) it.next();
            if (rec instanceof NoteRecord){
                NoteRecord note = (NoteRecord)rec;
-                    if (note.getRow() == record.getRow() && note.getColumn() == record.getColumn()){
+               if (note.getRow() == row && note.getColumn() == column){
                    TextObjectRecord txo = (TextObjectRecord)txshapes.get(new Integer(note.getShapeId()));
                    comment = new HSSFComment(note, txo);
                    comment.setRow(note.getRow());
@@ -1013,7 +1026,6 @@ public class HSSFCell
                }
            }
         }
-        }
         return comment;
    }
 }

src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java

@@ -1478,4 +1478,13 @@ public class HSSFSheet
         }
     }
 
+    /**
+     * Returns cell comment for the specified row and column
+     *
+     * @return cell comment or <code>null</code> if not found
+     */
+     public HSSFComment getCellComment(int row, int column){
+        return HSSFCell.findCellComment(sheet, row, column);
+    }
+
 }

src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java

@@ -101,6 +101,7 @@ public class TestHSSFComment extends TestCase {
              cell = row.getCell((short)0);
              comment = cell.getCellComment();
              assertNull("Cells in the first column are not commented", comment);
+             assertNull(sheet.getCellComment(rownum, 0));
          }
 
          for (int rownum = 0; rownum < 3; rownum++) {
@@ -108,6 +109,8 @@ public class TestHSSFComment extends TestCase {
              cell = row.getCell((short)1);
              comment = cell.getCellComment();
              assertNotNull("Cells in the second column have comments", comment);
+             assertNotNull("Cells in the second column have comments", sheet.getCellComment(rownum, 1));
+
              assertEquals(HSSFSimpleShape.OBJECT_TYPE_COMMENT, comment.getShapeType());
              assertEquals("Yegor Kozlov", comment.getAuthor());
              assertFalse("cells in the second column have not empyy notes",