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 [5/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/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java Sun Jan 17 17:31:22 2021
@@ -73,14 +73,17 @@ import org.apache.poi.util.Units;
*/
public final class HSLFSlideShow extends POIDocument implements SlideShow<HSLFShape,HSLFTextParagraph>, Closeable, GenericRecord {
- //arbitrarily selected; may need to increase
- private static final int MAX_RECORD_LENGTH = 10_000_000;
-
/** Powerpoint document entry/stream name */
- public static final String POWERPOINT_DOCUMENT = "PowerPoint Document";
+ public static final String POWERPOINT_DOCUMENT = "PowerPoint Document";
public static final String PP97_DOCUMENT = "PP97_DUALSTORAGE";
public static final String PP95_DOCUMENT = "PP40";
+ // For logging
+ private static final POILogger LOG = POILogFactory.getLogger(HSLFSlideShow.class);
+
+ //arbitrarily selected; may need to increase
+ private static final int MAX_RECORD_LENGTH = 10_000_000;
+
enum LoadSavePhase {
INIT, LOADED
}
@@ -106,9 +109,6 @@ public final class HSLFSlideShow extends
private final List<HSLFNotes> _notes = new ArrayList<>();
private FontCollection _fonts;
- // For logging
- private static final POILogger logger = POILogFactory.getLogger(HSLFSlideShow.class);
-
/**
* Constructs a Powerpoint document from the underlying
@@ -290,7 +290,7 @@ public final class HSLFSlideShow extends
if (coreRecordId != null) {
return _mostRecentCoreRecords[coreRecordId];
}
- logger.log(POILogger.ERROR,
+ LOG.log(POILogger.ERROR,
"We tried to look up a reference to a core record, but there was no core ID for reference ID ", refID);
return null;
}
@@ -382,13 +382,13 @@ public final class HSLFSlideShow extends
// we need to add null-records, otherwise the index references to other existing don't work anymore
if (r == null) {
- logger.log(POILogger.WARN, loggerLoc+", but that record didn't exist - record ignored.");
+ LOG.log(POILogger.WARN, loggerLoc+", but that record didn't exist - record ignored.");
continue;
}
// Ensure it really is a notes record
if (!(r instanceof Notes)) {
- logger.log(POILogger.ERROR, loggerLoc, ", but that was actually a ", r);
+ LOG.log(POILogger.ERROR, loggerLoc, ", but that was actually a ", r);
continue;
}
@@ -420,7 +420,7 @@ public final class HSLFSlideShow extends
// Ensure it really is a slide record
if (!(r instanceof Slide)) {
- logger.log(POILogger.ERROR, "A Slide SlideAtomSet at ", idx,
+ LOG.log(POILogger.ERROR, "A Slide SlideAtomSet at ", idx,
" said its record was at refID ",
spa.getRefID(),
", but that was actually a ", r);
@@ -439,7 +439,7 @@ public final class HSLFSlideShow extends
if (notesPos != null && 0 <= notesPos && notesPos < _notes.size()) {
notes = _notes.get(notesPos);
} else {
- logger.log(POILogger.ERROR, "Notes not found for noteId=", noteId);
+ LOG.log(POILogger.ERROR, "Notes not found for noteId=", noteId);
}
}
@@ -759,7 +759,7 @@ public final class HSLFSlideShow extends
// Add in to the list of Slides
_slides.add(slide);
- logger.log(POILogger.INFO, "Added slide ", _slides.size(), " with ref ", sp.getRefID(),
+ LOG.log(POILogger.INFO, "Added slide ", _slides.size(), " with ref ", sp.getRefID(),
" and identifier ", sp.getSlideIdentifier());
// Add the core records for this new Slide to the record tree
@@ -1145,7 +1145,7 @@ public final class HSLFSlideShow extends
int slideOffset = slideRecord.getLastOnDiskOffset();
slideRecord.setLastOnDiskOffset(slideOffset);
ptr.addSlideLookup(psrId, slideOffset);
- logger.log(POILogger.INFO, "New slide/object ended up at ", slideOffset);
+ LOG.log(POILogger.INFO, "New slide/object ended up at ", slideOffset);
return psrId;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java Sun Jan 17 17:31:22 2021
@@ -68,7 +68,7 @@ import org.apache.poi.util.POILogger;
* "reader". It is only a very basic class for now
*/
public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
- private static final POILogger logger = POILogFactory.getLogger(HSLFSlideShowImpl.class);
+ private static final POILogger LOG = POILogFactory.getLogger(HSLFSlideShowImpl.class);
static final int UNSET_OFFSET = -1;
@@ -303,7 +303,7 @@ public final class HSLFSlideShowImpl ext
int type = LittleEndian.getUShort(docstream, usrOffset + 2);
int len = LittleEndian.getInt(docstream, usrOffset + 4);
if (ver_inst == 0 && type == 4085 && (len == 0x1C || len == 0x20)) {
- logger.log(POILogger.WARN, "Repairing invalid user edit atom");
+ LOG.log(POILogger.WARN, "Repairing invalid user edit atom");
usr.setLastUserEditAtomOffset(usrOffset);
} else {
throw new CorruptPowerPointFileException("Powerpoint document contains invalid user edit atom");
@@ -329,7 +329,7 @@ public final class HSLFSlideShowImpl ext
try {
currentUser = new CurrentUserAtom(getDirectory());
} catch (IOException ie) {
- logger.log(POILogger.ERROR, "Error finding Current User Atom", ie);
+ LOG.log(POILogger.ERROR, "Error finding Current User Atom", ie);
currentUser = new CurrentUserAtom();
}
}
@@ -393,14 +393,14 @@ public final class HSLFSlideShowImpl ext
// If they type (including the bonus 0xF018) is 0, skip it
PictureType pt = PictureType.forNativeID(type - 0xF018);
if (pt == null) {
- logger.log(POILogger.ERROR, "Problem reading picture: Invalid image type 0, on picture with length ", imgsize, ".\nYour document will probably become corrupted if you save it!");
- logger.log(POILogger.ERROR, "position: ", pos);
+ LOG.log(POILogger.ERROR, "Problem reading picture: Invalid image type 0, on picture with length ", imgsize, ".\nYour document will probably become corrupted if you save it!");
+ LOG.log(POILogger.ERROR, "position: ", pos);
} else {
//The pictstream can be truncated halfway through a picture.
//This is not a problem if the pictstream contains extra pictures
//that are not used in any slide -- BUG-60305
if (pos + imgsize > pictstream.length) {
- logger.log(POILogger.WARN, "\"Pictures\" stream may have ended early. In some circumstances, this is not a problem; " +
+ LOG.log(POILogger.WARN, "\"Pictures\" stream may have ended early. In some circumstances, this is not a problem; " +
"in others, this could indicate a corrupt file");
break;
}
@@ -417,7 +417,7 @@ public final class HSLFSlideShowImpl ext
pict.setIndex(_pictures.size() + 1); // index is 1-based
_pictures.add(pict);
} catch (IllegalArgumentException e) {
- logger.log(POILogger.ERROR, "Problem reading picture: ", e, "\nYour document will probably become corrupted if you save it!");
+ LOG.log(POILogger.ERROR, "Problem reading picture: ", e, "\nYour document will probably become corrupted if you save it!");
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java Sun Jan 17 17:31:22 2021
@@ -82,7 +82,7 @@ import org.apache.poi.util.Units;
*/
public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFTextParagraph,HSLFTextRun> {
- protected static final POILogger logger = POILogFactory.getLogger(HSLFTextParagraph.class);
+ private static final POILogger LOG = POILogFactory.getLogger(HSLFTextParagraph.class);
/**
* How to align the text
@@ -322,7 +322,7 @@ public final class HSLFTextParagraph imp
}
if (startIdx[0] >= records.length) {
- logger.log(POILogger.INFO, "header atom wasn't found - container might contain only an OutlineTextRefAtom");
+ LOG.log(POILogger.INFO, "header atom wasn't found - container might contain only an OutlineTextRefAtom");
return new org.apache.poi.hslf.record.Record[0];
}
@@ -884,7 +884,7 @@ public final class HSLFTextParagraph imp
} else {
master = sheet.getMasterSheet();
if (master == null) {
- logger.log(POILogger.WARN, "MasterSheet is not available");
+ LOG.log(POILogger.WARN, "MasterSheet is not available");
return null;
}
}
@@ -984,7 +984,7 @@ public final class HSLFTextParagraph imp
}
if (style == null) {
- logger.log(POILogger.INFO, "styles atom doesn't exist. Creating dummy record for later saving.");
+ LOG.log(POILogger.INFO, "styles atom doesn't exist. Creating dummy record for later saving.");
style = new StyleTextPropAtom((textLen < 0) ? 1 : textLen);
} else {
if (textLen >= 0) {
@@ -1395,7 +1395,7 @@ public final class HSLFTextParagraph imp
}
}
if (rv == null || rv.isEmpty()) {
- logger.log(POILogger.WARN, "text run not found for OutlineTextRefAtom.TextIndex=" + idx);
+ LOG.log(POILogger.WARN, "text run not found for OutlineTextRefAtom.TextIndex=" + idx);
}
} else {
if (sheet != null) {
@@ -1481,7 +1481,7 @@ public final class HSLFTextParagraph imp
if (tbytes == null && tchars == null) {
tbytes = new TextBytesAtom();
// don't add record yet - set it in storeText
- logger.log(POILogger.INFO, "bytes nor chars atom doesn't exist. Creating dummy record for later saving.");
+ LOG.log(POILogger.INFO, "bytes nor chars atom doesn't exist. Creating dummy record for later saving.");
}
String rawText = (tchars != null) ? tchars.getText() : tbytes.getText();
@@ -1510,7 +1510,7 @@ public final class HSLFTextParagraph imp
}
if (paragraphCollection.isEmpty()) {
- logger.log(POILogger.DEBUG, "No text records found.");
+ LOG.log(POILogger.DEBUG, "No text records found.");
}
return paragraphCollection;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java Sun Jan 17 17:31:22 2021
@@ -46,7 +46,7 @@ import org.apache.poi.util.POILogger;
*/
@SuppressWarnings({"WeakerAccess", "Duplicates", "unused"})
public final class HSLFTextRun implements TextRun {
- private static final POILogger logger = POILogFactory.getLogger(HSLFTextRun.class);
+ private static final POILogger LOG = POILogFactory.getLogger(HSLFTextRun.class);
/** The TextRun we belong to */
private HSLFTextParagraph parentParagraph;
@@ -147,13 +147,13 @@ public final class HSLFTextRun implement
final int txtype = parentParagraph.getRunType();
final HSLFSheet sheet = parentParagraph.getSheet();
if (sheet == null) {
- logger.log(POILogger.ERROR, "Sheet is not available");
+ LOG.log(POILogger.ERROR, "Sheet is not available");
return null;
}
final HSLFMasterSheet master = sheet.getMasterSheet();
if (master == null) {
- logger.log(POILogger.WARN, "MasterSheet is not available");
+ LOG.log(POILogger.WARN, "MasterSheet is not available");
return null;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java Sun Jan 17 17:31:22 2021
@@ -56,10 +56,10 @@ import org.apache.poi.util.POILogger;
/**
* Reads an Outlook MSG File in and provides hooks into its data structure.
- *
+ *
* If you want to develop with HSMF, you might find it worth getting
* some of the Microsoft public documentation, such as:
- *
+ *
* [MS-OXCMSG]: Message and Attachment Object Protocol Specification
*/
public class MAPIMessage extends POIReadOnlyDocument {
@@ -79,8 +79,8 @@ public class MAPIMessage extends POIRead
}
/** For logging problems we spot with the file */
- private POILogger logger = POILogFactory.getLogger(MAPIMessage.class);
-
+ private static final POILogger LOG = POILogFactory.getLogger(MAPIMessage.class);
+
private Chunks mainChunks;
private NameIdChunks nameIdChunks;
private RecipientChunks[] recipientChunks;
@@ -99,7 +99,7 @@ public class MAPIMessage extends POIRead
/**
* Constructor for reading MSG Files from the file system.
- *
+ *
* @param filename Name of the file to read
* @exception IOException on errors reading, or invalid data
*/
@@ -108,7 +108,7 @@ public class MAPIMessage extends POIRead
}
/**
* Constructor for reading MSG Files from the file system.
- *
+ *
* @param file The file to read from
* @exception IOException on errors reading, or invalid data
*/
@@ -118,10 +118,10 @@ public class MAPIMessage extends POIRead
/**
* Constructor for reading MSG Files from an input stream.
- *
+ *
* <p>Note - this will buffer the whole message into memory
* in order to process. For lower memory use, use {@link #MAPIMessage(File)}
- *
+ *
* @param in The InputStream to buffer then read from
* @exception IOException on errors reading, or invalid data
*/
@@ -130,7 +130,7 @@ public class MAPIMessage extends POIRead
}
/**
* Constructor for reading MSG Files from a POIFS filesystem
- *
+ *
* @param fs Open POIFS FileSystem containing the message
* @exception IOException on errors reading, or invalid data
*/
@@ -221,7 +221,7 @@ public class MAPIMessage extends POIRead
byte[] htmlBodyBinary = htmlBodyBinaryChunk.getValue();
return new String(htmlBodyBinary, encoding);
} catch (UnsupportedEncodingException e) {
- logger.log(POILogger.WARN, "HTML body binary: Invalid codepage ID ", codepage, " set for the message via ",
+ LOG.log(POILogger.WARN, "HTML body binary: Invalid codepage ID ", codepage, " set for the message via ",
MAPIProperty.INTERNET_CPID, ", ignoring");
}
}
@@ -246,7 +246,7 @@ public class MAPIMessage extends POIRead
throw new ChunkNotFoundException();
}
}
-
+
try {
MAPIRtfAttribute rtf = new MAPIRtfAttribute(
MAPIProperty.RTF_COMPRESSED, Types.BINARY.getId(), chunk.getValue()
@@ -279,8 +279,8 @@ public class MAPIMessage extends POIRead
/**
* Gets the display value of the "TO" line of the outlook message.
* If there are multiple recipients, they will be separated
- * by semicolons.
- * This is not the actual list of addresses/values that will be
+ * by semicolons.
+ * This is not the actual list of addresses/values that will be
* sent to if you click Reply in the email - those are stored
* in {@link RecipientChunks}.
* @throws ChunkNotFoundException If the to-chunk does not exist and
@@ -293,8 +293,8 @@ public class MAPIMessage extends POIRead
/**
* Gets the display value of the "CC" line of the outlook message.
* If there are multiple recipients, they will be separated
- * by semicolons.
- * This is not the actual list of addresses/values that will be
+ * by semicolons.
+ * This is not the actual list of addresses/values that will be
* sent to if you click Reply in the email - those are stored
* in {@link RecipientChunks}.
* @throws ChunkNotFoundException If the cc-chunk does not exist and
@@ -307,8 +307,8 @@ public class MAPIMessage extends POIRead
/**
* Gets the display value of the "BCC" line of the outlook message.
* If there are multiple recipients, they will be separated
- * by semicolons.
- * This is not the actual list of addresses/values that will be
+ * by semicolons.
+ * This is not the actual list of addresses/values that will be
* sent to if you click Reply in the email - those are stored
* in {@link RecipientChunks}.
* This will only be present in sent emails, not received ones!
@@ -321,7 +321,7 @@ public class MAPIMessage extends POIRead
/**
* Returns all the recipients' email address, separated by
- * semicolons. Checks all the likely chunks in search of
+ * semicolons. Checks all the likely chunks in search of
* the addresses.
*/
public String getRecipientEmailAddress() throws ChunkNotFoundException {
@@ -330,7 +330,7 @@ public class MAPIMessage extends POIRead
/**
* Returns an array of all the recipient's email address, normally
* in TO then CC then BCC order.
- * Checks all the likely chunks in search of the addresses.
+ * Checks all the likely chunks in search of the addresses.
*/
public String[] getRecipientEmailAddressList() throws ChunkNotFoundException {
if(recipientChunks == null || recipientChunks.length == 0) {
@@ -358,7 +358,7 @@ public class MAPIMessage extends POIRead
/**
* Returns all the recipients' names, separated by
- * semicolons. Checks all the likely chunks in search of
+ * semicolons. Checks all the likely chunks in search of
* the names.
* See also {@link #getDisplayTo()}, {@link #getDisplayCC()}
* and {@link #getDisplayBCC()}.
@@ -369,7 +369,7 @@ public class MAPIMessage extends POIRead
/**
* Returns an array of all the recipient's names, normally
* in TO then CC then BCC order.
- * Checks all the likely chunks in search of the names.
+ * Checks all the likely chunks in search of the names.
* See also {@link #getDisplayTo()}, {@link #getDisplayCC()}
* and {@link #getDisplayBCC()}.
*/
@@ -391,7 +391,7 @@ public class MAPIMessage extends POIRead
return names;
}
-
+
/**
* Tries to identify the correct encoding for 7-bit (non-unicode)
* strings in the file.
@@ -400,7 +400,7 @@ public class MAPIMessage extends POIRead
* strings, but don't always store the encoding anywhere
* helpful in the file.</p>
* <p>This method checks for codepage properties, and failing that
- * looks at the headers for the message, and uses these to
+ * looks at the headers for the message, and uses these to
* guess the correct encoding for your file.</p>
* <p>Bug #49441 has more on why this is needed</p>
*/
@@ -418,7 +418,7 @@ public class MAPIMessage extends POIRead
String encoding = CodePageUtil.codepageToEncoding(codepage, true);
generalcodepage = encoding;
} catch (UnsupportedEncodingException e) {
- logger.log(POILogger.WARN, "Invalid codepage ID ", codepage, " set for the message via ",
+ LOG.log(POILogger.WARN, "Invalid codepage ID ", codepage, " set for the message via ",
MAPIProperty.MESSAGE_CODEPAGE, ", ignoring");
}
}
@@ -436,7 +436,7 @@ public class MAPIMessage extends POIRead
generalcodepage = encoding;
}
} catch (UnsupportedEncodingException e) {
- logger.log(POILogger.WARN, "Invalid codepage ID ", codepage, "from locale ID", lcid, " set for the message via ",
+ LOG.log(POILogger.WARN, "Invalid codepage ID ", codepage, "from locale ID", lcid, " set for the message via ",
MAPIProperty.MESSAGE_LOCALE_ID, ", ignoring");
}
}
@@ -476,7 +476,7 @@ public class MAPIMessage extends POIRead
bodycodepage = encoding;
}
} catch (UnsupportedEncodingException e) {
- logger.log(POILogger.WARN, "Invalid codepage ID ", codepage, " set for the message via ",
+ LOG.log(POILogger.WARN, "Invalid codepage ID ", codepage, " set for the message via ",
MAPIProperty.INTERNET_CPID, ", ignoring");
}
}
@@ -534,7 +534,7 @@ public class MAPIMessage extends POIRead
}
}
}
-
+
/**
* Does this file contain any strings that
* are stored as 7 bit rather than unicode?
@@ -547,7 +547,7 @@ public class MAPIMessage extends POIRead
}
}
}
-
+
if (nameIdChunks!=null) {
for(Chunk c : nameIdChunks.getChunks()) {
if(c instanceof StringChunk) {
@@ -557,7 +557,7 @@ public class MAPIMessage extends POIRead
}
}
}
-
+
for(RecipientChunks rc : recipientChunks) {
for(Chunk c : rc.getAll()) {
if(c instanceof StringChunk) {
@@ -569,7 +569,7 @@ public class MAPIMessage extends POIRead
}
return false;
}
-
+
/**
* Returns all the headers, one entry per line
*/
@@ -617,7 +617,7 @@ public class MAPIMessage extends POIRead
} else if (mc.equalsIgnoreCase("IPM.Post")) {
return MESSAGE_CLASS.POST;
} else {
- logger.log(POILogger.WARN, "I don't recognize message class '", mc, "'. ",
+ LOG.log(POILogger.WARN, "I don't recognize message class '", mc, "'. ",
"Please open an issue on POI's bugzilla");
return MESSAGE_CLASS.UNKNOWN;
}
@@ -642,7 +642,7 @@ public class MAPIMessage extends POIRead
}
}
}
-
+
if(returnNullOnMissingChunk)
return null;
throw new ChunkNotFoundException();
@@ -681,7 +681,7 @@ public class MAPIMessage extends POIRead
/**
- * Will you get a null on a missing chunk, or a
+ * Will you get a null on a missing chunk, or a
* {@link ChunkNotFoundException} (default is the
* exception).
*/
@@ -692,7 +692,7 @@ public class MAPIMessage extends POIRead
/**
* Sets whether on asking for a missing chunk,
* you get back null or a {@link ChunkNotFoundException}
- * (default is the exception).
+ * (default is the exception).
*/
public void setReturnNullOnMissingChunk(boolean returnNullOnMissingChunk) {
this.returnNullOnMissingChunk = returnNullOnMissingChunk;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java Sun Jan 17 17:31:22 2021
@@ -68,7 +68,7 @@ public abstract class PropertiesChunk ex
public static final int PROPERTIES_FLAG_WRITEABLE = 4;
/** For logging problems we spot with the file */
- private POILogger logger = POILogFactory.getLogger(PropertiesChunk.class);
+ private static final POILogger LOG = POILogFactory.getLogger(PropertiesChunk.class);
/**
* Holds properties, indexed by type. If a property is multi-valued, or
@@ -176,7 +176,7 @@ public abstract class PropertiesChunk ex
if (chunk != null) {
cVal.setValue(chunk);
} else {
- logger.log(POILogger.WARN, "No chunk found matching Property " + cVal);
+ LOG.log(POILogger.WARN, "No chunk found matching Property " + cVal);
}
}
}
@@ -200,7 +200,7 @@ public abstract class PropertiesChunk ex
prop = MAPIProperty.createCustom(id, type, "Unknown " + id);
}
if (type == null) {
- logger.log(POILogger.WARN, "Invalid type found, expected ",
+ LOG.log(POILogger.WARN, "Invalid type found, expected ",
prop.usualType, " but got ", typeID,
" for property ", prop);
going = false;
@@ -220,11 +220,11 @@ public abstract class PropertiesChunk ex
// We don't know what this property normally is, but it
// has come
// through with a valid type, so use that
- logger.log(POILogger.INFO, "Property definition for ", prop,
+ LOG.log(POILogger.INFO, "Property definition for ", prop,
" is missing a type definition, found a value with type ", type);
} else {
// Oh dear, something has gone wrong...
- logger.log(POILogger.WARN, "Type mismatch, expected ",
+ LOG.log(POILogger.WARN, "Type mismatch, expected ",
prop.usualType, " but got ", type, " for property ", prop);
going = false;
break;
@@ -285,7 +285,7 @@ public abstract class PropertiesChunk ex
}
if (properties.get(prop) != null) {
- logger.log(POILogger.WARN,
+ LOG.log(POILogger.WARN,
"Duplicate values found for " + prop);
}
properties.put(prop, propVal);
@@ -298,7 +298,7 @@ public abstract class PropertiesChunk ex
/**
* Writes this chunk in the specified {@code DirectoryEntry}.
- *
+ *
* @param directory
* The directory.
* @throws IOException
@@ -316,11 +316,11 @@ public abstract class PropertiesChunk ex
// write the property values
writeNodeData(directory, values);
}
-
+
/**
* Write the nodes for variable-length data. Those properties are returned by
* {@link #writeProperties(java.io.OutputStream)}.
- *
+ *
* @param directory
* The directory.
* @param values
@@ -338,7 +338,7 @@ public abstract class PropertiesChunk ex
/**
* Writes the header of the properties.
- *
+ *
* @param out
* The {@code OutputStream}.
* @return The variable-length properties that need to be written in another
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java Sun Jan 17 17:31:22 2021
@@ -60,8 +60,7 @@ public class ExcelToFoConverter extends
private static final float DPI = 72;
- private static final POILogger logger = POILogFactory
- .getLogger( ExcelToFoConverter.class );
+ private static final POILogger LOG = POILogFactory.getLogger( ExcelToFoConverter.class );
private static final float PAPER_A4_HEIGHT_INCHES = 29.4f / CM_PER_INCH;
@@ -233,7 +232,7 @@ public class ExcelToFoConverter extends
value = ErrorEval.getText( cell.getErrorCellValue() );
break;
default:
- logger.log(
+ LOG.log(
POILogger.WARN,
"Unexpected cell cachedFormulaResultType ("
+ cell.getCachedFormulaResultType() + ")" );
@@ -254,7 +253,7 @@ public class ExcelToFoConverter extends
value = ErrorEval.getText( cell.getErrorCellValue() );
break;
default:
- logger.log( POILogger.WARN,
+ LOG.log( POILogger.WARN,
"Unexpected cell type (" + cell.getCellType() + ")" );
return true;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java Sun Jan 17 17:31:22 2021
@@ -58,8 +58,7 @@ import org.w3c.dom.Text;
*/
@Beta
public class ExcelToHtmlConverter extends AbstractExcelConverter {
- private static final POILogger logger = POILogFactory
- .getLogger( ExcelToHtmlConverter.class );
+ private static final POILogger LOG = POILogFactory.getLogger( ExcelToHtmlConverter.class );
/**
* Java main() interface to interact with {@link ExcelToHtmlConverter}
@@ -323,7 +322,7 @@ public class ExcelToHtmlConverter extend
value = ErrorEval.getText( cell.getErrorCellValue() );
break;
default:
- logger.log(
+ LOG.log(
POILogger.WARN,
"Unexpected cell cachedFormulaResultType ("
+ cell.getCachedFormulaResultType() + ")" );
@@ -344,7 +343,7 @@ public class ExcelToHtmlConverter extend
value = ErrorEval.getText( cell.getErrorCellValue() );
break;
default:
- logger.log( POILogger.WARN,
+ LOG.log( POILogger.WARN,
"Unexpected cell type (" + cell.getCellType() + ")" );
return true;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java Sun Jan 17 17:31:22 2021
@@ -52,7 +52,7 @@ import org.apache.poi.util.RecordFormatE
*/
public class HwmfBitmapDib implements GenericRecord {
- private static final POILogger logger = POILogFactory.getLogger(HwmfBitmapDib.class);
+ private static final POILogger LOG = POILogFactory.getLogger(HwmfBitmapDib.class);
private static final int BMP_HEADER_SIZE = 14;
private static final int MAX_RECORD_LENGTH = HwmfPicture.MAX_RECORD_LENGTH;
@@ -479,7 +479,7 @@ public class HwmfBitmapDib implements Ge
try {
bi = ImageIO.read(getBMPStream());
} catch (IOException|RuntimeException e) {
- logger.log(POILogger.ERROR, "invalid bitmap data - returning placeholder image");
+ LOG.log(POILogger.ERROR, "invalid bitmap data - returning placeholder image");
return getPlaceholder();
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java Sun Jan 17 17:31:22 2021
@@ -48,7 +48,7 @@ import org.apache.poi.util.POILogFactory
import org.apache.poi.util.POILogger;
public class HwmfText {
- private static final POILogger logger = POILogFactory.getLogger(HwmfText.class);
+ private static final POILogger LOG = POILogFactory.getLogger(HwmfText.class);
private static final int MAX_RECORD_LENGTH = 1_000_000;
/**
@@ -430,13 +430,13 @@ public class HwmfText {
size += rawTextBytes.length;
if (size >= remainingRecordSize) {
- logger.log(POILogger.INFO, "META_EXTTEXTOUT doesn't contain character tracking info");
+ LOG.log(POILogger.INFO, "META_EXTTEXTOUT doesn't contain character tracking info");
return size;
}
int dxLen = Math.min(stringLength, (remainingRecordSize-size)/LittleEndianConsts.SHORT_SIZE);
if (dxLen < stringLength) {
- logger.log(POILogger.WARN, "META_EXTTEXTOUT tracking info doesn't cover all characters");
+ LOG.log(POILogger.WARN, "META_EXTTEXTOUT tracking info doesn't cover all characters");
}
for (int i=0; i<dxLen; i++) {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java Sun Jan 17 17:31:22 2021
@@ -57,7 +57,7 @@ public class HwmfPicture implements Iter
/** Max. record length - processing longer records will throw an exception */
public static final int MAX_RECORD_LENGTH = 50_000_000;
- private static final POILogger logger = POILogFactory.getLogger(HwmfPicture.class);
+ private static final POILogger LOG = POILogFactory.getLogger(HwmfPicture.class);
final List<HwmfRecord> records = new ArrayList<>();
final HwmfPlaceableHeader placeableHeader;
@@ -85,7 +85,7 @@ public class HwmfPicture implements Iter
recordSize = (int)recordSizeLong;
recordFunction = leis.readShort();
} catch (Exception e) {
- logger.log(POILogger.ERROR, "unexpected eof - wmf file was truncated");
+ LOG.log(POILogger.ERROR, "unexpected eof - wmf file was truncated");
break;
}
// 4 bytes (recordSize) + 2 bytes (recordFunction)
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java Sun Jan 17 17:31:22 2021
@@ -51,13 +51,12 @@ import org.apache.poi.util.StringUtil;
*/
public class HWPFOldDocument extends HWPFDocumentCore {
- private static final POILogger logger = POILogFactory
- .getLogger( HWPFOldDocument.class );
+ private static final POILogger LOG = POILogFactory.getLogger( HWPFOldDocument.class );
//arbitrarily selected; may need to increase
private static final int MAX_RECORD_LENGTH = 10_000_000;
- private final static Charset DEFAULT_CHARSET = StringUtil.WIN_1252;
+ private static final Charset DEFAULT_CHARSET = StringUtil.WIN_1252;
private OldTextPieceTable tpt;
@@ -115,7 +114,7 @@ public class HWPFOldDocument extends HWP
//if there was a problem with the guessed charset and the length of the
//textpiece, back off to win1252. This is effectively what we used to do.
tp = buildTextPiece(StringUtil.WIN_1252);
- logger.log(POILogger.WARN, "Error with "+guessedCharset +". Backing off to Windows-1252");
+ LOG.log(POILogger.WARN, "Error with "+guessedCharset +". Backing off to Windows-1252");
}
tpt.add(tp);
@@ -206,7 +205,7 @@ public class HWPFOldDocument extends HWP
return wmfCharset.getCharset();
}
}
- logger.log(POILogger.WARN, "Couldn't find a defined charset; backing off to cp1252");
+ LOG.log(POILogger.WARN, "Couldn't find a defined charset; backing off to cp1252");
//if all else fails
return DEFAULT_CHARSET;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java Sun Jan 17 17:31:22 2021
@@ -121,8 +121,7 @@ public abstract class AbstractWordConver
private static final byte FIELD_SEPARATOR_MARK = 20;
- private static final POILogger logger = POILogFactory
- .getLogger( AbstractWordConverter.class );
+ private static final POILogger LOG = POILogFactory.getLogger( AbstractWordConverter.class );
private static final Pattern PATTERN_HYPERLINK_EXTERNAL = Pattern
.compile( "^[ \\t\\r\\n]*HYPERLINK \"(.*)\".*$" );
@@ -449,7 +448,7 @@ public abstract class AbstractWordConver
{
if ( previous > range.getEndOffset() )
{
- logger.log( POILogger.WARN, "Latest structure in ", range,
+ LOG.log( POILogger.WARN, "Latest structure in ", range,
" ended at #", previous, " after range boundaries [",
range.getStartOffset(), "; ", range.getEndOffset(),
")" );
@@ -674,7 +673,7 @@ public abstract class AbstractWordConver
debug.append( range.getCharacterRun( i ) );
debug.append( "\n" );
}
- logger.log( POILogger.WARN, debug );
+ LOG.log( POILogger.WARN, debug );
Range deadFieldValueSubrage = new Range( range.getCharacterRun(
separatorMark ).getStartOffset() + 1, range.getCharacterRun(
@@ -706,7 +705,7 @@ public abstract class AbstractWordConver
}
catch ( Exception exc )
{
- logger.log( POILogger.WARN,
+ LOG.log( POILogger.WARN,
"Unable to process document summary information: ", exc,
exc );
}
@@ -747,7 +746,7 @@ public abstract class AbstractWordConver
.getOfficeDrawingAt( characterRun.getStartOffset() );
if ( officeDrawing == null )
{
- logger.log( POILogger.WARN, "Characters #", characterRun,
+ LOG.log( POILogger.WARN, "Characters #", characterRun,
" references missing drawn object" );
return;
}
@@ -812,7 +811,7 @@ public abstract class AbstractWordConver
{
if ( !field.hasSeparator() )
{
- logger.log( POILogger.WARN, parentRange, " contains ", field,
+ LOG.log( POILogger.WARN, parentRange, " contains ", field,
" with 'Embedded Object' but without separator mark" );
return;
}
@@ -898,7 +897,7 @@ public abstract class AbstractWordConver
}
}
- logger.log( POILogger.WARN, parentRange, " contains ", field,
+ LOG.log( POILogger.WARN, parentRange, " contains ", field,
" with unsupported type or format" );
processCharacters( wordDocument, currentTableLevel,
field.secondSubrange( parentRange ), currentBlock );
@@ -1011,7 +1010,7 @@ public abstract class AbstractWordConver
"_" + characterRun.getPicOffset() );
if ( entry == null )
{
- logger.log( POILogger.WARN, "Referenced OLE2 object '",
+ LOG.log( POILogger.WARN, "Referenced OLE2 object '",
Integer.valueOf( characterRun.getPicOffset() ),
"' not found in ObjectPool" );
return false;
@@ -1023,7 +1022,7 @@ public abstract class AbstractWordConver
}
catch ( Exception exc )
{
- logger.log( POILogger.WARN,
+ LOG.log( POILogger.WARN,
"Unable to convert internal OLE2 object '",
Integer.valueOf( characterRun.getPicOffset() ), "': ", exc,
exc );
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java Sun Jan 17 17:31:22 2021
@@ -51,8 +51,7 @@ public class AbstractWordUtils
{
static final String EMPTY = "";
- private static final POILogger logger = POILogFactory
- .getLogger( AbstractWordUtils.class );
+ private static final POILogger LOG = POILogFactory.getLogger( AbstractWordUtils.class );
public static final float TWIPS_PER_INCH = 1440.0f;
public static final int TWIPS_PER_PT = 20;
@@ -418,7 +417,7 @@ public class AbstractWordUtils
case 2057:
return "en-uk";
default:
- logger.log( POILogger.WARN, "Uknown or unmapped language code: ", languageCode);
+ LOG.log( POILogger.WARN, "Uknown or unmapped language code: ", languageCode);
return EMPTY;
}
}
@@ -427,7 +426,7 @@ public class AbstractWordUtils
{
if ( format != 0 )
- logger.log( POILogger.INFO, "NYI: toListItemNumberLabel(): ", format );
+ LOG.log( POILogger.INFO, "NYI: toListItemNumberLabel(): ", format );
return String.valueOf( number );
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java Sun Jan 17 17:31:22 2021
@@ -64,8 +64,7 @@ import org.w3c.dom.Text;
public class WordToFoConverter extends AbstractWordConverter
{
- private static final POILogger logger = POILogFactory
- .getLogger( WordToFoConverter.class );
+ private static final POILogger LOG = POILogFactory.getLogger( WordToFoConverter.class );
/**
* Java main() interface to interact with {@link WordToFoConverter}
@@ -575,7 +574,7 @@ public class WordToFoConverter extends A
}
else
{
- logger.log(
+ LOG.log(
POILogger.WARN,
"Table without body starting on offset ",
table.getStartOffset(), " -- ",
@@ -588,7 +587,7 @@ public class WordToFoConverter extends A
// making sure ID used once
if ( usedIds.contains( id ) )
{
- logger.log( POILogger.WARN,
+ LOG.log( POILogger.WARN,
"Tried to create element with same ID '", id, "'. Skipped" );
return false;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java Sun Jan 17 17:31:22 2021
@@ -81,7 +81,7 @@ public class WordToHtmlConverter extends
}
}
- private static final POILogger logger = POILogFactory.getLogger( WordToHtmlConverter.class );
+ private static final POILogger LOG = POILogFactory.getLogger( WordToHtmlConverter.class );
private final Deque<BlockProperies> blocksProperies = new LinkedList<>();
@@ -737,7 +737,7 @@ public class WordToHtmlConverter extends
}
else
{
- logger.log( POILogger.WARN, "Table without body starting at [",
+ LOG.log( POILogger.WARN, "Table without body starting at [",
Integer.valueOf( table.getStartOffset() ), "; ",
Integer.valueOf( table.getEndOffset() ), ")" );
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java Sun Jan 17 17:31:22 2021
@@ -55,8 +55,7 @@ import org.w3c.dom.Element;
@Beta
public class WordToTextConverter extends AbstractWordConverter
{
- private static final POILogger logger = POILogFactory
- .getLogger( WordToTextConverter.class );
+ private static final POILogger LOG = POILogFactory.getLogger( WordToTextConverter.class );
public static String getText( DirectoryNode root ) throws Exception
{
@@ -352,7 +351,7 @@ public class WordToTextConverter extends
catch ( Exception exc )
{
// no extractor in classpath
- logger.log( POILogger.WARN, "There is an OLE object entry '",
+ LOG.log( POILogger.WARN, "There is an OLE object entry '",
entry.getName(),
"', but there is no text extractor for this object type ",
"or text extractor factory is not available: ", "", exc );
@@ -371,7 +370,7 @@ public class WordToTextConverter extends
}
catch ( Exception exc )
{
- logger.log( POILogger.ERROR,
+ LOG.log( POILogger.ERROR,
"Unable to extract text from OLE entry '", entry.getName(),
"': ", exc, exc );
return false;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java Sun Jan 17 17:31:22 2021
@@ -30,8 +30,7 @@ import org.apache.poi.util.POILogger;
@Internal
public class BookmarksTables
{
- private static final POILogger logger = POILogFactory
- .getLogger( BookmarksTables.class );
+ private static final POILogger LOG = POILogFactory.getLogger( BookmarksTables.class );
private PlexOfCps descriptorsFirst = new PlexOfCps( 4 );
@@ -54,7 +53,7 @@ public class BookmarksTables
GenericPropertyNode endNode = descriptorsLim.getProperty( i );
if ( startNode.getStart() == endNode.getStart() )
{
- logger.log( POILogger.DEBUG, "Removing bookmark #",
+ LOG.log( POILogger.DEBUG, "Removing bookmark #",
Integer.valueOf( i ), "..." );
remove( i );
i--;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java Sun Jan 17 17:31:22 2021
@@ -49,8 +49,7 @@ import org.apache.poi.util.POILogger;
@Internal
public class CHPBinTable
{
- private static final POILogger logger = POILogFactory
- .getLogger( CHPBinTable.class );
+ private static final POILogger LOG = POILogFactory.getLogger( CHPBinTable.class );
/** List of character properties.*/
protected List<CHPX> _textRuns = new ArrayList<>();
@@ -106,13 +105,13 @@ public class CHPBinTable
_textRuns.add( chpx );
}
}
- logger.log( POILogger.DEBUG, "CHPX FKPs loaded in ",
+ LOG.log( POILogger.DEBUG, "CHPX FKPs loaded in ",
Long.valueOf( System.currentTimeMillis() - start ), " ms (",
Integer.valueOf( _textRuns.size() ), " elements)" );
if ( _textRuns.isEmpty() )
{
- logger.log( POILogger.WARN, "CHPX FKPs are empty" );
+ LOG.log( POILogger.WARN, "CHPX FKPs are empty" );
_textRuns.add( new CHPX( 0, 0, new SprmBuffer( 0 ) ) );
}
}
@@ -136,7 +135,7 @@ public class CHPBinTable
if ( igrpprl < 0 || igrpprl >= sprmBuffers.length )
{
- logger.log( POILogger.WARN, textPiece
+ LOG.log( POILogger.WARN, textPiece
+ "'s PRM references to unknown grpprl" );
continue;
}
@@ -163,7 +162,7 @@ public class CHPBinTable
_textRuns.add( chpx );
}
}
- logger.log( POILogger.DEBUG,
+ LOG.log( POILogger.DEBUG,
"Merged with CHPX from complex file table in ",
Long.valueOf( System.currentTimeMillis() - start ),
" ms (", Integer.valueOf( _textRuns.size() ),
@@ -174,7 +173,7 @@ public class CHPBinTable
List<CHPX> oldChpxSortedByStartPos = new ArrayList<>(_textRuns);
oldChpxSortedByStartPos.sort(PropertyNode.StartComparator);
- logger.log( POILogger.DEBUG, "CHPX sorted by start position in ",
+ LOG.log( POILogger.DEBUG, "CHPX sorted by start position in ",
Long.valueOf( System.currentTimeMillis() - start ), " ms" );
start = System.currentTimeMillis();
@@ -196,7 +195,7 @@ public class CHPBinTable
}
};
- logger.log( POILogger.DEBUG, "CHPX's order map created in ",
+ LOG.log( POILogger.DEBUG, "CHPX's order map created in ",
Long.valueOf( System.currentTimeMillis() - start ), " ms" );
start = System.currentTimeMillis();
@@ -214,7 +213,7 @@ public class CHPBinTable
Collections.sort( textRunsBoundariesList );
}
- logger.log( POILogger.DEBUG, "Texts CHPX boundaries collected in ",
+ LOG.log( POILogger.DEBUG, "Texts CHPX boundaries collected in ",
Long.valueOf( System.currentTimeMillis() - start ), " ms" );
start = System.currentTimeMillis();
@@ -254,7 +253,7 @@ public class CHPBinTable
if ( chpxs.size() == 0 )
{
- logger.log( POILogger.WARN, "Text piece [",
+ LOG.log( POILogger.WARN, "Text piece [",
Integer.valueOf( startInclusive ), "; ",
Integer.valueOf(boundary),
") has no CHPX. Creating new one." );
@@ -291,7 +290,7 @@ public class CHPBinTable
}
this._textRuns = new ArrayList<>(newChpxs);
- logger.log( POILogger.DEBUG, "CHPX rebuilded in ",
+ LOG.log( POILogger.DEBUG, "CHPX rebuilded in ",
Long.valueOf( System.currentTimeMillis() - start ), " ms (",
Integer.valueOf( _textRuns.size() ), " elements)" );
start = System.currentTimeMillis();
@@ -319,7 +318,7 @@ public class CHPBinTable
previous = current;
}
- logger.log( POILogger.DEBUG, "CHPX compacted in ",
+ LOG.log( POILogger.DEBUG, "CHPX compacted in ",
Long.valueOf( System.currentTimeMillis() - start ), " ms (",
Integer.valueOf( _textRuns.size() ), " elements)" );
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java Sun Jan 17 17:31:22 2021
@@ -145,7 +145,7 @@ public final class FIBFieldHandler
public static final int STTBLISTNAMES = 91;
public static final int STTBFUSSR = 92;
- private final static POILogger log = POILogFactory.getLogger(FIBFieldHandler.class);
+ private static final POILogger log = POILogFactory.getLogger(FIBFieldHandler.class);
private static final int FIELD_SIZE = LittleEndianConsts.INT_SIZE * 2;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java Sun Jan 17 17:31:22 2021
@@ -45,25 +45,23 @@ import org.apache.poi.util.POILogger;
* </ul>
*/
@Internal
-public final class FileInformationBlock
-{
+public final class FileInformationBlock {
//arbitrarily selected; may need to increase
private static final int MAX_RECORD_LENGTH = 100_000;
- public static final POILogger logger = POILogFactory
- .getLogger( FileInformationBlock.class );
+ private static final POILogger LOG = POILogFactory.getLogger( FileInformationBlock.class );
- private FibBase _fibBase;
- private int _csw;
- private FibRgW97 _fibRgW;
- private int _cslw;
- private FibRgLw _fibRgLw;
+ private final FibBase _fibBase;
+ private final int _csw;
+ private final FibRgW97 _fibRgW;
+ private final int _cslw;
+ private final FibRgLw _fibRgLw;
private int _cbRgFcLcb;
private FIBFieldHandler _fieldHandler;
private int _cswNew;
- private int _nFibNew;
- private byte[] _fibRgCswNew;
+ private final int _nFibNew;
+ private final byte[] _fibRgCswNew;
/** Creates a new instance of FileInformationBlock */
public FileInformationBlock( byte[] mainDocument )
@@ -177,7 +175,7 @@ public final class FileInformationBlock
/* The Word spec has a much smaller list of "valid" values
* to what the large CommonCrawl corpus contains!
*/
- logger.log(POILogger.WARN, "Invalid file format version number: ", nfib, "(", nfibHex, ")");
+ LOG.log(POILogger.WARN, "Invalid file format version number: ", nfib, "(", nfibHex, ")");
}
}
@@ -188,7 +186,7 @@ public final class FileInformationBlock
if ( cbRgFcLcb == expectedCbRgFcLcb )
return;
- logger.log( POILogger.WARN, "Since FIB.nFib == ", strNFib,
+ LOG.log( POILogger.WARN, "Since FIB.nFib == ", strNFib,
" value of FIB.cbRgFcLcb MUST be ", strCbRgFcLcb + ", not 0x",
Integer.toHexString( cbRgFcLcb ) );
}
@@ -213,7 +211,7 @@ public final class FileInformationBlock
assertCswNew( "0x0112", 0x0005, "0x0005", _cswNew );
break;
default:
- logger.log(POILogger.WARN, "Invalid file format version number: ", getNFib());
+ LOG.log(POILogger.WARN, "Invalid file format version number: ", getNFib());
}
}
@@ -224,7 +222,7 @@ public final class FileInformationBlock
if ( cswNew == expectedCswNew )
return;
- logger.log( POILogger.WARN, "Since FIB.nFib == ", strNFib,
+ LOG.log( POILogger.WARN, "Since FIB.nFib == ", strNFib,
" value of FIB.cswNew MUST be ",
strExpectedCswNew + ", not 0x", Integer.toHexString( cswNew ) );
}
@@ -237,14 +235,14 @@ public final class FileInformationBlock
* UnhandledDataStructure and save them on save.
*/
HashSet<Integer> knownFieldSet = new HashSet<>();
- knownFieldSet.add( Integer.valueOf( FIBFieldHandler.STSHF ) );
- knownFieldSet.add( Integer.valueOf( FIBFieldHandler.CLX ) );
- knownFieldSet.add( Integer.valueOf( FIBFieldHandler.DOP ) );
- knownFieldSet.add( Integer.valueOf( FIBFieldHandler.PLCFBTECHPX ) );
- knownFieldSet.add( Integer.valueOf( FIBFieldHandler.PLCFBTEPAPX ) );
- knownFieldSet.add( Integer.valueOf( FIBFieldHandler.PLCFSED ) );
- knownFieldSet.add( Integer.valueOf( FIBFieldHandler.PLFLST ) );
- knownFieldSet.add( Integer.valueOf( FIBFieldHandler.PLFLFO ) );
+ knownFieldSet.add(FIBFieldHandler.STSHF);
+ knownFieldSet.add(FIBFieldHandler.CLX);
+ knownFieldSet.add(FIBFieldHandler.DOP);
+ knownFieldSet.add(FIBFieldHandler.PLCFBTECHPX);
+ knownFieldSet.add(FIBFieldHandler.PLCFBTEPAPX);
+ knownFieldSet.add(FIBFieldHandler.PLCFSED);
+ knownFieldSet.add(FIBFieldHandler.PLFLST);
+ knownFieldSet.add(FIBFieldHandler.PLFLFO);
// field info
for ( FieldsDocumentPart part : FieldsDocumentPart.values() )
@@ -256,18 +254,15 @@ public final class FileInformationBlock
knownFieldSet.add( Integer.valueOf( FIBFieldHandler.STTBFBKMK ) );
// notes
- for ( NoteType noteType : NoteType.values() )
- {
- knownFieldSet.add( Integer.valueOf( noteType
- .getFibDescriptorsFieldIndex() ) );
- knownFieldSet.add( Integer.valueOf( noteType
- .getFibTextPositionsFieldIndex() ) );
+ for ( NoteType noteType : NoteType.values() ) {
+ knownFieldSet.add(noteType.getFibDescriptorsFieldIndex());
+ knownFieldSet.add(noteType.getFibTextPositionsFieldIndex());
}
- knownFieldSet.add( Integer.valueOf( FIBFieldHandler.STTBFFFN ) );
- knownFieldSet.add( Integer.valueOf( FIBFieldHandler.STTBFRMARK ) );
- knownFieldSet.add( Integer.valueOf( FIBFieldHandler.STTBSAVEDBY ) );
- knownFieldSet.add( Integer.valueOf( FIBFieldHandler.MODIFIED ) );
+ knownFieldSet.add( FIBFieldHandler.STTBFFFN );
+ knownFieldSet.add( FIBFieldHandler.STTBFRMARK );
+ knownFieldSet.add( FIBFieldHandler.STTBSAVEDBY );
+ knownFieldSet.add( FIBFieldHandler.MODIFIED );
_fieldHandler = new FIBFieldHandler( mainDocument, 154, _cbRgFcLcb,
tableStream, knownFieldSet, true );
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java Sun Jan 17 17:31:22 2021
@@ -38,7 +38,7 @@ import org.apache.poi.util.POILogger;
@Internal
public final class FontTable
{
- private final static POILogger _logger = POILogFactory.getLogger(FontTable.class);
+ private static final POILogger LOG = POILogFactory.getLogger(FontTable.class);
private short _stringCount;// how many strings are included in the string table
private short _extraDataSz;// size in bytes of the extra data
@@ -93,7 +93,7 @@ public final class FontTable
{
if(chpFtc >= _stringCount)
{
- _logger.log(POILogger.INFO, "Mismatch in chpFtc with stringCount");
+ LOG.log(POILogger.INFO, "Mismatch in chpFtc with stringCount");
return null;
}
@@ -104,7 +104,7 @@ public final class FontTable
{
if(chpFtc >= _stringCount)
{
- _logger.log(POILogger.INFO, "Mismatch in chpFtc with stringCount");
+ LOG.log(POILogger.INFO, "Mismatch in chpFtc with stringCount");
return null;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java Sun Jan 17 17:31:22 2021
@@ -43,8 +43,7 @@ public final class ListLevel
//arbitrarily selected; may need to increase
private static final int MAX_RECORD_LENGTH = 10_485_760;
- private static final POILogger logger = POILogFactory
- .getLogger( ListLevel.class );
+ private static final POILogger LOG = POILogFactory.getLogger( ListLevel.class );
private byte[] _grpprlChpx;
private byte[] _grpprlPapx;
@@ -245,7 +244,7 @@ public final class ListLevel
{
if ( _xst.getCch() != 1 )
{
- logger.log( POILogger.WARN, "LVL at offset ",
+ LOG.log( POILogger.WARN, "LVL at offset ",
Integer.valueOf( startOffset ),
" has nfc == 0x17 (bullets), but cch != 1 (",
Integer.valueOf( _xst.getCch() ), ")" );
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java Sun Jan 17 17:31:22 2021
@@ -33,7 +33,7 @@ import org.apache.poi.util.POILogger;
@Internal
public final class ListTables
{
- private final static POILogger log = POILogFactory.getLogger(ListTables.class);
+ private static final POILogger log = POILogFactory.getLogger(ListTables.class);
/**
* Both PlfLst and the following LVLs
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java Sun Jan 17 17:31:22 2021
@@ -32,9 +32,9 @@ import org.apache.poi.util.StringUtil;
@Internal
public final class OldFfn {
- private static final POILogger logger = POILogFactory.getLogger(OldFfn.class);
+ private static final POILogger LOG = POILogFactory.getLogger(OldFfn.class);
- private byte _chs;// character set identifier
+ private final byte _chs;// character set identifier
private final String fontName;
private final String altFontName;
@@ -59,7 +59,7 @@ public final class OldFfn {
short fontDescriptionLength = buf[offset];
offset += 1;
if (offset + fontDescriptionLength > fontTableEnd) {
- logger.log(POILogger.WARN, "Asked to read beyond font table end. Skipping font");
+ LOG.log(POILogger.WARN, "Asked to read beyond font table end. Skipping font");
return null;
}
@@ -69,7 +69,7 @@ public final class OldFfn {
Charset charset = null;
FontCharset wmfCharset = FontCharset.valueOf(chs & 0xff);
if (wmfCharset == null) {
- logger.log(POILogger.WARN, "Couldn't find font for type: ", (chs & 0xff));
+ LOG.log(POILogger.WARN, "Couldn't find font for type: ", (chs & 0xff));
} else {
charset = wmfCharset.getCharset();
}
@@ -88,7 +88,7 @@ public final class OldFfn {
}
}
if (fontNameLength == -1) {
- logger.log(POILogger.WARN, "Couldn't find the zero-byte delimited font name length");
+ LOG.log(POILogger.WARN, "Couldn't find the zero-byte delimited font name length");
return null;
}
String fontName = new String(buf, offset, fontNameLength, charset);
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java Sun Jan 17 17:31:22 2021
@@ -32,7 +32,7 @@ import org.apache.poi.util.POILogger;
*/
@Internal
public final class OldFontTable {
- private final static POILogger _logger = POILogFactory.getLogger(OldFontTable.class);
+ private static final POILogger LOG = POILogFactory.getLogger(OldFontTable.class);
// added extra facilitator members
// FFN structure containing strings of font names
@@ -69,7 +69,7 @@ public final class OldFontTable {
public String getMainFont(int chpFtc) {
if (chpFtc >= _fontNames.length) {
- _logger.log(POILogger.INFO, "Mismatch in chpFtc with stringCount");
+ LOG.log(POILogger.INFO, "Mismatch in chpFtc with stringCount");
return null;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java Sun Jan 17 17:31:22 2021
@@ -43,8 +43,7 @@ import org.apache.poi.util.POILogger;
@Internal
public class PAPBinTable
{
- private static final POILogger logger = POILogFactory
- .getLogger( PAPBinTable.class );
+ private static final POILogger LOG = POILogFactory.getLogger( PAPBinTable.class );
protected final ArrayList<PAPX> _paragraphs = new ArrayList<>();
@@ -81,13 +80,13 @@ public class PAPBinTable
}
}
- logger.log( POILogger.DEBUG, "PAPX tables loaded in ",
+ LOG.log( POILogger.DEBUG, "PAPX tables loaded in ",
Long.valueOf( System.currentTimeMillis() - start ), " ms (",
Integer.valueOf( _paragraphs.size() ), " elements)" );
if ( _paragraphs.isEmpty() )
{
- logger.log( POILogger.WARN, "PAPX FKPs are empty" );
+ LOG.log( POILogger.WARN, "PAPX FKPs are empty" );
_paragraphs.add( new PAPX( 0, 0, new SprmBuffer( 2 ) ) );
}
}
@@ -118,7 +117,7 @@ public class PAPBinTable
if ( igrpprl < 0 || igrpprl >= sprmBuffers.length )
{
- logger.log( POILogger.WARN, textPiece
+ LOG.log( POILogger.WARN, textPiece
+ "'s PRM references to unknown grpprl" );
continue;
}
@@ -147,7 +146,7 @@ public class PAPBinTable
}
}
- logger.log( POILogger.DEBUG,
+ LOG.log( POILogger.DEBUG,
"Merged (?) with PAPX from complex file table in ",
Long.valueOf( System.currentTimeMillis() - start ),
" ms (", Integer.valueOf( paragraphs.size() ),
@@ -158,7 +157,7 @@ public class PAPBinTable
List<PAPX> oldPapxSortedByEndPos = new ArrayList<>(paragraphs);
oldPapxSortedByEndPos.sort(PropertyNode.EndComparator);
- logger.log( POILogger.DEBUG, "PAPX sorted by end position in ",
+ LOG.log( POILogger.DEBUG, "PAPX sorted by end position in ",
Long.valueOf( System.currentTimeMillis() - start ), " ms" );
start = System.currentTimeMillis();
@@ -180,7 +179,7 @@ public class PAPBinTable
}
};
- logger.log( POILogger.DEBUG, "PAPX's order map created in ",
+ LOG.log( POILogger.DEBUG, "PAPX's order map created in ",
Long.valueOf( System.currentTimeMillis() - start ), " ms" );
start = System.currentTimeMillis();
@@ -224,7 +223,7 @@ public class PAPBinTable
if ( papxs.size() == 0 )
{
- logger.log( POILogger.WARN, "Paragraph [",
+ LOG.log( POILogger.WARN, "Paragraph [",
Integer.valueOf( startInclusive ), "; ",
Integer.valueOf( endExclusive ),
") has no PAPX. Creating new one." );
@@ -274,7 +273,7 @@ public class PAPBinTable
paragraphs.clear();
paragraphs.addAll( newPapxs );
- logger.log( POILogger.DEBUG, "PAPX rebuilded from document text in ",
+ LOG.log( POILogger.DEBUG, "PAPX rebuilded from document text in ",
Long.valueOf( System.currentTimeMillis() - start ), " ms (",
Integer.valueOf( paragraphs.size() ), " elements)" );
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java Sun Jan 17 17:31:22 2021
@@ -52,11 +52,9 @@ import org.apache.poi.util.POILogger;
* @author Dmitry Romanov
*/
@Internal
-public final class PicturesTable
-{
- private static final POILogger logger = POILogFactory
- .getLogger( PicturesTable.class );
-
+public final class PicturesTable {
+ private static final POILogger LOG = POILogFactory.getLogger( PicturesTable.class );
+
static final int TYPE_IMAGE = 0x08;
static final int TYPE_IMAGE_WORD2000 = 0x00;
static final int TYPE_IMAGE_PASTED_FROM_CLIPBOARD = 0xA;
@@ -200,7 +198,7 @@ public final class PicturesTable
}
catch ( Exception exc )
{
- logger.log(
+ LOG.log(
POILogger.WARN,
"Unable to load picture from BLIB record at offset #",
Integer.valueOf( bse.getOffset() ), exc );
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java Sun Jan 17 17:31:22 2021
@@ -39,7 +39,7 @@ import org.apache.poi.util.POILogger;
*/
public class PlfLfo
{
- private final static POILogger log = POILogFactory.getLogger( PlfLfo.class );
+ private static final POILogger log = POILogFactory.getLogger( PlfLfo.class );
/**
* An unsigned integer that specifies the count of elements in both the
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java Sun Jan 17 17:31:22 2021
@@ -40,7 +40,7 @@ public abstract class PropertyNode<T ext
public static final Comparator<PropertyNode<?>> StartComparator = Comparator.comparingInt(PropertyNode::getStart);
- private static final POILogger _logger = POILogFactory.getLogger(PropertyNode.class);
+ private static final POILogger LOG = POILogFactory.getLogger(PropertyNode.class);
protected Object _buf;
@@ -72,12 +72,12 @@ public abstract class PropertyNode<T ext
_buf = buf;
if (_cpStart < 0) {
- _logger.log(POILogger.WARN, "A property claimed to start before zero, at ", _cpStart, "! Resetting it to zero, and hoping for the best");
+ LOG.log(POILogger.WARN, "A property claimed to start before zero, at ", _cpStart, "! Resetting it to zero, and hoping for the best");
_cpStart = 0;
}
if (_cpEnd < _cpStart) {
- _logger.log(POILogger.WARN, "A property claimed to end (", _cpEnd,
+ LOG.log(POILogger.WARN, "A property claimed to end (", _cpEnd,
") before start! Resetting end to start, and hoping for the best");
_cpEnd = _cpStart;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java Sun Jan 17 17:31:22 2021
@@ -37,7 +37,7 @@ public class SectionTable
//arbitrarily selected; may need to increase
private static final int MAX_RECORD_LENGTH = 100_000;
- private final static POILogger _logger = POILogFactory.getLogger(SectionTable.class);
+ private static final POILogger LOG = POILogFactory.getLogger(SectionTable.class);
private static final int SED_SIZE = 12;
protected List<SEPX> _sections = new ArrayList<>();
@@ -100,7 +100,7 @@ public class SectionTable
}
}
if(! matchAt && matchHalf) {
- _logger.log(POILogger.WARN, "Your document seemed to be mostly unicode, but the section definition was in bytes! Trying anyway, but things may well go wrong!");
+ LOG.log(POILogger.WARN, "Your document seemed to be mostly unicode, but the section definition was in bytes! Trying anyway, but things may well go wrong!");
for(int i=0; i<_sections.size(); i++) {
SEPX s = _sections.get(i);
GenericPropertyNode node = sedPlex.getProperty(i);
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java Sun Jan 17 17:31:22 2021
@@ -39,14 +39,14 @@ import org.apache.poi.util.StringUtil;
@Internal
public final class StyleDescription {
- private static final POILogger logger = POILogFactory.getLogger(StyleDescription.class);
+ private static final POILogger LOG = POILogFactory.getLogger(StyleDescription.class);
//arbitrarily selected; may need to increase
private static final int MAX_RECORD_LENGTH = 100_000;
- private final static int PARAGRAPH_STYLE = 1;
- private final static int CHARACTER_STYLE = 2;
- // private final static int TABLE_STYLE = 3;
- // private final static int NUMBERING_STYLE = 4;
+ private static final int PARAGRAPH_STYLE = 1;
+ private static final int CHARACTER_STYLE = 2;
+ // private static final int TABLE_STYLE = 3;
+ // private static final int NUMBERING_STYLE = 4;
private int _baseLength;
private StdfBase _stdfBase;
@@ -74,7 +74,7 @@ public final class StyleDescription {
} else if (baseLength == 0x000A) {
readStdfPost2000 = false;
} else {
- logger.log(POILogger.WARN, "Style definition has non-standard size of ", baseLength);
+ LOG.log(POILogger.WARN, "Style definition has non-standard size of ", baseLength);
}
_stdfBase = new StdfBase(std, offset);
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java Sun Jan 17 17:31:22 2021
@@ -49,12 +49,12 @@ public final class StyleSheet {
// private static final int TAP_TYPE = 5;
@Deprecated
- private final static ParagraphProperties NIL_PAP = new ParagraphProperties();
+ private static final ParagraphProperties NIL_PAP = new ParagraphProperties();
@Deprecated
- private final static CharacterProperties NIL_CHP = new CharacterProperties();
+ private static final CharacterProperties NIL_CHP = new CharacterProperties();
- private final static byte[] NIL_CHPX = new byte[]{};
- private final static byte[] NIL_PAPX = new byte[]{0, 0};
+ private static final byte[] NIL_CHPX = new byte[]{};
+ private static final byte[] NIL_PAPX = new byte[]{0, 0};
/**
* Size of the STSHI structure
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java Sun Jan 17 17:31:22 2021
@@ -40,8 +40,7 @@ import org.apache.poi.util.POILogger;
*/
@Internal
public class TextPieceTable implements CharIndexTranslator {
- private static final POILogger logger = POILogFactory
- .getLogger(TextPieceTable.class);
+ private static final POILogger LOG = POILogFactory.getLogger(TextPieceTable.class);
//arbitrarily selected; may need to increase
private static final int MAX_RECORD_LENGTH = 100_000_000;
@@ -287,7 +286,7 @@ public class TextPieceTable implements C
int toAppendLength = toAppend.length();
if (toAppendLength != textPiece.getEnd() - textPiece.getStart()) {
- logger.log(
+ LOG.log(
POILogger.WARN,
"Text piece has boundaries [",
textPiece.getStart(),
@@ -301,7 +300,7 @@ public class TextPieceTable implements C
+ toAppendLength, toAppend);
}
- logger.log(POILogger.DEBUG, "Document text were rebuilded in ",
+ LOG.log(POILogger.DEBUG, "Document text were rebuilded in ",
System.currentTimeMillis() - start, " ms (",
docText.length(), " chars)");
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java Sun Jan 17 17:31:22 2021
@@ -51,11 +51,11 @@ public abstract class FFDataBaseAbstract
protected short field_2_bits;
/**/private static final BitField iType = new BitField(0x0003);
/** Specifies that the form field is a textbox. */
- /* */public final static byte ITYPE_TEXT = 0;
+ /* */public static final byte ITYPE_TEXT = 0;
/** Specifies that the form field is a checkbox. */
- /* */public final static byte ITYPE_CHCK = 1;
+ /* */public static final byte ITYPE_CHCK = 1;
/** Specifies that the form field is a dropdown list box. */
- /* */public final static byte ITYPE_DROP = 2;
+ /* */public static final byte ITYPE_DROP = 2;
/**/private static final BitField iRes = new BitField(0x007C);
/**/private static final BitField fOwnHelp = new BitField(0x0080);
/**/private static final BitField fOwnStat = new BitField(0x0100);
@@ -63,17 +63,17 @@ public abstract class FFDataBaseAbstract
/**/private static final BitField iSize = new BitField(0x0400);
/**/private static final BitField iTypeTxt = new BitField(0x3800);
/** Specifies that the textbox value is regular text. */
- /* */public final static byte ITYPETXT_REG = 0;
+ /* */public static final byte ITYPETXT_REG = 0;
/** Specifies that the textbox value is a number. */
- /* */public final static byte ITYPETXT_NUM = 0;
+ /* */public static final byte ITYPETXT_NUM = 0;
/** Specifies that the textbox value is a date or time. */
- /* */public final static byte ITYPETXT_DATE = 0;
+ /* */public static final byte ITYPETXT_DATE = 0;
/** Specifies that the textbox value is the current date. */
- /* */public final static byte ITYPETXT_CURDATE = 0;
+ /* */public static final byte ITYPETXT_CURDATE = 0;
/** Specifies that the textbox value is the current time. */
- /* */public final static byte ITYPETXT_CURTIME = 0;
+ /* */public static final byte ITYPETXT_CURTIME = 0;
/** Specifies that the textbox value is calculated from an expression. The expression is given by FFData.xstzTextDef. */
- /* */protected final static byte ITYPETXT_CALC = 0;
+ /* */protected static final byte ITYPETXT_CALC = 0;
/**/private static final BitField fRecalc = new BitField(0x4000);
/**/private static final BitField fHasListBox = new BitField(0x8000);
protected int field_3_cch;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org