You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/01/17 17:31:24 UTC
svn commit: r1885613 [2/6] - in /poi/trunk/src:
integrationtest/org/apache/poi/stress/ java/org/apache/poi/
java/org/apache/poi/ddf/ java/org/apache/poi/hpsf/
java/org/apache/poi/hssf/dev/ java/org/apache/poi/hssf/eventusermodel/
java/org/apache/poi/hs...
Modified: poi/trunk/src/java/org/apache/poi/poifs/property/PropertyTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/property/PropertyTable.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/property/PropertyTable.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/property/PropertyTable.java Sun Jan 17 17:31:22 2021
@@ -41,8 +41,7 @@ import org.apache.poi.util.POILogger;
* chain of blocks.
*/
public final class PropertyTable implements BATManaged {
- private static final POILogger _logger =
- POILogFactory.getLogger(PropertyTable.class);
+ private static final POILogger LOG = POILogFactory.getLogger(PropertyTable.class);
//arbitrarily selected; may need to increase
private static final int MAX_RECORD_LENGTH = 100_000;
@@ -97,7 +96,7 @@ public final class PropertyTable impleme
// Looks to be a truncated block
// This isn't allowed, but some third party created files
// sometimes do this, and we can normally read anyway
- _logger.log(POILogger.WARN, "Short Property Block, ", bb.remaining(),
+ LOG.log(POILogger.WARN, "Short Property Block, ", bb.remaining(),
" bytes instead of the expected " + _bigBigBlockSize.getBigBlockSize());
toRead = bb.remaining();
}
@@ -175,7 +174,7 @@ public final class PropertyTable impleme
}
return numBlocks;
}
-
+
/**
* Prepare to be written
*/
@@ -184,7 +183,7 @@ public final class PropertyTable impleme
// give each property its index
int i=0;
for (Property p : _properties) {
- // only handle non-null properties
+ // only handle non-null properties
if (p == null) continue;
p.setIndex(i++);
pList.add(p);
@@ -192,8 +191,8 @@ public final class PropertyTable impleme
// prepare each property for writing
for (Property p : pList) p.preWrite();
- }
-
+ }
+
/**
* Writes the properties out into the given low-level stream
*/
@@ -205,7 +204,7 @@ public final class PropertyTable impleme
}
}
os.close();
-
+
// Update the start position if needed
if(getStartBlock() != stream.getStartBlock()) {
setStartBlock(stream.getStartBlock());
@@ -248,7 +247,7 @@ public final class PropertyTable impleme
if (! Property.isValidIndex(index))
return false;
if (index < 0 || index >= _properties.size()) {
- _logger.log(POILogger.WARN, "Property index " + index +
+ LOG.log(POILogger.WARN, "Property index " + index +
"outside the valid range 0.."+_properties.size());
return false;
}
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java Sun Jan 17 17:31:22 2021
@@ -49,7 +49,7 @@ import org.apache.poi.util.POILogger;
* For now this class renders only images supported by the javax.imageio.ImageIO framework.
**/
public class BitmapImageRenderer implements ImageRenderer {
- private final static POILogger LOG = POILogFactory.getLogger(BitmapImageRenderer.class);
+ private static final POILogger LOG = POILogFactory.getLogger(BitmapImageRenderer.class);
protected BufferedImage img;
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java Sun Jan 17 17:31:22 2021
@@ -36,7 +36,7 @@ import org.apache.poi.util.POILogger;
import org.apache.poi.util.XMLHelper;
public final class PresetGeometries {
- private final static POILogger LOG = POILogFactory.getLogger(PresetGeometries.class);
+ private static final POILogger LOG = POILogFactory.getLogger(PresetGeometries.class);
private final Map<String, CustomGeometry> map = new TreeMap<>();
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetParser.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetParser.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetParser.java Sun Jan 17 17:31:22 2021
@@ -55,7 +55,7 @@ class PresetParser {
}
}
- private final static POILogger LOG = POILogFactory.getLogger(PresetParser.class);
+ private static final POILogger LOG = POILogFactory.getLogger(PresetParser.class);
private Mode mode;
Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java Sun Jan 17 17:31:22 2021
@@ -24,6 +24,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.logging.Level;
+import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -50,13 +51,13 @@ import org.apache.poi.util.LocaleUtil;
* <dt>One part (example: <tt>[Green]#.##</tt>)</dt>
* <dd>If the value is a number, display according to this one part (example: green text,
* with up to two decimal points). If the value is text, display it as is.</dd>
- *
+ *
* <dt>Two parts (example: <tt>[Green]#.##;[Red]#.##</tt>)</dt>
* <dd>If the value is a positive number or zero, display according to the first part (example: green
* text, with up to two decimal points); if it is a negative number, display
* according to the second part (example: red text, with up to two decimal
* points). If the value is text, display it as is.</dd>
- *
+ *
* <dt>Three parts (example: <tt>[Green]#.##;[Black]#.##;[Red]#.##</tt>)</dt>
* <dd>If the value is a positive
* number, display according to the first part (example: green text, with up to
@@ -64,7 +65,7 @@ import org.apache.poi.util.LocaleUtil;
* (example: black text, with up to two decimal points); if it is a negative
* number, display according to the third part (example: red text, with up to
* two decimal points). If the value is text, display it as is.</dd>
- *
+ *
* <dt>Four parts (example: <tt>[Green]#.##;[Black]#.##;[Red]#.##;[@]</tt>)</dt>
* <dd>If the value is a positive number, display according to the first part (example: green text,
* with up to two decimal points); if it is zero, display according to the
@@ -82,7 +83,7 @@ import org.apache.poi.util.LocaleUtil;
* <p>
* In addition to these, there is a general format that is used when no format
* is specified.
- *
+ *
* TODO Merge this with {@link DataFormatter} so we only have one set of
* code for formatting numbers.
* TODO Re-use parts of this logic with {@link ConditionalFormatting} /
@@ -91,13 +92,8 @@ import org.apache.poi.util.LocaleUtil;
* native character numbers, as documented at https://help.libreoffice.org/Common/Number_Format_Codes
*/
public class CellFormat {
- private final Locale locale;
- private final String format;
- private final CellFormatPart posNumFmt;
- private final CellFormatPart zeroNumFmt;
- private final CellFormatPart negNumFmt;
- private final CellFormatPart textFmt;
- private final int formatPartCount;
+ /** The logger to use in the formatting code. */
+ private static final Logger LOG = Logger.getLogger(CellFormat.class.getName());
private static final Pattern ONE_PART = Pattern.compile(
CellFormatPart.FORMAT_PAT.pattern() + "(;|$)",
@@ -115,8 +111,16 @@ public class CellFormat {
"###################################################" +
"###################################################";
- private static String QUOTE = "\"";
-
+ private static final String QUOTE = "\"";
+
+ private final Locale locale;
+ private final String format;
+ private final CellFormatPart posNumFmt;
+ private final CellFormatPart zeroNumFmt;
+ private final CellFormatPart negNumFmt;
+ private final CellFormatPart textFmt;
+ private final int formatPartCount;
+
private static CellFormat createGeneralFormat(final Locale locale) {
return new CellFormat(locale, "General") {
@Override
@@ -187,14 +191,13 @@ public class CellFormat {
parts.add(new CellFormatPart(locale, valueDesc));
} catch (RuntimeException e) {
- CellFormatter.logger.log(Level.WARNING,
- "Invalid format: " + CellFormatter.quote(m.group()), e);
+ LOG.log(Level.WARNING, "Invalid format: " + CellFormatter.quote(m.group()), e);
parts.add(null);
}
}
-
+
formatPartCount = parts.size();
-
+
switch (formatPartCount) {
case 1:
posNumFmt = parts.get(0);
@@ -382,16 +385,16 @@ public class CellFormat {
* Returns the {@link CellFormatPart} that applies to the value. Result
* depends on how many parts the cell format has, the cell value and any
* conditions. The value must be a {@link Number}.
- *
+ *
* @param value The value.
* @return The {@link CellFormatPart} that applies to the value.
*/
private CellFormatPart getApplicableFormatPart(Object value) {
-
+
if (value instanceof Number) {
-
+
double val = ((Number) value).doubleValue();
-
+
if (formatPartCount == 1) {
if (!posNumFmt.hasCondition()
|| (posNumFmt.hasCondition() && posNumFmt.applies(val))) {
@@ -425,15 +428,15 @@ public class CellFormat {
} else {
throw new IllegalArgumentException("value must be a Number");
}
-
+
}
-
+
/**
* Returns the ultimate cell type, following the results of formulas. If
* the cell is a {@link CellType#FORMULA}, this returns the result of
* {@link Cell#getCachedFormulaResultType()}. Otherwise this returns the
* result of {@link Cell#getCellType()}.
- *
+ *
* @param cell The cell.
*
* @return The ultimate type of this cell.
Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java Sun Jan 17 17:31:22 2021
@@ -26,10 +26,10 @@ import javax.swing.*;
import java.awt.*;
import java.util.*;
import java.util.List;
+import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import static org.apache.poi.ss.format.CellFormatter.logger;
import static org.apache.poi.ss.format.CellFormatter.quote;
/**
@@ -49,13 +49,16 @@ import static org.apache.poi.ss.format.C
* @author Ken Arnold, Industrious Media LLC
*/
public class CellFormatPart {
+ private static final Logger LOG = Logger.getLogger(CellFormat.class.getName());
+
+ static final Map<String, Color> NAMED_COLORS;
+
+
private final Color color;
private CellFormatCondition condition;
private final CellFormatter format;
private final CellFormatType type;
- static final Map<String, Color> NAMED_COLORS;
-
static {
NAMED_COLORS = new TreeMap<>(
String.CASE_INSENSITIVE_ORDER);
@@ -106,7 +109,7 @@ public class CellFormatPart {
// A condition specification
String condition = "([<>=]=?|!=|<>) # The operator\n" +
" \\s*([0-9]+(?:\\.[0-9]*)?)\\s* # The constant to test against\n";
-
+
// A currency symbol / string, in a specific locale
String currency = "(\\[\\$.{0,3}-[0-9a-f]{3}\\])";
@@ -173,7 +176,7 @@ public class CellFormatPart {
public CellFormatPart(String desc) {
this(LocaleUtil.getUserLocale(), desc);
}
-
+
/**
* Create an object to represent a format part.
*
@@ -253,8 +256,9 @@ public class CellFormatPart {
if (cdesc == null || cdesc.length() == 0)
return null;
Color c = NAMED_COLORS.get(cdesc);
- if (c == null)
- logger.warning("Unknown color: " + quote(cdesc));
+ if (c == null) {
+ LOG.warning("Unknown color: " + quote(cdesc));
+ }
return c;
}
@@ -297,7 +301,7 @@ public class CellFormatPart {
*/
private CellFormatter getFormatter(Locale locale, Matcher matcher) {
String fdesc = matcher.group(SPECIFICATION_GROUP);
-
+
// For now, we don't support localised currencies, so simplify if there
Matcher currencyM = CURRENCY_PAT.matcher(fdesc);
if (currencyM.find()) {
@@ -311,7 +315,7 @@ public class CellFormatPart {
}
fdesc = fdesc.replace(currencyPart, currencyRepl);
}
-
+
// Build a formatter for this simplified string
return type.formatter(locale, fdesc);
}
@@ -339,7 +343,7 @@ public class CellFormatPart {
String c2 = null;
if (codePoints.hasNext())
c2 = codePoints.next().toLowerCase(Locale.ROOT);
-
+
switch (c1) {
case "@":
return CellFormatType.TEXT;
Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellFormatter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellFormatter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellFormatter.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellFormatter.java Sun Jan 17 17:31:22 2021
@@ -23,10 +23,11 @@ import org.apache.poi.util.LocaleUtil;
/**
* This is the abstract supertype for the various cell formatters.
- *
- * @author Ken Arnold, Industrious Media LLC
*/
public abstract class CellFormatter {
+ /** The logger to use in the formatting code. */
+ private static final Logger LOG = Logger.getLogger(CellFormatter.class.getName());
+
/** The original specified format. */
protected final String format;
protected final Locale locale;
@@ -51,16 +52,12 @@ public abstract class CellFormatter {
this.format = format;
}
- /** The logger to use in the formatting code. */
- static final Logger logger = Logger.getLogger(
- CellFormatter.class.getName());
-
/**
* Format a value according the format string.
* <p/>
- * NOTE: this method must be thread safe! In particular, if it uses a
+ * NOTE: this method must be thread safe! In particular, if it uses a
* Format instance that is not thread safe, i.e. DateFormat, this method
- * must be synchronized, either on the method, if the format is a final
+ * must be synchronized, either on the method, if the format is a final
* property, or on the format instance itself.
*
* @param toAppendTo The buffer to append to.
@@ -71,9 +68,9 @@ public abstract class CellFormatter {
/**
* Format a value according to the type, in the most basic way.
* <p/>
- * NOTE: this method must be thread safe! In particular, if it uses a
+ * NOTE: this method must be thread safe! In particular, if it uses a
* Format instance that is not thread safe, i.e. DateFormat, this method
- * must be synchronized, either on the method, if the format is a final
+ * must be synchronized, either on the method, if the format is a final
* property, or on the format instance itself.
*
* @param toAppendTo The buffer to append to.
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/FormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/FormulaParser.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/FormulaParser.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/FormulaParser.java Sun Jan 17 17:31:22 2021
@@ -93,7 +93,7 @@ import org.apache.poi.util.POILogger;
*/
@Internal
public final class FormulaParser {
- private final static POILogger log = POILogFactory.getLogger(FormulaParser.class);
+ private static final POILogger log = POILogFactory.getLogger(FormulaParser.class);
private final String _formulaString;
private final int _formulaLength;
/** points at the next character to be read (after the {@link #look} codepoint) */
@@ -101,9 +101,9 @@ public final class FormulaParser {
private ParseNode _rootNode;
- private final static char TAB = '\t'; // HSSF + XSSF
- private final static char CR = '\r'; // Normally just XSSF
- private final static char LF = '\n'; // Normally just XSSF
+ private static final char TAB = '\t'; // HSSF + XSSF
+ private static final char CR = '\r'; // Normally just XSSF
+ private static final char LF = '\n'; // Normally just XSSF
/**
* Lookahead unicode codepoint
@@ -585,11 +585,11 @@ public final class FormulaParser {
- private final static String specHeaders = "Headers";
- private final static String specAll = "All";
- private final static String specData = "Data";
- private final static String specTotals = "Totals";
- private final static String specThisRow = "This Row";
+ private static final String specHeaders = "Headers";
+ private static final String specAll = "All";
+ private static final String specData = "Data";
+ private static final String specTotals = "Totals";
+ private static final String specThisRow = "This Row";
/**
* Parses a structured reference, returns it as area reference.
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java Sun Jan 17 17:31:22 2021
@@ -22,12 +22,12 @@ import org.apache.poi.util.POILogFactory
import org.apache.poi.util.POILogger;
/**
* Represents a constant error code value as encoded in a constant values array. <p>
- *
- * This class is a type-safe wrapper for a 16-bit int value performing a similar job to
+ *
+ * This class is a type-safe wrapper for a 16-bit int value performing a similar job to
* <tt>ErrorEval</tt>.
*/
-public class ErrorConstant {
- private static final POILogger logger = POILogFactory.getLogger(ErrorConstant.class);
+public final class ErrorConstant {
+ private static final POILogger LOG = POILogFactory.getLogger(ErrorConstant.class);
private static final ErrorConstant NULL = new ErrorConstant(FormulaError.NULL.getCode());
private static final ErrorConstant DIV_0 = new ErrorConstant(FormulaError.DIV0.getCode());
private static final ErrorConstant VALUE = new ErrorConstant(FormulaError.VALUE.getCode());
@@ -41,7 +41,7 @@ public class ErrorConstant {
private ErrorConstant(int errorCode) {
_errorCode = errorCode;
}
-
+
public int getErrorCode() {
return _errorCode;
}
@@ -66,7 +66,7 @@ public class ErrorConstant {
default: break;
}
}
- logger.log( POILogger.WARN, "Warning - unexpected error code (", errorCode, ")");
+ LOG.log( POILogger.WARN, "Warning - unexpected error code (", errorCode, ")");
return new ErrorConstant(errorCode);
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Bin.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Bin.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Bin.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Bin.java Sun Jan 17 17:31:22 2021
@@ -52,9 +52,9 @@ public class Dec2Bin extends Var1or2ArgF
public static final FreeRefFunction instance = new Dec2Bin();
- private final static long MIN_VALUE = -512;
- private final static long MAX_VALUE = 511;
- private final static int DEFAULT_PLACES_VALUE = 10;
+ private static final long MIN_VALUE = -512;
+ private static final long MAX_VALUE = 511;
+ private static final int DEFAULT_PLACES_VALUE = 10;
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE, ValueEval placesVE) {
ValueEval veText1;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Hex.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Hex.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Hex.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Hex.java Sun Jan 17 17:31:22 2021
@@ -56,9 +56,9 @@ public final class Dec2Hex extends Var1o
public static final FreeRefFunction instance = new Dec2Hex();
- private final static long MIN_VALUE = Long.parseLong("-549755813888");
- private final static long MAX_VALUE = Long.parseLong("549755813887");
- private final static int DEFAULT_PLACES_VALUE = 10;
+ private static final long MIN_VALUE = Long.parseLong("-549755813888");
+ private static final long MAX_VALUE = Long.parseLong("549755813887");
+ private static final int DEFAULT_PLACES_VALUE = 10;
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval number, ValueEval places) {
ValueEval veText1;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Delta.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Delta.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Delta.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Delta.java Sun Jan 17 17:31:22 2021
@@ -44,8 +44,8 @@ public final class Delta extends Fixed2A
public static final FreeRefFunction instance = new Delta();
- private final static NumberEval ONE = new NumberEval(1);
- private final static NumberEval ZERO = new NumberEval(0);
+ private static final NumberEval ONE = new NumberEval(1);
+ private static final NumberEval ZERO = new NumberEval(0);
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg1, ValueEval arg2) {
try {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java Sun Jan 17 17:31:22 2021
@@ -391,7 +391,7 @@ public abstract class NumericFunction im
};
public static final Function POISSON = new Fixed3ArgFunction() {
- private final static double DEFAULT_RETURN_RESULT =1;
+ private static final double DEFAULT_RETURN_RESULT =1;
/**
* This checks is x = 0 and the mean = 0.
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AddPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AddPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AddPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AddPtg.java Sun Jan 17 17:31:22 2021
@@ -21,9 +21,9 @@ package org.apache.poi.ss.formula.ptg;
* Addition operator PTG the "+" binomial operator.
*/
public final class AddPtg extends ValueOperatorPtg {
- public final static byte sid = 0x03;
+ public static final byte sid = 0x03;
- private final static String ADD = "+";
+ private static final String ADD = "+";
public static final AddPtg instance = new AddPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java Sun Jan 17 17:31:22 2021
@@ -25,7 +25,7 @@ import org.apache.poi.util.LittleEndianO
* Common superclass of 2-D area refs
*/
public abstract class Area2DPtgBase extends AreaPtgBase {
- private final static int SIZE = 9;
+ private static final int SIZE = 9;
protected Area2DPtgBase(int firstRow, int lastRow, int firstColumn, int lastColumn, boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative) {
super(firstRow, lastRow, firstColumn, lastColumn, firstRowRelative, lastRowRelative, firstColRelative, lastColRelative);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java Sun Jan 17 17:31:22 2021
@@ -37,8 +37,8 @@ import org.apache.poi.util.LittleEndianO
* The XSSF equivalent is {@link Area3DPxg}
*/
public final class Area3DPtg extends AreaPtgBase implements WorkbookDependentFormula, ExternSheetReferenceToken {
- public final static byte sid = 0x3b;
- private final static int SIZE = 11; // 10 + 1 for Ptg
+ public static final byte sid = 0x3b;
+ private static final int SIZE = 11; // 10 + 1 for Ptg
private int field_1_index_extern_sheet;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java Sun Jan 17 17:31:22 2021
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianO
* AreaErr - handles deleted cell area references.
*/
public final class AreaErrPtg extends OperandPtg {
- public final static byte sid = 0x2B;
+ public static final byte sid = 0x2B;
private final int unused1;
private final int unused2;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java Sun Jan 17 17:31:22 2021
@@ -24,7 +24,7 @@ import org.apache.poi.util.LittleEndianI
* @author Jason Height (jheight at chariot dot net dot au)
*/
public final class AreaNPtg extends Area2DPtgBase {
- public final static short sid = 0x2D;
+ public static final short sid = 0x2D;
public AreaNPtg(AreaNPtg other) {
super(other);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java Sun Jan 17 17:31:22 2021
@@ -24,7 +24,7 @@ import org.apache.poi.util.LittleEndianI
* Specifies a rectangular area of cells A1:A4 for instance.
*/
public final class AreaPtg extends Area2DPtgBase {
- public final static short sid = 0x25;
+ public static final short sid = 0x25;
public AreaPtg(int firstRow, int lastRow, int firstColumn, int lastColumn, boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative) {
super(firstRow, lastRow, firstColumn, lastColumn, firstRowRelative, lastRowRelative, firstColRelative, lastColRelative);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java Sun Jan 17 17:31:22 2021
@@ -34,9 +34,9 @@ import org.apache.poi.util.LittleEndianO
*/
public abstract class AreaPtgBase extends OperandPtg implements AreaI {
- private final static BitField rowRelative = BitFieldFactory.getInstance(0x8000);
- private final static BitField colRelative = BitFieldFactory.getInstance(0x4000);
- private final static BitField columnMask = BitFieldFactory.getInstance(0x3FFF);
+ private static final BitField rowRelative = BitFieldFactory.getInstance(0x8000);
+ private static final BitField colRelative = BitFieldFactory.getInstance(0x4000);
+ private static final BitField columnMask = BitFieldFactory.getInstance(0x3FFF);
/** zero based, unsigned 16 bit */
private int field_1_first_row;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java Sun Jan 17 17:31:22 2021
@@ -36,8 +36,8 @@ import org.apache.poi.util.LittleEndianO
* in SUM functions (i.e. SUM(A1:A3) causes an area PTG then an ATTR with the SUM option set)
*/
public final class AttrPtg extends ControlPtg {
- public final static byte sid = 0x19;
- private final static int SIZE = 4;
+ public static final byte sid = 0x19;
+ private static final int SIZE = 4;
// flags 'volatile' and 'space', can be combined.
// OOO spec says other combinations are theoretically possible but not likely to occur.
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java Sun Jan 17 17:31:22 2021
@@ -18,9 +18,9 @@
package org.apache.poi.ss.formula.ptg;
public final class ConcatPtg extends ValueOperatorPtg {
- public final static byte sid = 0x08;
+ public static final byte sid = 0x08;
- private final static String CONCAT = "&";
+ private static final String CONCAT = "&";
public static final ConcatPtg instance = new ConcatPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java Sun Jan 17 17:31:22 2021
@@ -34,7 +34,7 @@ import org.apache.poi.util.LittleEndianO
* @version 1.0-pre
*/
public final class DeletedArea3DPtg extends OperandPtg implements WorkbookDependentFormula {
- public final static byte sid = 0x3d;
+ public static final byte sid = 0x3d;
private final int field_1_index_extern_sheet;
private final int unused1;
private final int unused2;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java Sun Jan 17 17:31:22 2021
@@ -35,7 +35,7 @@ import org.apache.poi.util.LittleEndianO
* @since 1.0-pre
*/
public final class DeletedRef3DPtg extends OperandPtg implements WorkbookDependentFormula {
- public final static byte sid = 0x3c;
+ public static final byte sid = 0x3c;
private final int field_1_index_extern_sheet;
private final int unused1;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DividePtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DividePtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DividePtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DividePtg.java Sun Jan 17 17:31:22 2021
@@ -21,7 +21,7 @@ package org.apache.poi.ss.formula.ptg;
* This PTG implements the standard binomial divide "/"
*/
public final class DividePtg extends ValueOperatorPtg {
- public final static byte sid = 0x06;
+ public static final byte sid = 0x06;
public static final DividePtg instance = new DividePtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/EqualPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/EqualPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/EqualPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/EqualPtg.java Sun Jan 17 17:31:22 2021
@@ -22,7 +22,7 @@ package org.apache.poi.ss.formula.ptg;
* @author andy
*/
public final class EqualPtg extends ValueOperatorPtg {
- public final static byte sid = 0x0b;
+ public static final byte sid = 0x0b;
public static final EqualPtg instance = new EqualPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ExpPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ExpPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ExpPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ExpPtg.java Sun Jan 17 17:31:22 2021
@@ -25,8 +25,8 @@ import org.apache.poi.util.LittleEndianI
import org.apache.poi.util.LittleEndianOutput;
public final class ExpPtg extends ControlPtg {
- private final static int SIZE = 5;
- public final static short sid = 0x1;
+ private static final int SIZE = 5;
+ public static final short sid = 0x1;
private final int field_1_first_row;
private final int field_2_first_col;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncPtg.java Sun Jan 17 17:31:22 2021
@@ -24,8 +24,8 @@ import org.apache.poi.util.LittleEndianO
public final class FuncPtg extends AbstractFunctionPtg {
- public final static byte sid = 0x21;
- public final static int SIZE = 3;
+ public static final byte sid = 0x21;
+ public static final int SIZE = 3;
public static FuncPtg create(LittleEndianInput in) {
return create(in.readUShort());
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java Sun Jan 17 17:31:22 2021
@@ -28,8 +28,8 @@ import org.apache.poi.util.LittleEndianI
import org.apache.poi.util.LittleEndianOutput;
public final class FuncVarPtg extends AbstractFunctionPtg {
- public final static byte sid = 0x22;
- private final static int SIZE = 4;
+ public static final byte sid = 0x22;
+ private static final int SIZE = 4;
// See spec at 2.5.198.63 PtgFuncVar
private static final BitField ceFunc = BitFieldFactory.getInstance(0xF000);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java Sun Jan 17 17:31:22 2021
@@ -22,8 +22,8 @@ package org.apache.poi.ss.formula.ptg;
* PTG class to implement greater or equal to
*/
public final class GreaterEqualPtg extends ValueOperatorPtg {
- public final static int SIZE = 1;
- public final static byte sid = 0x0c;
+ public static final int SIZE = 1;
+ public static final byte sid = 0x0c;
public static final GreaterEqualPtg instance = new GreaterEqualPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java Sun Jan 17 17:31:22 2021
@@ -22,8 +22,8 @@ package org.apache.poi.ss.formula.ptg;
* Greater than operator PTG ">"
*/
public final class GreaterThanPtg extends ValueOperatorPtg {
- public final static byte sid = 0x0D;
- private final static String GREATERTHAN = ">";
+ public static final byte sid = 0x0D;
+ private static final String GREATERTHAN = ">";
public static final GreaterThanPtg instance = new GreaterThanPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/IntPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/IntPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/IntPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/IntPtg.java Sun Jan 17 17:31:22 2021
@@ -42,8 +42,8 @@ public final class IntPtg extends Scalar
return i >= MIN_VALUE && i <= MAX_VALUE;
}
- public final static int SIZE = 3;
- public final static byte sid = 0x1e;
+ public static final int SIZE = 3;
+ public static final byte sid = 0x1e;
private final int field_1_value;
public IntPtg(LittleEndianInput in) {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java Sun Jan 17 17:31:22 2021
@@ -20,7 +20,7 @@ package org.apache.poi.ss.formula.ptg;
import org.apache.poi.util.LittleEndianOutput;
public final class IntersectionPtg extends OperationPtg {
- public final static byte sid = 0x0f;
+ public static final byte sid = 0x0f;
public static final IntersectionPtg instance = new IntersectionPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java Sun Jan 17 17:31:22 2021
@@ -25,7 +25,7 @@ package org.apache.poi.ss.formula.ptg;
* Ptg class to implement less than or equal
*/
public final class LessEqualPtg extends ValueOperatorPtg {
- public final static byte sid = 0x0a;
+ public static final byte sid = 0x0a;
public static final LessEqualPtg instance = new LessEqualPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java Sun Jan 17 17:31:22 2021
@@ -24,10 +24,10 @@ package org.apache.poi.ss.formula.ptg;
*/
public final class LessThanPtg extends ValueOperatorPtg {
/** the sid for the less than operator as hex */
- public final static byte sid = 0x09;
+ public static final byte sid = 0x09;
/** identifier for LESS THAN char */
- private final static String LESSTHAN = "<";
+ private static final String LESSTHAN = "<";
public static final LessThanPtg instance = new LessThanPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java Sun Jan 17 17:31:22 2021
@@ -25,8 +25,8 @@ import org.apache.poi.util.LittleEndianI
import org.apache.poi.util.LittleEndianOutput;
public final class MemAreaPtg extends OperandPtg {
- public final static short sid = 0x26;
- private final static int SIZE = 7;
+ public static final short sid = 0x26;
+ private static final int SIZE = 7;
private final int field_1_reserved;
private final int field_2_subex_len;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java Sun Jan 17 17:31:22 2021
@@ -25,8 +25,8 @@ import org.apache.poi.util.LittleEndianI
import org.apache.poi.util.LittleEndianOutput;
public final class MemErrPtg extends OperandPtg {
- public final static short sid = 0x27;
- private final static int SIZE = 7;
+ public static final short sid = 0x27;
+ private static final int SIZE = 7;
private int field_1_reserved;
private short field_2_subex_len;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java Sun Jan 17 17:31:22 2021
@@ -26,7 +26,7 @@ import org.apache.poi.util.LittleEndianO
public final class MemFuncPtg extends OperandPtg {
- public final static byte sid = 0x29;
+ public static final byte sid = 0x29;
private final int field_1_len_ref_subexpression;
/**
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java Sun Jan 17 17:31:22 2021
@@ -27,8 +27,8 @@ import org.apache.poi.util.LittleEndianO
*/
public final class MissingArgPtg extends ScalarConstantPtg {
- private final static int SIZE = 1;
- public final static byte sid = 0x16;
+ private static final int SIZE = 1;
+ public static final byte sid = 0x16;
public static final Ptg instance = new MissingArgPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java Sun Jan 17 17:31:22 2021
@@ -21,7 +21,7 @@ package org.apache.poi.ss.formula.ptg;
* Implements the standard mathematical multiplication "*"
*/
public final class MultiplyPtg extends ValueOperatorPtg {
- public final static byte sid = 0x05;
+ public static final byte sid = 0x05;
public static final MultiplyPtg instance = new MultiplyPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java Sun Jan 17 17:31:22 2021
@@ -30,8 +30,8 @@ import org.apache.poi.util.LittleEndianO
* See the spec at 2.5.198.76 PtgName
*/
public final class NamePtg extends OperandPtg implements WorkbookDependentFormula {
- public final static short sid = 0x23;
- private final static int SIZE = 5;
+ public static final short sid = 0x23;
+ private static final int SIZE = 5;
/** one-based index to defined name record */
private int field_1_label_index;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java Sun Jan 17 17:31:22 2021
@@ -35,8 +35,8 @@ import org.apache.poi.util.LittleEndianO
* is {@link NameXPxg}
*/
public final class NameXPtg extends OperandPtg implements WorkbookDependentFormula {
- public final static short sid = 0x39;
- private final static int SIZE = 7;
+ public static final short sid = 0x39;
+ private static final int SIZE = 7;
/** index to REF entry in externsheet record */
private final int _sheetRefIndex;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java Sun Jan 17 17:31:22 2021
@@ -21,7 +21,7 @@ package org.apache.poi.ss.formula.ptg;
* Ptg class to implement not equal
*/
public final class NotEqualPtg extends ValueOperatorPtg {
- public final static byte sid = 0x0e;
+ public static final byte sid = 0x0e;
public static final NotEqualPtg instance = new NotEqualPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NumberPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NumberPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NumberPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NumberPtg.java Sun Jan 17 17:31:22 2021
@@ -30,8 +30,8 @@ import org.apache.poi.util.LittleEndianO
* field using IEEE notation
*/
public final class NumberPtg extends ScalarConstantPtg {
- public final static int SIZE = 9;
- public final static byte sid = 0x1f;
+ public static final int SIZE = 9;
+ public static final byte sid = 0x1f;
private final double field_1_value;
public NumberPtg(LittleEndianInput in) {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/OperationPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/OperationPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/OperationPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/OperationPtg.java Sun Jan 17 17:31:22 2021
@@ -25,9 +25,9 @@ import java.util.function.Supplier;
* @author andy
*/
public abstract class OperationPtg extends Ptg {
- public final static int TYPE_UNARY = 0;
- public final static int TYPE_BINARY = 1;
- public final static int TYPE_FUNCTION = 2;
+ public static final int TYPE_UNARY = 0;
+ public static final int TYPE_BINARY = 1;
+ public static final int TYPE_FUNCTION = 2;
protected OperationPtg() {}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java Sun Jan 17 17:31:22 2021
@@ -29,8 +29,8 @@ import org.apache.poi.util.LittleEndianO
*/
public final class ParenthesisPtg extends ControlPtg {
- private final static int SIZE = 1;
- public final static byte sid = 0x15;
+ private static final int SIZE = 1;
+ public static final byte sid = 0x15;
public static final ParenthesisPtg instance = new ParenthesisPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/PercentPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/PercentPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/PercentPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/PercentPtg.java Sun Jan 17 17:31:22 2021
@@ -21,10 +21,10 @@ package org.apache.poi.ss.formula.ptg;
* Percent PTG.
*/
public final class PercentPtg extends ValueOperatorPtg {
- public final static int SIZE = 1;
- public final static byte sid = 0x14;
+ public static final int SIZE = 1;
+ public static final byte sid = 0x14;
- private final static String PERCENT = "%";
+ private static final String PERCENT = "%";
public static final PercentPtg instance = new PercentPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/PowerPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/PowerPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/PowerPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/PowerPtg.java Sun Jan 17 17:31:22 2021
@@ -18,7 +18,7 @@
package org.apache.poi.ss.formula.ptg;
public final class PowerPtg extends ValueOperatorPtg {
- public final static byte sid = 0x07;
+ public static final byte sid = 0x07;
public static final PowerPtg instance = new PowerPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RangePtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RangePtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RangePtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RangePtg.java Sun Jan 17 17:31:22 2021
@@ -21,8 +21,8 @@ import org.apache.poi.util.LittleEndianO
public final class RangePtg extends OperationPtg {
- public final static int SIZE = 1;
- public final static byte sid = 0x11;
+ public static final int SIZE = 1;
+ public static final byte sid = 0x11;
public static final RangePtg instance = new RangePtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java Sun Jan 17 17:31:22 2021
@@ -22,7 +22,7 @@ import org.apache.poi.util.LittleEndianI
import org.apache.poi.util.LittleEndianOutput;
abstract class Ref2DPtgBase extends RefPtgBase {
- private final static int SIZE = 5;
+ private static final int SIZE = 5;
protected Ref2DPtgBase(int row, int column, boolean isRowRelative, boolean isColumnRelative) {
setRow(row);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java Sun Jan 17 17:31:22 2021
@@ -37,9 +37,9 @@ import org.apache.poi.util.LittleEndianO
* is {@link Ref3DPxg}
*/
public final class Ref3DPtg extends RefPtgBase implements WorkbookDependentFormula, ExternSheetReferenceToken {
- public final static byte sid = 0x3a;
+ public static final byte sid = 0x3a;
- private final static int SIZE = 7; // 6 + 1 for Ptg
+ private static final int SIZE = 7; // 6 + 1 for Ptg
private int field_1_index_extern_sheet;
public Ref3DPtg(Ref3DPtg other) {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java Sun Jan 17 17:31:22 2021
@@ -30,8 +30,8 @@ import org.apache.poi.util.LittleEndianO
*/
public final class RefErrorPtg extends OperandPtg {
- private final static int SIZE = 5;
- public final static byte sid = 0x2A;
+ private static final int SIZE = 5;
+ public static final byte sid = 0x2A;
private int field_1_reserved;
public RefErrorPtg() {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefNPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefNPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefNPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefNPtg.java Sun Jan 17 17:31:22 2021
@@ -21,7 +21,7 @@ import org.apache.poi.ss.util.CellRefere
import org.apache.poi.util.LittleEndianInput;
public final class RefNPtg extends Ref2DPtgBase {
- public final static byte sid = 0x2C;
+ public static final byte sid = 0x2C;
public RefNPtg(LittleEndianInput in) {
super(in);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtg.java Sun Jan 17 17:31:22 2021
@@ -24,7 +24,7 @@ import org.apache.poi.util.LittleEndianI
* ReferencePtg - handles references (such as A1, A2, IA4)
*/
public final class RefPtg extends Ref2DPtgBase {
- public final static byte sid = 0x24;
+ public static final byte sid = 0x24;
/**
* Takes in a String representation of a cell reference and fills out the
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/StringPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/StringPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/StringPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/StringPtg.java Sun Jan 17 17:31:22 2021
@@ -30,7 +30,7 @@ import org.apache.poi.util.StringUtil;
* <length 2 bytes>char[]
*/
public final class StringPtg extends ScalarConstantPtg {
- public final static byte sid = 0x17;
+ public static final byte sid = 0x17;
/** the character (") used in formulas to delimit string literals */
private static final char FORMULA_DELIMITER = '"';
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java Sun Jan 17 17:31:22 2021
@@ -18,7 +18,7 @@
package org.apache.poi.ss.formula.ptg;
public final class SubtractPtg extends ValueOperatorPtg {
- public final static byte sid = 0x04;
+ public static final byte sid = 0x04;
public static final SubtractPtg instance = new SubtractPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/TblPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/TblPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/TblPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/TblPtg.java Sun Jan 17 17:31:22 2021
@@ -39,8 +39,8 @@ import org.apache.poi.util.LittleEndianO
* See page 811 of the june 08 binary docs.
*/
public final class TblPtg extends ControlPtg {
- private final static int SIZE = 5;
- public final static short sid = 0x02;
+ private static final int SIZE = 5;
+ public static final short sid = 0x02;
/** The row number of the upper left corner */
private final int field_1_first_row;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java Sun Jan 17 17:31:22 2021
@@ -21,9 +21,9 @@ package org.apache.poi.ss.formula.ptg;
* Unary Plus operator - does not have any effect on the operand
*/
public final class UnaryMinusPtg extends ValueOperatorPtg {
- public final static byte sid = 0x13;
+ public static final byte sid = 0x13;
- private final static String MINUS = "-";
+ private static final String MINUS = "-";
public static final UnaryMinusPtg instance = new UnaryMinusPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java Sun Jan 17 17:31:22 2021
@@ -21,9 +21,9 @@ package org.apache.poi.ss.formula.ptg;
* Unary Plus operator - does not have any effect on the operand
*/
public final class UnaryPlusPtg extends ValueOperatorPtg {
- public final static byte sid = 0x12;
+ public static final byte sid = 0x12;
- private final static String ADD = "+";
+ private static final String ADD = "+";
public static final UnaryPlusPtg instance = new UnaryPlusPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnionPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnionPtg.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnionPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnionPtg.java Sun Jan 17 17:31:22 2021
@@ -24,7 +24,7 @@ import org.apache.poi.util.LittleEndianO
* @author Glen Stampoultzis (glens at apache.org)
*/
public final class UnionPtg extends OperationPtg {
- public final static byte sid = 0x10;
+ public static final byte sid = 0x10;
public static final UnionPtg instance = new UnionPtg();
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java Sun Jan 17 17:31:22 2021
@@ -67,7 +67,7 @@ public final class BuiltinFormats {
*/
public static final int FIRST_USER_DEFINED_FORMAT_INDEX = 164;
- private final static String[] _formats = {
+ private static final String[] _formats = {
"General",
"0",
"0.00",
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/DataFormatter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/DataFormatter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/DataFormatter.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/DataFormatter.java Sun Jan 17 17:31:22 2021
@@ -216,7 +216,7 @@ public class DataFormatter {
private final PropertyChangeSupport pcs;
/** For logging any problems we find */
- private static POILogger logger = POILogFactory.getLogger(DataFormatter.class);
+ private static final POILogger LOG = POILogFactory.getLogger(DataFormatter.class);
/**
* Creates a formatter using the {@link Locale#getDefault() default locale}.
@@ -337,7 +337,7 @@ public class DataFormatter {
// Wrap and return (non-cacheable - CellFormat does that)
return new CellFormatResultWrapper( cfmt.apply(cellValueO) );
} catch (Exception e) {
- logger.log(POILogger.WARN, "Formatting failed for format " + formatStr + ", falling back", e);
+ LOG.log(POILogger.WARN, "Formatting failed for format " + formatStr + ", falling back", e);
}
}
@@ -598,7 +598,7 @@ public class DataFormatter {
try {
return new ExcelStyleDateFormatter(formatStr, dateSymbols);
} catch(IllegalArgumentException iae) {
- logger.log(POILogger.DEBUG, "Formatting failed for format ", formatStr, ", falling back", iae);
+ LOG.log(POILogger.DEBUG, "Formatting failed for format ", formatStr, ", falling back", iae);
// the pattern could not be parsed correctly,
// so fall back to the default number format
return getDefaultFormat(cellValue);
@@ -758,7 +758,7 @@ public class DataFormatter {
try {
return new InternalDecimalFormatWithScale(format, symbols);
} catch(IllegalArgumentException iae) {
- logger.log(POILogger.DEBUG, "Formatting failed for format ", formatStr, ", falling back", iae);
+ LOG.log(POILogger.DEBUG, "Formatting failed for format ", formatStr, ", falling back", iae);
// the pattern could not be parsed correctly,
// so fall back to the default number format
return getDefaultFormat(cellValue);
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/FillPatternType.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/FillPatternType.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/FillPatternType.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/FillPatternType.java Sun Jan 17 17:31:22 2021
@@ -19,10 +19,10 @@ package org.apache.poi.ss.usermodel;
/**
* The enumeration value indicating the style of fill pattern being used for a cell format.
- *
+ *
*/
public enum FillPatternType {
-
+
/** No background */
NO_FILL(0),
@@ -79,18 +79,18 @@ public enum FillPatternType {
/** Least Dots */
LEAST_DOTS(18);
-
+
/** Codes are used by ExtendedFormatRecord in HSSF */
private final short code;
private FillPatternType(int code) {
this.code = (short) code;
}
-
+
public short getCode() {
return code;
}
-
- private final static int length = values().length;
+
+ private static final int length = values().length;
public static FillPatternType forInt(int code) {
if (code < 0 || code > length) {
throw new IllegalArgumentException("Invalid FillPatternType code: " + code);
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/IndexedColors.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/IndexedColors.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/IndexedColors.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/IndexedColors.java Sun Jan 17 17:31:22 2021
@@ -90,7 +90,7 @@ public enum IndexedColors {
GREY_80_PERCENT(63),
AUTOMATIC(64);
- private final static IndexedColors[] _values = new IndexedColors[65];
+ private static final IndexedColors[] _values = new IndexedColors[65];
static {
for (IndexedColors color : values()) {
_values[color.index] = color;
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/PatternFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/PatternFormatting.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/PatternFormatting.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/PatternFormatting.java Sun Jan 17 17:31:22 2021
@@ -24,43 +24,43 @@ package org.apache.poi.ss.usermodel;
*/
public interface PatternFormatting {
/** No background */
- public final static short NO_FILL = 0 ;
+ public static final short NO_FILL = 0 ;
/** Solidly filled */
- public final static short SOLID_FOREGROUND = 1 ;
+ public static final short SOLID_FOREGROUND = 1 ;
/** Small fine dots */
- public final static short FINE_DOTS = 2 ;
+ public static final short FINE_DOTS = 2 ;
/** Wide dots */
- public final static short ALT_BARS = 3 ;
+ public static final short ALT_BARS = 3 ;
/** Sparse dots */
- public final static short SPARSE_DOTS = 4 ;
+ public static final short SPARSE_DOTS = 4 ;
/** Thick horizontal bands */
- public final static short THICK_HORZ_BANDS = 5 ;
+ public static final short THICK_HORZ_BANDS = 5 ;
/** Thick vertical bands */
- public final static short THICK_VERT_BANDS = 6 ;
+ public static final short THICK_VERT_BANDS = 6 ;
/** Thick backward facing diagonals */
- public final static short THICK_BACKWARD_DIAG = 7 ;
+ public static final short THICK_BACKWARD_DIAG = 7 ;
/** Thick forward facing diagonals */
- public final static short THICK_FORWARD_DIAG = 8 ;
+ public static final short THICK_FORWARD_DIAG = 8 ;
/** Large spots */
- public final static short BIG_SPOTS = 9 ;
+ public static final short BIG_SPOTS = 9 ;
/** Brick-like layout */
- public final static short BRICKS = 10 ;
+ public static final short BRICKS = 10 ;
/** Thin horizontal bands */
- public final static short THIN_HORZ_BANDS = 11 ;
+ public static final short THIN_HORZ_BANDS = 11 ;
/** Thin vertical bands */
- public final static short THIN_VERT_BANDS = 12 ;
+ public static final short THIN_VERT_BANDS = 12 ;
/** Thin backward diagonal */
- public final static short THIN_BACKWARD_DIAG = 13 ;
+ public static final short THIN_BACKWARD_DIAG = 13 ;
/** Thin forward diagonal */
- public final static short THIN_FORWARD_DIAG = 14 ;
+ public static final short THIN_FORWARD_DIAG = 14 ;
/** Squares */
- public final static short SQUARES = 15 ;
+ public static final short SQUARES = 15 ;
/** Diamonds */
- public final static short DIAMONDS = 16 ;
+ public static final short DIAMONDS = 16 ;
/** Less Dots */
- public final static short LESS_DOTS = 17 ;
+ public static final short LESS_DOTS = 17 ;
/** Least Dots */
- public final static short LEAST_DOTS = 18 ;
+ public static final short LEAST_DOTS = 18 ;
short getFillBackgroundColor();
short getFillForegroundColor();
Modified: poi/trunk/src/java/org/apache/poi/ss/util/DateFormatConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/DateFormatConverter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/DateFormatConverter.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/DateFormatConverter.java Sun Jan 17 17:31:22 2021
@@ -49,7 +49,7 @@ import org.apache.poi.util.POILogger;
*/
@SuppressWarnings("unused")
public final class DateFormatConverter {
- private static POILogger logger = POILogFactory.getLogger(DateFormatConverter.class);
+ private static final POILogger LOG = POILogFactory.getLogger(DateFormatConverter.class);
private DateFormatConverter() {
}
@@ -152,7 +152,7 @@ public final class DateFormatConverter
loc = LocaleID.lookupByLanguageTag(languageTag.substring(0, idx));
}
if (loc == null) {
- logger.log( POILogger.ERROR, "Unable to find prefix for Locale '", languageTag, "' or its parent locales." );
+ LOG.log( POILogger.ERROR, "Unable to find prefix for Locale '", languageTag, "' or its parent locales." );
return "";
}
}
Modified: poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java Sun Jan 17 17:31:22 2021
@@ -45,7 +45,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
public final class ImageUtils {
- private static final POILogger logger = POILogFactory.getLogger(ImageUtils.class);
+ private static final POILogger LOG = POILogFactory.getLogger(ImageUtils.class);
private static final int WIDTH_UNITS = 1024;
private static final int HEIGHT_UNITS = 256;
@@ -93,18 +93,18 @@ public final class ImageUtils {
r.dispose();
}
} else {
- logger.log(POILogger.WARN, "ImageIO found no images");
+ LOG.log(POILogger.WARN, "ImageIO found no images");
}
}
} catch (IOException e) {
//silently return if ImageIO failed to read the image
- logger.log(POILogger.WARN, e);
+ LOG.log(POILogger.WARN, e);
}
break;
default:
- logger.log(POILogger.WARN, "Only JPEG, PNG and DIB pictures can be automatically sized");
+ LOG.log(POILogger.WARN, "Only JPEG, PNG and DIB pictures can be automatically sized");
}
return size;
}
Modified: poi/trunk/src/java/org/apache/poi/util/Configurator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/Configurator.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/Configurator.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/Configurator.java Sun Jan 17 17:31:22 2021
@@ -21,7 +21,7 @@ package org.apache.poi.util;
* Helper for fetching int values from system properties
*/
public class Configurator {
- private static POILogger logger = POILogFactory.getLogger(Configurator.class);
+ private static final POILogger LOG = POILogFactory.getLogger(Configurator.class);
public static int getIntValue(String systemProperty, int defaultValue) {
String property = System.getProperty(systemProperty);
@@ -31,7 +31,7 @@ public class Configurator {
try {
return Integer.parseInt(property);
} catch (Exception e) {
- logger.log(POILogger.ERROR, "System property -D", systemProperty, " does not contains a valid integer: ", property);
+ LOG.log(POILogger.ERROR, "System property -D", systemProperty, " does not contains a valid integer: ", property);
return defaultValue;
}
}
Modified: poi/trunk/src/java/org/apache/poi/util/IOUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/IOUtils.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/IOUtils.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/IOUtils.java Sun Jan 17 17:31:22 2021
@@ -37,7 +37,7 @@ import org.apache.poi.EmptyFileException
@Internal
public final class IOUtils {
- private static final POILogger logger = POILogFactory.getLogger( IOUtils.class );
+ private static final POILogger LOG = POILogFactory.getLogger( IOUtils.class );
/**
* The default buffer size to use for the skip() methods.
@@ -395,7 +395,7 @@ public final class IOUtils {
try {
closeable.close();
} catch ( Exception exc ) {
- logger.log( POILogger.ERROR, "Unable to close resource: ", exc,
+ LOG.log( POILogger.ERROR, "Unable to close resource: ", exc,
exc );
}
}
Modified: poi/trunk/src/java/org/apache/poi/util/XMLHelper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/XMLHelper.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/XMLHelper.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/XMLHelper.java Sun Jan 17 17:31:22 2021
@@ -74,7 +74,7 @@ public final class XMLHelper {
};
- private static POILogger logger = POILogFactory.getLogger(XMLHelper.class);
+ private static final POILogger LOG = POILogFactory.getLogger(XMLHelper.class);
private static long lastLog;
// DocumentBuilderFactory.newDocumentBuilder is thread-safe
@@ -290,7 +290,7 @@ public final class XMLHelper {
private static void logThrowable(Throwable t, String message, String name) {
if (System.currentTimeMillis() > lastLog + TimeUnit.MINUTES.toMillis(5)) {
- logger.log(POILogger.WARN, message + " [log suppressed for 5 minutes]", name, t);
+ LOG.log(POILogger.WARN, message + " [log suppressed for 5 minutes]", name, t);
lastLog = System.currentTimeMillis();
}
}
@@ -326,7 +326,7 @@ public final class XMLHelper {
':' + ex.getColumnNumber() +
':' + ex.getMessage();
- logger.log(type, message, ex);
+ LOG.log(type, message, ex);
}
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java Sun Jan 17 17:31:22 2021
@@ -52,7 +52,7 @@ import org.apache.poi.xwpf.usermodel.XWP
* </p>
*/
public class POIXMLDocumentPart {
- private static final POILogger logger = POILogFactory.getLogger(POIXMLDocumentPart.class);
+ private static final POILogger LOG = POILogFactory.getLogger(POIXMLDocumentPart.class);
private String coreDocumentRel = PackageRelationshipTypes.CORE_DOCUMENT;
private PackagePart packagePart;
@@ -619,7 +619,7 @@ public class POIXMLDocumentPart {
PackagePart pp = getPackagePart();
if (pp.getContentType().equals(XWPFRelation.GLOSSARY_DOCUMENT.getContentType())) {
- logger.log(POILogger.WARN,
+ LOG.log(POILogger.WARN,
"POI does not currently support template.main+xml (glossary) parts. " +
"Skipping this part for now.");
return;
@@ -651,7 +651,7 @@ public class POIXMLDocumentPart {
final PackagePart p = packagePart.getPackage().getPart(relName);
if (p == null) {
- logger.log(POILogger.ERROR, "Skipped invalid entry ", rel.getTargetURI());
+ LOG.log(POILogger.ERROR, "Skipped invalid entry ", rel.getTargetURI());
continue;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java Sun Jan 17 17:31:22 2021
@@ -70,7 +70,7 @@ public abstract class OPCPackage impleme
/**
* Logger.
*/
- private static final POILogger logger = POILogFactory.getLogger(OPCPackage.class);
+ private static final POILogger LOG = POILogFactory.getLogger(OPCPackage.class);
/**
* Default package access.
@@ -442,13 +442,13 @@ public abstract class OPCPackage impleme
}
if (this.packageAccess == PackageAccess.READ) {
- logger.log(POILogger.WARN,
+ LOG.log(POILogger.WARN,
"The close() method is intended to SAVE a package. This package is open in READ ONLY mode, use the revert() method instead !");
revert();
return;
}
if (this.contentTypeManager == null) {
- logger.log(POILogger.WARN,
+ LOG.log(POILogger.WARN,
"Unable to call close() on a package that hasn't been fully opened yet");
revert();
return;
@@ -748,7 +748,7 @@ public abstract class OPCPackage impleme
if (!hasCorePropertiesPart) {
hasCorePropertiesPart = true;
} else {
- logger.log(POILogger.WARN, "OPC Compliance error [M4.1]: " +
+ LOG.log(POILogger.WARN, "OPC Compliance error [M4.1]: " +
"there is more than one core properties relationship in the package! " +
"POI will use only the first, but other software may reject this file.");
}
@@ -772,7 +772,7 @@ public abstract class OPCPackage impleme
needCorePropertiesPart = false;
}
} catch (IOException ioe) {
- logger.log(POILogger.WARN, "Unmarshall operation : IOException for "
+ LOG.log(POILogger.WARN, "Unmarshall operation : IOException for "
+ part._partName);
continue;
} catch (InvalidOperationException invoe) {
@@ -1005,7 +1005,7 @@ public abstract class OPCPackage impleme
try {
sourcePartName = PackagingURIHelper.createPartName(sourceURI);
} catch (InvalidFormatException e) {
- logger
+ LOG
.log(POILogger.ERROR, "Part name URI '", sourceURI,
"' is not valid ! This message is not intended to be displayed !");
return;
@@ -1109,7 +1109,7 @@ public abstract class OPCPackage impleme
this.deletePartRecursive(targetPartName);
}
} catch (InvalidFormatException e) {
- logger.log(POILogger.WARN, "An exception occurs while deleting part '"
+ LOG.log(POILogger.WARN, "An exception occurs while deleting part '"
+ partName.getName()
+ "'. Some parts may remain in the package. - "
+ e.getMessage());
@@ -1397,7 +1397,7 @@ public abstract class OPCPackage impleme
try {
partMarshallers.put(new ContentType(contentType), marshaller);
} catch (InvalidFormatException e) {
- logger.log(POILogger.WARN, "The specified content type is not valid: '"
+ LOG.log(POILogger.WARN, "The specified content type is not valid: '"
+ e.getMessage() + "'. The marshaller will not be added !");
}
}
@@ -1415,7 +1415,7 @@ public abstract class OPCPackage impleme
try {
partUnmarshallers.put(new ContentType(contentType), unmarshaller);
} catch (InvalidFormatException e) {
- logger.log(POILogger.WARN, "The specified content type is not valid: '"
+ LOG.log(POILogger.WARN, "The specified content type is not valid: '"
+ e.getMessage()
+ "'. The unmarshaller will not be added !");
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java Sun Jan 17 17:31:22 2021
@@ -37,10 +37,9 @@ import org.w3c.dom.NodeList;
* @author Julien Chable, CDubettier
* @version 0.1
*/
-public final class PackageRelationshipCollection implements
- Iterable<PackageRelationship> {
+public final class PackageRelationshipCollection implements Iterable<PackageRelationship> {
- private final static POILogger logger = POILogFactory.getLogger(PackageRelationshipCollection.class);
+ private static final POILogger LOG = POILogFactory.getLogger(PackageRelationshipCollection.class);
/**
* Package relationships ordered by ID.
@@ -301,7 +300,7 @@ public final class PackageRelationshipCo
public void parseRelationshipsPart(PackagePart relPart)
throws InvalidFormatException {
try {
- logger.log(POILogger.DEBUG, "Parsing relationship: ", relPart.getPartName());
+ LOG.log(POILogger.DEBUG, "Parsing relationship: ", relPart.getPartName());
Document xmlRelationshipsDoc = DocumentHelper.readDocument(relPart.getInputStream());
// Browse default types
@@ -349,7 +348,7 @@ public final class PackageRelationshipCo
// package
target = PackagingURIHelper.toURI(value);
} catch (URISyntaxException e) {
- logger.log(POILogger.ERROR, "Cannot convert ", value,
+ LOG.log(POILogger.ERROR, "Cannot convert ", value,
" in a valid relationship URI-> dummy-URI used", e);
}
addRelationship(target, targetMode, type, id);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org