You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2017/06/18 05:59:11 UTC
svn commit: r1799035 - in /poi/trunk/src:
java/org/apache/poi/ss/formula/ptg/ java/org/apache/poi/util/
ooxml/java/org/apache/poi/xssf/model/
ooxml/java/org/apache/poi/xssf/usermodel/
ooxml/testcases/org/apache/poi/ss/usermodel/
Author: centic
Date: Sun Jun 18 05:59:11 2017
New Revision: 1799035
URL: http://svn.apache.org/viewvc?rev=1799035&view=rev
Log:
Fix some IntelliJ warnings
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java
poi/trunk/src/java/org/apache/poi/util/LittleEndianOutputStream.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java?rev=1799035&r1=1799034&r2=1799035&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java Sun Jun 18 05:59:11 2017
@@ -23,6 +23,7 @@ import org.apache.poi.util.LittleEndianI
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)
Modified: poi/trunk/src/java/org/apache/poi/util/LittleEndianOutputStream.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/LittleEndianOutputStream.java?rev=1799035&r1=1799034&r2=1799035&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/LittleEndianOutputStream.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/LittleEndianOutputStream.java Sun Jun 18 05:59:11 2017
@@ -49,7 +49,7 @@ public final class LittleEndianOutputStr
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 LittleEndianOutputStr
@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);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java?rev=1799035&r1=1799034&r2=1799035&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java Sun Jun 18 05:59:11 2017
@@ -120,6 +120,7 @@ public class SharedStringsTable extends
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);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=1799035&r1=1799034&r2=1799035&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java Sun Jun 18 05:59:11 2017
@@ -217,7 +217,7 @@ public class XSSFWorkbook extends POIXML
/**
* cached instance of XSSFCreationHelper for this workbook
- * @see {@link #getCreationHelper()}
+ * @see #getCreationHelper()
*/
private XSSFCreationHelper _creationHelper;
@@ -399,6 +399,7 @@ public class XSSFWorkbook extends POIXML
// 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 POIXML
// 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 POIXML
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 POIXML
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 POIXML
* @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 POIXML
* 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 POIXML
/**
* 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()) {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java?rev=1799035&r1=1799034&r2=1799035&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java Sun Jun 18 05:59:11 2017
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org