Author: fanningpj
Date: Tue Oct 15 16:33:15 2024
New Revision: 1921340
URL: http://svn.apache.org/viewvc?rev=1921340&view=rev
Log:
make static maps final
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java?rev=1921340&r1=1921339&r2=1921340&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java
Tue Oct 15 16:33:15 2024
@@ -604,7 +604,7 @@ public enum Borders {
static {
final Map<Integer, Borders> tempMap = new HashMap<>();
for (Borders p : values()) {
- tempMap.put(Integer.valueOf(p.getValue()), p);
+ tempMap.put(p.getValue(), p);
}
imap = Collections.unmodifiableMap(tempMap);
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java?rev=1921340&r1=1921339&r2=1921340&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java
Tue Oct 15 16:33:15 2024
@@ -16,6 +16,7 @@
==================================================================== */
package org.apache.poi.xwpf.usermodel;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -54,12 +55,14 @@ public enum BreakType {
*/
TEXT_WRAPPING(3);
- private static Map<Integer, BreakType> imap = new HashMap<>();
+ private static final Map<Integer, BreakType> imap;
static {
+ final Map<Integer, BreakType> tempMap = new HashMap<>();
for (BreakType p : values()) {
- imap.put(p.getValue(), p);
+ tempMap.put(p.getValue(), p);
}
+ imap = Collections.unmodifiableMap(tempMap);
}
private final int value;
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java?rev=1921340&r1=1921339&r2=1921340&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java
Tue Oct 15 16:33:15 2024
@@ -16,6 +16,7 @@
==================================================================== */
package org.apache.poi.xwpf.usermodel;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -47,12 +48,14 @@ public enum LineSpacingRule {
AT_LEAST(3);
- private static Map<Integer, LineSpacingRule> imap = new HashMap<>();
+ private static final Map<Integer, LineSpacingRule> imap;
static {
+ final Map<Integer, LineSpacingRule> tempMap = new HashMap<>();
for (LineSpacingRule p : values()) {
- imap.put(p.getValue(), p);
+ tempMap.put(p.getValue(), p);
}
+ imap = Collections.unmodifiableMap(tempMap);
}
private final int value;
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java?rev=1921340&r1=1921339&r2=1921340&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java
Tue Oct 15 16:33:15 2024
@@ -18,6 +18,7 @@ package org.apache.poi.xwpf.usermodel;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STJcTable;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -30,12 +31,14 @@ public enum TableRowAlign {
CENTER(STJcTable.INT_CENTER),
RIGHT(STJcTable.INT_END);
- private static Map<Integer, TableRowAlign> imap = new HashMap<>();
+ private static final Map<Integer, TableRowAlign> imap;
static {
+ final Map<Integer, TableRowAlign> tempMap = new HashMap<>();
for (TableRowAlign p : values()) {
- imap.put(p.getValue(), p);
+ tempMap.put(p.getValue(), p);
}
+ imap = Collections.unmodifiableMap(tempMap);
}
private final int value;
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java?rev=1921340&r1=1921339&r2=1921340&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java
Tue Oct 15 16:33:15 2024
@@ -16,6 +16,7 @@
==================================================================== */
package org.apache.poi.xwpf.usermodel;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -28,12 +29,14 @@ public enum TableRowHeightRule {
EXACT(2),
AT_LEAST(3);
- private static Map<Integer, TableRowHeightRule> imap = new HashMap<>();
+ private static final Map<Integer, TableRowHeightRule> imap;
static {
+ final Map<Integer, TableRowHeightRule> tempMap = new HashMap<>();
for (TableRowHeightRule p : values()) {
- imap.put(p.getValue(), p);
+ tempMap.put(p.getValue(), p);
}
+ imap = Collections.unmodifiableMap(tempMap);
}
private final int value;
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java?rev=1921340&r1=1921339&r2=1921340&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
Tue Oct 15 16:33:15 2024
@@ -16,6 +16,7 @@
==================================================================== */
package org.apache.poi.xwpf.usermodel;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -50,12 +51,14 @@ public enum TextAlignment {
*/
AUTO(5);
- private static Map<Integer, TextAlignment> imap = new HashMap<>();
+ private static final Map<Integer, TextAlignment> imap;
static {
+ final Map<Integer, TextAlignment> tempMap = new HashMap<>();
for (TextAlignment p : values()) {
- imap.put(p.getValue(), p);
+ tempMap.put(p.getValue(), p);
}
+ imap = Collections.unmodifiableMap(tempMap);
}
private final int value;
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java?rev=1921340&r1=1921339&r2=1921340&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java
Tue Oct 15 16:33:15 2024
@@ -30,7 +30,7 @@ import java.util.Map;
* ones, so we can't just re-use the HSMF ones.
*/
public final class TNEFProperty {
- private static Map<Integer, List<TNEFProperty>> properties = new
HashMap<>();
+ private static final Map<Integer, List<TNEFProperty>> properties = new
HashMap<>();
// Types taken from
http://msdn.microsoft.com/en-us/library/microsoft.exchange.data.contenttypes.tnef.tnefattributetype%28v=EXCHG.140%29.aspx
public static final int TYPE_TRIPLES = 0x0000;
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java?rev=1921340&r1=1921339&r2=1921340&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java
Tue Oct 15 16:33:15 2024
@@ -46,7 +46,7 @@ import static org.apache.poi.hsmf.dataty
*/
@SuppressWarnings("unused")
public class MAPIProperty {
- private static Map<Integer, MAPIProperty> attributes = new HashMap<>();
+ private static final Map<Integer, MAPIProperty> attributes = new
HashMap<>();
public static final MAPIProperty AB_DEFAULT_DIR =
new MAPIProperty(0x3d06, BINARY, "AbDefaultDir", "PR_AB_DEFAULT_DIR");
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java?rev=1921340&r1=1921339&r2=1921340&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
Tue Oct 15 16:33:15 2024
@@ -17,6 +17,7 @@
package org.apache.poi.ss.formula.functions;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -75,16 +76,20 @@ public final class LookupUtils {
public int getIntValue() { return intValue; }
}
- private static Map<Integer, MatchMode> matchModeMap = new HashMap<>();
- private static Map<Integer, SearchMode> searchModeMap = new HashMap<>();
+ private static final Map<Integer, MatchMode> matchModeMap;
+ private static final Map<Integer, SearchMode> searchModeMap;
static {
+ final Map<Integer, MatchMode> mmMap = new HashMap<>();
for (MatchMode mode : MatchMode.values()) {
- matchModeMap.put(mode.getIntValue(), mode);
+ mmMap.put(mode.getIntValue(), mode);
}
+ matchModeMap = Collections.unmodifiableMap(mmMap);
+ final Map<Integer, SearchMode> smMap = new HashMap<>();
for (SearchMode mode : SearchMode.values()) {
- searchModeMap.put(mode.getIntValue(), mode);
+ smMap.put(mode.getIntValue(), mode);
}
+ searchModeMap = Collections.unmodifiableMap(smMap);
}
public static MatchMode matchMode(int m) {
@@ -588,7 +593,7 @@ public final class LookupUtils {
if (valEval instanceof StringEval) {
String stringValue = ((StringEval) valEval).getStringValue();
- if(stringValue.length() < 1) {
+ if(stringValue.isEmpty()) {
// More trickiness:
// Empty string is not the same as BlankEval. It causes
#VALUE! error
throw EvaluationException.invalidValue();
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java?rev=1921340&r1=1921339&r2=1921340&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java
Tue Oct 15 16:33:15 2024
@@ -26,7 +26,7 @@ import java.util.Map;
* Represents a type of a conditional formatting rule
*/
public class ConditionType {
- private static Map<Integer,ConditionType> lookup = new HashMap<>();
+ private static final Map<Integer, ConditionType> lookup = new HashMap<>();
/**
* This conditional formatting rule compares a cell value
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
