Fix some IntelliJ warnings

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

diff --git a/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java b/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java
index 1c590acaa519b65f6b50fcc23e96139dff1c8248..a8632b534b6a3e46c77f0ede60c172d8cda8d296 100644 (file)
--- a/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java
+++ b/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java
@@ -23,6 +23,7 @@ import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**
+ * See the spec at 2.5.198.76 PtgName
  * 
  * @author andy
  * @author Jason Height (jheight at chariot dot net dot au)

diff --git a/src/java/org/apache/poi/util/LittleEndianOutputStream.java b/src/java/org/apache/poi/util/LittleEndianOutputStream.java
index 3e0daa310d475f76a595eba960087fd90a941ef5..fa4f9d1abe05efbf7628848c0675cd9bb87028e9 100644 (file)
--- a/src/java/org/apache/poi/util/LittleEndianOutputStream.java
+++ b/src/java/org/apache/poi/util/LittleEndianOutputStream.java
@@ -49,7 +49,7 @@ public final class LittleEndianOutputStream extends FilterOutputStream implement
                int b3 = (v >>> 24) & 0xFF;
                int b2 = (v >>> 16) & 0xFF;
                int b1 = (v >>>  8) & 0xFF;
-               int b0 = (v >>>  0) & 0xFF;
+               int b0 = (v/* >>>  0*/) & 0xFF;
                try {
                        out.write(b0);
                        out.write(b1);
@@ -62,14 +62,14 @@ public final class LittleEndianOutputStream extends FilterOutputStream implement
 
        @Override
     public void writeLong(long v) {
-               writeInt((int)(v >>  0));
+               writeInt((int)(v/* >>  0*/));
                writeInt((int)(v >> 32));
        }
 
        @Override
     public void writeShort(int v) {
                int b1 = (v >>>  8) & 0xFF;
-               int b0 = (v >>>  0) & 0xFF;
+               int b0 = (v/* >>>  0*/) & 0xFF;
                try {
                        out.write(b0);
                        out.write(b1);

diff --git a/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java b/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
index 59526d33e9806f5f901ccbbe25651a4fc2f553b5..5e9cbff6e5f693d76856615d1215247907b02c94 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
+++ b/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
@@ -120,6 +120,7 @@ public class SharedStringsTable extends POIXMLDocumentPart {
             CTSst sst = _sstDoc.getSst();
             count = (int)sst.getCount();
             uniqueCount = (int)sst.getUniqueCount();
+            //noinspection deprecation
             for (CTRst st : sst.getSiArray()) {
                 stmap.put(getKey(st), cnt);
                 strings.add(st);

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
index fecad97bc8c002f0ce53dcc710ef77ffaa243f45..e989cdf8666e7273a443d8e74b773238a87918cd 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
@@ -217,7 +217,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
 
     /**
      * cached instance of XSSFCreationHelper for this workbook
-     * @see {@link #getCreationHelper()}
+     * @see #getCreationHelper()
      */
     private XSSFCreationHelper _creationHelper;
 
@@ -399,6 +399,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
             // Load individual sheets. The order of sheets is defined by the order
             //  of CTSheet elements in the workbook
             sheets = new ArrayList<XSSFSheet>(shIdMap.size());
+            //noinspection deprecation
             for (CTSheet ctSheet : this.workbook.getSheets().getSheetArray()) {
                 parseSheet(shIdMap, ctSheet);
             }
@@ -594,7 +595,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
 
         // copy sheet's relations
         List<RelationPart> rels = srcSheet.getRelationParts();
-        // if the sheet being cloned has a drawing then rememebr it and re-create it too
+        // if the sheet being cloned has a drawing then remember it and re-create it too
         XSSFDrawing dg = null;
         for(RelationPart rp : rels) {
             POIXMLDocumentPart r = rp.getDocumentPart();
@@ -638,7 +639,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
 
         clonedSheet.setSelected(false);
 
-        // clone the sheet drawing alongs with its relationships
+        // clone the sheet drawing along with its relationships
         if (dg != null) {
             if(ct.isSetDrawing()) {
                 // unset the existing reference to the drawing,
@@ -1709,6 +1710,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
         newcts.set(cts);
 
         //notify sheets
+        //noinspection deprecation
         CTSheet[] sheetArray = ct.getSheetArray();
         for(int i=0; i < sheetArray.length; i++) {
             sheets.get(i).sheet = sheetArray[i];
@@ -1877,6 +1879,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
      * @return true if the sheet contains the name, false otherwise.
      */
     private boolean containsSheet(String name, int excludeSheetIdx) {
+        //noinspection deprecation
         CTSheet[] ctSheetArray = workbook.getSheets().getSheetArray();
 
         if (name.length() > MAX_SENSITIVE_SHEET_NAME_LEN) {
@@ -2359,7 +2362,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
      * Adds a vbaProject.bin file to the workbook.  This will change the workbook
      * type if necessary.
      *
-     * @throws IOException
+     * @throws IOException If copying data from the stream fails.
      */
     public void setVBAProject(InputStream vbaProjectStream) throws IOException {
         if (!isMacroEnabled()) {
@@ -2390,8 +2393,8 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
 
     /**
      * Adds a vbaProject.bin file taken from another, given workbook to this one.
-     * @throws IOException
-     * @throws InvalidFormatException
+     * @throws IOException If copying the VBAProject stream fails.
+     * @throws InvalidFormatException If an error occurs while handling parts of the XSSF format
      */
     public void setVBAProject(XSSFWorkbook macroWorkbook) throws IOException, InvalidFormatException {
         if (!macroWorkbook.isMacroEnabled()) {

diff --git a/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java b/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java
index ec581959220ae98f49e7a03b3d3416c41d41d575..f287d52fe9276173289a1da04c4397eca37192b3 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java
@@ -26,7 +26,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Locale;
 
 import org.apache.poi.POIDataSamples;