Author: centic
Date: Sat Sep 16 08:28:50 2017
New Revision: 1808519
URL: http://svn.apache.org/viewvc?rev=1808519&view=rev
Log:
Fix some warnings
Modified:
poi/trunk/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
Modified: poi/trunk/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java?rev=1808519&r1=1808518&r2=1808519&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java Sat Sep
16 08:28:50 2017
@@ -417,7 +417,7 @@ public class PropertyIDMap implements Ma
/**
* Creates a {@link PropertyIDMap} backed by another map.
*
- * @param map The instance to be created is backed by this map.
+ * @param idValues an array of key/value pairs via nested Object[2] arrays
*/
private PropertyIDMap(Object[][] idValues) {
Map<Long,String> m = new HashMap<>(idValues.length);
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java?rev=1808519&r1=1808518&r2=1808519&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
Sat Sep 16 08:28:50 2017
@@ -550,10 +550,7 @@ public class XSSFCellStyle implements Ce
*/
@Override
public boolean getHidden() {
- if (!_cellXf.isSetProtection() ||
!_cellXf.getProtection().isSetHidden()) {
- return false;
- }
- return _cellXf.getProtection().getHidden();
+ return _cellXf.isSetProtection() &&
_cellXf.getProtection().isSetHidden() && _cellXf.getProtection().getHidden();
}
/**
@@ -622,10 +619,7 @@ public class XSSFCellStyle implements Ce
*/
@Override
public boolean getLocked() {
- if (!_cellXf.isSetProtection() ||
!_cellXf.getProtection().isSetLocked()) {
- return true;
- }
- return _cellXf.getProtection().getLocked();
+ return !_cellXf.isSetProtection() ||
!_cellXf.getProtection().isSetLocked() || _cellXf.getProtection().getLocked();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
