Author: fanningpj
Date: Sat Aug 6 21:06:50 2022
New Revision: 1903257
URL: http://svn.apache.org/viewvc?rev=1903257&view=rev
Log:
[github-366] remove unnecessary local vars. Thanks to Arturo Bernal. This
closes #366
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Areas.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java?rev=1903257&r1=1903256&r2=1903257&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
Sat Aug 6 21:06:50 2022
@@ -408,11 +408,10 @@ public abstract class XDDFChartAxis impl
}
protected long getNextAxId(CTPlotArea plotArea) {
- long totalAxisCount = 0L
+ return 0L
+ plotArea.sizeOfValAxArray()
+ plotArea.sizeOfCatAxArray()
+ plotArea.sizeOfDateAxArray()
+ plotArea.sizeOfSerAxArray();
- return totalAxisCount;
}
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java?rev=1903257&r1=1903256&r2=1903257&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
Sat Aug 6 21:06:50 2022
@@ -492,8 +492,7 @@ public abstract class XWPFHeaderFooter e
private boolean isCursorInHdrF(XmlCursor cursor) {
try (XmlCursor verify = cursor.newCursor()) {
verify.toParent();
- boolean result = (verify.getObject() == this.headerFooter);
- return result;
+ return (verify.getObject() == this.headerFooter);
}
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java?rev=1903257&r1=1903256&r2=1903257&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
Sat Aug 6 21:06:50 2022
@@ -336,8 +336,7 @@ public class XWPFTableCell implements IB
private boolean isCursorInTableCell(XmlCursor cursor) {
try (XmlCursor verify = cursor.newCursor()) {
verify.toParent();
- boolean result = (verify.getObject() == this.ctTc);
- return result;
+ return (verify.getObject() == this.ctTc);
}
}
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java?rev=1903257&r1=1903256&r2=1903257&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
(original)
+++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
Sat Aug 6 21:06:50 2022
@@ -447,8 +447,7 @@ public class MAPIMessage extends POIRead
if (val != null && !val.isEmpty()) {
int codepage = ((LongPropertyValue) val.get(0)).getValue();
try {
- String encoding = CodePageUtil.codepageToEncoding(codepage,
true);
- generalcodepage = encoding;
+ generalcodepage = CodePageUtil.codepageToEncoding(codepage,
true);
} catch (UnsupportedEncodingException e) {
LOG.atWarn().log("Invalid codepage ID {} set for the message
via {}, ignoring", box(codepage), MAPIProperty.MESSAGE_CODEPAGE);
}
@@ -463,8 +462,7 @@ public class MAPIMessage extends POIRead
int codepage = LocaleUtil.getDefaultCodePageFromLCID(lcid);
try {
if (codepage != 0) {
- String encoding =
CodePageUtil.codepageToEncoding(codepage, true);
- generalcodepage = encoding;
+ generalcodepage =
CodePageUtil.codepageToEncoding(codepage, true);
}
} catch (UnsupportedEncodingException e) {
LOG.atWarn().log("Invalid codepage ID {}from locale ID{}
set for the message via {}, ignoring", box(codepage), box(lcid),
MAPIProperty.MESSAGE_LOCALE_ID);
@@ -482,8 +480,7 @@ public class MAPIMessage extends POIRead
if
(header.toLowerCase(LocaleUtil.getUserLocale()).startsWith("content-type")) {
Matcher m =
GUESS_7_BIT_ENCODING_PATTERN.matcher(header);
if (m.matches()) {
- String encoding = m.group(1);
- generalcodepage = encoding;
+ generalcodepage = m.group(1);
}
}
}
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java?rev=1903257&r1=1903256&r2=1903257&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
Sat Aug 6 21:06:50 2022
@@ -91,7 +91,7 @@ public abstract class GrfhicAbstractType
public String toString()
{
- String builder = "[Grfhic]\n" +
+ return "[Grfhic]\n" +
" .grfhic = " +
" ( " + field_1_grfhic + " )\n" +
" .fHtmlChecked = " + isFHtmlChecked() + '\n' +
@@ -103,7 +103,6 @@ public abstract class GrfhicAbstractType
" .fHtmlHangingIndentBeneathNumber = " +
isFHtmlHangingIndentBeneathNumber() + '\n' +
" .fHtmlBuiltInBullet = " + isFHtmlBuiltInBullet() +
'\n' +
"[/Grfhic]";
- return builder;
}
/**
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Areas.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Areas.java?rev=1903257&r1=1903256&r2=1903257&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Areas.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Areas.java
Sat Aug 6 21:06:50 2022
@@ -40,8 +40,7 @@ public final class Areas implements Func
RefListEval refListEval = (RefListEval) valueEval;
result = refListEval.getList().size();
}
- NumberEval numberEval = new NumberEval(new NumberPtg(result));
- return numberEval;
+ return new NumberEval(new NumberPtg(result));
} catch (Exception e) {
return ErrorEval.VALUE_INVALID;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
