From: Andreas Beeker <kiwiwings@apache.org>
Date: Sun, 8 Nov 2015 23:14:50 +0000 (+0000)
Subject: sonar fixes
X-Git-Tag: REL_3_14_BETA1~136
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=171a9e853d42565774fdf7425bab31d69042b9c1;p=poi.git

sonar fixes

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

diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
index fca30abd92..27ea105330 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
@@ -125,7 +125,9 @@ public class KeyInfoSignatureFacet extends SignatureFacet {
         };
 
         Element n = document.getDocumentElement();
-        DOMSignContext domSignContext = new DOMSignContext(key, n, nextSibling);
+        DOMSignContext domSignContext = (nextSibling == null)
+            ? new DOMSignContext(key, n)
+            : new DOMSignContext(key, n, nextSibling);
         for (Map.Entry<String,String> me : signatureConfig.getNamespacePrefixes().entrySet()) {
             domSignContext.putNamespacePrefix(me.getKey(), me.getValue());
         }
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java
index f5d29d3729..574d64013a 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java
@@ -65,14 +65,14 @@ public class XSSFXmlColumnPr {
 	 * @return the local XPath 
 	 */
 	public String getLocalXPath(){
-		String localXPath = "";
+		StringBuilder localXPath = new StringBuilder();
 		int numberOfCommonXPathAxis = table.getCommonXpath().split("/").length-1;
 		
 		String[] xPathTokens = ctXmlColumnPr.getXpath().split("/");
 		for(int i=numberOfCommonXPathAxis; i<xPathTokens.length;i++){
-			localXPath += "/" +xPathTokens[i];
+			localXPath.append("/" +xPathTokens[i]);
 		}
-		return localXPath;
+		return localXPath.toString();
 	}
 
 	public Enum getXmlDataType() {
diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java b/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
index 8c0d2e63f4..4f210ae425 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
@@ -247,26 +247,6 @@ public class XWPFHeaderFooterPolicy {
         return hdr;
     }
 
-    private CTHdrFtr buildHdrFtr(String pStyle, XWPFParagraph[] paragraphs) {
-        CTHdrFtr ftr = CTHdrFtr.Factory.newInstance();
-        if (paragraphs != null) {
-            for (int i = 0; i < paragraphs.length; i++) {
-                CTP p = ftr.addNewP();
-                //ftr.setPArray(0, paragraphs[i].getCTP());		// MB 23 May 2010
-                ftr.setPArray(i, paragraphs[i].getCTP());    // MB 23 May 2010
-            }
-        } else {
-            CTP p = ftr.addNewP();
-            byte[] rsidr = doc.getDocument().getBody().getPArray(0).getRsidR();
-            byte[] rsidrdefault = doc.getDocument().getBody().getPArray(0).getRsidRDefault();
-            p.setRsidP(rsidr);
-            p.setRsidRDefault(rsidrdefault);
-            CTPPr pPr = p.addNewPPr();
-            pPr.addNewPStyle().setVal(pStyle);
-        }
-        return ftr;
-    }
-
     /**
      * MB 24 May 2010. Created this overloaded buildHdrFtr() method because testing demonstrated
      * that the XWPFFooter or XWPFHeader object returned by calls to the createHeader(int, XWPFParagraph[])
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
index cc6ac3a280..adc04c26e7 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
@@ -232,7 +232,7 @@ public class XWPFTableCell implements IBody, ICell {
     public XWPFVertAlign getVerticalAlignment() {
         XWPFVertAlign vAlign = null;
         CTTcPr tcpr = ctTc.getTcPr();
-        if (ctTc != null) {
+        if (tcpr != null) {
             CTVerticalJc va = tcpr.getVAlign();
             vAlign = stVertAlignTypeMap.get(va.getVal().intValue());
         }
@@ -488,11 +488,11 @@ public class XWPFTableCell implements IBody, ICell {
         if (table == null) {
             return null;
         }
-        XWPFTableRow tableRow = table.getRow(row);
-        if (tableRow == null) {
+        XWPFTableRow tr = table.getRow(row);
+        if (tr == null) {
             return null;
         }
-        return tableRow.getTableCell(cell);
+        return tr.getTableCell(cell);
     }
 
     public XWPFDocument getXWPFDocument() {