Author: kiwiwings
Date: Wed May 3 22:16:26 2017
New Revision: 1793727
URL: http://svn.apache.org/viewvc?rev=1793727&view=rev
Log:
SonarQube fixes
Modified:
poi/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java
poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
Modified:
poi/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java?rev=1793727&r1=1793726&r2=1793727&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java
(original)
+++ poi/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java
Wed May 3 22:16:26 2017
@@ -401,11 +401,11 @@ public class CopyCompare
final String name,
final DocumentInputStream stream)
throws IOException {
- final DirectoryEntry de = getPath(poiFs, path);
- if (stream == null && name == null) {
+ if (stream == null || name == null) {
// Empty directory
return;
}
+ final DirectoryEntry de = getPath(poiFs, path);
final ByteArrayOutputStream out = new ByteArrayOutputStream();
int c;
while ((c = stream.read()) != -1) {
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java?rev=1793727&r1=1793726&r2=1793727&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java Wed May 3
22:16:26 2017
@@ -47,7 +47,7 @@ public final class EscherArrayProperty e
public EscherArrayProperty(short id, byte[] complexData) {
super(id, checkComplexData(complexData));
- emptyComplexPart = complexData.length == 0;
+ emptyComplexPart = (complexData == null || complexData.length == 0);
}
public EscherArrayProperty(short propertyNumber, boolean isBlipId, byte[]
complexData) {
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java?rev=1793727&r1=1793726&r2=1793727&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java
Wed May 3 22:16:26 2017
@@ -128,27 +128,29 @@ public final class ActiveXShape extends
*/
public ExControl getExControl(){
int idx = getControlIndex();
- ExControl ctrl = null;
Document doc = getSheet().getSlideShow().getDocumentRecord();
ExObjList lst =
(ExObjList)doc.findFirstOfType(RecordTypes.ExObjList.typeID);
- if(lst != null){
- Record[] ch = lst.getChildRecords();
- for (int i = 0; i < ch.length; i++) {
- if(ch[i] instanceof ExControl){
- ExControl c = (ExControl)ch[i];
- if(c.getExOleObjAtom().getObjID() == idx){
- ctrl = c;
- break;
- }
+ if (lst == null) {
+ return null;
+ }
+
+ for (Record ch : lst.getChildRecords()) {
+ if(ch instanceof ExControl){
+ ExControl c = (ExControl)ch;
+ if(c.getExOleObjAtom().getObjID() == idx){
+ return c;
}
}
}
- return ctrl;
+ return null;
}
@Override
protected void afterInsert(HSLFSheet sheet){
ExControl ctrl = getExControl();
+ if (ctrl == null) {
+ throw new NullPointerException("ExControl is not defined");
+ }
ctrl.getExControlAtom().setSlideId(sheet._getSheetNumber());
String name = ctrl.getProgId() + "-" + getControlIndex() + '\u0000';
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java?rev=1793727&r1=1793726&r2=1793727&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java Wed
May 3 22:16:26 2017
@@ -185,7 +185,8 @@ public final class OLEShape extends HSLF
* @return the instance name of the embedded object
*/
public String getInstanceName(){
- return getExEmbed().getMenuName();
+ ExEmbed ee = getExEmbed();
+ return (ee == null) ? null : ee.getMenuName();
}
/**
@@ -195,7 +196,8 @@ public final class OLEShape extends HSLF
* @return the full name of the embedded object
*/
public String getFullName(){
- return getExEmbed().getClipboardName();
+ ExEmbed ee = getExEmbed();
+ return (ee == null) ? null : ee.getClipboardName();
}
/**
@@ -206,6 +208,7 @@ public final class OLEShape extends HSLF
* @return the ProgID
*/
public String getProgID(){
- return getExEmbed().getProgId();
+ ExEmbed ee = getExEmbed();
+ return (ee == null) ? null : ee.getProgId();
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java?rev=1793727&r1=1793726&r2=1793727&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java Wed
May 3 22:16:26 2017
@@ -360,13 +360,16 @@ public final class PPDrawing extends Rec
* @return EscherDgRecord
*/
public EscherDgRecord getEscherDgRecord(){
- if(dg == null){
- for(EscherRecord r :
getDgContainer().getChildRecords()){
- if(r instanceof EscherDgRecord){
- dg = (EscherDgRecord)r;
- break;
- }
- }
+ if (dg == null) {
+ EscherContainerRecord dgr = getDgContainer();
+ if (dgr != null) {
+ for(EscherRecord r : dgr.getChildRecords()){
+ if(r instanceof EscherDgRecord){
+ dg = (EscherDgRecord)r;
+ break;
+ }
+ }
+ }
}
return dg;
}
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java?rev=1793727&r1=1793726&r2=1793727&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
Wed May 3 22:16:26 2017
@@ -372,7 +372,9 @@ public final class HSLFFill {
if(p != null) {
int idx = p.getPropertyValue();
EscherBSERecord bse = getEscherBSERecord(idx);
- bse.setRef(bse.getRef() + 1);
+ if (bse != null) {
+ bse.setRef(bse.getRef() + 1);
+ }
}
}
@@ -521,7 +523,9 @@ public final class HSLFFill {
HSLFShape.setEscherProperty(opt,
(short)(EscherProperties.FILL__PATTERNTEXTURE + 0x4000), (data == null ? 0 :
data.getIndex()));
if(data != null && shape.getSheet() != null) {
EscherBSERecord bse = getEscherBSERecord(data.getIndex());
- bse.setRef(bse.getRef() + 1);
+ if (bse != null) {
+ bse.setRef(bse.getRef() + 1);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
