From: Javen O'Neal <onealj@apache.org>
Date: Sun, 31 Jan 2016 12:33:00 +0000 (+0000)
Subject: HSSFComment: note a final field
X-Git-Tag: REL_3_14_FINAL~52
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=996c2d53ab2bd20a8de1364d2cf87b1e95e9b013;p=poi.git

HSSFComment: note a final field

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

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java b/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
index 1b8176b3ce..e5b1ac3941 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
@@ -53,11 +53,11 @@ public class HSSFComment extends HSSFTextbox implements Comment {
       * It seems like HSSFRow should manage a collection of local HSSFComments
       */
 
-    private NoteRecord _note;
+    private final NoteRecord _note;
 
-    public HSSFComment(EscherContainerRecord spContainer, ObjRecord objRecord, TextObjectRecord textObjectRecord, NoteRecord _note) {
+    public HSSFComment(EscherContainerRecord spContainer, ObjRecord objRecord, TextObjectRecord textObjectRecord, NoteRecord note) {
         super(spContainer, objRecord, textObjectRecord);
-        this._note = _note;
+        _note = note;
     }
 
     /**
@@ -67,8 +67,12 @@ public class HSSFComment extends HSSFTextbox implements Comment {
      * @param anchor defines position of this anchor in the sheet
      */
     public HSSFComment(HSSFShape parent, HSSFAnchor anchor) {
+        this(parent, anchor, createNoteRecord());
+    }
+
+    private HSSFComment(HSSFShape parent, HSSFAnchor anchor, NoteRecord note) {
         super(parent, anchor);
-        _note = createNoteRecord();
+        _note = note;
         //default color for comments
         setFillColor(0x08000050);
 
@@ -80,8 +84,7 @@ public class HSSFComment extends HSSFTextbox implements Comment {
     }
 
     protected HSSFComment(NoteRecord note, TextObjectRecord txo) {
-        this(null, new HSSFClientAnchor());
-        _note = note;
+        this(null, new HSSFClientAnchor(), note);
     }
 
     @Override
@@ -120,7 +123,7 @@ public class HSSFComment extends HSSFTextbox implements Comment {
         return obj;
     }
 
-    private NoteRecord createNoteRecord(){
+    private static NoteRecord createNoteRecord() {
         NoteRecord note = new NoteRecord();
         note.setFlags(NoteRecord.NOTE_HIDDEN);
         note.setAuthor("");