Organizes document information in a tree model in order to be * e.g. displayed in a Swing {@link javax.swing.JTree}. An instance of this * class is created with a root tree node ({@link MutableTreeNode}) and - * registered as a {@link POIFSReaderListener} with a {@link + * registered as a {@link POIFSReaderListener} with a {@link * org.apache.poi.poifs.eventfilesystem.POIFSReader}. While the latter processes * a POI filesystem it calls this class' {@link #processPOIFSReaderEvent} for * each document it has been registered for. This method appends the document it @@ -204,20 +204,16 @@ public class TreeReaderListener implements POIFSReaderListener } return n; } - else - { - /* The path is somewhere down in the POI filesystem's - * hierarchy. We need the tree node of this path's parent - * and attach our new node to it. */ - final String name = path.getComponent(path.length() - 1); - final POIFSDocumentPath parentPath = path.getParent(); - final MutableTreeNode parentNode = - getNode(parentPath, fsName, root); - n = new DefaultMutableTreeNode(name); - pathToNode.put(path, n); - parentNode.insert(n, 0); - return n; - } + /* else - The path is somewhere down in the POI filesystem's + * hierarchy. We need the tree node of this path's parent + * and attach our new node to it. */ + final String name = path.getComponent(path.length() - 1); + final POIFSDocumentPath parentPath = path.getParent(); + final MutableTreeNode parentNode = + getNode(parentPath, fsName, root); + n = new DefaultMutableTreeNode(name); + pathToNode.put(path, n); + parentNode.insert(n, 0); + return n; } - } diff --git a/src/contrib/src/org/apache/poi/hssf/contrib/view/SVFractionalFormat.java b/src/contrib/src/org/apache/poi/hssf/contrib/view/SVFractionalFormat.java index a4819bf436..5512a73a71 100644 --- a/src/contrib/src/org/apache/poi/hssf/contrib/view/SVFractionalFormat.java +++ b/src/contrib/src/org/apache/poi/hssf/contrib/view/SVFractionalFormat.java @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================== */ - + package org.apache.poi.hssf.contrib.view; @@ -196,7 +196,7 @@ public class SVFractionalFormat extends Format { toAppendTo.append(format(((Number)obj).doubleValue())); return toAppendTo; } - else throw new IllegalArgumentException("Can only handle Numbers"); + throw new IllegalArgumentException("Can only handle Numbers"); } public Object parseObject(String source, diff --git a/src/java/org/apache/poi/hpsf/MutablePropertySet.java b/src/java/org/apache/poi/hpsf/MutablePropertySet.java index 37c7b32f8b..3fb13af81a 100644 --- a/src/java/org/apache/poi/hpsf/MutablePropertySet.java +++ b/src/java/org/apache/poi/hpsf/MutablePropertySet.java @@ -75,10 +75,10 @@ public class MutablePropertySet extends PropertySet /** *
Constructs a MutablePropertySet by doing a deep copy of
- * an existing PropertySet. All nested elements, i.e.
+ * an existing PropertySet. All nested elements, i.e.
* Sections and Property instances, will be their
* mutable counterparts in the new MutablePropertySet.
Writes the property set to an output stream.
- * + * * @param out the output stream to write the section to * @exception IOException if an error when writing to the output stream * occurs @@ -232,10 +232,10 @@ public class MutablePropertySet extends PropertySet catch (HPSFRuntimeException ex) { final Throwable cause = ex.getReason(); - if (cause instanceof UnsupportedEncodingException) + if (cause instanceof UnsupportedEncodingException) { throw new IllegalPropertySetDataException(cause); - else - throw ex; + } + throw ex; } } @@ -259,7 +259,7 @@ public class MutablePropertySet extends PropertySet * the {@link MutablePropertySet} only. * * @return the contents of this property set stream - * + * * @throws WritingNotSupportedException if HPSF does not yet support writing * of a property's variant type. * @throws IOException if an I/O exception occurs. @@ -280,7 +280,7 @@ public class MutablePropertySet extends PropertySet * @param dir The directory in the POI filesystem to write the document to. * @param name The document's name. If there is already a document with the * same name in the directory the latter will be overwritten. - * + * * @throws WritingNotSupportedException * @throws IOException */ diff --git a/src/java/org/apache/poi/hpsf/Property.java b/src/java/org/apache/poi/hpsf/Property.java index 872f6931b8..38ce0d5660 100644 --- a/src/java/org/apache/poi/hpsf/Property.java +++ b/src/java/org/apache/poi/hpsf/Property.java @@ -46,7 +46,7 @@ import org.apache.poi.util.POILogger; * over time but largely depends on your feedback so that the POI team knows * which variant types are really needed. So please feel free to submit error * reports or patches for the types you need. - * + * *Microsoft documentation: * Property Set Display Name Dictionary. @@ -110,7 +110,7 @@ public class Property /** *
Creates a property.
- * + * * @param id the property's ID. * @param type the property's type, see {@link Variant}. * @param value the property's value. Only certain types are allowed, see @@ -183,7 +183,7 @@ public class Property /** *Reads a dictionary.
- * + * * @param src The byte array containing the bytes making out the dictionary. * @param offset At this offset within src the dictionary * starts. @@ -296,7 +296,7 @@ public class Property * 4. * * @return the property's size in bytes - * + * * @exception WritingNotSupportedException if HPSF does not yet support the * property's variant type. */ @@ -337,13 +337,14 @@ public class Property * ID == 0 is a special case: It does not have a type, and its value is the * section's dictionary. Another special case are strings: Two properties * may have the different types Variant.VT_LPSTR and Variant.VT_LPWSTR; - * + * * @see Object#equals(java.lang.Object) */ public boolean equals(final Object o) { - if (!(o instanceof Property)) + if (!(o instanceof Property)) { return false; + } final Property p = (Property) o; final Object pValue = p.getValue(); final long pId = p.getID(); @@ -355,8 +356,8 @@ public class Property return false; /* It's clear now that both values are non-null. */ - final Class valueClass = value.getClass(); - final Class pValueClass = pValue.getClass(); + final Class valueClass = value.getClass(); + final Class pValueClass = pValue.getClass(); if (!(valueClass.isAssignableFrom(pValueClass)) && !(pValueClass.isAssignableFrom(valueClass))) return false; @@ -373,10 +374,10 @@ public class Property { if (t1 == t2 || (t1 == Variant.VT_LPSTR && t2 == Variant.VT_LPWSTR) || - (t2 == Variant.VT_LPSTR && t1 == Variant.VT_LPWSTR)) + (t2 == Variant.VT_LPSTR && t1 == Variant.VT_LPWSTR)) { return true; - else - return false; + } + return false; } diff --git a/src/java/org/apache/poi/hpsf/Section.java b/src/java/org/apache/poi/hpsf/Section.java index 147f2af7eb..a9ea717c01 100644 --- a/src/java/org/apache/poi/hpsf/Section.java +++ b/src/java/org/apache/poi/hpsf/Section.java @@ -146,7 +146,7 @@ public class Section * @param src Contains the complete property set stream. * @param offset The position in the stream that points to the * section's format ID. - * + * * @exception UnsupportedEncodingException if the section's codepage is not * supported. */ @@ -183,7 +183,7 @@ public class Section /* * Read the properties. The offset is positioned at the first * entry of the property list. There are two problems: - * + * * 1. For each property we have to find out its length. In the * property list we find each property's ID and its offset relative * to the section's beginning. Unfortunately the properties in the @@ -191,8 +191,8 @@ public class Section * possible to calculate the length as * (offset of property(i+1) - offset of property(i)). Before we can * that we first have to sort the property list by ascending offsets. - * - * 2. We have to read the property with ID 1 before we read other + * + * 2. We have to read the property with ID 1 before we read other * properties, at least before other properties containing strings. * The reason is that property 1 specifies the codepage. If it is * 1200, all strings are in Unicode. In other words: Before we can @@ -205,10 +205,10 @@ public class Section * seconds pass reads the other properties. */ properties = new Property[propertyCount]; - + /* Pass 1: Read the property list. */ int pass1Offset = o1; - final List propertyList = new ArrayList(propertyCount); + final ListChecks whether this section is equal to another object. The result is
* false if one of the the following conditions holds:
The other object is not a {@link Section}.
The format IDs of the two sections are not equal.
The sections have a different number of properties. However, * properties with ID 1 (codepage) are not counted.
The other object is not a {@link Section}.
The properties have different values. The order of the properties * is irrelevant.
true if the objects are equal, false if
* not
@@ -504,7 +502,7 @@ public class Section
if (!s.getFormatID().equals(getFormatID()))
return false;
- /* Compare all properties except 0 and 1 as they must be handled
+ /* Compare all properties except 0 and 1 as they must be handled
* specially. */
Property[] pa1 = new Property[getProperties().length];
Property[] pa2 = new Property[s.getProperties().length];
@@ -559,10 +557,10 @@ public class Section
dictionaryEqual = p10.getValue().equals(p20.getValue());
else if (p10 != null || p20 != null)
dictionaryEqual = false;
- if (!dictionaryEqual)
- return false;
- else
+ if (dictionaryEqual) {
return Util.equals(pa1, pa2);
+ }
+ return false;
}
@@ -571,7 +569,7 @@ public class Section
* Removes a field from a property array. The resulting array is * compactified and returned.
* - * @param pa The property array. + * @param pa The property array. * @param i The index of the field to be removed. * @return the compactified array. */ diff --git a/src/java/org/apache/poi/hpsf/SummaryInformation.java b/src/java/org/apache/poi/hpsf/SummaryInformation.java index c0351a359b..31eaa60574 100644 --- a/src/java/org/apache/poi/hpsf/SummaryInformation.java +++ b/src/java/org/apache/poi/hpsf/SummaryInformation.java @@ -24,13 +24,12 @@ import org.apache.poi.hpsf.wellknown.PropertyIDMap; /** *Convenience class representing a Summary Information stream in a * Microsoft Office document.
- * + * * @author Rainer Klute <klute@rainer-klute.de> * @see DocumentSummaryInformation */ -public class SummaryInformation extends SpecialPropertySet -{ +public final class SummaryInformation extends SpecialPropertySet { /** *The document name a summary information stream usually has in a POIFS @@ -46,7 +45,7 @@ public class SummaryInformation extends SpecialPropertySet /** *
Creates a {@link SummaryInformation} from a given {@link * PropertySet}.
- * + * * @param ps A property set which should be created from a summary * information stream. * @throws UnexpectedPropertySetTypeException if ps does not @@ -65,7 +64,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the title (or null).
null
*/
public String getTitle()
@@ -77,7 +76,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the title.
- * + * * @param title The title to set. */ public void setTitle(final String title) @@ -101,7 +100,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the subject (or null).
null
*/
public String getSubject()
@@ -113,7 +112,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the subject.
- * + * * @param subject The subject to set. */ public void setSubject(final String subject) @@ -137,7 +136,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the author (or null).
null
*/
public String getAuthor()
@@ -149,7 +148,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the author.
- * + * * @param author The author to set. */ public void setAuthor(final String author) @@ -173,7 +172,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the keywords (or null).
null
*/
public String getKeywords()
@@ -185,7 +184,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the keywords.
- * + * * @param keywords The keywords to set. */ public void setKeywords(final String keywords) @@ -209,7 +208,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the comments (or null).
null
*/
public String getComments()
@@ -221,7 +220,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the comments.
- * + * * @param comments The comments to set. */ public void setComments(final String comments) @@ -245,7 +244,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the template (or null).
null
*/
public String getTemplate()
@@ -257,7 +256,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the template.
- * + * * @param template The template to set. */ public void setTemplate(final String template) @@ -281,7 +280,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the last author (or null).
null
*/
public String getLastAuthor()
@@ -293,7 +292,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the last author.
- * + * * @param lastAuthor The last author to set. */ public void setLastAuthor(final String lastAuthor) @@ -317,7 +316,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the revision number (or null).
null
*/
public String getRevNumber()
@@ -329,7 +328,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the revision number.
- * + * * @param revNumber The revision number to set. */ public void setRevNumber(final String revNumber) @@ -354,24 +353,24 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the total time spent in editing the document (or
* 0).
Sets the total time spent in editing the document.
- * + * * @param time The time to set. */ public void setEditTime(final long time) @@ -396,7 +395,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the last printed time (or null).
null
*/
public Date getLastPrinted()
@@ -408,7 +407,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the lastPrinted.
- * + * * @param lastPrinted The lastPrinted to set. */ public void setLastPrinted(final Date lastPrinted) @@ -433,7 +432,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the creation time (or null).
null
*/
public Date getCreateDateTime()
@@ -445,7 +444,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the creation time.
- * + * * @param createDateTime The creation time to set. */ public void setCreateDateTime(final Date createDateTime) @@ -470,7 +469,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the last save time (or null).
null
*/
public Date getLastSaveDateTime()
@@ -482,7 +481,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the total time spent in editing the document.
- * + * * @param time The time to set. */ public void setLastSaveDateTime(final Date time) @@ -509,7 +508,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the page count or 0 if the {@link SummaryInformation} does * not contain a page count.
- * + * * @return The page count or 0 if the {@link SummaryInformation} does not * contain a page count. */ @@ -522,7 +521,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Sets the page count.
- * + * * @param pageCount The page count to set. */ public void setPageCount(final int pageCount) @@ -547,7 +546,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the word count or 0 if the {@link SummaryInformation} does * not contain a word count.
- * + * * @return The word count ornull
*/
public int getWordCount()
@@ -559,7 +558,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the word count.
- * + * * @param wordCount The word count to set. */ public void setWordCount(final int wordCount) @@ -584,7 +583,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the character count or 0 if the {@link SummaryInformation} * does not contain a char count.
- * + * * @return The character count ornull
*/
public int getCharCount()
@@ -596,7 +595,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the character count.
- * + * * @param charCount The character count to set. */ public void setCharCount(final int charCount) @@ -622,12 +621,12 @@ public class SummaryInformation extends SpecialPropertySet *Returns the thumbnail (or null) when this
* method is implemented. Please note that the return type is likely to
* change!
Hint to developers: Drew Varner <Drew.Varner * -at- sc.edu> said that this is an image in WMF or Clipboard (BMP?) * format. However, we won't do any conversion into any image type but * instead just return a byte array.
- * + * * @return The thumbnail ornull
*/
public byte[] getThumbnail()
@@ -639,7 +638,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the thumbnail.
- * + * * @param thumbnail The thumbnail to set. */ public void setThumbnail(final byte[] thumbnail) @@ -664,7 +663,7 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns the application name (or null).
null
*/
public String getApplicationName()
@@ -676,7 +675,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the application name.
- * + * * @param applicationName The application name to set. */ public void setApplicationName(final String applicationName) @@ -700,24 +699,24 @@ public class SummaryInformation extends SpecialPropertySet /** *Returns a security code which is one of the following values:
- * + * *0 if the {@link SummaryInformation} does not contain a * security field or if there is no security on the document. Use * {@link PropertySet#wasNull()} to distinguish between the two * cases!
1 if the document is password protected
2 if the document is read-only recommended
4 if the document is read-only enforced
8 if the document is locked for annotations
null
*/
public int getSecurity()
@@ -729,7 +728,7 @@ public class SummaryInformation extends SpecialPropertySet
/**
* Sets the security code.
- * + * * @param security The security code to set. */ public void setSecurity(final int security) diff --git a/src/java/org/apache/poi/hpsf/Thumbnail.java b/src/java/org/apache/poi/hpsf/Thumbnail.java index cd2c36cd8a..c39abe0a9e 100644 --- a/src/java/org/apache/poi/hpsf/Thumbnail.java +++ b/src/java/org/apache/poi/hpsf/Thumbnail.java @@ -25,8 +25,7 @@ import org.apache.poi.util.LittleEndian; * @author Drew Varner (Drew.Varner inOrAround sc.edu) * @see SummaryInformation#getThumbnail() */ -public class Thumbnail -{ +public final class Thumbnail { /** *Offset in bytes where the Clipboard Format Tag starts in the @@ -128,7 +127,7 @@ public class Thumbnail *
A byte[] to hold a thumbnail image in ({@link
* Variant#VT_CF VT_CF}) format.
A property without a known name is described by this string.
+ *A property without a known name is described by this string.
*/ public static final String UNDEFINED = "[undefined]"; @@ -121,15 +121,13 @@ public class SectionIDMap extends HashMap { final long pid) { final PropertyIDMap m = getInstance().get(sectionFormatID); - if (m == null) + if (m == null) { return UNDEFINED; - else - { - final String s = (String) m.get(pid); - if (s == null) - return UNDEFINED; - return s; } + final String s = (String) m.get(pid); + if (s == null) + return UNDEFINED; + return s; } @@ -137,7 +135,7 @@ public class SectionIDMap extends HashMap { /** *Returns the {@link PropertyIDMap} for a given section format * ID.
- * + * * @param sectionFormatID the section format ID * @return the property ID map */ @@ -166,7 +164,7 @@ public class SectionIDMap extends HashMap { /** *Associates a section format ID with a {@link * PropertyIDMap}.
- * + * * @param sectionFormatID the section format ID * @param propertyIDMap the property ID map * @return as defined by {@link java.util.Map#put} @@ -183,7 +181,7 @@ public class SectionIDMap extends HashMap { * @deprecated Use {@link #put(byte[], PropertyIDMap)} instead! * * @see #put(byte[], PropertyIDMap) - * + * * @param key This parameter remains undocumented since the method is * deprecated. * @param value This parameter remains undocumented since the method is diff --git a/src/java/org/apache/poi/hssf/eventmodel/ModelFactory.java b/src/java/org/apache/poi/hssf/eventmodel/ModelFactory.java index 8f49e67b98..f1465b389f 100644 --- a/src/java/org/apache/poi/hssf/eventmodel/ModelFactory.java +++ b/src/java/org/apache/poi/hssf/eventmodel/ModelFactory.java @@ -71,25 +71,22 @@ public class ModelFactory implements ERFListener } //ERFListener - public boolean processRecord(Record rec) - { - if (rec.getSid() == BOFRecord.sid) { - if (lastEOF != true) { - throw new RuntimeException("Not yet handled embedded models"); - } else { - BOFRecord bof = (BOFRecord)rec; - switch (bof.getType()) { - case BOFRecord.TYPE_WORKBOOK: - currentmodel = new Workbook(); - break; - case BOFRecord.TYPE_WORKSHEET: - currentmodel = Sheet.createSheet(); - break; - default: + public boolean processRecord(Record rec) { + if (rec.getSid() == BOFRecord.sid) { + if (lastEOF != true) { + throw new RuntimeException("Not yet handled embedded models"); + } + BOFRecord bof = (BOFRecord)rec; + switch (bof.getType()) { + case BOFRecord.TYPE_WORKBOOK: + currentmodel = new Workbook(); + break; + case BOFRecord.TYPE_WORKSHEET: + currentmodel = Sheet.createSheet(); + break; + default: throw new RuntimeException("Unsupported model type "+bof.getType()); - } - - } + } } if (rec.getSid() == EOFRecord.sid) { @@ -98,8 +95,6 @@ public class ModelFactory implements ERFListener } else { lastEOF = false; } - - return true; } @@ -115,6 +110,4 @@ public class ModelFactory implements ERFListener mfl.process(model); } } - - } diff --git a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java b/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java index ff34958e6e..70e75a57e3 100644 --- a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java +++ b/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java @@ -31,130 +31,128 @@ import org.apache.poi.hssf.usermodel.HSSFDataFormat; import org.apache.poi.hssf.usermodel.HSSFDataFormatter; /** - * A proxy HSSFListener that keeps track of the document - * formatting records, and provides an easy way to look - * up the format strings used by cells from their ids. + * A proxy HSSFListener that keeps track of the document formatting records, and + * provides an easy way to look up the format strings used by cells from their + * ids. */ public class FormatTrackingHSSFListener implements HSSFListener { - private HSSFListener childListener; - private HSSFDataFormatter formatter = new HSSFDataFormatter(); - private Map customFormatRecords = new Hashtable(); - private List xfRecords = new ArrayList(); + private final HSSFListener _childListener; + private HSSFDataFormatter _formatter = new HSSFDataFormatter(); + private final MapFontDetails by loading them from the
@@ -173,6 +173,4 @@ public class FontDetails
return list;
}
-
-
}
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java b/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
index 00de9410cd..606fe3c5fd 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
@@ -29,20 +29,16 @@ import org.apache.poi.ss.usermodel.Font;
/**
* High level representation of the style of a cell in a sheet of a workbook.
*
- * @version 1.0-pre
- *
* @author Andrew C. Oliver (acoliver at apache dot org)
* @author Jason Height (jheight at chariot dot net dot au)
* @see org.apache.poi.hssf.usermodel.HSSFWorkbook#createCellStyle()
* @see org.apache.poi.hssf.usermodel.HSSFWorkbook#getCellStyleAt(short)
* @see org.apache.poi.hssf.usermodel.HSSFCell#setCellStyle(HSSFCellStyle)
*/
-
-public class HSSFCellStyle implements CellStyle
-{
- private ExtendedFormatRecord format = null;
- private short index = 0;
- private Workbook workbook = null;
+public final class HSSFCellStyle implements CellStyle {
+ private ExtendedFormatRecord _format = null;
+ private short _index = 0;
+ private Workbook _workbook = null;
/** Creates new HSSFCellStyle why would you want to do this?? */
@@ -52,9 +48,9 @@ public class HSSFCellStyle implements CellStyle
}
protected HSSFCellStyle(short index, ExtendedFormatRecord rec, Workbook workbook)
{
- this.workbook = workbook;
- this.index = index;
- format = rec;
+ _workbook = workbook;
+ _index = index;
+ _format = rec;
}
/**
@@ -62,25 +58,24 @@ public class HSSFCellStyle implements CellStyle
* @return unique index number of the underlying record this style represents (probably you don't care
* unless you're comparing which one is which)
*/
-
public short getIndex()
{
- return index;
+ return _index;
}
-
+
/**
* Return the parent style for this cell style.
* In most cases this will be null, but in a few
* cases there'll be a fully defined parent.
*/
public HSSFCellStyle getParentStyle() {
- if(format.getParentIndex() == 0) {
+ if(_format.getParentIndex() == 0) {
return null;
}
return new HSSFCellStyle(
- format.getParentIndex(),
- workbook.getExFormatAt(format.getParentIndex()),
- workbook
+ _format.getParentIndex(),
+ _workbook.getExFormatAt(_format.getParentIndex()),
+ _workbook
);
}
@@ -88,10 +83,9 @@ public class HSSFCellStyle implements CellStyle
* set the data format (must be a valid format)
* @see org.apache.poi.hssf.usermodel.HSSFDataFormat
*/
-
public void setDataFormat(short fmt)
{
- format.setFormatIndex(fmt);
+ _format.setFormatIndex(fmt);
}
/**
@@ -101,9 +95,9 @@ public class HSSFCellStyle implements CellStyle
public short getDataFormat()
{
- return format.getFormatIndex();
+ return _format.getFormatIndex();
}
-
+
/**
* Get the contents of the format string, by looking up
* the DataFormat against the bound workbook
@@ -111,7 +105,7 @@ public class HSSFCellStyle implements CellStyle
* @return the format string or "General" if not found
*/
public String getDataFormatString() {
- return getDataFormatString(workbook);
+ return getDataFormatString(_workbook);
}
/**
* Get the contents of the format string, by looking up
@@ -122,7 +116,7 @@ public class HSSFCellStyle implements CellStyle
*/
public String getDataFormatString(org.apache.poi.ss.usermodel.Workbook workbook) {
HSSFDataFormat format = new HSSFDataFormat( ((HSSFWorkbook)workbook).getWorkbook() );
-
+
int idx = getDataFormat();
return idx == -1 ? "General" : format.getFormat(getDataFormat());
}
@@ -133,7 +127,7 @@ public class HSSFCellStyle implements CellStyle
*/
public String getDataFormatString(org.apache.poi.hssf.model.Workbook workbook) {
HSSFDataFormat format = new HSSFDataFormat( workbook );
-
+
return format.getFormat(getDataFormat());
}
@@ -147,9 +141,9 @@ public class HSSFCellStyle implements CellStyle
setFont((HSSFFont)font);
}
public void setFont(HSSFFont font) {
- format.setIndentNotParentFont(true);
+ _format.setIndentNotParentFont(true);
short fontindex = font.getIndex();
- format.setFontIndex(fontindex);
+ _format.setFontIndex(fontindex);
}
/**
@@ -158,9 +152,9 @@ public class HSSFCellStyle implements CellStyle
*/
public short getFontIndex()
{
- return format.getFontIndex();
+ return _format.getFontIndex();
}
-
+
/**
* gets the font for this style
* @param parentWorkbook The HSSFWorkbook that this style belongs to
@@ -175,42 +169,38 @@ public class HSSFCellStyle implements CellStyle
* set the cell's using this style to be hidden
* @param hidden - whether the cell using this style should be hidden
*/
-
public void setHidden(boolean hidden)
{
- format.setIndentNotParentCellOptions(true);
- format.setHidden(hidden);
+ _format.setIndentNotParentCellOptions(true);
+ _format.setHidden(hidden);
}
/**
* get whether the cell's using this style are to be hidden
* @return hidden - whether the cell using this style should be hidden
*/
-
public boolean getHidden()
{
- return format.isHidden();
+ return _format.isHidden();
}
/**
* set the cell's using this style to be locked
* @param locked - whether the cell using this style should be locked
*/
-
public void setLocked(boolean locked)
{
- format.setIndentNotParentCellOptions(true);
- format.setLocked(locked);
+ _format.setIndentNotParentCellOptions(true);
+ _format.setLocked(locked);
}
/**
* get whether the cell's using this style are to be locked
* @return hidden - whether the cell using this style should be locked
*/
-
public boolean getLocked()
{
- return format.isLocked();
+ return _format.isLocked();
}
/**
@@ -224,11 +214,10 @@ public class HSSFCellStyle implements CellStyle
* @see #ALIGN_JUSTIFY
* @see #ALIGN_CENTER_SELECTION
*/
-
public void setAlignment(short align)
{
- format.setIndentNotParentAlignment(true);
- format.setAlignment(align);
+ _format.setIndentNotParentAlignment(true);
+ _format.setAlignment(align);
}
/**
@@ -242,31 +231,28 @@ public class HSSFCellStyle implements CellStyle
* @see #ALIGN_JUSTIFY
* @see #ALIGN_CENTER_SELECTION
*/
-
public short getAlignment()
{
- return format.getAlignment();
+ return _format.getAlignment();
}
/**
* set whether the text should be wrapped
* @param wrapped wrap text or not
*/
-
public void setWrapText(boolean wrapped)
{
- format.setIndentNotParentAlignment(true);
- format.setWrapText(wrapped);
+ _format.setIndentNotParentAlignment(true);
+ _format.setWrapText(wrapped);
}
/**
* get whether the text should be wrapped
* @return wrap text or not
*/
-
public boolean getWrapText()
{
- return format.getWrapText();
+ return _format.getWrapText();
}
/**
@@ -277,10 +263,9 @@ public class HSSFCellStyle implements CellStyle
* @see #VERTICAL_BOTTOM
* @see #VERTICAL_JUSTIFY
*/
-
public void setVerticalAlignment(short align)
{
- format.setVerticalAlignment(align);
+ _format.setVerticalAlignment(align);
}
/**
@@ -291,17 +276,15 @@ public class HSSFCellStyle implements CellStyle
* @see #VERTICAL_BOTTOM
* @see #VERTICAL_JUSTIFY
*/
-
public short getVerticalAlignment()
{
- return format.getVerticalAlignment();
+ return _format.getVerticalAlignment();
}
/**
* set the degree of rotation for the text in the cell
* @param rotation degrees (between -90 and 90 degrees)
*/
-
public void setRotation(short rotation)
{
if ((rotation < 0)&&(rotation >= -90)) {
@@ -312,17 +295,16 @@ public class HSSFCellStyle implements CellStyle
else if ((rotation < -90) ||(rotation > 90))
//Do not allow an incorrect rotation to be set
throw new IllegalArgumentException("The rotation must be between -90 and 90 degrees");
- format.setRotation(rotation);
+ _format.setRotation(rotation);
}
/**
* get the degree of rotation for the text in the cell
* @return rotation degrees (between -90 and 90 degrees)
*/
-
public short getRotation()
{
- short rotation = format.getRotation();
+ short rotation = _format.getRotation();
if (rotation > 90)
//This is actually the 4th quadrant
rotation = (short)(90-rotation);
@@ -333,20 +315,18 @@ public class HSSFCellStyle implements CellStyle
* set the number of spaces to indent the text in the cell
* @param indent - number of spaces
*/
-
public void setIndention(short indent)
{
- format.setIndent(indent);
+ _format.setIndent(indent);
}
/**
* get the number of spaces to indent the text in the cell
* @return indent - number of spaces
*/
-
public short getIndention()
{
- return format.getIndent();
+ return _format.getIndent();
}
/**
@@ -367,11 +347,10 @@ public class HSSFCellStyle implements CellStyle
* @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_DOT
*/
-
public void setBorderLeft(short border)
{
- format.setIndentNotParentBorder(true);
- format.setBorderLeft(border);
+ _format.setIndentNotParentBorder(true);
+ _format.setBorderLeft(border);
}
/**
@@ -392,10 +371,9 @@ public class HSSFCellStyle implements CellStyle
* @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_DOT
*/
-
public short getBorderLeft()
{
- return format.getBorderLeft();
+ return _format.getBorderLeft();
}
/**
@@ -416,11 +394,10 @@ public class HSSFCellStyle implements CellStyle
* @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_DOT
*/
-
public void setBorderRight(short border)
{
- format.setIndentNotParentBorder(true);
- format.setBorderRight(border);
+ _format.setIndentNotParentBorder(true);
+ _format.setBorderRight(border);
}
/**
@@ -441,10 +418,9 @@ public class HSSFCellStyle implements CellStyle
* @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_DOT
*/
-
public short getBorderRight()
{
- return format.getBorderRight();
+ return _format.getBorderRight();
}
/**
@@ -465,11 +441,10 @@ public class HSSFCellStyle implements CellStyle
* @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_DOT
*/
-
public void setBorderTop(short border)
{
- format.setIndentNotParentBorder(true);
- format.setBorderTop(border);
+ _format.setIndentNotParentBorder(true);
+ _format.setBorderTop(border);
}
/**
@@ -490,10 +465,9 @@ public class HSSFCellStyle implements CellStyle
* @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_DOT
*/
-
public short getBorderTop()
{
- return format.getBorderTop();
+ return _format.getBorderTop();
}
/**
@@ -514,11 +488,10 @@ public class HSSFCellStyle implements CellStyle
* @see #BORDER_MEDIUM_DASH_DOT_DOT
* @see #BORDER_SLANTED_DASH_DOT
*/
-
public void setBorderBottom(short border)
{
- format.setIndentNotParentBorder(true);
- format.setBorderBottom(border);
+ _format.setIndentNotParentBorder(true);
+ _format.setBorderBottom(border);
}
/**
@@ -541,7 +514,7 @@ public class HSSFCellStyle implements CellStyle
*/
public short getBorderBottom()
{
- return format.getBorderBottom();
+ return _format.getBorderBottom();
}
/**
@@ -550,7 +523,7 @@ public class HSSFCellStyle implements CellStyle
*/
public void setLeftBorderColor(short color)
{
- format.setLeftBorderPaletteIdx(color);
+ _format.setLeftBorderPaletteIdx(color);
}
/**
@@ -560,7 +533,7 @@ public class HSSFCellStyle implements CellStyle
*/
public short getLeftBorderColor()
{
- return format.getLeftBorderPaletteIdx();
+ return _format.getLeftBorderPaletteIdx();
}
/**
@@ -569,7 +542,7 @@ public class HSSFCellStyle implements CellStyle
*/
public void setRightBorderColor(short color)
{
- format.setRightBorderPaletteIdx(color);
+ _format.setRightBorderPaletteIdx(color);
}
/**
@@ -579,7 +552,7 @@ public class HSSFCellStyle implements CellStyle
*/
public short getRightBorderColor()
{
- return format.getRightBorderPaletteIdx();
+ return _format.getRightBorderPaletteIdx();
}
/**
@@ -588,7 +561,7 @@ public class HSSFCellStyle implements CellStyle
*/
public void setTopBorderColor(short color)
{
- format.setTopBorderPaletteIdx(color);
+ _format.setTopBorderPaletteIdx(color);
}
/**
@@ -598,7 +571,7 @@ public class HSSFCellStyle implements CellStyle
*/
public short getTopBorderColor()
{
- return format.getTopBorderPaletteIdx();
+ return _format.getTopBorderPaletteIdx();
}
/**
@@ -607,7 +580,7 @@ public class HSSFCellStyle implements CellStyle
*/
public void setBottomBorderColor(short color)
{
- format.setBottomBorderPaletteIdx(color);
+ _format.setBottomBorderPaletteIdx(color);
}
/**
@@ -617,7 +590,7 @@ public class HSSFCellStyle implements CellStyle
*/
public short getBottomBorderColor()
{
- return format.getBottomBorderPaletteIdx();
+ return _format.getBottomBorderPaletteIdx();
}
/**
@@ -646,19 +619,18 @@ public class HSSFCellStyle implements CellStyle
*/
public void setFillPattern(short fp)
{
- format.setAdtlFillPattern(fp);
+ _format.setAdtlFillPattern(fp);
}
/**
* get the fill pattern (??) - set to 1 to fill with foreground color
* @return fill pattern
*/
-
public short getFillPattern()
{
- return format.getAdtlFillPattern();
+ return _format.getAdtlFillPattern();
}
-
+
/**
* Checks if the background and foreground fills are set correctly when one
* or the other is set to the default color.
@@ -667,18 +639,18 @@ public class HSSFCellStyle implements CellStyle
* NONE AUTOMATIC
*0x41 0x40
*NONE RED/ANYTHING
- *0x40 0xSOMETHING
+ *0x40 0xSOMETHING
*/ private void checkDefaultBackgroundFills() { - if (format.getFillForeground() == org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index) { + if (_format.getFillForeground() == org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index) { //JMH: Why +1, hell why not. I guess it made some sense to someone at the time. Doesnt //to me now.... But experience has shown that when the fore is set to AUTOMATIC then the //background needs to be incremented...... - if (format.getFillBackground() != (org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index+1)) + if (_format.getFillBackground() != (org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index+1)) setFillBackgroundColor((short)(org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index+1)); - } else if (format.getFillBackground() == org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index+1) + } else if (_format.getFillBackground() == org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index+1) //Now if the forground changes to a non-AUTOMATIC color the background resets itself!!! - if (format.getFillForeground() != org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index) + if (_format.getFillForeground() != org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index) setFillBackgroundColor(org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index); } @@ -688,14 +660,14 @@ public class HSSFCellStyle implements CellStyle * For example: *
* cs.setFillPattern(HSSFCellStyle.FINE_DOTS );
- * cs.setFillBackgroundColor(new HSSFColor.RED().getIndex());
+ * cs.setFillBackgroundColor(new HSSFColor.RED().getIndex());
*
* optionally a Foreground and background fill can be applied:
* Note: Ensure Foreground color is set prior to background
*
* cs.setFillPattern(HSSFCellStyle.FINE_DOTS );
* cs.setFillForegroundColor(new HSSFColor.BLUE().getIndex());
- * cs.setFillBackgroundColor(new HSSFColor.RED().getIndex());
+ * cs.setFillBackgroundColor(new HSSFColor.RED().getIndex());
*
* or, for the special case of SOLID_FILL:
*
@@ -707,10 +679,9 @@ public class HSSFCellStyle implements CellStyle
*
* @param bg color
*/
-
public void setFillBackgroundColor(short bg)
- {
- format.setFillBackground(bg);
+ {
+ _format.setFillBackground(bg);
checkDefaultBackgroundFills();
}
@@ -723,12 +694,13 @@ public class HSSFCellStyle implements CellStyle
*/
public short getFillBackgroundColor()
{
- short result = format.getFillBackground();
+ short result = _format.getFillBackground();
//JMH: Do this ridiculous conversion, and let HSSFCellStyle
//internally migrate back and forth
- if (result == (HSSFColor.AUTOMATIC.index+1))
- return HSSFColor.AUTOMATIC.index;
- else return result;
+ if (result == (HSSFColor.AUTOMATIC.index+1)) {
+ return HSSFColor.AUTOMATIC.index;
+ }
+ return result;
}
/**
@@ -738,29 +710,29 @@ public class HSSFCellStyle implements CellStyle
*/
public void setFillForegroundColor(short bg)
{
- format.setFillForeground(bg);
+ _format.setFillForeground(bg);
checkDefaultBackgroundFills();
}
/**
* Get the foreground fill color.
- * Many cells are filled with this, instead of a
+ * Many cells are filled with this, instead of a
* background color ({@link #getFillBackgroundColor()})
* @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
* @return fill color
*/
public short getFillForegroundColor()
{
- return format.getFillForeground();
+ return _format.getFillForeground();
}
-
+
/**
* Gets the name of the user defined style.
* Returns null for built in styles, and
* styles where no name has been defined
*/
public String getUserStyleName() {
- StyleRecord sr = workbook.getStyleRecord(index);
+ StyleRecord sr = _workbook.getStyleRecord(_index);
if(sr == null) {
return null;
}
@@ -769,15 +741,15 @@ public class HSSFCellStyle implements CellStyle
}
return sr.getName();
}
-
+
/**
* Sets the name of the user defined style.
* Will complain if you try this on a built in style.
*/
public void setUserStyleName(String styleName) {
- StyleRecord sr = workbook.getStyleRecord(index);
+ StyleRecord sr = _workbook.getStyleRecord(_index);
if(sr == null) {
- sr = workbook.createStyleRecord(index);
+ sr = _workbook.createStyleRecord(_index);
}
if(sr.isBuiltin()) {
throw new IllegalArgumentException("Unable to set user specified style names for built in styles!");
@@ -794,19 +766,19 @@ public class HSSFCellStyle implements CellStyle
* @throws IllegalArgumentException if there's a workbook mis-match
*/
public void verifyBelongsToWorkbook(HSSFWorkbook wb) {
- if(wb.getWorkbook() != workbook) {
+ if(wb.getWorkbook() != _workbook) {
throw new IllegalArgumentException("This Style does not belong to the supplied Workbook. Are you trying to assign a style from one workbook to the cell of a differnt workbook?");
}
}
-
+
/**
* Clones all the style information from another
- * HSSFCellStyle, onto this one. This
+ * HSSFCellStyle, onto this one. This
* HSSFCellStyle will then have all the same
* properties as the source, but the two may
* be edited independently.
- * Any stylings on this HSSFCellStyle will be lost!
- *
+ * Any stylings on this HSSFCellStyle will be lost!
+ *
* The source HSSFCellStyle could be from another
* HSSFWorkbook if you like. This allows you to
* copy styles from one HSSFWorkbook to another.
@@ -821,37 +793,37 @@ public class HSSFCellStyle implements CellStyle
public void cloneStyleFrom(HSSFCellStyle source) {
// First we need to clone the extended format
// record
- format.cloneStyleFrom(source.format);
-
+ _format.cloneStyleFrom(source._format);
+
// Handle matching things if we cross workbooks
- if(workbook != source.workbook) {
+ if(_workbook != source._workbook) {
// Then we need to clone the format string,
// and update the format record for this
- short fmt = (short)workbook.createFormat(source.getDataFormatString() );
+ short fmt = (short)_workbook.createFormat(source.getDataFormatString() );
setDataFormat(fmt);
-
+
// Finally we need to clone the font,
// and update the format record for this
- FontRecord fr = workbook.createNewFont();
+ FontRecord fr = _workbook.createNewFont();
fr.cloneStyleFrom(
- source.workbook.getFontRecordAt(
+ source._workbook.getFontRecordAt(
source.getFontIndex()
)
);
-
+
HSSFFont font = new HSSFFont(
- (short)workbook.getFontIndex(fr), fr
+ (short)_workbook.getFontIndex(fr), fr
);
setFont(font);
- }
+ }
}
-
+
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((format == null) ? 0 : format.hashCode());
- result = prime * result + index;
+ result = prime * result + ((_format == null) ? 0 : _format.hashCode());
+ result = prime * result + _index;
return result;
}
@@ -860,12 +832,12 @@ public class HSSFCellStyle implements CellStyle
if (obj == null) return false;
if (obj instanceof HSSFCellStyle) {
final HSSFCellStyle other = (HSSFCellStyle) obj;
- if (format == null) {
- if (other.format != null)
+ if (_format == null) {
+ if (other._format != null)
return false;
- } else if (!format.equals(other.format))
+ } else if (!_format.equals(other._format))
return false;
- if (index != other.index)
+ if (_index != other._index)
return false;
return true;
}
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java b/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
index 605b5ac3d0..cffb00cd55 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
@@ -26,9 +26,7 @@ import org.apache.poi.ss.usermodel.ClientAnchor;
*
* @author Glen Stampoultzis (glens at apache.org)
*/
-public class HSSFClientAnchor
- extends HSSFAnchor implements ClientAnchor
-{
+public final class HSSFClientAnchor extends HSSFAnchor implements ClientAnchor {
short col1;
int row1;
short col2;
@@ -108,10 +106,10 @@ public class HSSFClientAnchor
private float getRowHeightInPoints(HSSFSheet sheet, int rowNum)
{
HSSFRow row = sheet.getRow(rowNum);
- if (row == null)
+ if (row == null) {
return sheet.getDefaultRowHeightInPoints();
- else
- return row.getHeightInPoints();
+ }
+ return row.getHeightInPoints();
}
public short getCol1()
@@ -204,10 +202,10 @@ public class HSSFClientAnchor
*/
public boolean isHorizontallyFlipped()
{
- if (col1 == col2)
+ if (col1 == col2) {
return dx1 > dx2;
- else
- return col1 > col2;
+ }
+ return col1 > col2;
}
/**
@@ -215,10 +213,10 @@ public class HSSFClientAnchor
*/
public boolean isVerticallyFlipped()
{
- if (row1 == row2)
+ if (row1 == row2) {
return dy1 > dy2;
- else
- return row1 > row2;
+ }
+ return row1 > row2;
}
/**
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java b/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
index d3f37e25c7..afcfc00ee8 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
@@ -23,6 +23,7 @@ import java.util.Iterator;
import org.apache.poi.hssf.record.EmbeddedObjectRefSubRecord;
import org.apache.poi.hssf.record.ObjRecord;
+import org.apache.poi.hssf.record.SubRecord;
import org.apache.poi.poifs.filesystem.DirectoryEntry;
import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
@@ -33,17 +34,16 @@ import org.apache.poi.util.HexDump;
*
* @author Daniel Noll
*/
-public final class HSSFObjectData
-{
+public final class HSSFObjectData {
/**
* Underlying object record ultimately containing a reference to the object.
*/
- private ObjRecord record;
+ private final ObjRecord _record;
/**
* Reference to the filesystem, required for retrieving the object data.
*/
- private POIFSFileSystem poifs;
+ private final POIFSFileSystem _poifs;
/**
* Constructs object data by wrapping a lower level object record.
@@ -53,10 +53,10 @@ public final class HSSFObjectData
*/
public HSSFObjectData(ObjRecord record, POIFSFileSystem poifs)
{
- this.record = record;
- this.poifs = poifs;
+ _record = record;
+ _poifs = poifs;
}
-
+
/**
* Returns the OLE2 Class Name of the object
*/
@@ -77,14 +77,13 @@ public final class HSSFObjectData
int streamId = subRecord.getStreamId().intValue();
String streamName = "MBD" + HexDump.toHex(streamId);
- Entry entry = poifs.getRoot().getEntry(streamName);
+ Entry entry = _poifs.getRoot().getEntry(streamName);
if (entry instanceof DirectoryEntry) {
return (DirectoryEntry) entry;
- } else {
- throw new IOException("Stream " + streamName + " was not an OLE2 directory");
}
+ throw new IOException("Stream " + streamName + " was not an OLE2 directory");
}
-
+
/**
* Returns the data portion, for an ObjectData
* that doesn't have an associated POIFS Directory
@@ -93,34 +92,34 @@ public final class HSSFObjectData
public byte[] getObjectData() {
return findObjectRecord().getObjectData();
}
-
+
/**
- * Does this ObjectData have an associated POIFS
+ * Does this ObjectData have an associated POIFS
* Directory Entry?
* (Not all do, those that don't have a data portion)
*/
public boolean hasDirectoryEntry() {
EmbeddedObjectRefSubRecord subRecord = findObjectRecord();
-
+
// 'stream id' field tells you
Integer streamId = subRecord.getStreamId();
return streamId != null && streamId.intValue() != 0;
}
-
+
/**
- * Finds the EmbeddedObjectRefSubRecord, or throws an
+ * Finds the EmbeddedObjectRefSubRecord, or throws an
* Exception if there wasn't one
*/
protected EmbeddedObjectRefSubRecord findObjectRecord() {
- Iterator subRecordIter = record.getSubRecords().iterator();
-
+ Iterator subRecordIter = _record.getSubRecords().iterator();
+
while (subRecordIter.hasNext()) {
Object subRecord = subRecordIter.next();
if (subRecord instanceof EmbeddedObjectRefSubRecord) {
return (EmbeddedObjectRefSubRecord)subRecord;
}
}
-
+
throw new IllegalStateException("Object data does not contain a reference to an embedded object OLE2 directory");
}
}
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java b/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
index d22030ac77..dee0a455a5 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
@@ -31,60 +31,59 @@ import org.apache.poi.ss.usermodel.RichTextString;
* @author Glen Stampoultzis (glens at apache.org)
* @author Jason Height (jheight at apache.org)
*/
-public class HSSFRichTextString
- implements Comparable, RichTextString
-{
+public final class HSSFRichTextString implements Comparable, RichTextString {
/** Place holder for indicating that NO_FONT has been applied here */
public static final short NO_FONT = 0;
- private UnicodeString string;
- private Workbook book;
- private LabelSSTRecord record;
+ private UnicodeString _string;
+ private Workbook _book;
+ private LabelSSTRecord _record;
public HSSFRichTextString()
{
this("");
}
- public HSSFRichTextString( String string )
- {
- if (string == null)
- string = "";
- this.string = new UnicodeString(string);
+ public HSSFRichTextString(String string) {
+ if (string == null) {
+ _string = new UnicodeString("");
+ } else {
+ _string = new UnicodeString(string);
+ }
}
HSSFRichTextString(Workbook book, LabelSSTRecord record) {
setWorkbookReferences(book, record);
-
- this.string = book.getSSTString(record.getSSTIndex());
+
+ _string = book.getSSTString(record.getSSTIndex());
}
-
+
/** This must be called to setup the internal work book references whenever
* a RichTextString is added to a cell
- */
+ */
void setWorkbookReferences(Workbook book, LabelSSTRecord record) {
- this.book = book;
- this.record = record;
+ _book = book;
+ _record = record;
}
-
+
/** Called whenever the unicode string is modified. When it is modified
* we need to create a new SST index, so that other LabelSSTRecords will not
* be affected by changes that we make to this string.
*/
private UnicodeString cloneStringIfRequired() {
- if (book == null)
- return string;
- UnicodeString s = (UnicodeString)string.clone();
+ if (_book == null)
+ return _string;
+ UnicodeString s = (UnicodeString)_string.clone();
return s;
}
private void addToSSTIfRequired() {
- if (book != null) {
- int index = book.addSSTString(string);
- record.setSSTIndex(index);
+ if (_book != null) {
+ int index = _book.addSSTString(_string);
+ _record.setSSTIndex(index);
//The act of adding the string to the SST record may have meant that
- //a extsing string was returned for the index, so update our local version
- string = book.getSSTString(index);
+ //an existing string was returned for the index, so update our local version
+ _string = _book.getSSTString(index);
}
}
@@ -113,8 +112,8 @@ public class HSSFRichTextString
}
//Need to clear the current formatting between the startIndex and endIndex
- string = cloneStringIfRequired();
- Iterator formatting = string.formatIterator();
+ _string = cloneStringIfRequired();
+ Iterator formatting = _string.formatIterator();
if (formatting != null) {
while (formatting.hasNext()) {
UnicodeString.FormatRun r = (UnicodeString.FormatRun)formatting.next();
@@ -124,10 +123,10 @@ public class HSSFRichTextString
}
- string.addFormatRun(new UnicodeString.FormatRun((short)startIndex, fontIndex));
+ _string.addFormatRun(new UnicodeString.FormatRun((short)startIndex, fontIndex));
if (endIndex != length())
- string.addFormatRun(new UnicodeString.FormatRun((short)endIndex, currentFont));
-
+ _string.addFormatRun(new UnicodeString.FormatRun((short)endIndex, currentFont));
+
addToSSTIfRequired();
}
@@ -149,15 +148,15 @@ public class HSSFRichTextString
*/
public void applyFont(Font font)
{
- applyFont(0, string.getCharCount(), font);
+ applyFont(0, _string.getCharCount(), font);
}
/**
* Removes any formatting that may have been applied to the string.
*/
public void clearFormatting() {
- string = cloneStringIfRequired();
- string.clearFormatting();
+ _string = cloneStringIfRequired();
+ _string.clearFormatting();
addToSSTIfRequired();
}
@@ -166,40 +165,40 @@ public class HSSFRichTextString
*/
public String getString()
{
- return string.getString();
+ return _string.getString();
}
- /**
- * Used internally by the HSSFCell to get the internal
+ /**
+ * Used internally by the HSSFCell to get the internal
* string value.
* Will ensure the string is not shared
*/
UnicodeString getUnicodeString() {
return cloneStringIfRequired();
}
-
+
/**
- * Returns the raw, probably shared Unicode String.
- * Used when tweaking the styles, eg updating font
+ * Returns the raw, probably shared Unicode String.
+ * Used when tweaking the styles, eg updating font
* positions.
* Changes to this string may well effect
- * other RichTextStrings too!
+ * other RichTextStrings too!
*/
UnicodeString getRawUnicodeString() {
- return string;
+ return _string;
}
/** Used internally by the HSSFCell to set the internal string value*/
void setUnicodeString(UnicodeString str) {
- this.string = str;
+ this._string = str;
}
-
+
/**
* @return the number of characters in the text.
*/
public int length() {
- return string.getCharCount();
+ return _string.getCharCount();
}
/**
@@ -212,17 +211,19 @@ public class HSSFRichTextString
*/
public short getFontAtIndex( int index )
{
- int size = string.getFormatRunCount();
+ int size = _string.getFormatRunCount();
UnicodeString.FormatRun currentRun = null;
for (int i=0;i index)
- break;
- else currentRun = r;
+ UnicodeString.FormatRun r = _string.getFormatRun(i);
+ if (r.getCharacterPos() > index) {
+ break;
+ }
+ currentRun = r;
}
- if (currentRun == null)
- return NO_FONT;
- else return currentRun.getFontIndex();
+ if (currentRun == null) {
+ return NO_FONT;
+ }
+ return currentRun.getFontIndex();
}
/**
@@ -233,7 +234,7 @@ public class HSSFRichTextString
*/
public int numFormattingRuns()
{
- return string.getFormatRunCount();
+ return _string.getFormatRunCount();
}
/**
@@ -243,7 +244,7 @@ public class HSSFRichTextString
*/
public int getIndexOfFormattingRun(int index)
{
- UnicodeString.FormatRun r = string.getFormatRun(index);
+ UnicodeString.FormatRun r = _string.getFormatRun(index);
return r.getCharacterPos();
}
@@ -255,25 +256,23 @@ public class HSSFRichTextString
*/
public short getFontOfFormattingRun(int index)
{
- UnicodeString.FormatRun r = string.getFormatRun(index);
+ UnicodeString.FormatRun r = _string.getFormatRun(index);
return r.getFontIndex();
}
/**
* Compares one rich text string to another.
*/
- public int compareTo( Object o )
- {
- HSSFRichTextString r = (HSSFRichTextString)o;
- return string.compareTo(r.string);
+ public int compareTo(HSSFRichTextString r) {
+ return _string.compareTo(r._string);
}
public boolean equals(Object o) {
if (o instanceof HSSFRichTextString) {
- return string.equals(((HSSFRichTextString)o).string);
+ return _string.equals(((HSSFRichTextString)o)._string);
}
return false;
-
+
}
/**
@@ -281,7 +280,7 @@ public class HSSFRichTextString
*/
public String toString()
{
- return string.toString();
+ return _string.toString();
}
/**
@@ -291,6 +290,6 @@ public class HSSFRichTextString
*/
public void applyFont( short fontIndex )
{
- applyFont(0, string.getCharCount(), fontIndex);
+ applyFont(0, _string.getCharCount(), fontIndex);
}
}
diff --git a/src/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java b/src/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java
index 41efa6d079..ef34ae4302 100644
--- a/src/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java
+++ b/src/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java
@@ -17,107 +17,110 @@
package org.apache.poi.hssf.usermodel;
-import java.util.*;
-import java.awt.*;
-import java.io.*;
+import java.awt.Font;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
/**
* Allows the user to lookup the font metrics for a particular font without
- * actually having the font on the system. The font details are loaded
- * as a resource from the POI jar file (or classpath) and should be contained
- * in path "/font_metrics.properties". The font widths are for a 10 point
- * version of the font. Use a multiplier for other sizes.
+ * actually having the font on the system. The font details are loaded as a
+ * resource from the POI jar file (or classpath) and should be contained in path
+ * "/font_metrics.properties". The font widths are for a 10 point version of the
+ * font. Use a multiplier for other sizes.
*
* @author Glen Stampoultzis (glens at apache.org)
*/
-class StaticFontMetrics
-{
+final class StaticFontMetrics {
/** The font metrics property file we're using */
- private static Properties fontMetricsProps;
+ private static Properties fontMetricsProps;
/** Our cache of font details we've already looked up */
- private static Map fontDetailsMap = new HashMap();
+ private static Map fontDetailsMap = new HashMap();
- /**
- * Retrieves the fake font details for a given font.
- * @param font the font to lookup.
- * @return the fake font.
- */
- public static FontDetails getFontDetails(Font font)
- {
+ /**
+ * Retrieves the fake font details for a given font.
+ *
+ * @param font
+ * the font to lookup.
+ * @return the fake font.
+ */
+ public static FontDetails getFontDetails(Font font) {
// If we haven't already identified out font metrics file,
- // figure out which one to use and load it
- if (fontMetricsProps == null)
- {
- InputStream metricsIn = null;
- try
- {
- fontMetricsProps = new Properties();
+ // figure out which one to use and load it
+ if (fontMetricsProps == null) {
+ InputStream metricsIn = null;
+ try {
+ fontMetricsProps = new Properties();
- // Check to see if the font metric file was specified
- // as a system property
- String propFileName = null;
- try {
- propFileName = System.getProperty("font.metrics.filename");
- } catch(SecurityException e) {}
+ // Check to see if the font metric file was specified
+ // as a system property
+ String propFileName = null;
+ try {
+ propFileName = System.getProperty("font.metrics.filename");
+ } catch (SecurityException e) {
+ }
- if (propFileName != null) {
- File file = new File(propFileName);
- if (!file.exists())
- throw new FileNotFoundException("font_metrics.properties not found at path " + file.getAbsolutePath());
- metricsIn = new FileInputStream(file);
- }
- else {
- // Use the built-in font metrics file off the classpath
- metricsIn = FontDetails.class.getResourceAsStream("/font_metrics.properties");
- if (metricsIn == null)
- throw new FileNotFoundException("font_metrics.properties not found in classpath");
- }
- fontMetricsProps.load(metricsIn);
- }
- catch ( IOException e )
- {
- throw new RuntimeException("Could not load font metrics: " + e.getMessage());
- }
- finally
- {
- if (metricsIn != null)
- {
- try
- {
- metricsIn.close();
- }
- catch ( IOException ignore ) { }
- }
- }
- }
+ if (propFileName != null) {
+ File file = new File(propFileName);
+ if (!file.exists())
+ throw new FileNotFoundException(
+ "font_metrics.properties not found at path "
+ + file.getAbsolutePath());
+ metricsIn = new FileInputStream(file);
+ } else {
+ // Use the built-in font metrics file off the classpath
+ metricsIn = FontDetails.class.getResourceAsStream("/font_metrics.properties");
+ if (metricsIn == null)
+ throw new FileNotFoundException(
+ "font_metrics.properties not found in classpath");
+ }
+ fontMetricsProps.load(metricsIn);
+ } catch (IOException e) {
+ throw new RuntimeException("Could not load font metrics: " + e.getMessage());
+ } finally {
+ if (metricsIn != null) {
+ try {
+ metricsIn.close();
+ } catch (IOException ignore) {
+ }
+ }
+ }
+ }
// Grab the base name of the font they've asked about
- String fontName = font.getName();
+ String fontName = font.getName();
// Some fonts support plain/bold/italic/bolditalic variants
// Others have different font instances for bold etc
// (eg font.dialog.plain.* vs font.Californian FB Bold.*)
String fontStyle = "";
- if(font.isPlain()) fontStyle += "plain";
- if(font.isBold()) fontStyle += "bold";
- if(font.isItalic()) fontStyle += "italic";
+ if (font.isPlain())
+ fontStyle += "plain";
+ if (font.isBold())
+ fontStyle += "bold";
+ if (font.isItalic())
+ fontStyle += "italic";
// Do we have a definition for this font with just the name?
// If not, check with the font style added
- if(fontMetricsProps.get(FontDetails.buildFontHeightProperty(fontName)) == null &&
- fontMetricsProps.get(FontDetails.buildFontHeightProperty(fontName+"."+fontStyle)) != null) {
+ if (fontMetricsProps.get(FontDetails.buildFontHeightProperty(fontName)) == null
+ && fontMetricsProps.get(FontDetails.buildFontHeightProperty(fontName + "."
+ + fontStyle)) != null) {
// Need to add on the style to the font name
fontName += "." + fontStyle;
}
// Get the details on this font
- if (fontDetailsMap.get(fontName) == null) {
- FontDetails fontDetails = FontDetails.create(fontName, fontMetricsProps);
- fontDetailsMap.put( fontName, fontDetails );
- return fontDetails;
- } else {
- return (FontDetails) fontDetailsMap.get(fontName);
- }
-
- }
+ if (fontDetailsMap.get(fontName) == null) {
+ FontDetails fontDetails = FontDetails.create(fontName, fontMetricsProps);
+ fontDetailsMap.put(fontName, fontDetails);
+ return fontDetails;
+ }
+ return fontDetailsMap.get(fontName);
+ }
}
diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java b/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
index fc89d74c9a..9c52a67b16 100644
--- a/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
+++ b/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
+
package org.apache.poi.poifs.filesystem;
@@ -64,7 +64,7 @@ public class POIFSFileSystem
{
private static final POILogger _logger =
POILogFactory.getLogger(POIFSFileSystem.class);
-
+
private static final class CloseIgnoringInputStream extends InputStream {
private final InputStream _is;
@@ -81,18 +81,18 @@ public class POIFSFileSystem
// do nothing
}
}
-
+
/**
* Convenience method for clients that want to avoid the auto-close behaviour of the constructor.
*/
public static InputStream createNonClosingInputStream(InputStream is) {
return new CloseIgnoringInputStream(is);
}
-
+
private PropertyTable _property_table;
private List _documents;
private DirectoryNode _root;
-
+
/**
* What big block size the file uses. Most files
* use 512 bytes, but a few use 4096
@@ -112,20 +112,20 @@ public class POIFSFileSystem
/**
* Create a POIFSFileSystem from an InputStream. Normally the stream is read until
* EOF. The stream is always closed.
- *
- * Some streams are usable after reaching EOF (typically those that return true
- * for markSupported()). In the unlikely case that the caller has such a stream
+ *
+ * Some streams are usable after reaching EOF (typically those that return true
+ * for markSupported()). In the unlikely case that the caller has such a stream
* and needs to use it after this constructor completes, a work around is to wrap the
* stream in order to trap the close() call. A convenience method (
* createNonClosingInputStream()) has been provided for this purpose:
*
* InputStream wrappedStream = POIFSFileSystem.createNonClosingInputStream(is);
* HSSFWorkbook wb = new HSSFWorkbook(wrappedStream);
- * is.reset();
- * doSomethingElse(is);
+ * is.reset();
+ * doSomethingElse(is);
*
* Note also the special case of ByteArrayInputStream for which the close()
- * method does nothing.
+ * method does nothing.
*
* ByteArrayInputStream bais = ...
* HSSFWorkbook wb = new HSSFWorkbook(bais); // calls bais.close() !
@@ -150,14 +150,14 @@ public class POIFSFileSystem
// read the header block from the stream
header_block_reader = new HeaderBlockReader(stream);
bigBlockSize = header_block_reader.getBigBlockSize();
-
+
// read the rest of the stream into blocks
data_blocks = new RawDataBlockList(stream, bigBlockSize);
success = true;
} finally {
closeInputStream(stream, success);
}
-
+
// set up the block allocation table (necessary for the
// data_blocks to be manageable
@@ -175,11 +175,11 @@ public class POIFSFileSystem
// init documents
processProperties(
SmallBlockTableReader.getSmallDocumentBlocks(
- data_blocks, properties.getRoot(),
+ data_blocks, properties.getRoot(),
header_block_reader.getSBATStart()
- ),
- data_blocks,
- properties.getRoot().getChildren(),
+ ),
+ data_blocks,
+ properties.getRoot().getChildren(),
null,
header_block_reader.getPropertyStart()
);
@@ -192,9 +192,9 @@ public class POIFSFileSystem
* @param success false if an exception is currently being thrown in the calling method
*/
private void closeInputStream(InputStream stream, boolean success) {
-
+
if(stream.markSupported() && !(stream instanceof ByteArrayInputStream)) {
- String msg = "POIFS is closing the supplied input stream of type ("
+ String msg = "POIFS is closing the supplied input stream of type ("
+ stream.getClass().getName() + ") which supports mark/reset. "
+ "This will be a problem for the caller if the stream will still be used. "
+ "If that is the case the caller should wrap the input stream to avoid this close logic. "
@@ -207,7 +207,7 @@ public class POIFSFileSystem
if(success) {
throw new RuntimeException(e);
}
- // else not success? Try block did not complete normally
+ // else not success? Try block did not complete normally
// just print stack trace and leave original ex to be thrown
e.printStackTrace();
}
@@ -215,15 +215,15 @@ public class POIFSFileSystem
/**
* Checks that the supplied InputStream (which MUST
- * support mark and reset, or be a PushbackInputStream)
+ * support mark and reset, or be a PushbackInputStream)
* has a POIFS (OLE2) header at the start of it.
* If your InputStream does not support mark / reset,
* then wrap it in a PushBackInputStream, then be
* sure to always use that, and not the original!
- * @param inp An InputStream which supports either mark/reset, or is a PushbackInputStream
+ * @param inp An InputStream which supports either mark/reset, or is a PushbackInputStream
*/
public static boolean hasPOIFSHeader(InputStream inp) throws IOException {
- // We want to peek at the first 8 bytes
+ // We want to peek at the first 8 bytes
inp.mark(8);
byte[] header = new byte[8];
@@ -237,7 +237,7 @@ public class POIFSFileSystem
} else {
inp.reset();
}
-
+
// Did it match the signature?
return (signature.get() == HeaderBlockConstants._signature);
}
@@ -296,7 +296,7 @@ public class POIFSFileSystem
{
return getRoot().createDirectory(name);
}
-
+
/**
* Write the filesystem out
*
@@ -520,7 +520,7 @@ public class POIFSFileSystem
processProperties(
small_blocks, big_blocks,
- (( DirectoryProperty ) property).getChildren(),
+ (( DirectoryProperty ) property).getChildren(),
new_dir, headerPropertiesStartAt);
}
else
@@ -532,8 +532,8 @@ public class POIFSFileSystem
if (property.shouldUseSmallBlocks())
{
document =
- new POIFSDocument(name,
- small_blocks.fetchBlocks(startBlock, headerPropertiesStartAt),
+ new POIFSDocument(name,
+ small_blocks.fetchBlocks(startBlock, headerPropertiesStartAt),
size);
}
else
@@ -563,10 +563,7 @@ public class POIFSFileSystem
{
return (( POIFSViewable ) getRoot()).getViewableArray();
}
- else
- {
- return new Object[ 0 ];
- }
+ return new Object[ 0 ];
}
/**
@@ -583,10 +580,7 @@ public class POIFSFileSystem
{
return (( POIFSViewable ) getRoot()).getViewableIterator();
}
- else
- {
- return Collections.EMPTY_LIST.iterator();
- }
+ return Collections.EMPTY_LIST.iterator();
}
/**
@@ -620,7 +614,7 @@ public class POIFSFileSystem
public int getBigBlockSize() {
return bigBlockSize;
}
-
+
/* ********** END begin implementation of POIFSViewable ********** */
} // end public class POIFSFileSystem
diff --git a/src/java/org/apache/poi/util/HexDump.java b/src/java/org/apache/poi/util/HexDump.java
index c5ebab30a7..66c47f387f 100644
--- a/src/java/org/apache/poi/util/HexDump.java
+++ b/src/java/org/apache/poi/util/HexDump.java
@@ -169,7 +169,7 @@ public class HexDump {
* outside the data array's bounds
* @return output string
*/
-
+
public static String dump(final byte [] data, final long offset,
final int index) {
StringBuffer buffer;
@@ -216,10 +216,10 @@ public class HexDump {
}
buffer.append(EOL);
display_offset += chars_read;
- }
+ }
return buffer.toString();
}
-
+
private static String dump(final long value)
{
@@ -399,10 +399,10 @@ public class HexDump {
while (bytesRemaining-- > 0)
{
int c = in.read();
- if (c == -1)
+ if (c == -1) {
break;
- else
- buf.write(c);
+ }
+ buf.write(c);
}
}
@@ -417,13 +417,13 @@ public class HexDump {
// The return type is char array because most callers will probably append the value to a
// StringBuffer, or write it to a Stream / Writer so there is no need to create a String;
char[] result = new char[charPos];
-
+
long value = pValue;
do {
result[--charPos] = _hexcodes[(int) (value & 0x0F)];
value >>>= 4;
} while (charPos > 1);
-
+
// Prefix added to avoid ambiguity
result[0] = '0';
result[1] = 'x';
@@ -456,7 +456,7 @@ public class HexDump {
public static void main(String[] args) throws Exception {
File file = new File(args[0]);
- InputStream in = new BufferedInputStream(new FileInputStream(file));
+ InputStream in = new BufferedInputStream(new FileInputStream(file));
byte[] b = new byte[(int)file.length()];
in.read(b);
System.out.println(HexDump.dump(b, 0, 0));
diff --git a/src/java/org/apache/poi/util/IOUtils.java b/src/java/org/apache/poi/util/IOUtils.java
index 2e60e9bdbe..a4bf7b0aea 100644
--- a/src/java/org/apache/poi/util/IOUtils.java
+++ b/src/java/org/apache/poi/util/IOUtils.java
@@ -1,4 +1,3 @@
-
/* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,7 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
package org.apache.poi.util;
@@ -24,80 +22,70 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-public class IOUtils
-{
- private IOUtils()
- {
- }
+public final class IOUtils {
+ private IOUtils() {
+ // no instances of this class
+ }
- /**
- * Reads all the data from the input stream, and returns
- * the bytes read.
- */
- public static byte[] toByteArray(InputStream stream) throws IOException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
- byte[] buffer = new byte[4096];
- int read = 0;
- while(read != -1) {
- read = stream.read(buffer);
- if(read > 0) {
- baos.write(buffer, 0, read);
- }
- }
-
- return baos.toByteArray();
- }
+ /**
+ * Reads all the data from the input stream, and returns the bytes read.
+ */
+ public static byte[] toByteArray(InputStream stream) throws IOException {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
- /**
- * Helper method, just calls readFully(in, b, 0, b.length)
- */
- public static int readFully(InputStream in, byte[] b)
- throws IOException
- {
- return readFully(in, b, 0, b.length);
- }
+ byte[] buffer = new byte[4096];
+ int read = 0;
+ while (read != -1) {
+ read = stream.read(buffer);
+ if (read > 0) {
+ baos.write(buffer, 0, read);
+ }
+ }
- /**
- * Same as the normal in.read(b, off, len), but
- * tries to ensure that the entire len number of bytes
- * is read.
- *
- * If the end of file is reached before any bytes
- * are read, returns -1.
- * If the end of the file is reached after some bytes are
- * read, returns the number of bytes read.
- * If the end of the file isn't reached before len
- * bytes have been read, will return len bytes.
- */
- public static int readFully(InputStream in, byte[] b, int off, int len)
- throws IOException
- {
- int total = 0;
- for (;;) {
- int got = in.read(b, off + total, len - total);
- if (got < 0) {
- return (total == 0) ? -1 : total;
- } else {
- total += got;
- if (total == len)
- return total;
- }
- }
- }
+ return baos.toByteArray();
+ }
- /**
- * Copies all the data from the given InputStream to the
- * OutputStream. It leaves both streams open, so you
- * will still need to close them once done.
- */
+ /**
+ * Helper method, just calls readFully(in, b, 0, b.length)
+ */
+ public static int readFully(InputStream in, byte[] b) throws IOException {
+ return readFully(in, b, 0, b.length);
+ }
+
+ /**
+ * Same as the normal in.read(b, off, len), but tries to ensure
+ * that the entire len number of bytes is read.
+ *
+ * If the end of file is reached before any bytes are read, returns -1. If
+ * the end of the file is reached after some bytes are read, returns the
+ * number of bytes read. If the end of the file isn't reached before len
+ * bytes have been read, will return len bytes.
+ */
+ public static int readFully(InputStream in, byte[] b, int off, int len) throws IOException {
+ int total = 0;
+ while (true) {
+ int got = in.read(b, off + total, len - total);
+ if (got < 0) {
+ return (total == 0) ? -1 : total;
+ }
+ total += got;
+ if (total == len) {
+ return total;
+ }
+ }
+ }
+
+ /**
+ * Copies all the data from the given InputStream to the OutputStream. It
+ * leaves both streams open, so you will still need to close them once done.
+ */
public static void copy(InputStream inp, OutputStream out) throws IOException {
byte[] buff = new byte[4096];
int count;
- while( (count = inp.read(buff)) != -1 ) {
- if(count > 0) {
+ while ((count = inp.read(buff)) != -1) {
+ if (count > 0) {
out.write(buff, 0, count);
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/java/org/apache/poi/util/SystemOutLogger.java b/src/java/org/apache/poi/util/SystemOutLogger.java
index af678e186a..bf88036f31 100644
--- a/src/java/org/apache/poi/util/SystemOutLogger.java
+++ b/src/java/org/apache/poi/util/SystemOutLogger.java
@@ -1,4 +1,3 @@
-
/* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,7 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
package org.apache.poi.util;
@@ -33,11 +31,11 @@ package org.apache.poi.util;
*/
public class SystemOutLogger extends POILogger
{
- private String cat;
+ private String _cat;
public void initialize(final String cat)
{
- this.cat=cat;
+ this._cat=cat;
}
/**
@@ -51,7 +49,7 @@ public class SystemOutLogger extends POILogger
{
log(level, obj1, null);
}
-
+
/**
* Log a message
*
@@ -62,7 +60,7 @@ public class SystemOutLogger extends POILogger
public void log(final int level, final Object obj1,
final Throwable exception) {
if (check(level)) {
- System.out.println("["+cat+"] "+obj1);
+ System.out.println("["+_cat+"] "+obj1);
if(exception != null) {
exception.printStackTrace(System.out);
}
@@ -88,10 +86,10 @@ public class SystemOutLogger extends POILogger
currentLevel = POILogger.DEBUG;
}
- if (level >= currentLevel)
+ if (level >= currentLevel) {
return true;
- else
- return false;
+ }
+ return false;
}
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
index 582fe507a2..aeea4dccbc 100755
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
@@ -35,11 +35,10 @@ import org.apache.poi.openxml4j.util.Nullable;
/**
* Represents the core properties part of a package.
- *
+ *
* @author Julien Chable
- * @version 1.0
*/
-public class PackagePropertiesPart extends PackagePart implements
+public final class PackagePropertiesPart extends PackagePart implements
PackageProperties {
public final static String NAMESPACE_DC_URI = "http://purl.org/dc/elements/1.1/";
@@ -52,7 +51,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Constructor.
- *
+ *
* @param pack
* Container package.
* @param partName
@@ -67,7 +66,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* A categorization of the content of this package.
- *
+ *
* [Example: Example values for this property might include: Resume, Letter,
* Financial Forecast, Proposal, Technical Presentation, and so on. This
* value might be used by an application's user interface to facilitate
@@ -77,7 +76,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* The status of the content.
- *
+ *
* [Example: Values might include "Draft", "Reviewed", and "Final". end
* example]
*/
@@ -86,7 +85,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* The type of content represented, generally defined by a specific use and
* intended audience.
- *
+ *
* [Example: Values might include "Whitepaper", "Security Bulletin", and
* "Exam". end example] [Note: This property is distinct from MIME content
* types as defined in RFC 2616. end note]
@@ -105,7 +104,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* An explanation of the content of the resource.
- *
+ *
* [Example: Values might include an abstract, table of contents, reference
* to a graphical representation of content, and a free-text account of the
* content. end example]
@@ -126,7 +125,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* The language of the intellectual content of the resource.
- *
+ *
* [Note: IETF RFC 3066 provides guidance on encoding to represent
* languages. end note]
*/
@@ -135,7 +134,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* The user who performed the last modification. The identification is
* environment-specific.
- *
+ *
* [Example: A name, email address, or employee ID. end example] It is
* recommended that this value be as concise as possible.
*/
@@ -153,7 +152,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* The revision number.
- *
+ *
* [Example: This value might indicate the number of saves or revisions,
* provided the application updates it after each revision. end example]
*/
@@ -180,7 +179,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get the category property.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getCategoryProperty()
*/
public Nullable getCategoryProperty() {
@@ -189,7 +188,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get content status.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getContentStatusProperty()
*/
public Nullable getContentStatusProperty() {
@@ -198,7 +197,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get content type.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getContentTypeProperty()
*/
public Nullable getContentTypeProperty() {
@@ -207,7 +206,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get created date.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getCreatedProperty()
*/
public Nullable getCreatedProperty() {
@@ -216,7 +215,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get created date formated into a String.
- *
+ *
* @return A string representation of the created date.
*/
public String getCreatedPropertyString() {
@@ -225,7 +224,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get creator.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getCreatorProperty()
*/
public Nullable getCreatorProperty() {
@@ -234,7 +233,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get description.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getDescriptionProperty()
*/
public Nullable getDescriptionProperty() {
@@ -243,7 +242,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get identifier.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getIdentifierProperty()
*/
public Nullable getIdentifierProperty() {
@@ -252,7 +251,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get keywords.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getKeywordsProperty()
*/
public Nullable getKeywordsProperty() {
@@ -261,7 +260,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get the language.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getLanguageProperty()
*/
public Nullable getLanguageProperty() {
@@ -270,7 +269,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get the author of last modifications.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getLastModifiedByProperty()
*/
public Nullable getLastModifiedByProperty() {
@@ -279,7 +278,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get last printed date.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getLastPrintedProperty()
*/
public Nullable getLastPrintedProperty() {
@@ -288,7 +287,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get last printed date formated into a String.
- *
+ *
* @return A string representation of the last printed date.
*/
public String getLastPrintedPropertyString() {
@@ -297,7 +296,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get modified date.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getModifiedProperty()
*/
public Nullable getModifiedProperty() {
@@ -306,19 +305,19 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get modified date formated into a String.
- *
+ *
* @return A string representation of the modified date.
*/
public String getModifiedPropertyString() {
- if (!modified.hasValue())
- return getDateValue(new Nullable(new Date()));
- else
+ if (modified.hasValue()) {
return getDateValue(modified);
+ }
+ return getDateValue(new Nullable(new Date()));
}
/**
* Get revision.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getRevisionProperty()
*/
public Nullable getRevisionProperty() {
@@ -327,7 +326,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get subject.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getSubjectProperty()
*/
public Nullable getSubjectProperty() {
@@ -336,7 +335,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get title.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getTitleProperty()
*/
public Nullable getTitleProperty() {
@@ -345,7 +344,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Get version.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#getVersionProperty()
*/
public Nullable getVersionProperty() {
@@ -354,7 +353,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set the category.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setCategoryProperty(java.lang.String)
*/
public void setCategoryProperty(String category) {
@@ -363,7 +362,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set the content status.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setContentStatusProperty(java.lang.String)
*/
public void setContentStatusProperty(String contentStatus) {
@@ -372,7 +371,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set the content type.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setContentTypeProperty(java.lang.String)
*/
public void setContentTypeProperty(String contentType) {
@@ -381,7 +380,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set the created date.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setCreatedProperty(org.apache.poi.openxml4j.util.Nullable)
*/
public void setCreatedProperty(String created) {
@@ -395,7 +394,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set the created date.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setCreatedProperty(org.apache.poi.openxml4j.util.Nullable)
*/
public void setCreatedProperty(Nullable created) {
@@ -405,7 +404,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set the creator.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setCreatorProperty(java.lang.String)
*/
public void setCreatorProperty(String creator) {
@@ -414,7 +413,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set the description.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setDescriptionProperty(java.lang.String)
*/
public void setDescriptionProperty(String description) {
@@ -423,7 +422,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set identifier.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setIdentifierProperty(java.lang.String)
*/
public void setIdentifierProperty(String identifier) {
@@ -432,7 +431,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set keywords.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setKeywordsProperty(java.lang.String)
*/
public void setKeywordsProperty(String keywords) {
@@ -441,7 +440,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set language.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setLanguageProperty(java.lang.String)
*/
public void setLanguageProperty(String language) {
@@ -450,7 +449,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set last modifications author.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setLastModifiedByProperty(java.lang.String)
*/
public void setLastModifiedByProperty(String lastModifiedBy) {
@@ -459,7 +458,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set last printed date.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setLastPrintedProperty(org.apache.poi.openxml4j.util.Nullable)
*/
public void setLastPrintedProperty(String lastPrinted) {
@@ -473,7 +472,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set last printed date.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setLastPrintedProperty(org.apache.poi.openxml4j.util.Nullable)
*/
public void setLastPrintedProperty(Nullable lastPrinted) {
@@ -483,7 +482,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set last modification date.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setModifiedProperty(org.apache.poi.openxml4j.util.Nullable)
*/
public void setModifiedProperty(String modified) {
@@ -497,7 +496,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set last modification date.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setModifiedProperty(org.apache.poi.openxml4j.util.Nullable)
*/
public void setModifiedProperty(Nullable modified) {
@@ -507,7 +506,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set revision.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setRevisionProperty(java.lang.String)
*/
public void setRevisionProperty(String revision) {
@@ -516,7 +515,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set subject.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setSubjectProperty(java.lang.String)
*/
public void setSubjectProperty(String subject) {
@@ -525,7 +524,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set title.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setTitleProperty(java.lang.String)
*/
public void setTitleProperty(String title) {
@@ -534,7 +533,7 @@ public class PackagePropertiesPart extends PackagePart implements
/**
* Set version.
- *
+ *
* @see org.apache.poi.openxml4j.opc.PackageProperties#setVersionProperty(java.lang.String)
*/
public void setVersionProperty(String version) {
@@ -545,47 +544,46 @@ public class PackagePropertiesPart extends PackagePart implements
* Convert a strig value into a Nullable
*/
private Nullable setStringValue(String s) {
- if (s == null || s.equals(""))
+ if (s == null || s.equals("")) {
return new Nullable();
- else
- return new Nullable(s);
+ }
+ return new Nullable(s);
}
/**
* Convert a string value represented a date into a Nullable.
- *
+ *
* @throws InvalidFormatException
* Throws if the date format isnot valid.
*/
private Nullable setDateValue(String s) throws InvalidFormatException {
- if (s == null || s.equals(""))
+ if (s == null || s.equals("")) {
return new Nullable();
- else {
- SimpleDateFormat df = new SimpleDateFormat(
- "yyyy-MM-dd'T'HH:mm:ss'Z'");
- Date d = df.parse(s, new ParsePosition(0));
- if (d == null)
- throw new InvalidFormatException("Date not well formated");
- return new Nullable(d);
}
+ SimpleDateFormat df = new SimpleDateFormat(
+ "yyyy-MM-dd'T'HH:mm:ss'Z'");
+ Date d = df.parse(s, new ParsePosition(0));
+ if (d == null) {
+ throw new InvalidFormatException("Date not well formated");
+ }
+ return new Nullable(d);
}
/**
* Convert a Nullable into a String.
- *
+ *
* @param d
* The Date to convert.
* @return The formated date or null.
* @see java.util.SimpleDateFormat
*/
private String getDateValue(Nullable d) {
- if (d == null || d.equals(""))
+ if (d == null || d.equals("")) {
return "";
- else {
- SimpleDateFormat df = new SimpleDateFormat(
- "yyyy-MM-dd'T'HH:mm:ss'Z'");
- return df.format(d.getValue());
}
+ SimpleDateFormat df = new SimpleDateFormat(
+ "yyyy-MM-dd'T'HH:mm:ss'Z'");
+ return df.format(d.getValue());
}
@Override
@@ -600,12 +598,12 @@ public class PackagePropertiesPart extends PackagePart implements
}
@Override
- public boolean save(OutputStream zos) throws OpenXML4JException {
+ public boolean save(OutputStream zos) {
throw new InvalidOperationException("Operation not authorized");
}
@Override
- public boolean load(InputStream ios) throws InvalidFormatException {
+ public boolean load(InputStream ios) {
throw new InvalidOperationException("Operation not authorized");
}
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java
index 7355c7e099..3491dc6424 100755
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java
@@ -34,7 +34,7 @@ import org.dom4j.Document;
/**
* Zip implementation of the ContentTypeManager.
- *
+ *
* @author Julien Chable
* @version 1.0
* @see ContentTypeManager
@@ -44,7 +44,7 @@ public class ZipContentTypeManager extends ContentTypeManager {
/**
* Delegate constructor to the super constructor.
- *
+ *
* @param in
* The input stream to parse to fill internal content type
* collections.
@@ -78,9 +78,8 @@ public class ZipContentTypeManager extends ContentTypeManager {
if (resultRead == -1) {
// end of file reached
break;
- } else {
- zos.write(buff, 0, resultRead);
}
+ zos.write(buff, 0, resultRead);
}
zos.closeEntry();
} catch (IOException ioe) {
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
index ab867ad250..5e72198f65 100755
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
@@ -58,8 +58,7 @@ public final class ZipHelper {
* @throws OpenXML4JException
* Throws if internal error occurs.
*/
- public static ZipEntry getCorePropertiesZipEntry(ZipPackage pkg)
- throws OpenXML4JException {
+ public static ZipEntry getCorePropertiesZipEntry(ZipPackage pkg) {
PackageRelationship corePropsRel = pkg.getRelationshipsByType(
PackageRelationshipTypes.CORE_PROPERTIES).getRelationship(0);
@@ -96,10 +95,10 @@ public final class ZipHelper {
public static String getOPCNameFromZipItemName(String zipItemName) {
if (zipItemName == null)
throw new IllegalArgumentException("zipItemName");
- if (zipItemName.startsWith(FORWARD_SLASH))
+ if (zipItemName.startsWith(FORWARD_SLASH)) {
return zipItemName;
- else
- return FORWARD_SLASH + zipItemName;
+ }
+ return FORWARD_SLASH + zipItemName;
}
/**
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java
index a86f56d0af..36719d3470 100755
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java
@@ -31,7 +31,6 @@ import org.dom4j.Namespace;
import org.dom4j.QName;
import org.dom4j.io.SAXReader;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.openxml4j.opc.PackageNamespaces;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackageProperties;
@@ -44,7 +43,6 @@ import org.apache.poi.openxml4j.opc.internal.ZipHelper;
* Package properties unmarshaller.
*
* @author Julien Chable
- * @version 1.0
*/
public final class PackagePropertiesUnmarshaller implements PartUnmarshaller {
@@ -110,15 +108,9 @@ public final class PackagePropertiesUnmarshaller implements PartUnmarshaller {
.getInputStream(context.getZipEntry());
} else if (context.getPackage() != null) {
// Try to retrieve the part inputstream from the URI
- ZipEntry zipEntry;
- try {
- zipEntry = ZipHelper
- .getCorePropertiesZipEntry((ZipPackage) context
- .getPackage());
- } catch (OpenXML4JException e) {
- throw new IOException(
- "Error while trying to get the part input stream.");
- }
+ ZipEntry zipEntry = ZipHelper
+ .getCorePropertiesZipEntry((ZipPackage) context
+ .getPackage());
in = ((ZipPackage) context.getPackage()).getZipArchive()
.getInputStream(zipEntry);
} else
diff --git a/src/ooxml/java/org/apache/poi/util/PackageHelper.java b/src/ooxml/java/org/apache/poi/util/PackageHelper.java
index 953a4ab866..3fefe53a03 100755
--- a/src/ooxml/java/org/apache/poi/util/PackageHelper.java
+++ b/src/ooxml/java/org/apache/poi/util/PackageHelper.java
@@ -14,6 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
+
package org.apache.poi.util;
import org.apache.poi.openxml4j.opc.*;
@@ -31,7 +32,7 @@ import java.net.URI;
*
* @author Yegor Kozlov
*/
-public class PackageHelper {
+public final class PackageHelper {
/**
* Clone the specified package.
@@ -74,10 +75,9 @@ public class PackageHelper {
if (rel.getRelationshipType().equals(PackageRelationshipTypes.CORE_PROPERTIES)) {
copyProperties(pkg.getPackageProperties(), dest.getPackageProperties());
continue;
- } else {
- dest.addRelationship(part.getPartName(), rel.getTargetMode(), rel.getRelationshipType());
- part_tgt = dest.createPart(part.getPartName(), part.getContentType());
}
+ dest.addRelationship(part.getPartName(), rel.getTargetMode(), rel.getRelationshipType());
+ part_tgt = dest.createPart(part.getPartName(), part.getContentType());
OutputStream out = part_tgt.getOutputStream();
IOUtils.copy(part.getInputStream(), out);
@@ -95,7 +95,7 @@ public class PackageHelper {
}
/**
- * Creates an empty file in the default temporary-file directory,
+ * Creates an empty file in the default temporary-file directory,
*/
public static File createTempFile() throws IOException {
File file = TempFile.createTempFile("poi-ooxml-", ".tmp");
@@ -117,18 +117,18 @@ public class PackageHelper {
part_tgt.addExternalRelationship(rel.getTargetURI().toString(), rel.getRelationshipType(), rel.getId());
//external relations don't have associated package parts
continue;
- } else {
- URI uri = rel.getTargetURI();
-
- if(uri.getRawFragment() != null) {
- part_tgt.addRelationship(uri, rel.getTargetMode(), rel.getRelationshipType(), rel.getId());
- continue;
- } else {
- PackagePartName relName = PackagingURIHelper.createPartName(rel.getTargetURI());
- p = pkg.getPart(relName);
- part_tgt.addRelationship(p.getPartName(), rel.getTargetMode(), rel.getRelationshipType(), rel.getId());
- }
}
+ URI uri = rel.getTargetURI();
+
+ if(uri.getRawFragment() != null) {
+ part_tgt.addRelationship(uri, rel.getTargetMode(), rel.getRelationshipType(), rel.getId());
+ continue;
+ }
+ PackagePartName relName = PackagingURIHelper.createPartName(rel.getTargetURI());
+ p = pkg.getPart(relName);
+ part_tgt.addRelationship(p.getPartName(), rel.getTargetMode(), rel.getRelationshipType(), rel.getId());
+
+
PackagePart dest;
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java b/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
index 0be0142d45..f408d936ce 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
+++ b/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
@@ -440,9 +440,9 @@ public class StylesTable extends POIXMLDocumentPart {
}
protected CTDxf getDxf(int idx) {
- if(dxfs.size()==0)
- return CTDxf.Factory.newInstance();
- else
+ if (dxfs.size()==0) {
+ return CTDxf.Factory.newInstance();
+ }
return dxfs.get(idx);
}
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
index f9c2bdf2bd..883d2696bb 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
@@ -33,8 +33,6 @@ import org.apache.poi.ss.formula.FormulaRenderer;
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.xssf.model.StylesTable;
import org.apache.poi.xssf.model.SharedStringsTable;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.POILogFactory;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellFormula;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellType;
@@ -55,7 +53,6 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellFormulaType;
*
*/
public final class XSSFCell implements Cell {
- private static POILogger logger = POILogFactory.getLogger(XSSFCell.class);
private static final String FALSE_AS_STRING = "0";
private static final String TRUE_AS_STRING = "1";
@@ -64,28 +61,28 @@ public final class XSSFCell implements Cell {
* the xml bean containing information about the cell's location, value,
* data type, formatting, and formula
*/
- private final CTCell cell;
+ private final CTCell _cell;
/**
* the XSSFRow this cell belongs to
*/
- private final XSSFRow row;
+ private final XSSFRow _row;
/**
* 0-based column index
*/
- private int cellNum;
+ private int _cellNum;
/**
* Table of strings shared across this workbook.
* If two cells contain the same string, then the cell value is the same index into SharedStringsTable
*/
- private SharedStringsTable sharedStringSource;
+ private SharedStringsTable _sharedStringSource;
/**
* Table of cell styles shared across all cells in a workbook.
*/
- private StylesTable stylesSource;
+ private StylesTable _stylesSource;
/**
* Construct a XSSFCell.
@@ -94,27 +91,27 @@ public final class XSSFCell implements Cell {
* @param cell the xml bean containing information about the cell.
*/
protected XSSFCell(XSSFRow row, CTCell cell) {
- this.cell = cell;
- this.row = row;
+ _cell = cell;
+ _row = row;
if (cell.getR() != null) {
- this.cellNum = new CellReference(cell.getR()).getCol();
+ _cellNum = new CellReference(cell.getR()).getCol();
}
- this.sharedStringSource = row.getSheet().getWorkbook().getSharedStringSource();
- this.stylesSource = row.getSheet().getWorkbook().getStylesSource();
+ _sharedStringSource = row.getSheet().getWorkbook().getSharedStringSource();
+ _stylesSource = row.getSheet().getWorkbook().getStylesSource();
}
/**
* @return table of strings shared across this workbook
*/
protected SharedStringsTable getSharedStringSource() {
- return sharedStringSource;
+ return _sharedStringSource;
}
/**
* @return table of cell styles shared across this workbook
*/
protected StylesTable getStylesSource() {
- return stylesSource;
+ return _stylesSource;
}
/**
@@ -132,7 +129,7 @@ public final class XSSFCell implements Cell {
* @return the row this cell belongs to
*/
public XSSFRow getRow() {
- return row;
+ return _row;
}
/**
@@ -150,10 +147,10 @@ public final class XSSFCell implements Cell {
case CELL_TYPE_BLANK:
return false;
case CELL_TYPE_BOOLEAN:
- return cell.isSetV() && TRUE_AS_STRING.equals(cell.getV());
+ return _cell.isSetV() && TRUE_AS_STRING.equals(_cell.getV());
case CELL_TYPE_FORMULA:
//YK: should throw an exception if requesting boolean value from a non-boolean formula
- return cell.isSetV() && TRUE_AS_STRING.equals(cell.getV());
+ return _cell.isSetV() && TRUE_AS_STRING.equals(_cell.getV());
default:
throw typeMismatch(CELL_TYPE_BOOLEAN, cellType, false);
}
@@ -167,8 +164,8 @@ public final class XSSFCell implements Cell {
* will change the cell to a boolean cell and set its value.
*/
public void setCellValue(boolean value) {
- cell.setT(STCellType.B);
- cell.setV(value ? TRUE_AS_STRING : FALSE_AS_STRING);
+ _cell.setT(STCellType.B);
+ _cell.setV(value ? TRUE_AS_STRING : FALSE_AS_STRING);
}
/**
@@ -189,7 +186,7 @@ public final class XSSFCell implements Cell {
return 0.0;
case CELL_TYPE_FORMULA:
case CELL_TYPE_NUMERIC:
- return cell.isSetV() ? Double.parseDouble(cell.getV()) : 0.0;
+ return _cell.isSetV() ? Double.parseDouble(_cell.getV()) : 0.0;
default:
throw typeMismatch(CELL_TYPE_NUMERIC, cellType, false);
}
@@ -205,11 +202,11 @@ public final class XSSFCell implements Cell {
*/
public void setCellValue(double value) {
if(Double.isInfinite(value) || Double.isNaN(value)) {
- cell.setT(STCellType.E);
- cell.setV(FormulaError.NUM.getString());
+ _cell.setT(STCellType.E);
+ _cell.setV(FormulaError.NUM.getString());
} else {
- cell.setT(STCellType.N);
- cell.setV(String.valueOf(value));
+ _cell.setT(STCellType.N);
+ _cell.setV(String.valueOf(value));
}
}
@@ -242,20 +239,20 @@ public final class XSSFCell implements Cell {
rt = new XSSFRichTextString("");
break;
case CELL_TYPE_STRING:
- if (cell.getT() == STCellType.INLINE_STR) {
- if(cell.isSetIs()) {
+ if (_cell.getT() == STCellType.INLINE_STR) {
+ if(_cell.isSetIs()) {
//string is expressed directly in the cell definition instead of implementing the shared string table.
- rt = new XSSFRichTextString(cell.getIs());
- } else if (cell.isSetV()) {
+ rt = new XSSFRichTextString(_cell.getIs());
+ } else if (_cell.isSetV()) {
//cached result of a formula
- rt = new XSSFRichTextString(cell.getV());
+ rt = new XSSFRichTextString(_cell.getV());
} else {
rt = new XSSFRichTextString("");
}
} else {
- if (cell.isSetV()) {
- int idx = Integer.parseInt(cell.getV());
- rt = new XSSFRichTextString(sharedStringSource.getEntryAt(idx));
+ if (_cell.isSetV()) {
+ int idx = Integer.parseInt(_cell.getV());
+ rt = new XSSFRichTextString(_sharedStringSource.getEntryAt(idx));
}
else {
rt = new XSSFRichTextString("");
@@ -263,12 +260,12 @@ public final class XSSFCell implements Cell {
}
break;
case CELL_TYPE_FORMULA:
- rt = new XSSFRichTextString(cell.isSetV() ? cell.getV() : "");
+ rt = new XSSFRichTextString(_cell.isSetV() ? _cell.getV() : "");
break;
default:
throw typeMismatch(CELL_TYPE_STRING, cellType, false);
}
- rt.setStylesTableReference(stylesSource);
+ rt.setStylesTableReference(_stylesSource);
return rt;
}
@@ -300,19 +297,19 @@ public final class XSSFCell implements Cell {
int cellType = getCellType();
switch(cellType){
case Cell.CELL_TYPE_FORMULA:
- cell.setV(str.getString());
- cell.setT(STCellType.STR);
+ _cell.setV(str.getString());
+ _cell.setT(STCellType.STR);
break;
default:
- if(cell.getT() == STCellType.INLINE_STR) {
+ if(_cell.getT() == STCellType.INLINE_STR) {
//set the 'pre-evaluated result
- cell.setV(str.getString());
+ _cell.setV(str.getString());
} else {
- cell.setT(STCellType.S);
+ _cell.setT(STCellType.S);
XSSFRichTextString rt = (XSSFRichTextString)str;
- rt.setStylesTableReference(stylesSource);
- int sRef = sharedStringSource.addEntry(rt.getCTRst());
- cell.setV(Integer.toString(sRef));
+ rt.setStylesTableReference(_stylesSource);
+ int sRef = _sharedStringSource.addEntry(rt.getCTRst());
+ _cell.setV(Integer.toString(sRef));
}
break;
}
@@ -328,12 +325,11 @@ public final class XSSFCell implements Cell {
int cellType = getCellType();
if(cellType != CELL_TYPE_FORMULA) throw typeMismatch(CELL_TYPE_FORMULA, cellType, false);
- CTCellFormula f = cell.getF();
+ CTCellFormula f = _cell.getF();
if(f.getT() == STCellFormulaType.SHARED){
return convertSharedFormula((int)f.getSi());
- } else {
- return f.getStringValue();
}
+ return f.getStringValue();
}
/**
@@ -368,10 +364,10 @@ public final class XSSFCell implements Cell {
* @throws IllegalArgumentException if the formula is invalid
*/
public void setCellFormula(String formula) {
- XSSFWorkbook wb = row.getSheet().getWorkbook();
+ XSSFWorkbook wb = _row.getSheet().getWorkbook();
if (formula == null) {
wb.onDeleteFormula(this);
- if(cell.isSetF()) cell.unsetF();
+ if(_cell.isSetF()) _cell.unsetF();
return;
}
@@ -381,8 +377,8 @@ public final class XSSFCell implements Cell {
CTCellFormula f = CTCellFormula.Factory.newInstance();
f.setStringValue(formula);
- cell.setF(f);
- if(cell.isSetV()) cell.unsetV();
+ _cell.setF(f);
+ if(_cell.isSetV()) _cell.unsetV();
}
/**
@@ -391,7 +387,7 @@ public final class XSSFCell implements Cell {
* @return zero-based column index of a column in a sheet.
*/
public int getColumnIndex() {
- return this.cellNum;
+ return this._cellNum;
}
/**
@@ -400,7 +396,7 @@ public final class XSSFCell implements Cell {
* @return zero-based row index of a row in the sheet that contains this cell
*/
public int getRowIndex() {
- return row.getRowNum();
+ return _row.getRowNum();
}
/**
@@ -409,7 +405,7 @@ public final class XSSFCell implements Cell {
* @return A1 style reference to the location of this cell
*/
public String getReference() {
- return cell.getR();
+ return _cell.getR();
}
/**
@@ -419,8 +415,8 @@ public final class XSSFCell implements Cell {
* workbook.getCellStyleAt(0)
*/
public XSSFCellStyle getCellStyle() {
- long idx = cell.isSetS() ? cell.getS() : 0;
- return stylesSource.getStyleAt((int)idx);
+ long idx = _cell.isSetS() ? _cell.getS() : 0;
+ return _stylesSource.getStyleAt((int)idx);
}
/**
@@ -432,13 +428,13 @@ public final class XSSFCell implements Cell {
*/
public void setCellStyle(CellStyle style) {
if(style == null) {
- if(cell.isSetS()) cell.unsetS();
+ if(_cell.isSetS()) _cell.unsetS();
} else {
XSSFCellStyle xStyle = (XSSFCellStyle)style;
- xStyle.verifyBelongsToStylesSource(stylesSource);
+ xStyle.verifyBelongsToStylesSource(_stylesSource);
- long idx = stylesSource.putStyle(xStyle);
- cell.setS(idx);
+ long idx = _stylesSource.putStyle(xStyle);
+ _cell.setS(idx);
}
}
@@ -455,7 +451,7 @@ public final class XSSFCell implements Cell {
*/
public int getCellType() {
- if (cell.getF() != null) {
+ if (_cell.getF() != null) {
return CELL_TYPE_FORMULA;
}
@@ -469,7 +465,7 @@ public final class XSSFCell implements Cell {
* on the cached value of the formula
*/
public int getCachedFormulaResultType() {
- if (cell.getF() == null) {
+ if (_cell.getF() == null) {
throw new IllegalStateException("Only formula cells have cached results");
}
@@ -480,11 +476,11 @@ public final class XSSFCell implements Cell {
* Detect cell type based on the "t" attribute of the CTCell bean
*/
private int getBaseCellType(boolean blankCells) {
- switch (cell.getT().intValue()) {
+ switch (_cell.getT().intValue()) {
case STCellType.INT_B:
return CELL_TYPE_BOOLEAN;
case STCellType.INT_N:
- if (!cell.isSetV() && blankCells) {
+ if (!_cell.isSetV() && blankCells) {
// ooxml does have a separate cell type of 'blank'. A blank cell gets encoded as
// (either not present or) a numeric cell with no value set.
// The formula evaluator (and perhaps other clients of this interface) needs to
@@ -500,7 +496,7 @@ public final class XSSFCell implements Cell {
case STCellType.INT_STR:
return CELL_TYPE_STRING;
default:
- throw new IllegalStateException("Illegal cell type: " + this.cell.getT());
+ throw new IllegalStateException("Illegal cell type: " + this._cell.getT());
}
}
@@ -570,7 +566,7 @@ public final class XSSFCell implements Cell {
int cellType = getCellType();
if(cellType != CELL_TYPE_ERROR) throw typeMismatch(CELL_TYPE_ERROR, cellType, false);
- return cell.getV();
+ return _cell.getV();
}
/**
* Get the value of the cell as an error code.
@@ -615,15 +611,15 @@ public final class XSSFCell implements Cell {
* cell and set its value.
*/
public void setCellErrorValue(FormulaError error) {
- cell.setT(STCellType.E);
- cell.setV(error.getString());
+ _cell.setT(STCellType.E);
+ _cell.setV(error.getString());
}
/**
* Sets this cell as the active cell for the worksheet.
*/
public void setAsActiveCell() {
- getSheet().setActiveCell(cell.getR());
+ getSheet().setActiveCell(_cell.getR());
}
/**
@@ -632,9 +628,9 @@ public final class XSSFCell implements Cell {
*/
private void setBlank(){
CTCell blank = CTCell.Factory.newInstance();
- blank.setR(cell.getR());
- blank.setS(cell.getS());
- cell.set(blank);
+ blank.setR(_cell.getR());
+ blank.setS(_cell.getS());
+ _cell.set(blank);
}
/**
@@ -644,9 +640,9 @@ public final class XSSFCell implements Cell {
*/
protected void setCellNum(int num) {
checkBounds(num);
- cellNum = num;
+ _cellNum = num;
String ref = new CellReference(getRowIndex(), getColumnIndex()).formatAsString();
- cell.setR(ref);
+ _cell.setR(ref);
}
/**
@@ -668,31 +664,31 @@ public final class XSSFCell implements Cell {
break;
case CELL_TYPE_BOOLEAN:
String newVal = convertCellValueToBoolean() ? TRUE_AS_STRING : FALSE_AS_STRING;
- cell.setT(STCellType.B);
- cell.setV(newVal);
+ _cell.setT(STCellType.B);
+ _cell.setV(newVal);
break;
case CELL_TYPE_NUMERIC:
- cell.setT(STCellType.N);
+ _cell.setT(STCellType.N);
break;
case CELL_TYPE_ERROR:
- cell.setT(STCellType.E);
+ _cell.setT(STCellType.E);
break;
case CELL_TYPE_STRING:
if(prevType != CELL_TYPE_STRING){
String str = convertCellValueToString();
XSSFRichTextString rt = new XSSFRichTextString(str);
- rt.setStylesTableReference(stylesSource);
- int sRef = sharedStringSource.addEntry(rt.getCTRst());
- cell.setV(Integer.toString(sRef));
+ rt.setStylesTableReference(_stylesSource);
+ int sRef = _sharedStringSource.addEntry(rt.getCTRst());
+ _cell.setV(Integer.toString(sRef));
}
- cell.setT(STCellType.S);
+ _cell.setT(STCellType.S);
break;
case CELL_TYPE_FORMULA:
- if(!cell.isSetF()){
+ if(!_cell.isSetF()){
CTCellFormula f = CTCellFormula.Factory.newInstance();
f.setStringValue("0");
- cell.setF(f);
- if(cell.isSetT()) cell.unsetT();
+ _cell.setF(f);
+ if(_cell.isSetT()) _cell.unsetT();
}
break;
default:
@@ -722,9 +718,8 @@ public final class XSSFCell implements Cell {
if (DateUtil.isCellDateFormatted(this)) {
DateFormat sdf = new SimpleDateFormat("dd-MMM-yyyy");
return sdf.format(getDateCellValue());
- } else {
- return getNumericCellValue() + "";
}
+ return getNumericCellValue() + "";
case CELL_TYPE_STRING:
return getRichStringCellValue().toString();
default:
@@ -745,7 +740,7 @@ public final class XSSFCell implements Cell {
* null for blank cells.
*/
public String getRawValue() {
- return cell.getV();
+ return _cell.getV();
}
/**
@@ -792,7 +787,7 @@ public final class XSSFCell implements Cell {
* @return the cell comment associated with this cell or null
*/
public XSSFComment getCellComment() {
- return getSheet().getCellComment(row.getRowNum(), getColumnIndex());
+ return getSheet().getCellComment(_row.getRowNum(), getColumnIndex());
}
/**
@@ -802,7 +797,7 @@ public final class XSSFCell implements Cell {
* @param comment comment associated with this cell
*/
public void setCellComment(Comment comment) {
- String cellRef = new CellReference(row.getRowNum(), getColumnIndex()).formatAsString();
+ String cellRef = new CellReference(_row.getRowNum(), getColumnIndex()).formatAsString();
getSheet().setCellComment(cellRef, (XSSFComment)comment);
}
@@ -812,7 +807,7 @@ public final class XSSFCell implements Cell {
* @return hyperlink associated with this cell or null if not found
*/
public XSSFHyperlink getHyperlink() {
- return getSheet().getHyperlink(row.getRowNum(), cellNum);
+ return getSheet().getHyperlink(_row.getRowNum(), _cellNum);
}
/**
@@ -824,7 +819,7 @@ public final class XSSFCell implements Cell {
XSSFHyperlink link = (XSSFHyperlink)hyperlink;
// Assign to us
- link.setCellReference( new CellReference(row.getRowNum(), cellNum).formatAsString() );
+ link.setCellReference( new CellReference(_row.getRowNum(), _cellNum).formatAsString() );
// Add to the lists
getSheet().setCellHyperlink(link);
@@ -837,7 +832,7 @@ public final class XSSFCell implements Cell {
* @return the xml bean containing information about this cell
*/
public CTCell getCTCell(){
- return cell;
+ return _cell;
}
/**
@@ -857,14 +852,14 @@ public final class XSSFCell implements Cell {
switch (cellType) {
case CELL_TYPE_BOOLEAN:
- return TRUE_AS_STRING.equals(cell.getV());
+ return TRUE_AS_STRING.equals(_cell.getV());
case CELL_TYPE_STRING:
- int sstIndex = Integer.parseInt(cell.getV());
- XSSFRichTextString rt = new XSSFRichTextString(sharedStringSource.getEntryAt(sstIndex));
+ int sstIndex = Integer.parseInt(_cell.getV());
+ XSSFRichTextString rt = new XSSFRichTextString(_sharedStringSource.getEntryAt(sstIndex));
String text = rt.getString();
- return Boolean.valueOf(text);
+ return Boolean.valueOf(text).booleanValue();
case CELL_TYPE_NUMERIC:
- return Double.parseDouble(cell.getV()) != 0;
+ return Double.parseDouble(_cell.getV()) != 0;
case CELL_TYPE_ERROR:
case CELL_TYPE_BLANK:
@@ -880,15 +875,15 @@ public final class XSSFCell implements Cell {
case CELL_TYPE_BLANK:
return "";
case CELL_TYPE_BOOLEAN:
- return TRUE_AS_STRING.equals(cell.getV()) ? "TRUE" : "FALSE";
+ return TRUE_AS_STRING.equals(_cell.getV()) ? "TRUE" : "FALSE";
case CELL_TYPE_STRING:
- int sstIndex = Integer.parseInt(cell.getV());
- XSSFRichTextString rt = new XSSFRichTextString(sharedStringSource.getEntryAt(sstIndex));
+ int sstIndex = Integer.parseInt(_cell.getV());
+ XSSFRichTextString rt = new XSSFRichTextString(_sharedStringSource.getEntryAt(sstIndex));
return rt.getString();
case CELL_TYPE_NUMERIC:
- return String.valueOf(Double.parseDouble(cell.getV()));
+ return String.valueOf(Double.parseDouble(_cell.getV()));
case CELL_TYPE_ERROR:
- return cell.getV();
+ return _cell.getV();
case CELL_TYPE_FORMULA:
// should really evaluate, but HSSFCell can't call HSSFFormulaEvaluator
return "";
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
index 5ce05a176d..4987d6564f 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
@@ -37,12 +37,12 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.*;
*/
public class XSSFCellStyle implements CellStyle {
- private int cellXfId;
- private StylesTable stylesSource;
- private CTXf cellXf;
- private CTXf cellStyleXf;
- private XSSFFont font;
- private XSSFCellAlignment cellAlignment;
+ private int _cellXfId;
+ private StylesTable _stylesSource;
+ private CTXf _cellXf;
+ private CTXf _cellStyleXf;
+ private XSSFFont _font;
+ private XSSFCellAlignment _cellAlignment;
/**
* Creates a Cell Style from the supplied parts
@@ -51,35 +51,35 @@ public class XSSFCellStyle implements CellStyle {
* @param stylesSource Styles Source to work off
*/
public XSSFCellStyle(int cellXfId, int cellStyleXfId, StylesTable stylesSource) {
- this.cellXfId = cellXfId;
- this.stylesSource = stylesSource;
- this.cellXf = stylesSource.getCellXfAt(this.cellXfId);
- this.cellStyleXf = stylesSource.getCellStyleXfAt(cellStyleXfId);
+ _cellXfId = cellXfId;
+ _stylesSource = stylesSource;
+ _cellXf = stylesSource.getCellXfAt(this._cellXfId);
+ _cellStyleXf = stylesSource.getCellStyleXfAt(cellStyleXfId);
}
/**
* Used so that StylesSource can figure out our location
*/
public CTXf getCoreXf() {
- return cellXf;
+ return _cellXf;
}
/**
* Used so that StylesSource can figure out our location
*/
public CTXf getStyleXf() {
- return cellStyleXf;
+ return _cellStyleXf;
}
/**
* Creates an empty Cell Style
*/
public XSSFCellStyle(StylesTable stylesSource) {
- this.stylesSource = stylesSource;
+ _stylesSource = stylesSource;
// We need a new CTXf for the main styles
// TODO decide on a style ctxf
- cellXf = CTXf.Factory.newInstance();
- cellStyleXf = null;
+ _cellXf = CTXf.Factory.newInstance();
+ _cellStyleXf = null;
}
/**
@@ -92,7 +92,7 @@ public class XSSFCellStyle implements CellStyle {
* @throws IllegalArgumentException if there's a workbook mis-match
*/
public void verifyBelongsToStylesSource(StylesTable src) {
- if(this.stylesSource != src) {
+ if(this._stylesSource != src) {
throw new IllegalArgumentException("This Style does not belong to the supplied Workbook Stlyes Source. Are you trying to assign a style from one workbook to the cell of a differnt workbook?");
}
}
@@ -112,8 +112,8 @@ public class XSSFCellStyle implements CellStyle {
public void cloneStyleFrom(CellStyle source) {
if(source instanceof XSSFCellStyle) {
XSSFCellStyle src = (XSSFCellStyle)source;
- cellXf.set(src.getCoreXf());
- cellStyleXf.set(src.getStyleXf());
+ _cellXf.set(src.getCoreXf());
+ _cellStyleXf.set(src.getStyleXf());
} else {
throw new IllegalArgumentException("Can only clone from one XSSFCellStyle to another, not between HSSFCellStyle and XSSFCellStyle");
}
@@ -142,7 +142,7 @@ public class XSSFCellStyle implements CellStyle {
* @see org.apache.poi.ss.usermodel.HorizontalAlignment
*/
public HorizontalAlignment getAlignmentEnum() {
- CTCellAlignment align = cellXf.getAlignment();
+ CTCellAlignment align = _cellXf.getAlignment();
if(align != null && align.isSetHorizontal()) {
return HorizontalAlignment.values()[align.getHorizontal().intValue()-1];
}
@@ -169,10 +169,10 @@ public class XSSFCellStyle implements CellStyle {
* @see org.apache.poi.ss.usermodel.CellStyle#BORDER_SLANTED_DASH_DOT
*/
public short getBorderBottom() {
- if(!cellXf.getApplyBorder()) return BORDER_NONE;
+ if(!_cellXf.getApplyBorder()) return BORDER_NONE;
- int idx = (int)cellXf.getBorderId();
- CTBorder ct = stylesSource.getBorderAt(idx).getCTBorder();
+ int idx = (int)_cellXf.getBorderId();
+ CTBorder ct = _stylesSource.getBorderAt(idx).getCTBorder();
STBorderStyle.Enum ptrn = ct.isSetBottom() ? ct.getBottom().getStyle() : null;
return ptrn == null ? BORDER_NONE : (short)(ptrn.intValue() - 1);
}
@@ -208,10 +208,10 @@ public class XSSFCellStyle implements CellStyle {
* @see org.apache.poi.ss.usermodel.CellStyle#BORDER_SLANTED_DASH_DOT
*/
public short getBorderLeft() {
- if(!cellXf.getApplyBorder()) return BORDER_NONE;
+ if(!_cellXf.getApplyBorder()) return BORDER_NONE;
- int idx = (int)cellXf.getBorderId();
- CTBorder ct = stylesSource.getBorderAt(idx).getCTBorder();
+ int idx = (int)_cellXf.getBorderId();
+ CTBorder ct = _stylesSource.getBorderAt(idx).getCTBorder();
STBorderStyle.Enum ptrn = ct.isSetLeft() ? ct.getLeft().getStyle() : null;
return ptrn == null ? BORDER_NONE : (short)(ptrn.intValue() - 1);
}
@@ -246,10 +246,10 @@ public class XSSFCellStyle implements CellStyle {
* @see org.apache.poi.ss.usermodel.CellStyle#BORDER_SLANTED_DASH_DOT
*/
public short getBorderRight() {
- if(!cellXf.getApplyBorder()) return BORDER_NONE;
+ if(!_cellXf.getApplyBorder()) return BORDER_NONE;
- int idx = (int)cellXf.getBorderId();
- CTBorder ct = stylesSource.getBorderAt(idx).getCTBorder();
+ int idx = (int)_cellXf.getBorderId();
+ CTBorder ct = _stylesSource.getBorderAt(idx).getCTBorder();
STBorderStyle.Enum ptrn = ct.isSetRight() ? ct.getRight().getStyle() : null;
return ptrn == null ? BORDER_NONE : (short)(ptrn.intValue() - 1);
}
@@ -284,10 +284,10 @@ public class XSSFCellStyle implements CellStyle {
* @see org.apache.poi.ss.usermodel.CellStyle#BORDER_SLANTED_DASH_DOT
*/
public short getBorderTop() {
- if(!cellXf.getApplyBorder()) return BORDER_NONE;
+ if(!_cellXf.getApplyBorder()) return BORDER_NONE;
- int idx = (int)cellXf.getBorderId();
- CTBorder ct = stylesSource.getBorderAt(idx).getCTBorder();
+ int idx = (int)_cellXf.getBorderId();
+ CTBorder ct = _stylesSource.getBorderAt(idx).getCTBorder();
STBorderStyle.Enum ptrn = ct.isSetTop() ? ct.getTop().getStyle() : null;
return ptrn == null ? BORDER_NONE : (short)(ptrn.intValue() - 1);
}
@@ -320,10 +320,10 @@ public class XSSFCellStyle implements CellStyle {
* @return the used color or null if not set
*/
public XSSFColor getBottomBorderXSSFColor() {
- if(!cellXf.getApplyBorder()) return null;
+ if(!_cellXf.getApplyBorder()) return null;
- int idx = (int)cellXf.getBorderId();
- XSSFCellBorder border = stylesSource.getBorderAt(idx);
+ int idx = (int)_cellXf.getBorderId();
+ XSSFCellBorder border = _stylesSource.getBorderAt(idx);
return border.getBorderColor(BorderSide.BOTTOM);
}
@@ -334,7 +334,7 @@ public class XSSFCellStyle implements CellStyle {
* @return the index of the number format
*/
public short getDataFormat() {
- return (short)cellXf.getNumFmtId();
+ return (short)_cellXf.getNumFmtId();
}
/**
@@ -345,7 +345,7 @@ public class XSSFCellStyle implements CellStyle {
*/
public String getDataFormatString() {
int idx = getDataFormat();
- return new XSSFDataFormat(stylesSource).getFormat((short)idx);
+ return new XSSFDataFormat(_stylesSource).getFormat((short)idx);
}
/**
@@ -372,10 +372,10 @@ public class XSSFCellStyle implements CellStyle {
* @return XSSFColor - fill color or null if not set
*/
public XSSFColor getFillBackgroundXSSFColor() {
- if(!cellXf.getApplyFill()) return null;
+ if(!_cellXf.getApplyFill()) return null;
- int fillIndex = (int)cellXf.getFillId();
- XSSFCellFill fg = stylesSource.getFillAt(fillIndex);
+ int fillIndex = (int)_cellXf.getFillId();
+ XSSFCellFill fg = _stylesSource.getFillAt(fillIndex);
return fg.getFillBackgroundColor();
}
@@ -400,10 +400,10 @@ public class XSSFCellStyle implements CellStyle {
* @return XSSFColor - fill color or null if not set
*/
public XSSFColor getFillForegroundXSSFColor() {
- if(!cellXf.getApplyFill()) return null;
+ if(!_cellXf.getApplyFill()) return null;
- int fillIndex = (int)cellXf.getFillId();
- XSSFCellFill fg = stylesSource.getFillAt(fillIndex);
+ int fillIndex = (int)_cellXf.getFillId();
+ XSSFCellFill fg = _stylesSource.getFillAt(fillIndex);
return fg.getFillForegroundColor();
}
@@ -431,10 +431,10 @@ public class XSSFCellStyle implements CellStyle {
* @see org.apache.poi.ss.usermodel.CellStyle#DIAMONDS
*/
public short getFillPattern() {
- if(!cellXf.getApplyFill()) return 0;
+ if(!_cellXf.getApplyFill()) return 0;
- int fillIndex = (int)cellXf.getFillId();
- XSSFCellFill fill = stylesSource.getFillAt(fillIndex);
+ int fillIndex = (int)_cellXf.getFillId();
+ XSSFCellFill fill = _stylesSource.getFillAt(fillIndex);
STPatternType.Enum ptrn = fill.getPatternType();
if(ptrn == null) return CellStyle.NO_FILL;
@@ -456,10 +456,10 @@ public class XSSFCellStyle implements CellStyle {
* @return Font - font
*/
public XSSFFont getFont() {
- if (font == null) {
- font = stylesSource.getFontAt(getFontId());
+ if (_font == null) {
+ _font = _stylesSource.getFontAt(getFontId());
}
- return font;
+ return _font;
}
/**
@@ -487,7 +487,7 @@ public class XSSFCellStyle implements CellStyle {
* @return indent - number of spaces
*/
public short getIndention() {
- CTCellAlignment align = cellXf.getAlignment();
+ CTCellAlignment align = _cellXf.getAlignment();
return (short)(align == null ? 0 : align.getIndent());
}
@@ -497,7 +497,7 @@ public class XSSFCellStyle implements CellStyle {
* @return unique index number of the underlying record this style represents
*/
public short getIndex() {
- return (short)this.cellXfId;
+ return (short)this._cellXfId;
}
/**
@@ -518,10 +518,10 @@ public class XSSFCellStyle implements CellStyle {
* @see org.apache.poi.ss.usermodel.IndexedColors
*/
public XSSFColor getLeftBorderXSSFColor() {
- if(!cellXf.getApplyBorder()) return null;
+ if(!_cellXf.getApplyBorder()) return null;
- int idx = (int)cellXf.getBorderId();
- XSSFCellBorder border = stylesSource.getBorderAt(idx);
+ int idx = (int)_cellXf.getBorderId();
+ XSSFCellBorder border = _stylesSource.getBorderAt(idx);
return border.getBorderColor(BorderSide.LEFT);
}
@@ -551,10 +551,10 @@ public class XSSFCellStyle implements CellStyle {
* @return the used color or null if not set
*/
public XSSFColor getRightBorderXSSFColor() {
- if(!cellXf.getApplyBorder()) return null;
+ if(!_cellXf.getApplyBorder()) return null;
- int idx = (int)cellXf.getBorderId();
- XSSFCellBorder border = stylesSource.getBorderAt(idx);
+ int idx = (int)_cellXf.getBorderId();
+ XSSFCellBorder border = _stylesSource.getBorderAt(idx);
return border.getBorderColor(BorderSide.RIGHT);
}
@@ -574,7 +574,7 @@ public class XSSFCellStyle implements CellStyle {
* @return rotation degrees (between 0 and 180 degrees)
*/
public short getRotation() {
- CTCellAlignment align = cellXf.getAlignment();
+ CTCellAlignment align = _cellXf.getAlignment();
return (short)(align == null ? 0 : align.getTextRotation());
}
@@ -595,10 +595,10 @@ public class XSSFCellStyle implements CellStyle {
* @return the used color or null if not set
*/
public XSSFColor getTopBorderXSSFColor() {
- if(!cellXf.getApplyBorder()) return null;
+ if(!_cellXf.getApplyBorder()) return null;
- int idx = (int)cellXf.getBorderId();
- XSSFCellBorder border = stylesSource.getBorderAt(idx);
+ int idx = (int)_cellXf.getBorderId();
+ XSSFCellBorder border = _stylesSource.getBorderAt(idx);
return border.getBorderColor(BorderSide.TOP);
}
@@ -623,12 +623,11 @@ public class XSSFCellStyle implements CellStyle {
* @see org.apache.poi.ss.usermodel.VerticalAlignment
*/
public VerticalAlignment getVerticalAlignmentEnum() {
- CTCellAlignment align = cellXf.getAlignment();
+ CTCellAlignment align = _cellXf.getAlignment();
if(align != null && align.isSetVertical()) {
return VerticalAlignment.values()[align.getVertical().intValue()-1];
- } else {
- return VerticalAlignment.BOTTOM;
}
+ return VerticalAlignment.BOTTOM;
}
/**
@@ -637,7 +636,7 @@ public class XSSFCellStyle implements CellStyle {
* @return a boolean value indicating if the text in a cell should be line-wrapped within the cell.
*/
public boolean getWrapText() {
- CTCellAlignment align = cellXf.getAlignment();
+ CTCellAlignment align = _cellXf.getAlignment();
return align != null && align.getWrapText();
}
@@ -692,10 +691,10 @@ public class XSSFCellStyle implements CellStyle {
if(border == BORDER_NONE) ct.unsetBottom();
else pr.setStyle(STBorderStyle.Enum.forInt(border + 1));
- int idx = stylesSource.putBorder(new XSSFCellBorder(ct));
+ int idx = _stylesSource.putBorder(new XSSFCellBorder(ct));
- cellXf.setBorderId(idx);
- cellXf.setApplyBorder(true);
+ _cellXf.setBorderId(idx);
+ _cellXf.setApplyBorder(true);
}
/**
@@ -732,10 +731,10 @@ public class XSSFCellStyle implements CellStyle {
if(border == BORDER_NONE) ct.unsetLeft();
else pr.setStyle(STBorderStyle.Enum.forInt(border + 1));
- int idx = stylesSource.putBorder(new XSSFCellBorder(ct));
+ int idx = _stylesSource.putBorder(new XSSFCellBorder(ct));
- cellXf.setBorderId(idx);
- cellXf.setApplyBorder(true);
+ _cellXf.setBorderId(idx);
+ _cellXf.setApplyBorder(true);
}
/**
@@ -772,10 +771,10 @@ public class XSSFCellStyle implements CellStyle {
if(border == BORDER_NONE) ct.unsetRight();
else pr.setStyle(STBorderStyle.Enum.forInt(border + 1));
- int idx = stylesSource.putBorder(new XSSFCellBorder(ct));
+ int idx = _stylesSource.putBorder(new XSSFCellBorder(ct));
- cellXf.setBorderId(idx);
- cellXf.setApplyBorder(true);
+ _cellXf.setBorderId(idx);
+ _cellXf.setApplyBorder(true);
}
/**
@@ -812,10 +811,10 @@ public class XSSFCellStyle implements CellStyle {
if(border == BORDER_NONE) ct.unsetTop();
else pr.setStyle(STBorderStyle.Enum.forInt(border + 1));
- int idx = stylesSource.putBorder(new XSSFCellBorder(ct));
+ int idx = _stylesSource.putBorder(new XSSFCellBorder(ct));
- cellXf.setBorderId(idx);
- cellXf.setApplyBorder(true);
+ _cellXf.setBorderId(idx);
+ _cellXf.setApplyBorder(true);
}
/**
@@ -851,10 +850,10 @@ public class XSSFCellStyle implements CellStyle {
if(color != null) pr.setColor(color.getCTColor());
else pr.unsetColor();
- int idx = stylesSource.putBorder(new XSSFCellBorder(ct));
+ int idx = _stylesSource.putBorder(new XSSFCellBorder(ct));
- cellXf.setBorderId(idx);
- cellXf.setApplyBorder(true);
+ _cellXf.setBorderId(idx);
+ _cellXf.setApplyBorder(true);
}
/**
@@ -863,8 +862,8 @@ public class XSSFCellStyle implements CellStyle {
* @param fmt the index of a data format
*/
public void setDataFormat(short fmt) {
- cellXf.setApplyNumberFormat(true);
- cellXf.setNumFmtId(fmt);
+ _cellXf.setApplyNumberFormat(true);
+ _cellXf.setNumFmtId(fmt);
}
/**
@@ -902,10 +901,10 @@ public class XSSFCellStyle implements CellStyle {
ptrn.setBgColor(color.getCTColor());
}
- int idx = stylesSource.putFill(new XSSFCellFill(ct));
+ int idx = _stylesSource.putFill(new XSSFCellFill(ct));
- cellXf.setFillId(idx);
- cellXf.setApplyFill(true);
+ _cellXf.setFillId(idx);
+ _cellXf.setApplyFill(true);
}
/**
@@ -958,10 +957,10 @@ public class XSSFCellStyle implements CellStyle {
ptrn.setFgColor(color.getCTColor());
}
- int idx = stylesSource.putFill(new XSSFCellFill(ct));
+ int idx = _stylesSource.putFill(new XSSFCellFill(ct));
- cellXf.setFillId(idx);
- cellXf.setApplyFill(true);
+ _cellXf.setFillId(idx);
+ _cellXf.setApplyFill(true);
}
/**
@@ -982,9 +981,9 @@ public class XSSFCellStyle implements CellStyle {
*/
private CTFill getCTFill(){
CTFill ct;
- if(cellXf.getApplyFill()) {
- int fillIndex = (int)cellXf.getFillId();
- XSSFCellFill cf = stylesSource.getFillAt(fillIndex);
+ if(_cellXf.getApplyFill()) {
+ int fillIndex = (int)_cellXf.getFillId();
+ XSSFCellFill cf = _stylesSource.getFillAt(fillIndex);
ct = (CTFill)cf.getCTFill().copy();
} else {
@@ -998,9 +997,9 @@ public class XSSFCellStyle implements CellStyle {
*/
private CTBorder getCTBorder(){
CTBorder ct;
- if(cellXf.getApplyBorder()) {
- int idx = (int)cellXf.getBorderId();
- XSSFCellBorder cf = stylesSource.getBorderAt(idx);
+ if(_cellXf.getApplyBorder()) {
+ int idx = (int)_cellXf.getBorderId();
+ XSSFCellBorder cf = _stylesSource.getBorderAt(idx);
ct = (CTBorder)cf.getCTBorder().copy();
} else {
@@ -1041,10 +1040,10 @@ public class XSSFCellStyle implements CellStyle {
if(fp == NO_FILL && ptrn.isSetPatternType()) ptrn.unsetPatternType();
else ptrn.setPatternType(STPatternType.Enum.forInt(fp + 1));
- int idx = stylesSource.putFill(new XSSFCellFill(ct));
+ int idx = _stylesSource.putFill(new XSSFCellFill(ct));
- cellXf.setFillId(idx);
- cellXf.setApplyFill(true);
+ _cellXf.setFillId(idx);
+ _cellXf.setApplyFill(true);
}
/**
@@ -1070,10 +1069,10 @@ public class XSSFCellStyle implements CellStyle {
public void setFont(Font font) {
if(font != null){
long index = font.getIndex();
- this.cellXf.setFontId(index);
- this.cellXf.setApplyFont(true);
+ this._cellXf.setFontId(index);
+ this._cellXf.setApplyFont(true);
} else {
- this.cellXf.setApplyFont(false);
+ this._cellXf.setApplyFont(false);
}
}
@@ -1120,10 +1119,10 @@ public class XSSFCellStyle implements CellStyle {
if(color != null) pr.setColor(color.getCTColor());
else pr.unsetColor();
- int idx = stylesSource.putBorder(new XSSFCellBorder(ct));
+ int idx = _stylesSource.putBorder(new XSSFCellBorder(ct));
- cellXf.setBorderId(idx);
- cellXf.setApplyBorder(true);
+ _cellXf.setBorderId(idx);
+ _cellXf.setApplyBorder(true);
}
/**
@@ -1160,10 +1159,10 @@ public class XSSFCellStyle implements CellStyle {
if(color != null) pr.setColor(color.getCTColor());
else pr.unsetColor();
- int idx = stylesSource.putBorder(new XSSFCellBorder(ct));
+ int idx = _stylesSource.putBorder(new XSSFCellBorder(ct));
- cellXf.setBorderId(idx);
- cellXf.setApplyBorder(true);
+ _cellXf.setBorderId(idx);
+ _cellXf.setApplyBorder(true);
}
/**
@@ -1210,10 +1209,10 @@ public class XSSFCellStyle implements CellStyle {
if(color != null) pr.setColor(color.getCTColor());
else pr.unsetColor();
- int idx = stylesSource.putBorder(new XSSFCellBorder(ct));
+ int idx = _stylesSource.putBorder(new XSSFCellBorder(ct));
- cellXf.setBorderId(idx);
- cellXf.setApplyBorder(true);
+ _cellXf.setBorderId(idx);
+ _cellXf.setApplyBorder(true);
}
/**
@@ -1296,10 +1295,10 @@ public class XSSFCellStyle implements CellStyle {
}
}
private int getFontId() {
- if (cellXf.isSetFontId()) {
- return (int) cellXf.getFontId();
+ if (_cellXf.isSetFontId()) {
+ return (int) _cellXf.getFontId();
}
- return (int) cellStyleXf.getFontId();
+ return (int) _cellStyleXf.getFontId();
}
/**
@@ -1307,10 +1306,10 @@ public class XSSFCellStyle implements CellStyle {
* @return CTCellProtection
*/
private CTCellProtection getCellProtection() {
- if (cellXf.getProtection() == null) {
- cellXf.addNewProtection();
+ if (_cellXf.getProtection() == null) {
+ _cellXf.addNewProtection();
}
- return cellXf.getProtection();
+ return _cellXf.getProtection();
}
/**
@@ -1318,10 +1317,10 @@ public class XSSFCellStyle implements CellStyle {
* @return XSSFCellAlignment - cell alignment
*/
protected XSSFCellAlignment getCellAlignment() {
- if (this.cellAlignment == null) {
- this.cellAlignment = new XSSFCellAlignment(getCTCellAlignment());
+ if (this._cellAlignment == null) {
+ this._cellAlignment = new XSSFCellAlignment(getCTCellAlignment());
}
- return this.cellAlignment;
+ return this._cellAlignment;
}
/**
@@ -1330,10 +1329,10 @@ public class XSSFCellStyle implements CellStyle {
* @return CTCellAlignment
*/
private CTCellAlignment getCTCellAlignment() {
- if (cellXf.getAlignment() == null) {
- cellXf.setAlignment(CTCellAlignment.Factory.newInstance());
+ if (_cellXf.getAlignment() == null) {
+ _cellXf.setAlignment(CTCellAlignment.Factory.newInstance());
}
- return cellXf.getAlignment();
+ return _cellXf.getAlignment();
}
/**
@@ -1342,7 +1341,7 @@ public class XSSFCellStyle implements CellStyle {
* @return the hash code value for this style
*/
public int hashCode(){
- return cellXf.toString().hashCode();
+ return _cellXf.toString().hashCode();
}
/**
@@ -1355,7 +1354,7 @@ public class XSSFCellStyle implements CellStyle {
if(o == null || !(o instanceof XSSFCellStyle)) return false;
XSSFCellStyle cf = (XSSFCellStyle)o;
- return cellXf.toString().equals(cf.getCoreXf().toString());
+ return _cellXf.toString().equals(cf.getCoreXf().toString());
}
/**
@@ -1365,11 +1364,11 @@ public class XSSFCellStyle implements CellStyle {
* @return a copy of this style
*/
public Object clone(){
- CTXf xf = (CTXf)cellXf.copy();
+ CTXf xf = (CTXf)_cellXf.copy();
- int xfSize = stylesSource._getStyleXfsSize();
- int indexXf = stylesSource.putCellXf(xf);
- return new XSSFCellStyle(indexXf-1, xfSize-1, stylesSource);
+ int xfSize = _stylesSource._getStyleXfsSize();
+ int indexXf = _stylesSource.putCellXf(xf);
+ return new XSSFCellStyle(indexXf-1, xfSize-1, _stylesSource);
}
}
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
index 739ef4ca50..914b383f49 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
@@ -42,8 +42,8 @@ public class XSSFFont implements Font {
*/
public static final short DEFAULT_FONT_COLOR = IndexedColors.BLACK.getIndex();
- private CTFont ctFont;
- private short index;
+ private CTFont _ctFont;
+ private short _index;
/**
* Create a new XSSFFont
@@ -51,20 +51,20 @@ public class XSSFFont implements Font {
* @param font the underlying CTFont bean
*/
public XSSFFont(CTFont font) {
- this.ctFont = font;
- this.index = 0;
+ _ctFont = font;
+ _index = 0;
}
public XSSFFont(CTFont font, int index) {
- this.ctFont = font;
- this.index = (short)index;
+ _ctFont = font;
+ _index = (short)index;
}
/**
* Create a new XSSFont. This method is protected to be used only by XSSFWorkbook
*/
protected XSSFFont() {
- this.ctFont = CTFont.Factory.newInstance();
+ this._ctFont = CTFont.Factory.newInstance();
setFontName(DEFAULT_FONT_NAME);
setFontHeight((double)DEFAULT_FONT_SIZE);
}
@@ -73,7 +73,7 @@ public class XSSFFont implements Font {
* get the underlying CTFont font
*/
public CTFont getCTFont() {
- return ctFont;
+ return _ctFont;
}
/**
@@ -82,7 +82,7 @@ public class XSSFFont implements Font {
* @return boolean - bold
*/
public boolean getBold() {
- CTBooleanProperty bold = ctFont.sizeOfBArray() == 0 ? null : ctFont.getBArray(0);
+ CTBooleanProperty bold = _ctFont.sizeOfBArray() == 0 ? null : _ctFont.getBArray(0);
return (bold != null && bold.getVal());
}
@@ -93,7 +93,7 @@ public class XSSFFont implements Font {
* @see org.apache.poi.ss.usermodel.FontCharset
*/
public byte getCharSet() {
- CTIntProperty charset = ctFont.sizeOfCharsetArray() == 0 ? null : ctFont.getCharsetArray(0);
+ CTIntProperty charset = _ctFont.sizeOfCharsetArray() == 0 ? null : _ctFont.getCharsetArray(0);
int val = charset == null ? FontCharset.ANSI.getValue() : FontCharset.valueOf(charset.getVal()).getValue();
return (byte)val;
}
@@ -107,7 +107,7 @@ public class XSSFFont implements Font {
* @see IndexedColors
*/
public short getColor() {
- CTColor color = ctFont.sizeOfColorArray() == 0 ? null : ctFont.getColorArray(0);
+ CTColor color = _ctFont.sizeOfColorArray() == 0 ? null : _ctFont.getColorArray(0);
if (color == null) return IndexedColors.BLACK.getIndex();
long index = color.getIndexed();
@@ -128,7 +128,7 @@ public class XSSFFont implements Font {
* @return XSSFColor - rgb color to use
*/
public XSSFColor getXSSFColor() {
- CTColor ctColor = ctFont.sizeOfColorArray() == 0 ? null : ctFont.getColorArray(0);
+ CTColor ctColor = _ctFont.sizeOfColorArray() == 0 ? null : _ctFont.getColorArray(0);
return ctColor == null ? null : new XSSFColor(ctColor);
}
@@ -140,7 +140,7 @@ public class XSSFFont implements Font {
* @return short - theme defined to use
*/
public short getThemeColor() {
- CTColor color = ctFont.sizeOfColorArray() == 0 ? null : ctFont.getColorArray(0);
+ CTColor color = _ctFont.sizeOfColorArray() == 0 ? null : _ctFont.getColorArray(0);
long index = color == null ? 0 : color.getTheme();
return (short) index;
}
@@ -151,12 +151,12 @@ public class XSSFFont implements Font {
* @return short - height in point
*/
public short getFontHeight() {
- CTFontSize size = ctFont.sizeOfSzArray() == 0 ? null : ctFont.getSzArray(0);
+ CTFontSize size = _ctFont.sizeOfSzArray() == 0 ? null : _ctFont.getSzArray(0);
if (size != null) {
double fontHeight = size.getVal();
return (short)(fontHeight*20);
- } else
- return (short)(DEFAULT_FONT_SIZE*20);
+ }
+ return (short)(DEFAULT_FONT_SIZE*20);
}
/**
@@ -172,7 +172,7 @@ public class XSSFFont implements Font {
* @return String - a string representing the name of the font to use
*/
public String getFontName() {
- CTFontName name = ctFont.sizeOfNameArray() == 0 ? null : ctFont.getNameArray(0);
+ CTFontName name = _ctFont.sizeOfNameArray() == 0 ? null : _ctFont.getNameArray(0);
return name == null ? DEFAULT_FONT_NAME : name.getVal();
}
@@ -182,7 +182,7 @@ public class XSSFFont implements Font {
* @return boolean - value for italic
*/
public boolean getItalic() {
- CTBooleanProperty italic = ctFont.sizeOfIArray() == 0 ? null : ctFont.getIArray(0);
+ CTBooleanProperty italic = _ctFont.sizeOfIArray() == 0 ? null : _ctFont.getIArray(0);
return italic != null && italic.getVal();
}
@@ -192,7 +192,7 @@ public class XSSFFont implements Font {
* @return boolean - value for strikeout
*/
public boolean getStrikeout() {
- CTBooleanProperty strike = ctFont.sizeOfStrikeArray() == 0 ? null : ctFont.getStrikeArray(0);
+ CTBooleanProperty strike = _ctFont.sizeOfStrikeArray() == 0 ? null : _ctFont.getStrikeArray(0);
return strike != null && strike.getVal();
}
@@ -205,21 +205,21 @@ public class XSSFFont implements Font {
* @see Font#SS_SUB
*/
public short getTypeOffset() {
- CTVerticalAlignFontProperty vAlign = ctFont.sizeOfVertAlignArray() == 0 ? null : ctFont.getVertAlignArray(0);
- if (vAlign != null) {
- int val = vAlign.getVal().intValue();
- switch (val) {
- case STVerticalAlignRun.INT_BASELINE:
- return Font.SS_NONE;
- case STVerticalAlignRun.INT_SUBSCRIPT:
- return Font.SS_SUB;
- case STVerticalAlignRun.INT_SUPERSCRIPT:
- return Font.SS_SUPER;
- default:
- throw new POIXMLException("Wrong offset value " + val);
- }
- } else
+ CTVerticalAlignFontProperty vAlign = _ctFont.sizeOfVertAlignArray() == 0 ? null : _ctFont.getVertAlignArray(0);
+ if (vAlign == null) {
return Font.SS_NONE;
+ }
+ int val = vAlign.getVal().intValue();
+ switch (val) {
+ case STVerticalAlignRun.INT_BASELINE:
+ return Font.SS_NONE;
+ case STVerticalAlignRun.INT_SUBSCRIPT:
+ return Font.SS_SUB;
+ case STVerticalAlignRun.INT_SUPERSCRIPT:
+ return Font.SS_SUPER;
+ default:
+ throw new POIXMLException("Wrong offset value " + val);
+ }
}
/**
@@ -229,7 +229,7 @@ public class XSSFFont implements Font {
* @see org.apache.poi.ss.usermodel.FontUnderline
*/
public byte getUnderline() {
- CTUnderlineProperty underline = ctFont.sizeOfUArray() == 0 ? null : ctFont.getUArray(0);
+ CTUnderlineProperty underline = _ctFont.sizeOfUArray() == 0 ? null : _ctFont.getUArray(0);
if (underline != null) {
FontUnderline val = FontUnderline.valueOf(underline.getVal().intValue());
return val.getByteValue();
@@ -244,10 +244,10 @@ public class XSSFFont implements Font {
*/
public void setBold(boolean bold) {
if(bold){
- CTBooleanProperty ctBold = ctFont.sizeOfBArray() == 0 ? ctFont.addNewB() : ctFont.getBArray(0);
+ CTBooleanProperty ctBold = _ctFont.sizeOfBArray() == 0 ? _ctFont.addNewB() : _ctFont.getBArray(0);
ctBold.setVal(bold);
} else {
- ctFont.setBArray(null);
+ _ctFont.setBArray(null);
}
}
@@ -275,7 +275,7 @@ public class XSSFFont implements Font {
* @see FontCharset
*/
public void setCharSet(byte charset) {
- CTIntProperty charsetProperty = ctFont.sizeOfCharsetArray() == 0 ? ctFont.addNewCharset() : ctFont.getCharsetArray(0);
+ CTIntProperty charsetProperty = _ctFont.sizeOfCharsetArray() == 0 ? _ctFont.addNewCharset() : _ctFont.getCharsetArray(0);
switch (charset) {
case Font.ANSI_CHARSET:
charsetProperty.setVal(FontCharset.ANSI.getValue());
@@ -308,7 +308,7 @@ public class XSSFFont implements Font {
* @see IndexedColors
*/
public void setColor(short color) {
- CTColor ctColor = ctFont.sizeOfColorArray() == 0 ? ctFont.addNewColor() : ctFont.getColorArray(0);
+ CTColor ctColor = _ctFont.sizeOfColorArray() == 0 ? _ctFont.addNewColor() : _ctFont.getColorArray(0);
switch (color) {
case Font.COLOR_NORMAL: {
ctColor.setIndexed(XSSFFont.DEFAULT_FONT_COLOR);
@@ -329,9 +329,9 @@ public class XSSFFont implements Font {
* @param color - color to use
*/
public void setColor(XSSFColor color) {
- if(color == null) ctFont.setColorArray(null);
+ if(color == null) _ctFont.setColorArray(null);
else {
- CTColor ctColor = ctFont.sizeOfColorArray() == 0 ? ctFont.addNewColor() : ctFont.getColorArray(0);
+ CTColor ctColor = _ctFont.sizeOfColorArray() == 0 ? _ctFont.addNewColor() : _ctFont.getColorArray(0);
ctColor.setRgb(color.getRgb());
}
}
@@ -351,7 +351,7 @@ public class XSSFFont implements Font {
* @param height - height in points
*/
public void setFontHeight(double height) {
- CTFontSize fontSize = ctFont.sizeOfSzArray() == 0 ? ctFont.addNewSz() : ctFont.getSzArray(0);
+ CTFontSize fontSize = _ctFont.sizeOfSzArray() == 0 ? _ctFont.addNewSz() : _ctFont.getSzArray(0);
fontSize.setVal(height);
}
@@ -370,7 +370,7 @@ public class XSSFFont implements Font {
* @param theme - theme color to use
*/
public void setThemeColor(short theme) {
- CTColor ctColor = ctFont.sizeOfColorArray() == 0 ? ctFont.addNewColor() : ctFont.getColorArray(0);
+ CTColor ctColor = _ctFont.sizeOfColorArray() == 0 ? _ctFont.addNewColor() : _ctFont.getColorArray(0);
ctColor.setTheme(theme);
}
@@ -386,7 +386,7 @@ public class XSSFFont implements Font {
* @see #DEFAULT_FONT_NAME
*/
public void setFontName(String name) {
- CTFontName fontName = ctFont.sizeOfNameArray() == 0 ? ctFont.addNewName() : ctFont.getNameArray(0);
+ CTFontName fontName = _ctFont.sizeOfNameArray() == 0 ? _ctFont.addNewName() : _ctFont.getNameArray(0);
fontName.setVal(name == null ? DEFAULT_FONT_NAME : name);
}
@@ -399,10 +399,10 @@ public class XSSFFont implements Font {
*/
public void setItalic(boolean italic) {
if(italic){
- CTBooleanProperty bool = ctFont.sizeOfIArray() == 0 ? ctFont.addNewI() : ctFont.getIArray(0);
+ CTBooleanProperty bool = _ctFont.sizeOfIArray() == 0 ? _ctFont.addNewI() : _ctFont.getIArray(0);
bool.setVal(italic);
} else {
- ctFont.setIArray(null);
+ _ctFont.setIArray(null);
}
}
@@ -414,9 +414,9 @@ public class XSSFFont implements Font {
* @param strikeout - value for strikeout or not
*/
public void setStrikeout(boolean strikeout) {
- if(!strikeout) ctFont.setStrikeArray(null);
+ if(!strikeout) _ctFont.setStrikeArray(null);
else {
- CTBooleanProperty strike = ctFont.sizeOfStrikeArray() == 0 ? ctFont.addNewStrike() : ctFont.getStrikeArray(0);
+ CTBooleanProperty strike = _ctFont.sizeOfStrikeArray() == 0 ? _ctFont.addNewStrike() : _ctFont.getStrikeArray(0);
strike.setVal(strikeout);
}
}
@@ -433,9 +433,9 @@ public class XSSFFont implements Font {
*/
public void setTypeOffset(short offset) {
if(offset == Font.SS_NONE){
- ctFont.setVertAlignArray(null);
+ _ctFont.setVertAlignArray(null);
} else {
- CTVerticalAlignFontProperty offsetProperty = ctFont.sizeOfVertAlignArray() == 0 ? ctFont.addNewVertAlign() : ctFont.getVertAlignArray(0);
+ CTVerticalAlignFontProperty offsetProperty = _ctFont.sizeOfVertAlignArray() == 0 ? _ctFont.addNewVertAlign() : _ctFont.getVertAlignArray(0);
switch (offset) {
case Font.SS_NONE:
offsetProperty.setVal(STVerticalAlignRun.BASELINE);
@@ -469,10 +469,10 @@ public class XSSFFont implements Font {
* @param underline - FontUnderline enum value
*/
public void setUnderline(FontUnderline underline) {
- if(underline == FontUnderline.NONE && ctFont.sizeOfUArray() > 0){
- ctFont.setUArray(null);
+ if(underline == FontUnderline.NONE && _ctFont.sizeOfUArray() > 0){
+ _ctFont.setUArray(null);
} else {
- CTUnderlineProperty ctUnderline = ctFont.sizeOfUArray() == 0 ? ctFont.addNewU() : ctFont.getUArray(0);
+ CTUnderlineProperty ctUnderline = _ctFont.sizeOfUArray() == 0 ? _ctFont.addNewU() : _ctFont.getUArray(0);
STUnderlineValues.Enum val = STUnderlineValues.Enum.forInt(underline.getValue());
ctUnderline.setVal(val);
}
@@ -480,7 +480,7 @@ public class XSSFFont implements Font {
public String toString() {
- return ctFont.toString();
+ return _ctFont.toString();
}
@@ -489,7 +489,7 @@ public class XSSFFont implements Font {
*/
public long putFont(StylesTable styles) {
short idx = (short)styles.putFont(this);
- this.index = idx;
+ this._index = idx;
return idx;
}
@@ -501,7 +501,7 @@ public class XSSFFont implements Font {
* @see org.apache.poi.xssf.model.StylesTable#createDefaultFont()
*/
public FontScheme getScheme() {
- CTFontScheme scheme = ctFont.sizeOfSchemeArray() == 0 ? null : ctFont.getSchemeArray(0);
+ CTFontScheme scheme = _ctFont.sizeOfSchemeArray() == 0 ? null : _ctFont.getSchemeArray(0);
return scheme == null ? FontScheme.NONE : FontScheme.valueOf(scheme.getVal().intValue());
}
@@ -512,7 +512,7 @@ public class XSSFFont implements Font {
* @see FontScheme
*/
public void setScheme(FontScheme scheme) {
- CTFontScheme ctFontScheme = ctFont.sizeOfSchemeArray() == 0 ? ctFont.addNewScheme() : ctFont.getSchemeArray(0);
+ CTFontScheme ctFontScheme = _ctFont.sizeOfSchemeArray() == 0 ? _ctFont.addNewScheme() : _ctFont.getSchemeArray(0);
STFontScheme.Enum val = STFontScheme.Enum.forInt(scheme.getValue());
ctFontScheme.setVal(val);
}
@@ -524,7 +524,7 @@ public class XSSFFont implements Font {
* @see org.apache.poi.ss.usermodel.FontFamily
*/
public int getFamily() {
- CTIntProperty family = ctFont.sizeOfFamilyArray() == 0 ? ctFont.addNewFamily() : ctFont.getFamilyArray(0);
+ CTIntProperty family = _ctFont.sizeOfFamilyArray() == 0 ? _ctFont.addNewFamily() : _ctFont.getFamilyArray(0);
return family == null ? FontFamily.NOT_APPLICABLE.getValue() : FontFamily.valueOf(family.getVal()).getValue();
}
@@ -537,7 +537,7 @@ public class XSSFFont implements Font {
* @see FontFamily
*/
public void setFamily(int value) {
- CTIntProperty family = ctFont.sizeOfFamilyArray() == 0 ? ctFont.addNewFamily() : ctFont.getFamilyArray(0);
+ CTIntProperty family = _ctFont.sizeOfFamilyArray() == 0 ? _ctFont.addNewFamily() : _ctFont.getFamilyArray(0);
family.setVal(value);
}
@@ -560,18 +560,18 @@ public class XSSFFont implements Font {
public short getIndex()
{
- return index;
+ return _index;
}
public int hashCode(){
- return ctFont.toString().hashCode();
+ return _ctFont.toString().hashCode();
}
public boolean equals(Object o){
if(!(o instanceof XSSFFont)) return false;
XSSFFont cf = (XSSFFont)o;
- return ctFont.toString().equals(cf.getCTFont().toString());
+ return _ctFont.toString().equals(cf.getCTFont().toString());
}
}
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
index 671e6f402f..e492d28f16 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
@@ -32,10 +32,10 @@ import org.apache.poi.openxml4j.opc.PackageRelationship;
* are largely stored as relations of the sheet
*/
public class XSSFHyperlink implements Hyperlink {
- private int type;
- private PackageRelationship externalRel;
- private CTHyperlink ctHyperlink;
- private String location;
+ private int _type;
+ private PackageRelationship _externalRel;
+ private CTHyperlink _ctHyperlink;
+ private String _location;
/**
* Create a new XSSFHyperlink. This method is protected to be used only by XSSFCreationHelper
@@ -43,8 +43,8 @@ public class XSSFHyperlink implements Hyperlink {
* @param type - the type of hyperlink to create
*/
protected XSSFHyperlink(int type) {
- this.type = type;
- this.ctHyperlink = CTHyperlink.Factory.newInstance();
+ _type = type;
+ _ctHyperlink = CTHyperlink.Factory.newInstance();
}
/**
@@ -54,37 +54,36 @@ public class XSSFHyperlink implements Hyperlink {
* @param hyperlinkRel the relationship in the underlying OPC package which stores the actual link's address
*/
protected XSSFHyperlink(CTHyperlink ctHyperlink, PackageRelationship hyperlinkRel) {
- this.ctHyperlink = ctHyperlink;
- this.externalRel = hyperlinkRel;
+ _ctHyperlink = ctHyperlink;
+ _externalRel = hyperlinkRel;
// Figure out the Hyperlink type and distination
// If it has a location, it's internal
if (ctHyperlink.getLocation() != null) {
- type = Hyperlink.LINK_DOCUMENT;
- location = ctHyperlink.getLocation();
+ _type = Hyperlink.LINK_DOCUMENT;
+ _location = ctHyperlink.getLocation();
} else {
// Otherwise it's somehow external, check
// the relation to see how
- if (externalRel == null) {
+ if (_externalRel == null) {
if (ctHyperlink.getId() != null) {
throw new IllegalStateException("The hyperlink for cell " + ctHyperlink.getRef() + " references relation " + ctHyperlink.getId() + ", but that didn't exist!");
- } else {
- throw new IllegalStateException("A sheet hyperlink must either have a location, or a relationship. Found:\n" + ctHyperlink);
}
+ throw new IllegalStateException("A sheet hyperlink must either have a location, or a relationship. Found:\n" + ctHyperlink);
}
- URI target = externalRel.getTargetURI();
- location = target.toString();
+ URI target = _externalRel.getTargetURI();
+ _location = target.toString();
// Try to figure out the type
- if (location.startsWith("http://") || location.startsWith("https://")
- || location.startsWith("ftp://")) {
- type = Hyperlink.LINK_URL;
- } else if (location.startsWith("mailto:")) {
- type = Hyperlink.LINK_EMAIL;
+ if (_location.startsWith("http://") || _location.startsWith("https://")
+ || _location.startsWith("ftp://")) {
+ _type = Hyperlink.LINK_URL;
+ } else if (_location.startsWith("mailto:")) {
+ _type = Hyperlink.LINK_EMAIL;
} else {
- type = Hyperlink.LINK_FILE;
+ _type = Hyperlink.LINK_FILE;
}
}
}
@@ -93,7 +92,7 @@ public class XSSFHyperlink implements Hyperlink {
* Returns the underlying hyperlink object
*/
protected CTHyperlink getCTHyperlink() {
- return ctHyperlink;
+ return _ctHyperlink;
}
/**
@@ -101,7 +100,7 @@ public class XSSFHyperlink implements Hyperlink {
* this hyperlink?
*/
public boolean needsRelationToo() {
- return (type != Hyperlink.LINK_DOCUMENT);
+ return (_type != Hyperlink.LINK_DOCUMENT);
}
/**
@@ -111,10 +110,10 @@ public class XSSFHyperlink implements Hyperlink {
if (needsRelationToo()) {
// Generate the relation
PackageRelationship rel =
- sheetPart.addExternalRelationship(location, XSSFRelation.SHEET_HYPERLINKS.getRelation());
+ sheetPart.addExternalRelationship(_location, XSSFRelation.SHEET_HYPERLINKS.getRelation());
// Update the r:id
- ctHyperlink.setId(rel.getId());
+ _ctHyperlink.setId(rel.getId());
}
}
@@ -124,7 +123,7 @@ public class XSSFHyperlink implements Hyperlink {
* @return the type of this hyperlink
*/
public int getType() {
- return type;
+ return _type;
}
/**
@@ -132,7 +131,7 @@ public class XSSFHyperlink implements Hyperlink {
* es A55
*/
public String getCellRef() {
- return ctHyperlink.getRef();
+ return _ctHyperlink.getRef();
}
/**
@@ -141,7 +140,7 @@ public class XSSFHyperlink implements Hyperlink {
* @return the address of this hyperlink
*/
public String getAddress() {
- return location;
+ return _location;
}
/**
@@ -150,7 +149,7 @@ public class XSSFHyperlink implements Hyperlink {
* @return text to display
*/
public String getLabel() {
- return ctHyperlink.getDisplay();
+ return _ctHyperlink.getDisplay();
}
/**
@@ -160,7 +159,7 @@ public class XSSFHyperlink implements Hyperlink {
* @return location
*/
public String getLocation() {
- return ctHyperlink.getLocation();
+ return _ctHyperlink.getLocation();
}
/**
@@ -169,7 +168,7 @@ public class XSSFHyperlink implements Hyperlink {
* @param label text label for this hyperlink
*/
public void setLabel(String label) {
- ctHyperlink.setDisplay(label);
+ _ctHyperlink.setDisplay(label);
}
/**
@@ -179,7 +178,7 @@ public class XSSFHyperlink implements Hyperlink {
* @param location - string representing a location of this hyperlink
*/
public void setLocation(String location) {
- ctHyperlink.setLocation(location);
+ _ctHyperlink.setLocation(location);
}
/**
@@ -188,9 +187,9 @@ public class XSSFHyperlink implements Hyperlink {
* @param address - the address of this hyperlink
*/
public void setAddress(String address) {
- location = address;
- //we must set location for internal hyperlinks
- if (type == Hyperlink.LINK_DOCUMENT) {
+ _location = address;
+ //we must set location for internal hyperlinks
+ if (_type == Hyperlink.LINK_DOCUMENT) {
setLocation(address);
}
}
@@ -199,11 +198,11 @@ public class XSSFHyperlink implements Hyperlink {
* Assigns this hyperlink to the given cell reference
*/
protected void setCellReference(String ref) {
- ctHyperlink.setRef(ref);
+ _ctHyperlink.setRef(ref);
}
private CellReference buildCellReference() {
- return new CellReference(ctHyperlink.getRef());
+ return new CellReference(_ctHyperlink.getRef());
}
@@ -251,7 +250,7 @@ public class XSSFHyperlink implements Hyperlink {
* @param col the 0-based column of the first cell that contains the hyperlink
*/
public void setFirstColumn(int col) {
- ctHyperlink.setRef(
+ _ctHyperlink.setRef(
new CellReference(
getFirstRow(), col
).formatAsString()
@@ -273,7 +272,7 @@ public class XSSFHyperlink implements Hyperlink {
* @param row the 0-based row of the first cell that contains the hyperlink
*/
public void setFirstRow(int row) {
- ctHyperlink.setRef(
+ _ctHyperlink.setRef(
new CellReference(
row, getFirstColumn()
).formatAsString()
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java
index ed4d364abe..2cb64cc27f 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java
@@ -102,8 +102,8 @@ public final class XSSFName implements Name {
*/
public final static String BUILTIN_SHEET_TITLE = "_xlnm.Sheet_Title";
- private XSSFWorkbook workbook;
- private CTDefinedName ctName;
+ private XSSFWorkbook _workbook;
+ private CTDefinedName _ctName;
/**
* Creates an XSSFName object - called internally by XSSFWorkbook.
@@ -113,15 +113,15 @@ public final class XSSFName implements Name {
* @see org.apache.poi.xssf.usermodel.XSSFWorkbook#createName()
*/
protected XSSFName(CTDefinedName name, XSSFWorkbook workbook) {
- this.workbook = workbook;
- this.ctName = name;
+ _workbook = workbook;
+ _ctName = name;
}
/**
* Returns the underlying named range object
*/
protected CTDefinedName getCTName() {
- return ctName;
+ return _ctName;
}
/**
@@ -130,7 +130,7 @@ public final class XSSFName implements Name {
* @return text name of this defined name
*/
public String getNameName() {
- return ctName.getName();
+ return _ctName.getName();
}
/**
@@ -169,8 +169,8 @@ public final class XSSFName implements Name {
int sheetIndex = getSheetIndex();
//Check to ensure no other names have the same case-insensitive name
- for (int i = 0; i < workbook.getNumberOfNames(); i++) {
- XSSFName nm = workbook.getNameAt(i);
+ for (int i = 0; i < _workbook.getNumberOfNames(); i++) {
+ XSSFName nm = _workbook.getNameAt(i);
if (nm != this) {
if(name.equalsIgnoreCase(nm.getNameName()) && sheetIndex == nm.getSheetIndex()){
String msg = "The "+(sheetIndex == -1 ? "workbook" : "sheet")+" already contains this name: " + name;
@@ -178,11 +178,11 @@ public final class XSSFName implements Name {
}
}
}
- ctName.setName(name);
+ _ctName.setName(name);
}
public String getRefersToFormula() {
- String result = ctName.getStringValue();
+ String result = _ctName.getStringValue();
if (result == null || result.length() < 1) {
return null;
}
@@ -190,11 +190,11 @@ public final class XSSFName implements Name {
}
public void setRefersToFormula(String formulaText) {
- XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(workbook);
+ XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(_workbook);
//validate through the FormulaParser
FormulaParser.parse(formulaText, fpb, FormulaType.NAMEDRANGE, getSheetIndex());
- ctName.setStringValue(formulaText);
+ _ctName.setStringValue(formulaText);
}
public boolean isDeleted(){
@@ -202,7 +202,7 @@ public final class XSSFName implements Name {
if (formulaText == null) {
return false;
}
- XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(workbook);
+ XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(_workbook);
Ptg[] ptgs = FormulaParser.parse(formulaText, fpb, FormulaType.NAMEDRANGE, getSheetIndex());
return Ptg.doesFormulaReferToDeletedCell(ptgs);
}
@@ -213,16 +213,16 @@ public final class XSSFName implements Name {
* @param index the sheet index this name applies to, -1 unsets this property making the name workbook-global
*/
public void setSheetIndex(int index) {
- int lastSheetIx = workbook.getNumberOfSheets() - 1;
+ int lastSheetIx = _workbook.getNumberOfSheets() - 1;
if (index < -1 || index > lastSheetIx) {
throw new IllegalArgumentException("Sheet index (" + index +") is out of range" +
(lastSheetIx == -1 ? "" : (" (0.." + lastSheetIx + ")")));
}
if(index == -1) {
- if(ctName.isSetLocalSheetId()) ctName.unsetLocalSheetId();
+ if(_ctName.isSetLocalSheetId()) _ctName.unsetLocalSheetId();
} else {
- ctName.setLocalSheetId(index);
+ _ctName.setLocalSheetId(index);
}
}
@@ -232,7 +232,7 @@ public final class XSSFName implements Name {
* @return the sheet index this name applies to, -1 if this name applies to the entire workbook
*/
public int getSheetIndex() {
- return ctName.isSetLocalSheetId() ? (int) ctName.getLocalSheetId() : -1;
+ return _ctName.isSetLocalSheetId() ? (int) _ctName.getLocalSheetId() : -1;
}
/**
@@ -242,7 +242,7 @@ public final class XSSFName implements Name {
* @param value true indicates the name refers to a function.
*/
public void setFunction(boolean value) {
- ctName.setFunction(value);
+ _ctName.setFunction(value);
}
/**
@@ -252,7 +252,7 @@ public final class XSSFName implements Name {
* @return true indicates the name refers to a function.
*/
public boolean getFunction() {
- return ctName.getFunction();
+ return _ctName.getFunction();
}
/**
@@ -263,7 +263,7 @@ public final class XSSFName implements Name {
* @param functionGroupId the function group index that defines the general category for the function
*/
public void setFunctionGroupId(int functionGroupId) {
- ctName.setFunctionGroupId(functionGroupId);
+ _ctName.setFunctionGroupId(functionGroupId);
}
/**
@@ -274,7 +274,7 @@ public final class XSSFName implements Name {
* @return the function group index that defines the general category for the function
*/
public int getFunctionGroupId() {
- return (int) ctName.getFunctionGroupId();
+ return (int) _ctName.getFunctionGroupId();
}
/**
@@ -284,15 +284,14 @@ public final class XSSFName implements Name {
* Empty string if the referenced sheet name weas not found.
*/
public String getSheetName() {
- if (ctName.isSetLocalSheetId()) {
+ if (_ctName.isSetLocalSheetId()) {
// Given as explicit sheet id
- int sheetId = (int)ctName.getLocalSheetId();
- return workbook.getSheetName(sheetId);
- } else {
- String ref = getRefersToFormula();
- AreaReference areaRef = new AreaReference(ref);
- return areaRef.getFirstCell().getSheetName();
+ int sheetId = (int)_ctName.getLocalSheetId();
+ return _workbook.getSheetName(sheetId);
}
+ String ref = getRefersToFormula();
+ AreaReference areaRef = new AreaReference(ref);
+ return areaRef.getFirstCell().getSheetName();
}
/**
@@ -310,7 +309,7 @@ public final class XSSFName implements Name {
* @return the user comment for this named range
*/
public String getComment() {
- return ctName.getComment();
+ return _ctName.getComment();
}
/**
@@ -319,12 +318,12 @@ public final class XSSFName implements Name {
* @param comment the user comment for this named range
*/
public void setComment(String comment) {
- ctName.setComment(comment);
+ _ctName.setComment(comment);
}
@Override
public int hashCode() {
- return ctName.toString().hashCode();
+ return _ctName.toString().hashCode();
}
/**
@@ -343,7 +342,7 @@ public final class XSSFName implements Name {
if (!(o instanceof XSSFName)) return false;
XSSFName cf = (XSSFName) o;
- return ctName.toString().equals(cf.getCTName().toString());
+ return _ctName.toString().equals(cf.getCTName().toString());
}
private static void validateName(String name){
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
index 702f549ba7..42cd41a3e3 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
@@ -42,7 +42,7 @@ import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
import org.apache.poi.openxml4j.opc.PackagingURIHelper;
/**
- *
+ *
*/
public final class XSSFRelation extends POIXMLRelation {
@@ -114,28 +114,28 @@ public final class XSSFRelation extends POIXMLRelation {
"/xl/drawings/vmlDrawing#.vml",
null
);
-
+
public static final XSSFRelation CUSTOM_XML_MAPPINGS = new XSSFRelation(
"application/xml",
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/xmlMaps",
"/xl/xmlMaps.xml",
MapInfo.class
);
-
+
public static final XSSFRelation SINGLE_XML_CELLS = new XSSFRelation(
"application/vnd.openxmlformats-officedocument.spreadsheetml.tableSingleCells+xml",
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/tableSingleCells",
"/tables/tableSingleCells#.xml",
SingleXmlCells.class
);
-
+
public static final XSSFRelation TABLE = new XSSFRelation(
"application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml",
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/table",
"/tables/table#.xml",
Table.class
);
-
+
public static final XSSFRelation IMAGES = new XSSFRelation(
null,
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
@@ -234,7 +234,7 @@ public final class XSSFRelation extends POIXMLRelation {
"/xl/calcChain.xml",
CalculationChain.class
);
-
+
private XSSFRelation(String type, String rel, String defaultName, Class cls) {
super(type, rel, defaultName, cls);
@@ -256,10 +256,9 @@ public final class XSSFRelation extends POIXMLRelation {
PackagePartName relName = PackagingURIHelper.createPartName(rel.getTargetURI());
PackagePart part = corePart.getPackage().getPart(relName);
return part.getInputStream();
- } else {
- log.log(POILogger.WARN, "No part " + _defaultName + " found");
- return null;
}
+ log.log(POILogger.WARN, "No part " + _defaultName + " found");
+ return null;
}
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
index 879faeed8a..aa4e87f78e 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
@@ -324,14 +324,14 @@ public class XSSFRichTextString implements RichTextString {
* Returns the plain string representation.
*/
public String getString() {
- if(st.sizeOfRArray() == 0) return st.getT();
- else {
- StringBuffer buf = new StringBuffer();
- for(CTRElt r : st.getRArray()){
- buf.append(r.getT());
- }
- return buf.toString();
+ if(st.sizeOfRArray() == 0) {
+ return st.getT();
}
+ StringBuffer buf = new StringBuffer();
+ for(CTRElt r : st.getRArray()){
+ buf.append(r.getT());
+ }
+ return buf.toString();
}
/**
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
index 4cd7c41634..ee0c9af245 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
@@ -38,18 +38,18 @@ public class XSSFRow implements Row, Comparable {
/**
* the xml bean containing all cell definitions for this row
*/
- private final CTRow row;
+ private final CTRow _row;
/**
* Cells of this row keyed by their column indexes.
* The TreeMap ensures that the cells are ordered by columnIndex in the ascending order.
*/
- private final TreeMap cells;
+ private final TreeMap _cells;
/**
* the parent sheet
*/
- private final XSSFSheet sheet;
+ private final XSSFSheet _sheet;
/**
* Construct a XSSFRow.
@@ -58,12 +58,12 @@ public class XSSFRow implements Row, Comparable {
* @param sheet the parent sheet.
*/
protected XSSFRow(CTRow row, XSSFSheet sheet) {
- this.row = row;
- this.sheet = sheet;
- this.cells = new TreeMap();
+ _row = row;
+ _sheet = sheet;
+ _cells = new TreeMap();
for (CTCell c : row.getCArray()) {
XSSFCell cell = new XSSFCell(this, c);
- cells.put(cell.getColumnIndex(), cell);
+ _cells.put(cell.getColumnIndex(), cell);
sheet.onReadCell(cell);
}
}
@@ -74,7 +74,7 @@ public class XSSFRow implements Row, Comparable {
* @return the XSSFSheet that owns this row
*/
public XSSFSheet getSheet() {
- return this.sheet;
+ return this._sheet;
}
/**
@@ -89,7 +89,7 @@ public class XSSFRow implements Row, Comparable {
* @return an iterator over cells in this row.
*/
public Iterator cellIterator() {
- return cells.values().iterator();
+ return _cells.values().iterator();
}
/**
@@ -164,7 +164,7 @@ public class XSSFRow implements Row, Comparable {
if (type != Cell.CELL_TYPE_BLANK) {
xcell.setCellType(type);
}
- cells.put(columnIndex, xcell);
+ _cells.put(columnIndex, xcell);
return xcell;
}
@@ -175,7 +175,7 @@ public class XSSFRow implements Row, Comparable {
* @return the cell at the given (0 based) index
*/
public XSSFCell getCell(int cellnum) {
- return getCell(cellnum, sheet.getWorkbook().getMissingCellPolicy());
+ return getCell(cellnum, _sheet.getWorkbook().getMissingCellPolicy());
}
/**
@@ -190,7 +190,7 @@ public class XSSFRow implements Row, Comparable {
public XSSFCell getCell(int cellnum, MissingCellPolicy policy) {
if(cellnum < 0) throw new IllegalArgumentException("Cell index must be >= 0");
- XSSFCell cell = (XSSFCell)cells.get(cellnum);
+ XSSFCell cell = (XSSFCell)_cells.get(cellnum);
if(policy == RETURN_NULL_AND_BLANK) {
return cell;
}
@@ -217,7 +217,7 @@ public class XSSFRow implements Row, Comparable {
* or -1 if the row does not contain any cells.
*/
public short getFirstCellNum() {
- return (short)(cells.size() == 0 ? -1 : cells.firstKey());
+ return (short)(_cells.size() == 0 ? -1 : _cells.firstKey());
}
/**
@@ -240,7 +240,7 @@ public class XSSFRow implements Row, Comparable {
* or -1 if the row does not contain any cells.
*/
public short getLastCellNum() {
- return (short)(cells.size() == 0 ? -1 : (cells.lastKey() + 1));
+ return (short)(_cells.size() == 0 ? -1 : (_cells.lastKey() + 1));
}
/**
@@ -261,11 +261,10 @@ public class XSSFRow implements Row, Comparable {
* @see org.apache.poi.xssf.usermodel.XSSFSheet#getDefaultRowHeightInPoints()
*/
public float getHeightInPoints() {
- if (this.row.isSetHt()) {
- return (float) this.row.getHt();
- } else {
- return sheet.getDefaultRowHeightInPoints();
+ if (this._row.isSetHt()) {
+ return (float) this._row.getHt();
}
+ return _sheet.getDefaultRowHeightInPoints();
}
/**
@@ -275,11 +274,11 @@ public class XSSFRow implements Row, Comparable {
*/
public void setHeight(short height) {
if (height == -1) {
- if (row.isSetHt()) row.unsetHt();
- if (row.isSetCustomHeight()) row.unsetCustomHeight();
+ if (_row.isSetHt()) _row.unsetHt();
+ if (_row.isSetCustomHeight()) _row.unsetCustomHeight();
} else {
- row.setHt((double) height / 20);
- row.setCustomHeight(true);
+ _row.setHt((double) height / 20);
+ _row.setCustomHeight(true);
}
}
@@ -300,7 +299,7 @@ public class XSSFRow implements Row, Comparable {
* @return int representing the number of defined cells in the row.
*/
public int getPhysicalNumberOfCells() {
- return cells.size();
+ return _cells.size();
}
/**
@@ -309,7 +308,7 @@ public class XSSFRow implements Row, Comparable {
* @return the row number (0 based)
*/
public int getRowNum() {
- return (int) (row.getR() - 1);
+ return (int) (_row.getR() - 1);
}
/**
@@ -321,10 +320,10 @@ public class XSSFRow implements Row, Comparable {
public void setRowNum(int rowIndex) {
int maxrow = SpreadsheetVersion.EXCEL2007.getLastRowIndex();
if (rowIndex < 0 || rowIndex > maxrow) {
- throw new IllegalArgumentException("Invalid row number (" + rowIndex
+ throw new IllegalArgumentException("Invalid row number (" + rowIndex
+ ") outside allowable range (0.." + maxrow + ")");
}
- row.setR(rowIndex + 1);
+ _row.setR(rowIndex + 1);
}
/**
@@ -333,7 +332,7 @@ public class XSSFRow implements Row, Comparable {
* @return - height is zero or not.
*/
public boolean getZeroHeight() {
- return this.row.getHidden();
+ return this._row.getHidden();
}
/**
@@ -342,7 +341,7 @@ public class XSSFRow implements Row, Comparable {
* @param height height is zero or not.
*/
public void setZeroHeight(boolean height) {
- this.row.setHidden(height);
+ this._row.setHidden(height);
}
@@ -352,7 +351,7 @@ public class XSSFRow implements Row, Comparable {
* @param cell the cell to remove
*/
public void removeCell(Cell cell) {
- cells.remove(cell.getColumnIndex());
+ _cells.remove(cell.getColumnIndex());
}
/**
@@ -361,7 +360,7 @@ public class XSSFRow implements Row, Comparable {
* @return the underlying CTRow xml bean
*/
public CTRow getCTRow(){
- return row;
+ return _row;
}
/**
@@ -372,14 +371,14 @@ public class XSSFRow implements Row, Comparable {
* @see org.apache.poi.xssf.usermodel.XSSFSheet#commit()
*/
protected void onDocumentWrite(){
- ArrayList cArray = new ArrayList(cells.size());
+ ArrayList cArray = new ArrayList(_cells.size());
//create array of CTCell objects.
//TreeMap's value iterator ensures that the cells are ordered by columnIndex in the ascending order
- for (Cell cell : cells.values()) {
+ for (Cell cell : _cells.values()) {
XSSFCell c = (XSSFCell)cell;
cArray.add(c.getCTCell());
}
- row.setCArray(cArray.toArray(new CTCell[cArray.size()]));
+ _row.setCArray(cArray.toArray(new CTCell[cArray.size()]));
}
/**
@@ -387,7 +386,7 @@ public class XSSFRow implements Row, Comparable {
*/
@Override
public String toString(){
- return row.toString();
+ return _row.toString();
}
/**
@@ -397,8 +396,8 @@ public class XSSFRow implements Row, Comparable {
*/
protected void shift(int n) {
int rownum = getRowNum() + n;
- CalculationChain calcChain = sheet.getWorkbook().getCalculationChain();
- int sheetId = (int)sheet.sheet.getSheetId();
+ CalculationChain calcChain = _sheet.getWorkbook().getCalculationChain();
+ int sheetId = (int)_sheet.sheet.getSheetId();
for(Cell c : this){
XSSFCell cell = (XSSFCell)c;
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index 77d4b5c34e..bd2b5b875b 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -434,8 +434,10 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
}
public XSSFComment getCellComment(int row, int column) {
- if (sheetComments == null) return null;
- else return sheetComments.findCellComment(row, column);
+ if (sheetComments == null) {
+ return null;
+ }
+ return sheetComments.findCellComment(row, column);
}
public XSSFHyperlink getHyperlink(int row, int column) {
@@ -1915,9 +1917,8 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
}
if (endLevel > startLevel) {
return endHidden;
- } else {
- return startHidden;
}
+ return startHidden;
}
/**
@@ -1925,10 +1926,10 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
*/
private boolean isRowGroupCollapsed(int row) {
int collapseRow = findEndOfRowOutlineGroup(row) + 1;
- if (getRow(collapseRow) == null)
- return false;
- else
- return getRow(collapseRow).getCTRow().getCollapsed();
+ if (getRow(collapseRow) == null) {
+ return false;
+ }
+ return getRow(collapseRow).getCTRow().getCollapsed();
}
/**
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
index 2d0caf1b5f..91e1c13481 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
@@ -89,7 +89,7 @@ public class XWPFParagraph {
if (o instanceof CTFtnEdnRef) {
CTFtnEdnRef ftn = (CTFtnEdnRef) o;
footnoteText.append("[").append(ftn.getId()).append(": ");
- XWPFFootnote footnote =
+ XWPFFootnote footnote =
ftn.getDomNode().getLocalName().equals("footnoteReference") ?
document.getFootnoteByID(ftn.getId().intValue()) :
document.getEndnoteByID(ftn.getId().intValue());
@@ -582,10 +582,10 @@ public class XWPFParagraph {
CTOnOff ct_pageBreak = ppr.isSetPageBreakBefore() ? ppr
.getPageBreakBefore() : null;
if (ct_pageBreak != null
- && ct_pageBreak.getVal().intValue() == STOnOff.INT_TRUE)
+ && ct_pageBreak.getVal().intValue() == STOnOff.INT_TRUE) {
return true;
- else
- return false;
+ }
+ return false;
}
/**
@@ -934,8 +934,8 @@ public class XWPFParagraph {
return (wordWrap.getVal() == STOnOff.ON
|| wordWrap.getVal() == STOnOff.TRUE || wordWrap.getVal() == STOnOff.X_1) ? true
: false;
- } else
- return false;
+ }
+ return false;
}
/**
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
index 17d0465f58..774cf852c1 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
@@ -155,10 +155,10 @@ public class XWPFTable {
* @return the row at the position specified or null if no rows is defined or if the position is greather than the max size of rows array
*/
public XWPFTableRow getRow(int pos) {
- if (pos >= 0 && pos < ctTbl.sizeOfTrArray())
+ if (pos >= 0 && pos < ctTbl.sizeOfTrArray()) {
return new XWPFTableRow(ctTbl.getTrArray(pos));
- else
- return null;
+ }
+ return null;
}
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
index d34541cfda..e2cea13fa2 100755
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
@@ -44,10 +44,10 @@ public class XWPFTableRow {
}
public XWPFTableCell getCell(int pos) {
- if (pos >= 0 && pos < ctRow.sizeOfTcArray())
+ if (pos >= 0 && pos < ctRow.sizeOfTcArray()) {
return new XWPFTableCell(ctRow.getTcArray(pos));
- else
- return null;
+ }
+ return null;
}
/**
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java
index 83ede7aeda..3a3ea083a5 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java
@@ -52,14 +52,6 @@ public final class HeaderFooter
}
public boolean isEmpty()
{
- if(_start - _end == 0)
- {
- return true;
- }
- else
- {
- return false;
- }
+ return _start - _end == 0;
}
-
}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java
index 310b0e2235..4681f85cf9 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java
@@ -1279,13 +1279,6 @@ public final class StyleSheet {
}
public static boolean getFlag(int x)
{
- if(x != 0)
- {
- return true;
- }
- else
- {
- return false;
- }
+ return x != 0;
}
}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java
index fb237ffc52..5a1afa6a6a 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java
@@ -314,34 +314,29 @@ public final class WordDocument {
{
throw new IOException("corrupted Word file");
}
- else
+ //parse out the text pieces
+ int pieceTableSize = LittleEndian.getInt(tableStream, ++pos);
+ pos += 4;
+ int pieces = (pieceTableSize - 4) / 12;
+ for (int x = 0; x < pieces; x++)
{
- //parse out the text pieces
- int pieceTableSize = LittleEndian.getInt(tableStream, ++pos);
- pos += 4;
- int pieces = (pieceTableSize - 4) / 12;
- for (int x = 0; x < pieces; x++)
+ int filePos = LittleEndian.getInt(tableStream, pos + ((pieces + 1) * 4) + (x * 8) + 2);
+ boolean unicode = false;
+ if ((filePos & 0x40000000) == 0)
{
- int filePos = LittleEndian.getInt(tableStream, pos + ((pieces + 1) * 4) + (x * 8) + 2);
- boolean unicode = false;
- if ((filePos & 0x40000000) == 0)
- {
- unicode = true;
- }
- else
- {
- unicode = false;
- filePos &= ~(0x40000000);//gives me FC in doc stream
- filePos /= 2;
- }
- int totLength = LittleEndian.getInt(tableStream, pos + (x + 1) * 4) -
- LittleEndian.getInt(tableStream, pos + (x * 4));
-
- TextPiece piece = new TextPiece(filePos, totLength, unicode);
- _text.add(piece);
-
+ unicode = true;
}
+ else
+ {
+ unicode = false;
+ filePos &= ~(0x40000000);//gives me FC in doc stream
+ filePos /= 2;
+ }
+ int totLength = LittleEndian.getInt(tableStream, pos + (x + 1) * 4) -
+ LittleEndian.getInt(tableStream, pos + (x * 4));
+ TextPiece piece = new TextPiece(filePos, totLength, unicode);
+ _text.add(piece);
}
}
@@ -355,8 +350,7 @@ public final class WordDocument {
* @param size of the paragraph bin table.
*/
private void findFormatting(byte[] tableStream, int charOffset,
- int charPlcSize, int parOffset, int parPlcSize) throws IOException
- {
+ int charPlcSize, int parOffset, int parPlcSize) {
openDoc();
createStyleSheet(tableStream);
createListTables(tableStream);
@@ -1287,7 +1281,7 @@ public final class WordDocument {
private ArrayList findProperties(int start, int end, BTreeSet.BTreeNode root)
{
ArrayList results = new ArrayList();
- BTreeSet.Entry[] entries = root.entries;
+ BTreeSet.Entry[] entries = root._entries;
for(int x = 0; x < entries.length; x++)
{
@@ -1366,7 +1360,7 @@ public final class WordDocument {
private ArrayList findPAPProperties(int start, int end, BTreeSet.BTreeNode root)
{
ArrayList results = new ArrayList();
- BTreeSet.Entry[] entries = root.entries;
+ BTreeSet.Entry[] entries = root._entries;
for(int x = 0; x < entries.length; x++)
{
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java
index 3f05811544..95ba6fbda8 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java
@@ -42,8 +42,8 @@ public final class BTreeSet extends AbstractSet implements Set {
*/
public BTreeNode root;
private Comparator comparator = null;
- private int order;
- private int size = 0;
+ int order;
+ int size = 0;
/*
* Constructors
@@ -99,14 +99,14 @@ public final class BTreeSet extends AbstractSet implements Set {
}
public java.util.Iterator iterator() {
- return new Iterator();
+ return new BTIterator();
}
/*
* Private methods
*/
- private int compare(Object x, Object y) {
+ int compare(Object x, Object y) {
return (comparator == null ? ((Comparable)x).compareTo(y) : comparator.compare(x, y));
}
@@ -125,14 +125,14 @@ public final class BTreeSet extends AbstractSet implements Set {
* chance of receiving a NullPointerException. The Iterator.delete method is supported.
*/
- private class Iterator implements java.util.Iterator {
+ private final class BTIterator implements java.util.Iterator {
private int index = 0;
- private Stack parentIndex = new Stack(); // Contains all parentIndicies for currentNode
+ Stack parentIndex = new Stack(); // Contains all parentIndicies for currentNode
private Object lastReturned = null;
private Object next;
- private BTreeNode currentNode;
+ BTreeNode currentNode;
- Iterator() {
+ BTIterator() {
currentNode = firstNode();
next = nextElement();
}
@@ -159,8 +159,8 @@ public final class BTreeSet extends AbstractSet implements Set {
private BTreeNode firstNode() {
BTreeNode temp = BTreeSet.this.root;
- while (temp.entries[0].child != null) {
- temp = temp.entries[0].child;
+ while (temp._entries[0].child != null) {
+ temp = temp._entries[0].child;
parentIndex.push(new Integer(0));
}
@@ -169,40 +169,39 @@ public final class BTreeSet extends AbstractSet implements Set {
private Object nextElement() {
if (currentNode.isLeaf()) {
- if (index < currentNode.nrElements) return currentNode.entries[index++].element;
+ if (index < currentNode._nrElements) return currentNode._entries[index++].element;
else if (!parentIndex.empty()) { //All elements have been returned, return successor of lastReturned if it exists
- currentNode = currentNode.parent;
+ currentNode = currentNode._parent;
index = ((Integer)parentIndex.pop()).intValue();
- while (index == currentNode.nrElements) {
+ while (index == currentNode._nrElements) {
if (parentIndex.empty()) break;
- currentNode = currentNode.parent;
+ currentNode = currentNode._parent;
index = ((Integer)parentIndex.pop()).intValue();
}
- if (index == currentNode.nrElements) return null; //Reached root and he has no more children
- return currentNode.entries[index++].element;
+ if (index == currentNode._nrElements) return null; //Reached root and he has no more children
+ return currentNode._entries[index++].element;
}
else { //Your a leaf and the root
- if (index == currentNode.nrElements) return null;
- return currentNode.entries[index++].element;
+ if (index == currentNode._nrElements) return null;
+ return currentNode._entries[index++].element;
}
}
- else { //Your not a leaf so simply find and return the successor of lastReturned
- currentNode = currentNode.entries[index].child;
- parentIndex.push(new Integer(index));
+ // else - You're not a leaf so simply find and return the successor of lastReturned
+ currentNode = currentNode._entries[index].child;
+ parentIndex.push(new Integer(index));
- while (currentNode.entries[0].child != null) {
- currentNode = currentNode.entries[0].child;
- parentIndex.push(new Integer(0));
- }
-
- index = 1;
- return currentNode.entries[0].element;
+ while (currentNode._entries[0].child != null) {
+ currentNode = currentNode._entries[0].child;
+ parentIndex.push(new Integer(0));
}
+
+ index = 1;
+ return currentNode._entries[0].element;
}
}
@@ -216,49 +215,51 @@ public final class BTreeSet extends AbstractSet implements Set {
public class BTreeNode {
- public Entry[] entries;
- public BTreeNode parent;
- private int nrElements = 0;
+ public Entry[] _entries;
+ public BTreeNode _parent;
+ int _nrElements = 0;
private final int MIN = (BTreeSet.this.order - 1) / 2;
BTreeNode(BTreeNode parent) {
- this.parent = parent;
- entries = new Entry[BTreeSet.this.order];
- entries[0] = new Entry();
+ _parent = parent;
+ _entries = new Entry[BTreeSet.this.order];
+ _entries[0] = new Entry();
}
boolean insert(Object x, int parentIndex) {
if (isFull()) { // If full, you must split and promote splitNode before inserting
- Object splitNode = entries[nrElements / 2].element;
+ Object splitNode = _entries[_nrElements / 2].element;
BTreeNode rightSibling = split();
if (isRoot()) { // Grow a level
splitRoot(splitNode, this, rightSibling);
// Determine where to insert
- if (BTreeSet.this.compare(x, BTreeSet.this.root.entries[0].element) < 0) insert(x, 0);
+ if (BTreeSet.this.compare(x, BTreeSet.this.root._entries[0].element) < 0) insert(x, 0);
else rightSibling.insert(x, 1);
}
else { // Promote splitNode
- parent.insertSplitNode(splitNode, this, rightSibling, parentIndex);
- if (BTreeSet.this.compare(x, parent.entries[parentIndex].element) < 0) return insert(x, parentIndex);
- else return rightSibling.insert(x, parentIndex + 1);
+ _parent.insertSplitNode(splitNode, this, rightSibling, parentIndex);
+ if (BTreeSet.this.compare(x, _parent._entries[parentIndex].element) < 0) {
+ return insert(x, parentIndex);
+ }
+ return rightSibling.insert(x, parentIndex + 1);
}
}
else if (isLeaf()) { // If leaf, simply insert the non-duplicate element
int insertAt = childToInsertAt(x, true);
- if (insertAt == -1) return false; // Determine if the element already exists
- else {
- insertNewElement(x, insertAt);
- BTreeSet.this.size++;
- return true;
+ if (insertAt == -1) {
+ return false; // Determine if the element already exists
}
+ insertNewElement(x, insertAt);
+ BTreeSet.this.size++;
+ return true;
}
else { // If not full and not leaf recursively find correct node to insert at
int insertAt = childToInsertAt(x, true);
- return (insertAt == -1 ? false : entries[insertAt].child.insert(x, insertAt));
+ return (insertAt == -1 ? false : _entries[insertAt].child.insert(x, insertAt));
}
return false;
}
@@ -266,8 +267,8 @@ public final class BTreeSet extends AbstractSet implements Set {
boolean includes(Object x) {
int index = childToInsertAt(x, true);
if (index == -1) return true;
- if (entries[index] == null || entries[index].child == null) return false;
- return entries[index].child.includes(x);
+ if (_entries[index] == null || _entries[index].child == null) return false;
+ return _entries[index].child.includes(x);
}
boolean delete(Object x, int parentIndex) {
@@ -276,8 +277,8 @@ public final class BTreeSet extends AbstractSet implements Set {
BTreeNode temp = this;
if (i != -1) {
do {
- if (temp.entries[i] == null || temp.entries[i].child == null) return false;
- temp = temp.entries[i].child;
+ if (temp._entries[i] == null || temp._entries[i].child == null) return false;
+ temp = temp._entries[i].child;
priorParentIndex = parentIndex;
parentIndex = i;
i = temp.childToInsertAt(x, true);
@@ -285,54 +286,52 @@ public final class BTreeSet extends AbstractSet implements Set {
} // Now temp contains element to delete and temp's parentIndex is parentIndex
if (temp.isLeaf()) { // If leaf and have more than MIN elements, simply delete
- if (temp.nrElements > MIN) {
+ if (temp._nrElements > MIN) {
temp.deleteElement(x);
BTreeSet.this.size--;
return true;
}
- else { // If leaf and have less than MIN elements, than prepare the BTreeSet for deletion
- temp.prepareForDeletion(parentIndex);
- temp.deleteElement(x);
- BTreeSet.this.size--;
- temp.fixAfterDeletion(priorParentIndex);
- return true;
- }
+ // else If leaf and have less than MIN elements, than prepare the BTreeSet for deletion
+ temp.prepareForDeletion(parentIndex);
+ temp.deleteElement(x);
+ BTreeSet.this.size--;
+ temp.fixAfterDeletion(priorParentIndex);
+ return true;
}
- else { // Only delete at leaf so first switch with successor than delete
- temp.switchWithSuccessor(x);
- parentIndex = temp.childToInsertAt(x, false) + 1;
- return temp.entries[parentIndex].child.delete(x, parentIndex);
- }
+ // else Only delete at leaf so first switch with successor than delete
+ temp.switchWithSuccessor(x);
+ parentIndex = temp.childToInsertAt(x, false) + 1;
+ return temp._entries[parentIndex].child.delete(x, parentIndex);
}
- private boolean isFull() { return nrElements == (BTreeSet.this.order - 1); }
+ private boolean isFull() { return _nrElements == (BTreeSet.this.order - 1); }
- private boolean isLeaf() { return entries[0].child == null; }
+ boolean isLeaf() { return _entries[0].child == null; }
- private boolean isRoot() { return parent == null; }
+ private boolean isRoot() { return _parent == null; }
/*
* Splits a BTreeNode into two BTreeNodes, removing the splitNode from the
* calling BTreeNode.
*/
private BTreeNode split() {
- BTreeNode rightSibling = new BTreeNode(parent);
- int index = nrElements / 2;
- entries[index++].element = null;
+ BTreeNode rightSibling = new BTreeNode(_parent);
+ int index = _nrElements / 2;
+ _entries[index++].element = null;
- for (int i = 0, nr = nrElements; index <= nr; i++, index++) {
- rightSibling.entries[i] = entries[index];
- if (rightSibling.entries[i] != null && rightSibling.entries[i].child != null)
- rightSibling.entries[i].child.parent = rightSibling;
- entries[index] = null;
- nrElements--;
- rightSibling.nrElements++;
+ for (int i = 0, nr = _nrElements; index <= nr; i++, index++) {
+ rightSibling._entries[i] = _entries[index];
+ if (rightSibling._entries[i] != null && rightSibling._entries[i].child != null)
+ rightSibling._entries[i].child._parent = rightSibling;
+ _entries[index] = null;
+ _nrElements--;
+ rightSibling._nrElements++;
}
- rightSibling.nrElements--; // Need to correct for copying the last Entry which has a null element and a child
+ rightSibling._nrElements--; // Need to correct for copying the last Entry which has a null element and a child
return rightSibling;
}
@@ -342,34 +341,34 @@ public final class BTreeSet extends AbstractSet implements Set {
*/
private void splitRoot(Object splitNode, BTreeNode left, BTreeNode right) {
BTreeNode newRoot = new BTreeNode(null);
- newRoot.entries[0].element = splitNode;
- newRoot.entries[0].child = left;
- newRoot.entries[1] = new Entry();
- newRoot.entries[1].child = right;
- newRoot.nrElements = 1;
- left.parent = right.parent = newRoot;
+ newRoot._entries[0].element = splitNode;
+ newRoot._entries[0].child = left;
+ newRoot._entries[1] = new Entry();
+ newRoot._entries[1].child = right;
+ newRoot._nrElements = 1;
+ left._parent = right._parent = newRoot;
BTreeSet.this.root = newRoot;
}
private void insertSplitNode(Object splitNode, BTreeNode left, BTreeNode right, int insertAt) {
- for (int i = nrElements; i >= insertAt; i--) entries[i + 1] = entries[i];
+ for (int i = _nrElements; i >= insertAt; i--) _entries[i + 1] = _entries[i];
- entries[insertAt] = new Entry();
- entries[insertAt].element = splitNode;
- entries[insertAt].child = left;
- entries[insertAt + 1].child = right;
+ _entries[insertAt] = new Entry();
+ _entries[insertAt].element = splitNode;
+ _entries[insertAt].child = left;
+ _entries[insertAt + 1].child = right;
- nrElements++;
+ _nrElements++;
}
private void insertNewElement(Object x, int insertAt) {
- for (int i = nrElements; i > insertAt; i--) entries[i] = entries[i - 1];
+ for (int i = _nrElements; i > insertAt; i--) _entries[i] = _entries[i - 1];
- entries[insertAt] = new Entry();
- entries[insertAt].element = x;
+ _entries[insertAt] = new Entry();
+ _entries[insertAt].element = x;
- nrElements++;
+ _nrElements++;
}
/*
@@ -382,13 +381,13 @@ public final class BTreeSet extends AbstractSet implements Set {
* in entries[] is returned.
*/
private int childToInsertAt(Object x, boolean position) {
- int index = nrElements / 2;
+ int index = _nrElements / 2;
- if (entries[index] == null || entries[index].element == null) return index;
+ if (_entries[index] == null || _entries[index].element == null) return index;
- int lo = 0, hi = nrElements - 1;
+ int lo = 0, hi = _nrElements - 1;
while (lo <= hi) {
- if (BTreeSet.this.compare(x, entries[index].element) > 0) {
+ if (BTreeSet.this.compare(x, _entries[index].element) > 0) {
lo = index + 1;
index = (hi + lo) / 2;
}
@@ -399,32 +398,32 @@ public final class BTreeSet extends AbstractSet implements Set {
}
hi++;
- if (entries[hi] == null || entries[hi].element == null) return hi;
- return (!position ? hi : BTreeSet.this.compare(x, entries[hi].element) == 0 ? -1 : hi);
+ if (_entries[hi] == null || _entries[hi].element == null) return hi;
+ return (!position ? hi : BTreeSet.this.compare(x, _entries[hi].element) == 0 ? -1 : hi);
}
private void deleteElement(Object x) {
int index = childToInsertAt(x, false);
- for (; index < (nrElements - 1); index++) entries[index] = entries[index + 1];
+ for (; index < (_nrElements - 1); index++) _entries[index] = _entries[index + 1];
- if (nrElements == 1) entries[index] = new Entry(); // This is root and it is empty
- else entries[index] = null;
+ if (_nrElements == 1) _entries[index] = new Entry(); // This is root and it is empty
+ else _entries[index] = null;
- nrElements--;
+ _nrElements--;
}
private void prepareForDeletion(int parentIndex) {
if (isRoot()) return; // Don't attempt to steal or merge if your the root
// If not root then try to steal left
- else if (parentIndex != 0 && parent.entries[parentIndex - 1].child.nrElements > MIN) {
+ else if (parentIndex != 0 && _parent._entries[parentIndex - 1].child._nrElements > MIN) {
stealLeft(parentIndex);
return;
}
// If not root and can't steal left try to steal right
- else if (parentIndex < entries.length && parent.entries[parentIndex + 1] != null && parent.entries[parentIndex + 1].child != null && parent.entries[parentIndex + 1].child.nrElements > MIN) {
+ else if (parentIndex < _entries.length && _parent._entries[parentIndex + 1] != null && _parent._entries[parentIndex + 1].child != null && _parent._entries[parentIndex + 1].child._nrElements > MIN) {
stealRight(parentIndex);
return;
}
@@ -440,29 +439,29 @@ public final class BTreeSet extends AbstractSet implements Set {
}
private void fixAfterDeletion(int parentIndex) {
- if (isRoot() || parent.isRoot()) return; // No fixing needed
+ if (isRoot() || _parent.isRoot()) return; // No fixing needed
- if (parent.nrElements < MIN) { // If parent lost it's n/2 element repair it
- BTreeNode temp = parent;
+ if (_parent._nrElements < MIN) { // If parent lost it's n/2 element repair it
+ BTreeNode temp = _parent;
temp.prepareForDeletion(parentIndex);
- if (temp.parent == null) return; // Root changed
- if (!temp.parent.isRoot() && temp.parent.nrElements < MIN) { // If need be recurse
- BTreeNode x = temp.parent.parent;
+ if (temp._parent == null) return; // Root changed
+ if (!temp._parent.isRoot() && temp._parent._nrElements < MIN) { // If need be recurse
+ BTreeNode x = temp._parent._parent;
int i = 0;
// Find parent's parentIndex
- for (; i < entries.length; i++) if (x.entries[i].child == temp.parent) break;
- temp.parent.fixAfterDeletion(i);
+ for (; i < _entries.length; i++) if (x._entries[i].child == temp._parent) break;
+ temp._parent.fixAfterDeletion(i);
}
}
}
private void switchWithSuccessor(Object x) {
int index = childToInsertAt(x, false);
- BTreeNode temp = entries[index + 1].child;
- while (temp.entries[0] != null && temp.entries[0].child != null) temp = temp.entries[0].child;
- Object successor = temp.entries[0].element;
- temp.entries[0].element = entries[index].element;
- entries[index].element = successor;
+ BTreeNode temp = _entries[index + 1].child;
+ while (temp._entries[0] != null && temp._entries[0].child != null) temp = temp._entries[0].child;
+ Object successor = temp._entries[0].element;
+ temp._entries[0].element = _entries[index].element;
+ _entries[index].element = successor;
}
/*
@@ -470,26 +469,26 @@ public final class BTreeSet extends AbstractSet implements Set {
* has a leftSibling, and the leftSibling has more than the minimum number of elements.
*/
private void stealLeft(int parentIndex) {
- BTreeNode p = parent;
- BTreeNode ls = parent.entries[parentIndex - 1].child;
+ BTreeNode p = _parent;
+ BTreeNode ls = _parent._entries[parentIndex - 1].child;
if (isLeaf()) { // When stealing from leaf to leaf don't worry about children
- int add = childToInsertAt(p.entries[parentIndex - 1].element, true);
- insertNewElement(p.entries[parentIndex - 1].element, add);
- p.entries[parentIndex - 1].element = ls.entries[ls.nrElements - 1].element;
- ls.entries[ls.nrElements - 1] = null;
- ls.nrElements--;
+ int add = childToInsertAt(p._entries[parentIndex - 1].element, true);
+ insertNewElement(p._entries[parentIndex - 1].element, add);
+ p._entries[parentIndex - 1].element = ls._entries[ls._nrElements - 1].element;
+ ls._entries[ls._nrElements - 1] = null;
+ ls._nrElements--;
}
else { // Was called recursively to fix an undermanned parent
- entries[0].element = p.entries[parentIndex - 1].element;
- p.entries[parentIndex - 1].element = ls.entries[ls.nrElements - 1].element;
- entries[0].child = ls.entries[ls.nrElements].child;
- entries[0].child.parent = this;
- ls.entries[ls.nrElements] = null;
- ls.entries[ls.nrElements - 1].element = null;
- nrElements++;
- ls.nrElements--;
+ _entries[0].element = p._entries[parentIndex - 1].element;
+ p._entries[parentIndex - 1].element = ls._entries[ls._nrElements - 1].element;
+ _entries[0].child = ls._entries[ls._nrElements].child;
+ _entries[0].child._parent = this;
+ ls._entries[ls._nrElements] = null;
+ ls._entries[ls._nrElements - 1].element = null;
+ _nrElements++;
+ ls._nrElements--;
}
}
@@ -499,30 +498,30 @@ public final class BTreeSet extends AbstractSet implements Set {
* has more than the minimum number of elements.
*/
private void stealRight(int parentIndex) {
- BTreeNode p = parent;
- BTreeNode rs = p.entries[parentIndex + 1].child;
+ BTreeNode p = _parent;
+ BTreeNode rs = p._entries[parentIndex + 1].child;
if (isLeaf()) { // When stealing from leaf to leaf don't worry about children
- entries[nrElements] = new Entry();
- entries[nrElements].element = p.entries[parentIndex].element;
- p.entries[parentIndex].element = rs.entries[0].element;
- for (int i = 0; i < rs.nrElements; i++) rs.entries[i] = rs.entries[i + 1];
- rs.entries[rs.nrElements - 1] = null;
- nrElements++;
- rs.nrElements--;
+ _entries[_nrElements] = new Entry();
+ _entries[_nrElements].element = p._entries[parentIndex].element;
+ p._entries[parentIndex].element = rs._entries[0].element;
+ for (int i = 0; i < rs._nrElements; i++) rs._entries[i] = rs._entries[i + 1];
+ rs._entries[rs._nrElements - 1] = null;
+ _nrElements++;
+ rs._nrElements--;
}
else { // Was called recursively to fix an undermanned parent
- for (int i = 0; i <= nrElements; i++) entries[i] = entries[i + 1];
- entries[nrElements].element = p.entries[parentIndex].element;
- p.entries[parentIndex].element = rs.entries[0].element;
- entries[nrElements + 1] = new Entry();
- entries[nrElements + 1].child = rs.entries[0].child;
- entries[nrElements + 1].child.parent = this;
- for (int i = 0; i <= rs.nrElements; i++) rs.entries[i] = rs.entries[i + 1];
- rs.entries[rs.nrElements] = null;
- nrElements++;
- rs.nrElements--;
+ for (int i = 0; i <= _nrElements; i++) _entries[i] = _entries[i + 1];
+ _entries[_nrElements].element = p._entries[parentIndex].element;
+ p._entries[parentIndex].element = rs._entries[0].element;
+ _entries[_nrElements + 1] = new Entry();
+ _entries[_nrElements + 1].child = rs._entries[0].child;
+ _entries[_nrElements + 1].child._parent = this;
+ for (int i = 0; i <= rs._nrElements; i++) rs._entries[i] = rs._entries[i + 1];
+ rs._entries[rs._nrElements] = null;
+ _nrElements++;
+ rs._nrElements--;
}
}
@@ -536,77 +535,77 @@ public final class BTreeSet extends AbstractSet implements Set {
* expect the parent to be in such a condition.
*/
private void mergeLeft(int parentIndex) {
- BTreeNode p = parent;
- BTreeNode ls = p.entries[parentIndex - 1].child;
+ BTreeNode p = _parent;
+ BTreeNode ls = p._entries[parentIndex - 1].child;
if (isLeaf()) { // Don't worry about children
- int add = childToInsertAt(p.entries[parentIndex - 1].element, true);
- insertNewElement(p.entries[parentIndex - 1].element, add); // Could have been a successor switch
- p.entries[parentIndex - 1].element = null;
+ int add = childToInsertAt(p._entries[parentIndex - 1].element, true);
+ insertNewElement(p._entries[parentIndex - 1].element, add); // Could have been a successor switch
+ p._entries[parentIndex - 1].element = null;
- for (int i = nrElements - 1, nr = ls.nrElements; i >= 0; i--)
- entries[i + nr] = entries[i];
+ for (int i = _nrElements - 1, nr = ls._nrElements; i >= 0; i--)
+ _entries[i + nr] = _entries[i];
- for (int i = ls.nrElements - 1; i >= 0; i--) {
- entries[i] = ls.entries[i];
- nrElements++;
+ for (int i = ls._nrElements - 1; i >= 0; i--) {
+ _entries[i] = ls._entries[i];
+ _nrElements++;
}
- if (p.nrElements == MIN && p != BTreeSet.this.root) {
+ if (p._nrElements == MIN && p != BTreeSet.this.root) {
for (int x = parentIndex - 1, y = parentIndex - 2; y >= 0; x--, y--)
- p.entries[x] = p.entries[y];
- p.entries[0] = new Entry();
- p.entries[0].child = ls; //So p doesn't think it's a leaf this will be deleted in the next recursive call
+ p._entries[x] = p._entries[y];
+ p._entries[0] = new Entry();
+ p._entries[0].child = ls; //So p doesn't think it's a leaf this will be deleted in the next recursive call
}
else {
- for (int x = parentIndex - 1, y = parentIndex; y <= p.nrElements; x++, y++)
- p.entries[x] = p.entries[y];
- p.entries[p.nrElements] = null;
+ for (int x = parentIndex - 1, y = parentIndex; y <= p._nrElements; x++, y++)
+ p._entries[x] = p._entries[y];
+ p._entries[p._nrElements] = null;
}
- p.nrElements--;
+ p._nrElements--;
- if (p.isRoot() && p.nrElements == 0) { // It's the root and it's empty
+ if (p.isRoot() && p._nrElements == 0) { // It's the root and it's empty
BTreeSet.this.root = this;
- parent = null;
+ _parent = null;
}
}
else { // I'm not a leaf but fixing the tree structure
- entries[0].element = p.entries[parentIndex - 1].element;
- entries[0].child = ls.entries[ls.nrElements].child;
- nrElements++;
+ _entries[0].element = p._entries[parentIndex - 1].element;
+ _entries[0].child = ls._entries[ls._nrElements].child;
+ _nrElements++;
- for (int x = nrElements, nr = ls.nrElements; x >= 0; x--)
- entries[x + nr] = entries[x];
+ for (int x = _nrElements, nr = ls._nrElements; x >= 0; x--)
+ _entries[x + nr] = _entries[x];
- for (int x = ls.nrElements - 1; x >= 0; x--) {
- entries[x] = ls.entries[x];
- entries[x].child.parent = this;
- nrElements++;
+ for (int x = ls._nrElements - 1; x >= 0; x--) {
+ _entries[x] = ls._entries[x];
+ _entries[x].child._parent = this;
+ _nrElements++;
}
- if (p.nrElements == MIN && p != BTreeSet.this.root) { // Push everything to the right
+ if (p._nrElements == MIN && p != BTreeSet.this.root) { // Push everything to the right
for (int x = parentIndex - 1, y = parentIndex - 2; y >= 0; x++, y++){
System.out.println(x + " " + y);
- p.entries[x] = p.entries[y];}
- p.entries[0] = new Entry();
+ p._entries[x] = p._entries[y];}
+ p._entries[0] = new Entry();
}
else { // Either p.nrElements > MIN or p == BTreeSet.this.root so push everything to the left
- for (int x = parentIndex - 1, y = parentIndex; y <= p.nrElements; x++, y++)
- p.entries[x] = p.entries[y];
- p.entries[p.nrElements] = null;
+ for (int x = parentIndex - 1, y = parentIndex; y <= p._nrElements; x++, y++)
+ p._entries[x] = p._entries[y];
+ p._entries[p._nrElements] = null;
}
- p.nrElements--;
+ p._nrElements--;
- if (p.isRoot() && p.nrElements == 0) { // p == BTreeSet.this.root and it's empty
+ if (p.isRoot() && p._nrElements == 0) { // p == BTreeSet.this.root and it's empty
BTreeSet.this.root = this;
- parent = null;
+ _parent = null;
}
}
}
@@ -621,69 +620,69 @@ public final class BTreeSet extends AbstractSet implements Set {
* expect the parent to be in such a condition.
*/
private void mergeRight(int parentIndex) {
- BTreeNode p = parent;
- BTreeNode rs = p.entries[parentIndex + 1].child;
+ BTreeNode p = _parent;
+ BTreeNode rs = p._entries[parentIndex + 1].child;
if (isLeaf()) { // Don't worry about children
- entries[nrElements] = new Entry();
- entries[nrElements].element = p.entries[parentIndex].element;
- nrElements++;
- for (int i = 0, nr = nrElements; i < rs.nrElements; i++, nr++) {
- entries[nr] = rs.entries[i];
- nrElements++;
+ _entries[_nrElements] = new Entry();
+ _entries[_nrElements].element = p._entries[parentIndex].element;
+ _nrElements++;
+ for (int i = 0, nr = _nrElements; i < rs._nrElements; i++, nr++) {
+ _entries[nr] = rs._entries[i];
+ _nrElements++;
}
- p.entries[parentIndex].element = p.entries[parentIndex + 1].element;
- if (p.nrElements == MIN && p != BTreeSet.this.root) {
+ p._entries[parentIndex].element = p._entries[parentIndex + 1].element;
+ if (p._nrElements == MIN && p != BTreeSet.this.root) {
for (int x = parentIndex + 1, y = parentIndex; y >= 0; x--, y--)
- p.entries[x] = p.entries[y];
- p.entries[0] = new Entry();
- p.entries[0].child = rs; // So it doesn't think it's a leaf, this child will be deleted in the next recursive call
+ p._entries[x] = p._entries[y];
+ p._entries[0] = new Entry();
+ p._entries[0].child = rs; // So it doesn't think it's a leaf, this child will be deleted in the next recursive call
}
else {
- for (int x = parentIndex + 1, y = parentIndex + 2; y <= p.nrElements; x++, y++)
- p.entries[x] = p.entries[y];
- p.entries[p.nrElements] = null;
+ for (int x = parentIndex + 1, y = parentIndex + 2; y <= p._nrElements; x++, y++)
+ p._entries[x] = p._entries[y];
+ p._entries[p._nrElements] = null;
}
- p.nrElements--;
- if (p.isRoot() && p.nrElements == 0) { // It's the root and it's empty
+ p._nrElements--;
+ if (p.isRoot() && p._nrElements == 0) { // It's the root and it's empty
BTreeSet.this.root = this;
- parent = null;
+ _parent = null;
}
}
else { // It's not a leaf
- entries[nrElements].element = p.entries[parentIndex].element;
- nrElements++;
+ _entries[_nrElements].element = p._entries[parentIndex].element;
+ _nrElements++;
- for (int x = nrElements + 1, y = 0; y <= rs.nrElements; x++, y++) {
- entries[x] = rs.entries[y];
- rs.entries[y].child.parent = this;
- nrElements++;
+ for (int x = _nrElements + 1, y = 0; y <= rs._nrElements; x++, y++) {
+ _entries[x] = rs._entries[y];
+ rs._entries[y].child._parent = this;
+ _nrElements++;
}
- nrElements--;
+ _nrElements--;
- p.entries[++parentIndex].child = this;
+ p._entries[++parentIndex].child = this;
- if (p.nrElements == MIN && p != BTreeSet.this.root) {
+ if (p._nrElements == MIN && p != BTreeSet.this.root) {
for (int x = parentIndex - 1, y = parentIndex - 2; y >= 0; x--, y--)
- p.entries[x] = p.entries[y];
- p.entries[0] = new Entry();
+ p._entries[x] = p._entries[y];
+ p._entries[0] = new Entry();
}
else {
- for (int x = parentIndex - 1, y = parentIndex; y <= p.nrElements; x++, y++)
- p.entries[x] = p.entries[y];
- p.entries[p.nrElements] = null;
+ for (int x = parentIndex - 1, y = parentIndex; y <= p._nrElements; x++, y++)
+ p._entries[x] = p._entries[y];
+ p._entries[p._nrElements] = null;
}
- p.nrElements--;
+ p._nrElements--;
- if (p.isRoot() && p.nrElements == 0) { // It's the root and it's empty
+ if (p.isRoot() && p._nrElements == 0) { // It's the root and it's empty
BTreeSet.this.root = this;
- parent = null;
+ _parent = null;
}
}
}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java
index e5a8ffae76..f42fb22518 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java
@@ -52,14 +52,6 @@ public final class HeaderFooter
}
public boolean isEmpty()
{
- if(_start - _end == 0)
- {
- return true;
- }
- else
- {
- return false;
- }
+ return _start - _end == 0;
}
-
}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java
index 9db6016cd5..7f575e59ef 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java
@@ -1466,13 +1466,6 @@ public final class StyleSheet implements HDFType {
*/
public static boolean getFlag(int x)
{
- if(x != 0)
- {
- return true;
- }
- else
- {
- return false;
- }
+ return x != 0;
}
}
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java b/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java
index 25d9612d10..994fe09868 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java
@@ -45,7 +45,7 @@ public final class BTreeSet extends AbstractSet
public BTreeNode root;
private Comparator comparator = null;
private int order;
- private int size = 0;
+ int size = 0;
/*
* Constructors
@@ -172,7 +172,7 @@ public final class BTreeSet extends AbstractSet
/*
* Private methods
*/
- private int compare(Object x, Object y)
+ int compare(Object x, Object y)
{
return (comparator == null ? ((Comparable)x).compareTo(y) : comparator.compare(x, y));
}
@@ -270,20 +270,18 @@ public final class BTreeSet extends AbstractSet
}
}
- else
- { //Your not a leaf so simply find and return the successor of lastReturned
- currentNode = currentNode.entries[index].child;
- parentIndex.push(new Integer(index));
+ // else - You're not a leaf so simply find and return the successor of lastReturned
+ currentNode = currentNode.entries[index].child;
+ parentIndex.push(new Integer(index));
- while (currentNode.entries[0].child != null)
- {
- currentNode = currentNode.entries[0].child;
- parentIndex.push(new Integer(0));
- }
-
- index = 1;
- return currentNode.entries[0].element;
+ while (currentNode.entries[0].child != null)
+ {
+ currentNode = currentNode.entries[0].child;
+ parentIndex.push(new Integer(0));
}
+
+ index = 1;
+ return currentNode.entries[0].element;
}
}
@@ -329,21 +327,23 @@ public final class BTreeSet extends AbstractSet
else
{ // Promote splitNode
parent.insertSplitNode(splitNode, this, rightSibling, parentIndex);
- if (BTreeSet.this.compare(x, parent.entries[parentIndex].element) < 0) return insert(x, parentIndex);
- else return rightSibling.insert(x, parentIndex + 1);
+ if (BTreeSet.this.compare(x, parent.entries[parentIndex].element) < 0) {
+ return insert(x, parentIndex);
+ }
+ return rightSibling.insert(x, parentIndex + 1);
}
}
else if (isLeaf())
{ // If leaf, simply insert the non-duplicate element
int insertAt = childToInsertAt(x, true);
- if (insertAt == -1) return false; // Determine if the element already exists
- else
- {
- insertNewElement(x, insertAt);
- BTreeSet.this.size++;
- return true;
+ // Determine if the element already exists
+ if (insertAt == -1) {
+ return false;
}
+ insertNewElement(x, insertAt);
+ BTreeSet.this.size++;
+ return true;
}
else
@@ -388,22 +388,19 @@ public final class BTreeSet extends AbstractSet
return true;
}
- else
- { // If leaf and have less than MIN elements, than prepare the BTreeSet for deletion
- temp.prepareForDeletion(parentIndex);
- temp.deleteElement(x);
- BTreeSet.this.size--;
- temp.fixAfterDeletion(priorParentIndex);
- return true;
- }
+ // else - If leaf and have less than MIN elements, than prepare the BTreeSet for deletion
+ temp.prepareForDeletion(parentIndex);
+ temp.deleteElement(x);
+ BTreeSet.this.size--;
+ temp.fixAfterDeletion(priorParentIndex);
+ return true;
}
- else
- { // Only delete at leaf so first switch with successor than delete
- temp.switchWithSuccessor(x);
- parentIndex = temp.childToInsertAt(x, false) + 1;
- return temp.entries[parentIndex].child.delete(x, parentIndex);
- }
+ // else - Only delete at leaf so first switch with successor than delete
+ temp.switchWithSuccessor(x);
+ parentIndex = temp.childToInsertAt(x, false) + 1;
+ return temp.entries[parentIndex].child.delete(x, parentIndex);
+
}
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java b/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java
index 7f31f26252..0595343d45 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java
+++ b/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java
@@ -311,7 +311,7 @@ private void output8Codes(OutputStream res) throws IOException {
/**
* Does the compression
*/
-private void compress(InputStream src, OutputStream res) throws IOException {
+public void compress(InputStream src, OutputStream res) throws IOException {
// Have we hit the end of the file yet?
boolean going = true;
@@ -375,11 +375,10 @@ private void compress(InputStream src, OutputStream res) throws IOException {
if(findRawCodeInBuffer() > -1) {
// Fits in, wait for next byte
continue;
- } else {
- // Doesn't fit, output
- outputUncompressed(dataB,res);
- rawCodeLen = 0;
}
+ // Doesn't fit, output
+ outputUncompressed(dataB,res);
+ rawCodeLen = 0;
} else {
// Nothing in rawCode before, so this byte
// isn't in the buffer dictionary
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java b/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java
index 299fe55225..1b8e7dde68 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java
@@ -112,10 +112,9 @@ public class AutoShape extends TextShape {
if(outline == null){
logger.log(POILogger.WARN, "Outline not found for " + ShapeTypes.typeName(getShapeType()));
return anchor;
- } else {
- java.awt.Shape shape = outline.getOutline(this);
- return AutoShapes.transform(shape, anchor);
}
+ java.awt.Shape shape = outline.getOutline(this);
+ return AutoShapes.transform(shape, anchor);
}
}
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java b/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java
index 4686dc3f76..e81bf50807 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java
@@ -43,15 +43,15 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
protected POILogger log = POILogFactory.getLogger(this.getClass());
//The ppt object to write into.
- private ShapeGroup group;
+ private ShapeGroup _group;
- private AffineTransform transform;
- private Stroke stroke;
- private Paint paint;
- private Font font;
- private Color foreground;
- private Color background;
- private RenderingHints hints;
+ private AffineTransform _transform;
+ private Stroke _stroke;
+ private Paint _paint;
+ private Font _font;
+ private Color _foreground;
+ private Color _background;
+ private RenderingHints _hints;
/**
* Construct Java Graphics object which translates graphic calls in ppt drawing layer.
@@ -59,22 +59,22 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @param group The shape group to write the graphics calls into.
*/
public PPGraphics2D(ShapeGroup group){
- this.group = group;
+ this._group = group;
- transform = new AffineTransform();
- stroke = new BasicStroke();
- paint = Color.black;
- font = new Font("Arial", Font.PLAIN, 12);
- background = Color.black;
- foreground = Color.white;
- hints = new RenderingHints(null);
+ _transform = new AffineTransform();
+ _stroke = new BasicStroke();
+ _paint = Color.black;
+ _font = new Font("Arial", Font.PLAIN, 12);
+ _background = Color.black;
+ _foreground = Color.white;
+ _hints = new RenderingHints(null);
}
/**
* @return the shape group being used for drawing
*/
public ShapeGroup getShapeGroup(){
- return group;
+ return _group;
}
/**
@@ -84,7 +84,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see java.awt.Graphics#setFont(Font)
*/
public Font getFont(){
- return font;
+ return _font;
}
/**
@@ -98,7 +98,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see java.awt.Graphics#drawChars(char[], int, int, int, int)
*/
public void setFont(Font font){
- this.font = font;
+ this._font = font;
}
/**
@@ -108,7 +108,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see java.awt.Graphics#setColor
*/
public Color getColor(){
- return foreground;
+ return _foreground;
}
/**
@@ -131,7 +131,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see #setStroke
*/
public Stroke getStroke(){
- return stroke;
+ return _stroke;
}
/**
@@ -140,7 +140,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* Shape during the rendering process
*/
public void setStroke(Stroke s){
- this.stroke = s;
+ this._stroke = s;
}
/**
@@ -152,7 +152,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see java.awt.Graphics#setColor
*/
public Paint getPaint(){
- return paint;
+ return _paint;
}
/**
@@ -168,8 +168,8 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
public void setPaint(Paint paint){
if(paint == null) return;
- this.paint = paint;
- if (paint instanceof Color) foreground = (Color)paint;
+ this._paint = paint;
+ if (paint instanceof Color) _foreground = (Color)paint;
}
/**
@@ -177,11 +177,11 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* Graphics2D context.
* @return the current AffineTransform in the
* Graphics2D context.
- * @see #transform
+ * @see #_transform
* @see #setTransform
*/
public AffineTransform getTransform(){
- return new AffineTransform(transform);
+ return new AffineTransform(_transform);
}
/**
@@ -189,11 +189,11 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* context.
* @param Tx the AffineTransform object to be used in the
* rendering process
- * @see #transform
+ * @see #_transform
* @see AffineTransform
*/
public void setTransform(AffineTransform Tx) {
- transform = new AffineTransform(Tx);
+ _transform = new AffineTransform(Tx);
}
/**
@@ -206,19 +206,19 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see #setStroke
* @see #setPaint
* @see java.awt.Graphics#setColor
- * @see #transform
+ * @see #_transform
* @see #setTransform
* @see #clip
* @see #setClip
* @see #setComposite
*/
public void draw(Shape shape){
- GeneralPath path = new GeneralPath(transform.createTransformedShape(shape));
- Freeform p = new Freeform(group);
+ GeneralPath path = new GeneralPath(_transform.createTransformedShape(shape));
+ Freeform p = new Freeform(_group);
p.setPath(path);
p.getFill().setForegroundColor(null);
applyStroke(p);
- group.addShape(p);
+ _group.addShape(p);
}
/**
@@ -247,18 +247,18 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see #setClip
*/
public void drawString(String s, float x, float y) {
- TextBox txt = new TextBox(group);
- txt.getTextRun().supplySlideShow(group.getSheet().getSlideShow());
- txt.getTextRun().setSheet(group.getSheet());
+ TextBox txt = new TextBox(_group);
+ txt.getTextRun().supplySlideShow(_group.getSheet().getSlideShow());
+ txt.getTextRun().setSheet(_group.getSheet());
txt.setText(s);
RichTextRun rt = txt.getTextRun().getRichTextRuns()[0];
- rt.setFontSize(font.getSize());
- rt.setFontName(font.getFamily());
+ rt.setFontSize(_font.getSize());
+ rt.setFontName(_font.getFamily());
if (getColor() != null) rt.setFontColor(getColor());
- if (font.isBold()) rt.setBold(true);
- if (font.isItalic()) rt.setItalic(true);
+ if (_font.isBold()) rt.setBold(true);
+ if (_font.isItalic()) rt.setItalic(true);
txt.setMarginBottom(0);
txt.setMarginTop(0);
@@ -269,7 +269,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
txt.setVerticalAlignment(TextBox.AnchorMiddle);
- TextLayout layout = new TextLayout(s, font, getFontRenderContext());
+ TextLayout layout = new TextLayout(s, _font, getFontRenderContext());
float ascent = layout.getAscent();
float width = (float) Math.floor(layout.getAdvance());
@@ -295,7 +295,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
*/
txt.setAnchor(new Rectangle2D.Float(x, y, width, height));
- group.addShape(txt);
+ _group.addShape(txt);
}
/**
@@ -306,19 +306,19 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @param shape the Shape to be filled
* @see #setPaint
* @see java.awt.Graphics#setColor
- * @see #transform
+ * @see #_transform
* @see #setTransform
* @see #setComposite
* @see #clip
* @see #setClip
*/
public void fill(Shape shape){
- GeneralPath path = new GeneralPath(transform.createTransformedShape(shape));
- Freeform p = new Freeform(group);
+ GeneralPath path = new GeneralPath(_transform.createTransformedShape(shape));
+ Freeform p = new Freeform(_group);
p.setPath(path);
applyPaint(p);
p.setLineColor(null); //Fills must be "No Line"
- group.addShape(p);
+ _group.addShape(p);
}
/**
@@ -333,7 +333,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @param y the y coordinate.
*/
public void translate(int x, int y){
- transform.translate(x, y);
+ _transform.translate(x, y);
}
/**
@@ -400,7 +400,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* rendering operations.
*/
public void scale(double sx, double sy){
- transform.scale(sx, sy);
+ _transform.scale(sx, sy);
}
/**
@@ -1055,10 +1055,10 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
*/
public Rectangle getClipBounds(){
Shape c = getClip();
- if(c==null)
+ if (c==null) {
return null;
- else
- return c.getBounds();
+ }
+ return c.getBounds();
}
/**
@@ -1143,7 +1143,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @param theta the angle of rotation in radians
*/
public void rotate(double theta){
- transform.rotate(theta);
+ _transform.rotate(theta);
}
/**
@@ -1166,7 +1166,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @param y y coordinate of the origin of the rotation
*/
public void rotate(double theta, double x, double y){
- transform.rotate(theta, x, y);
+ _transform.rotate(theta, x, y);
}
/**
@@ -1188,7 +1188,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* the positive Y axis direction as a function of their X coordinate
*/
public void shear(double shx, double shy){
- transform.shear(shx, shy);
+ _transform.shear(shx, shy);
}
/**
@@ -1240,7 +1240,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see AffineTransform
*/
public void transform(AffineTransform Tx) {
- transform.concatenate(Tx);
+ _transform.concatenate(Tx);
}
/**
@@ -1258,7 +1258,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @param op the filter to be applied to the image before rendering
* @param x the x coordinate in user space where the image is rendered
* @param y the y coordinate in user space where the image is rendered
- * @see #transform
+ * @see #_transform
* @see #setTransform
* @see #setComposite
* @see #clip
@@ -1292,7 +1292,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
if(color == null)
return;
- background = color;
+ _background = color;
}
/**
@@ -1302,7 +1302,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see #setBackground
*/
public Color getBackground(){
- return background;
+ return _background;
}
/**
@@ -1359,7 +1359,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see RenderingHints
*/
public Object getRenderingHint(RenderingHints.Key hintKey){
- return hints.get(hintKey);
+ return _hints.get(hintKey);
}
/**
@@ -1374,7 +1374,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see RenderingHints
*/
public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue){
- hints.put(hintKey, hintValue);
+ _hints.put(hintKey, hintValue);
}
@@ -1434,7 +1434,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see RenderingHints
*/
public void addRenderingHints(Map hints){
- this.hints.putAll(hints);
+ this._hints.putAll(hints);
}
/**
@@ -1454,7 +1454,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @param ty the distance to translate along the y-axis
*/
public void translate(double tx, double ty){
- transform.translate(tx, ty);
+ _transform.translate(tx, ty);
}
/**
@@ -1510,7 +1510,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see #setStroke
* @see #fill(Shape)
* @see #draw(Shape)
- * @see #transform
+ * @see #_transform
* @see #setTransform
* @see #clip
* @see #setClip(Shape)
@@ -1540,7 +1540,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see RenderingHints
*/
public RenderingHints getRenderingHints(){
- return hints;
+ return _hints;
}
/**
@@ -1557,7 +1557,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @see RenderingHints
*/
public void setRenderingHints(Map hints){
- this.hints = new RenderingHints(hints);
+ this._hints = new RenderingHints(hints);
}
/**
@@ -1579,7 +1579,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @return true if the Image is
* fully loaded and completely rendered;
* false if the Image is still being loaded.
- * @see #transform
+ * @see #_transform
* @see #setTransform
* @see #setComposite
* @see #clip
@@ -1713,7 +1713,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @param img the image to be rendered. This method does
* nothing if img is null.
* @param xform the transformation from image space into user space
- * @see #transform
+ * @see #_transform
* @see #setTransform
* @see #setComposite
* @see #clip
@@ -1739,7 +1739,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
* @param img the image to be rendered. This method does
* nothing if img is null.
* @param xform the transformation from image space into user space
- * @see #transform
+ * @see #_transform
* @see #setTransform
* @see #setComposite
* @see #clip
@@ -1750,8 +1750,8 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
}
protected void applyStroke(SimpleShape shape) {
- if (stroke instanceof BasicStroke){
- BasicStroke bs = (BasicStroke)stroke;
+ if (_stroke instanceof BasicStroke){
+ BasicStroke bs = (BasicStroke)_stroke;
shape.setLineWidth(bs.getLineWidth());
float[] dash = bs.getDashArray();
if (dash != null) {
@@ -1762,8 +1762,8 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable {
}
protected void applyPaint(SimpleShape shape) {
- if (paint instanceof Color) {
- shape.getFill().setForegroundColor((Color)paint);
+ if (_paint instanceof Color) {
+ shape.getFill().setForegroundColor((Color)_paint);
}
}
}
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java b/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java
index 408dfc47e7..8a8f843569 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java
@@ -152,14 +152,14 @@ public class Picture extends SimpleShape {
img = ImageIO.read(new ByteArrayInputStream(pict.getData()));
}
catch (IOException e){}
- catch (NegativeArraySizeException ne) {}
+ catch (NegativeArraySizeException ne) {}
if(img != null) {
- // Valid image, set anchor from it
- setAnchor(new java.awt.Rectangle(0, 0, img.getWidth()*POINT_DPI/PIXEL_DPI, img.getHeight()*POINT_DPI/PIXEL_DPI));
+ // Valid image, set anchor from it
+ setAnchor(new java.awt.Rectangle(0, 0, img.getWidth()*POINT_DPI/PIXEL_DPI, img.getHeight()*POINT_DPI/PIXEL_DPI));
} else {
- // Invalid image, go with the default metafile size
- setAnchor(new java.awt.Rectangle(0, 0, 200, 200));
+ // Invalid image, go with the default metafile size
+ setAnchor(new java.awt.Rectangle(0, 0, 200, 200));
}
} else {
//default size of a metafile picture is 200x200
@@ -204,9 +204,8 @@ public class Picture extends SimpleShape {
if (idx == 0){
logger.log(POILogger.DEBUG, "picture index was not found, returning ");
return null;
- } else {
- return (EscherBSERecord)lst.get(idx-1);
}
+ return (EscherBSERecord)lst.get(idx-1);
}
/**
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java b/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java
index 9440bc61e2..05e8733b5a 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java
@@ -40,10 +40,8 @@ public final class ShapeFactory {
public static Shape createShape(EscherContainerRecord spContainer, Shape parent){
if (spContainer.getRecordId() == EscherContainerRecord.SPGR_CONTAINER){
return createShapeGroup(spContainer, parent);
- } else {
- return createSimpeShape(spContainer, parent);
-
}
+ return createSimpeShape(spContainer, parent);
}
public static ShapeGroup createShapeGroup(EscherContainerRecord spContainer, Shape parent){
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java b/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java
index d01ac302d7..0e6b0027dd 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java
@@ -17,16 +17,22 @@
package org.apache.poi.hslf.model;
+import java.awt.Graphics2D;
import java.util.Vector;
-import java.util.Iterator;
-import java.awt.*;
-import org.apache.poi.hslf.record.*;
-import org.apache.poi.hslf.record.SlideListWithText.SlideAtomsSet;
-import org.apache.poi.ddf.EscherDggRecord;
import org.apache.poi.ddf.EscherContainerRecord;
import org.apache.poi.ddf.EscherDgRecord;
+import org.apache.poi.ddf.EscherDggRecord;
import org.apache.poi.ddf.EscherSpRecord;
+import org.apache.poi.hslf.record.ColorSchemeAtom;
+import org.apache.poi.hslf.record.Comment2000;
+import org.apache.poi.hslf.record.HeadersFootersContainer;
+import org.apache.poi.hslf.record.Record;
+import org.apache.poi.hslf.record.RecordContainer;
+import org.apache.poi.hslf.record.RecordTypes;
+import org.apache.poi.hslf.record.SlideAtom;
+import org.apache.poi.hslf.record.TextHeaderAtom;
+import org.apache.poi.hslf.record.SlideListWithText.SlideAtomsSet;
/**
* This class represents a slide in a PowerPoint Document. It allows
@@ -144,8 +150,7 @@ public final class Slide extends Sheet
dgg.setDrawingsSaved(dgg.getDrawingsSaved() + 1);
dgg.setMaxDrawingGroupId(dgId);
- for (Iterator it = dgContainer.getChildContainers().iterator(); it.hasNext(); ) {
- EscherContainerRecord c = (EscherContainerRecord)it.next();
+ for (EscherContainerRecord c : dgContainer.getChildContainers()) {
EscherSpRecord spr = null;
switch(c.getRecordId()){
case EscherContainerRecord.SPGR_CONTAINER:
@@ -343,10 +348,10 @@ public final class Slide extends Sheet
* Background for this slide.
*/
public Background getBackground() {
- if(getFollowMasterBackground())
+ if(getFollowMasterBackground()) {
return getMasterSheet().getBackground();
- else
- return super.getBackground();
+ }
+ return super.getBackground();
}
/**
@@ -449,13 +454,11 @@ public final class Slide extends Sheet
if(hdd == null && !ppt2007) {
return getSlideShow().getSlideHeadersFooters();
}
- else {
- if(hdd == null) {
- hdd = new HeadersFootersContainer(HeadersFootersContainer.SlideHeadersFootersContainer);
- newRecord = true;
- }
- return new HeadersFooters(hdd, this, newRecord, ppt2007);
+ if(hdd == null) {
+ hdd = new HeadersFootersContainer(HeadersFootersContainer.SlideHeadersFootersContainer);
+ newRecord = true;
}
+ return new HeadersFooters(hdd, this, newRecord, ppt2007);
}
protected void onAddTextShape(TextShape shape) {
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java b/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java
index aa24b6c3db..65c4459d17 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java
@@ -46,7 +46,7 @@ public final class TextRun
protected boolean _isUnicode;
protected RichTextRun[] _rtRuns;
private SlideShow slideShow;
- private Sheet sheet;
+ private Sheet _sheet;
private int shapeId;
private int slwtIndex; //position in the owning SlideListWithText
/**
@@ -564,9 +564,8 @@ public final class TextRun
public String getRawText() {
if(_isUnicode) {
return _charAtom.getText();
- } else {
- return _byteAtom.getText();
}
+ return _byteAtom.getText();
}
/**
@@ -610,11 +609,11 @@ public final class TextRun
}
public void setSheet(Sheet sheet){
- this.sheet = sheet;
+ this._sheet = sheet;
}
public Sheet getSheet(){
- return this.sheet;
+ return this._sheet;
}
/**
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java
index b262530c0d..aca0427ddb 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java
@@ -171,26 +171,26 @@ public final class TxMasterStyleAtom extends RecordAtom {
protected TextProp[] getParagraphProps(int type, int level){
if (level != 0 || type >= MAX_INDENT){
return StyleTextPropAtom.paragraphTextPropTypes;
- } else {
- return new TextProp[] {
- new ParagraphFlagsTextProp(),
- new TextProp(2, 0x80, "bullet.char"),
- new TextProp(2, 0x10, "bullet.font"),
- new TextProp(2, 0x40, "bullet.size"),
- new TextProp(4, 0x20, "bullet.color"),
- new TextProp(2, 0xD00, "alignment"),
- new TextProp(2, 0x1000, "linespacing"),
- new TextProp(2, 0x2000, "spacebefore"),
- new TextProp(2, 0x4000, "spaceafter"),
- new TextProp(2, 0x8000, "text.offset"),
- new TextProp(2, 0x10000, "bullet.offset"),
- new TextProp(2, 0x20000, "defaulttab"),
- new TextProp(2, 0x40000, "para_unknown_2"),
- new TextProp(2, 0x80000, "para_unknown_3"),
- new TextProp(2, 0x100000, "para_unknown_4"),
- new TextProp(2, 0x200000, "para_unknown_5")
- };
}
+ return new TextProp[] {
+ new ParagraphFlagsTextProp(),
+ new TextProp(2, 0x80, "bullet.char"),
+ new TextProp(2, 0x10, "bullet.font"),
+ new TextProp(2, 0x40, "bullet.size"),
+ new TextProp(4, 0x20, "bullet.color"),
+ new TextProp(2, 0xD00, "alignment"),
+ new TextProp(2, 0x1000, "linespacing"),
+ new TextProp(2, 0x2000, "spacebefore"),
+ new TextProp(2, 0x4000, "spaceafter"),
+ new TextProp(2, 0x8000, "text.offset"),
+ new TextProp(2, 0x10000, "bullet.offset"),
+ new TextProp(2, 0x20000, "defaulttab"),
+ new TextProp(2, 0x40000, "para_unknown_2"),
+ new TextProp(2, 0x80000, "para_unknown_3"),
+ new TextProp(2, 0x100000, "para_unknown_4"),
+ new TextProp(2, 0x200000, "para_unknown_5")
+ };
+
}
/**
@@ -202,16 +202,16 @@ public final class TxMasterStyleAtom extends RecordAtom {
protected TextProp[] getCharacterProps(int type, int level){
if (level != 0 || type >= MAX_INDENT){
return StyleTextPropAtom.characterTextPropTypes;
- } else
- return new TextProp[] {
- new CharFlagsTextProp(),
- new TextProp(2, 0x10000, "font.index"),
- new TextProp(2, 0x20000, "char_unknown_1"),
- new TextProp(4, 0x40000, "char_unknown_2"),
- new TextProp(2, 0x80000, "font.size"),
- new TextProp(2, 0x100000, "char_unknown_3"),
- new TextProp(4, 0x200000, "font.color"),
- new TextProp(2, 0x800000, "char_unknown_4")
- };
+ }
+ return new TextProp[] {
+ new CharFlagsTextProp(),
+ new TextProp(2, 0x10000, "font.index"),
+ new TextProp(2, 0x20000, "char_unknown_1"),
+ new TextProp(4, 0x40000, "char_unknown_2"),
+ new TextProp(2, 0x80000, "font.size"),
+ new TextProp(2, 0x100000, "char_unknown_3"),
+ new TextProp(4, 0x200000, "font.color"),
+ new TextProp(2, 0x800000, "char_unknown_4")
+ };
}
}
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/RichTextRun.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/RichTextRun.java
index da8093ecf4..bac458087a 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/RichTextRun.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/RichTextRun.java
@@ -38,7 +38,7 @@ import org.apache.poi.util.POILogFactory;
*
*/
public final class RichTextRun {
- protected POILogger logger = POILogFactory.getLogger(this.getClass());
+ protected POILogger logger = POILogFactory.getLogger(this.getClass());
/** The TextRun we belong to */
private TextRun parentRun;
@@ -51,8 +51,8 @@ public final class RichTextRun {
/** How long a string (in the parent TextRun) we represent */
private int length;
- private String _fontname;
- /**
+ private String _fontname;
+ /**
* Our paragraph and character style.
* Note - we may share these styles with other RichTextRuns
*/
@@ -111,10 +111,10 @@ public final class RichTextRun {
*/
public void supplySlideShow(SlideShow ss) {
slideShow = ss;
- if (_fontname != null) {
- setFontName(_fontname);
- _fontname = null;
- }
+ if (_fontname != null) {
+ setFontName(_fontname);
+ _fontname = null;
+ }
}
/**
@@ -124,23 +124,23 @@ public final class RichTextRun {
return length;
}
- /**
- * The beginning index, inclusive.
- *
- * @return the beginning index, inclusive.
- */
- public int getStartIndex(){
- return startPos;
- }
+ /**
+ * The beginning index, inclusive.
+ *
+ * @return the beginning index, inclusive.
+ */
+ public int getStartIndex(){
+ return startPos;
+ }
- /**
- * The ending index, exclusive.
- *
- * @return the ending index, exclusive.
- */
- public int getEndIndex(){
- return startPos + length;
- }
+ /**
+ * The ending index, exclusive.
+ *
+ * @return the ending index, exclusive.
+ */
+ public int getEndIndex(){
+ return startPos + length;
+ }
/**
* Fetch the text, in output suitable form
@@ -159,17 +159,17 @@ public final class RichTextRun {
* Change the text
*/
public void setText(String text) {
- String s = parentRun.normalize(text);
- setRawText(s);
+ String s = parentRun.normalize(text);
+ setRawText(s);
}
- /**
- * Change the text
- */
- public void setRawText(String text) {
- length = text.length();
- parentRun.changeTextInRichTextRun(this,text);
- }
+ /**
+ * Change the text
+ */
+ public void setRawText(String text) {
+ length = text.length();
+ parentRun.changeTextInRichTextRun(this,text);
+ }
/**
* Tells the RichTextRun its new position in the parent TextRun
@@ -191,65 +191,65 @@ public final class RichTextRun {
return getFlag(true, index);
}
- private boolean getFlag(boolean isCharacter, int index) {
- TextPropCollection props;
- String propname;
- if (isCharacter){
- props = characterStyle;
- propname = CharFlagsTextProp.NAME;
- } else {
- props = paragraphStyle;
- propname = ParagraphFlagsTextProp.NAME;
- }
+ private boolean getFlag(boolean isCharacter, int index) {
+ TextPropCollection props;
+ String propname;
+ if (isCharacter){
+ props = characterStyle;
+ propname = CharFlagsTextProp.NAME;
+ } else {
+ props = paragraphStyle;
+ propname = ParagraphFlagsTextProp.NAME;
+ }
- BitMaskTextProp prop = null;
- if (props != null){
- prop = (BitMaskTextProp)props.findByName(propname);
- }
- if (prop == null){
- Sheet sheet = parentRun.getSheet();
- if(sheet != null){
- int txtype = parentRun.getRunType();
- MasterSheet master = sheet.getMasterSheet();
- if (master != null){
- prop = (BitMaskTextProp)master.getStyleAttribute(txtype, getIndentLevel(), propname, isCharacter);
- }
- } else {
- logger.log(POILogger.WARN, "MasterSheet is not available");
- }
- }
+ BitMaskTextProp prop = null;
+ if (props != null){
+ prop = (BitMaskTextProp)props.findByName(propname);
+ }
+ if (prop == null){
+ Sheet sheet = parentRun.getSheet();
+ if(sheet != null){
+ int txtype = parentRun.getRunType();
+ MasterSheet master = sheet.getMasterSheet();
+ if (master != null){
+ prop = (BitMaskTextProp)master.getStyleAttribute(txtype, getIndentLevel(), propname, isCharacter);
+ }
+ } else {
+ logger.log(POILogger.WARN, "MasterSheet is not available");
+ }
+ }
- return prop == null ? false : prop.getSubValue(index);
- }
+ return prop == null ? false : prop.getSubValue(index);
+ }
/**
* Set the value of the given flag in the CharFlagsTextProp, adding
* it if required.
*/
private void setCharFlagsTextPropVal(int index, boolean value) {
- if(getFlag(true, index) != value) setFlag(true, index, value);
+ if(getFlag(true, index) != value) setFlag(true, index, value);
}
- public void setFlag(boolean isCharacter, int index, boolean value) {
- TextPropCollection props;
- String propname;
- if (isCharacter){
- props = characterStyle;
- propname = CharFlagsTextProp.NAME;
- } else {
- props = paragraphStyle;
- propname = ParagraphFlagsTextProp.NAME;
- }
+ public void setFlag(boolean isCharacter, int index, boolean value) {
+ TextPropCollection props;
+ String propname;
+ if (isCharacter){
+ props = characterStyle;
+ propname = CharFlagsTextProp.NAME;
+ } else {
+ props = paragraphStyle;
+ propname = ParagraphFlagsTextProp.NAME;
+ }
// Ensure we have the StyleTextProp atom we're going to need
if(props == null) {
parentRun.ensureStyleAtomPresent();
- props = isCharacter ? characterStyle : paragraphStyle;
+ props = isCharacter ? characterStyle : paragraphStyle;
}
BitMaskTextProp prop = (BitMaskTextProp) fetchOrAddTextProp(props, propname);
prop.setSubValue(value,index);
- }
+ }
/**
* Returns the named TextProp, either by fetching it (if it exists) or adding it
@@ -273,18 +273,18 @@ public final class RichTextRun {
* Master Sheet will apply.
*/
private int getCharTextPropVal(String propName) {
- TextProp prop = null;
- if (characterStyle != null){
- prop = characterStyle.findByName(propName);
- }
+ TextProp prop = null;
+ if (characterStyle != null){
+ prop = characterStyle.findByName(propName);
+ }
- if (prop == null){
- Sheet sheet = parentRun.getSheet();
- int txtype = parentRun.getRunType();
- MasterSheet master = sheet.getMasterSheet();
- if (master != null)
- prop = master.getStyleAttribute(txtype, getIndentLevel(), propName, true);
- }
+ if (prop == null){
+ Sheet sheet = parentRun.getSheet();
+ int txtype = parentRun.getRunType();
+ MasterSheet master = sheet.getMasterSheet();
+ if (master != null)
+ prop = master.getStyleAttribute(txtype, getIndentLevel(), propName, true);
+ }
return prop == null ? -1 : prop.getValue();
}
/**
@@ -294,21 +294,21 @@ public final class RichTextRun {
* Master Sheet will apply.
*/
private int getParaTextPropVal(String propName) {
- TextProp prop = null;
- boolean hardAttribute = false;
- if (paragraphStyle != null){
- prop = paragraphStyle.findByName(propName);
+ TextProp prop = null;
+ boolean hardAttribute = false;
+ if (paragraphStyle != null){
+ prop = paragraphStyle.findByName(propName);
- BitMaskTextProp maskProp = (BitMaskTextProp)paragraphStyle.findByName(ParagraphFlagsTextProp.NAME);
- hardAttribute = maskProp != null && maskProp.getValue() == 0;
- }
- if (prop == null && !hardAttribute){
- Sheet sheet = parentRun.getSheet();
- int txtype = parentRun.getRunType();
- MasterSheet master = sheet.getMasterSheet();
- if (master != null)
- prop = master.getStyleAttribute(txtype, getIndentLevel(), propName, false);
- }
+ BitMaskTextProp maskProp = (BitMaskTextProp)paragraphStyle.findByName(ParagraphFlagsTextProp.NAME);
+ hardAttribute = maskProp != null && maskProp.getValue() == 0;
+ }
+ if (prop == null && !hardAttribute){
+ Sheet sheet = parentRun.getSheet();
+ int txtype = parentRun.getRunType();
+ MasterSheet master = sheet.getMasterSheet();
+ if (master != null)
+ prop = master.getStyleAttribute(txtype, getIndentLevel(), propName, false);
+ }
return prop == null ? -1 : prop.getValue();
}
@@ -347,164 +347,163 @@ public final class RichTextRun {
// --------------- Friendly getters / setters on rich text properties -------
- /**
- * Is the text bold?
- */
+ /**
+ * Is the text bold?
+ */
public boolean isBold() {
return isCharFlagsTextPropVal(CharFlagsTextProp.BOLD_IDX);
}
- /**
- * Is the text bold?
- */
+ /**
+ * Is the text bold?
+ */
public void setBold(boolean bold) {
setCharFlagsTextPropVal(CharFlagsTextProp.BOLD_IDX, bold);
}
- /**
- * Is the text italic?
- */
+ /**
+ * Is the text italic?
+ */
public boolean isItalic() {
return isCharFlagsTextPropVal(CharFlagsTextProp.ITALIC_IDX);
}
- /**
- * Is the text italic?
- */
+ /**
+ * Is the text italic?
+ */
public void setItalic(boolean italic) {
setCharFlagsTextPropVal(CharFlagsTextProp.ITALIC_IDX, italic);
}
- /**
- * Is the text underlined?
- */
+ /**
+ * Is the text underlined?
+ */
public boolean isUnderlined() {
return isCharFlagsTextPropVal(CharFlagsTextProp.UNDERLINE_IDX);
}
- /**
- * Is the text underlined?
- */
+ /**
+ * Is the text underlined?
+ */
public void setUnderlined(boolean underlined) {
setCharFlagsTextPropVal(CharFlagsTextProp.UNDERLINE_IDX, underlined);
}
- /**
- * Does the text have a shadow?
- */
- public boolean isShadowed() {
- return isCharFlagsTextPropVal(CharFlagsTextProp.SHADOW_IDX);
- }
+ /**
+ * Does the text have a shadow?
+ */
+ public boolean isShadowed() {
+ return isCharFlagsTextPropVal(CharFlagsTextProp.SHADOW_IDX);
+ }
- /**
- * Does the text have a shadow?
- */
- public void setShadowed(boolean flag) {
- setCharFlagsTextPropVal(CharFlagsTextProp.SHADOW_IDX, flag);
- }
+ /**
+ * Does the text have a shadow?
+ */
+ public void setShadowed(boolean flag) {
+ setCharFlagsTextPropVal(CharFlagsTextProp.SHADOW_IDX, flag);
+ }
- /**
- * Is this text embossed?
- */
- public boolean isEmbossed() {
- return isCharFlagsTextPropVal(CharFlagsTextProp.RELIEF_IDX);
- }
+ /**
+ * Is this text embossed?
+ */
+ public boolean isEmbossed() {
+ return isCharFlagsTextPropVal(CharFlagsTextProp.RELIEF_IDX);
+ }
- /**
- * Is this text embossed?
- */
- public void setEmbossed(boolean flag) {
- setCharFlagsTextPropVal(CharFlagsTextProp.RELIEF_IDX, flag);
- }
+ /**
+ * Is this text embossed?
+ */
+ public void setEmbossed(boolean flag) {
+ setCharFlagsTextPropVal(CharFlagsTextProp.RELIEF_IDX, flag);
+ }
- /**
- * Gets the strikethrough flag
- */
- public boolean isStrikethrough() {
- return isCharFlagsTextPropVal(CharFlagsTextProp.STRIKETHROUGH_IDX);
- }
+ /**
+ * Gets the strikethrough flag
+ */
+ public boolean isStrikethrough() {
+ return isCharFlagsTextPropVal(CharFlagsTextProp.STRIKETHROUGH_IDX);
+ }
- /**
- * Sets the strikethrough flag
- */
- public void setStrikethrough(boolean flag) {
- setCharFlagsTextPropVal(CharFlagsTextProp.STRIKETHROUGH_IDX, flag);
- }
+ /**
+ * Sets the strikethrough flag
+ */
+ public void setStrikethrough(boolean flag) {
+ setCharFlagsTextPropVal(CharFlagsTextProp.STRIKETHROUGH_IDX, flag);
+ }
- /**
- * Gets the subscript/superscript option
- *
- * @return the percentage of the font size. If the value is positive, it is superscript, otherwise it is subscript
- */
+ /**
+ * Gets the subscript/superscript option
+ *
+ * @return the percentage of the font size. If the value is positive, it is superscript, otherwise it is subscript
+ */
public int getSuperscript() {
- int val = getCharTextPropVal("superscript");
+ int val = getCharTextPropVal("superscript");
return val == -1 ? 0 : val;
}
- /**
- * Sets the subscript/superscript option
- *
- * @param val the percentage of the font size. If the value is positive, it is superscript, otherwise it is subscript
- */
+ /**
+ * Sets the subscript/superscript option
+ *
+ * @param val the percentage of the font size. If the value is positive, it is superscript, otherwise it is subscript
+ */
public void setSuperscript(int val) {
setCharTextPropVal("superscript", val);
}
- /**
- * Gets the font size
- */
+ /**
+ * Gets the font size
+ */
public int getFontSize() {
return getCharTextPropVal("font.size");
}
- /**
- * Sets the font size
- */
+ /**
+ * Sets the font size
+ */
public void setFontSize(int fontSize) {
setCharTextPropVal("font.size", fontSize);
}
- /**
- * Gets the font index
- */
+ /**
+ * Gets the font index
+ */
public int getFontIndex() {
return getCharTextPropVal("font.index");
}
- /**
- * Sets the font index
- */
+ /**
+ * Sets the font index
+ */
public void setFontIndex(int idx) {
setCharTextPropVal("font.index", idx);
}
- /**
- * Sets the font name to use
- */
+ /**
+ * Sets the font name to use
+ */
public void setFontName(String fontName) {
- if (slideShow == null) {
- //we can't set font since slideshow is not assigned yet
- _fontname = fontName;
- } else {
- // Get the index for this font (adding if needed)
- int fontIdx = slideShow.getFontCollection().addFont(fontName);
- setCharTextPropVal("font.index", fontIdx);
- }
+ if (slideShow == null) {
+ //we can't set font since slideshow is not assigned yet
+ _fontname = fontName;
+ } else {
+ // Get the index for this font (adding if needed)
+ int fontIdx = slideShow.getFontCollection().addFont(fontName);
+ setCharTextPropVal("font.index", fontIdx);
+ }
}
- /**
- * Gets the font name
- */
+ /**
+ * Gets the font name
+ */
public String getFontName() {
- if (slideShow == null) {
- return _fontname;
- } else {
- int fontIdx = getCharTextPropVal("font.index");
- if(fontIdx == -1) { return null; }
- return slideShow.getFontCollection().getFontWithId(fontIdx);
- }
+ if (slideShow == null) {
+ return _fontname;
+ }
+ int fontIdx = getCharTextPropVal("font.index");
+ if(fontIdx == -1) { return null; }
+ return slideShow.getFontCollection().getFontWithId(fontIdx);
}
/**
@@ -512,15 +511,15 @@ public final class RichTextRun {
* @see java.awt.Color
*/
public Color getFontColor() {
- int rgb = getCharTextPropVal("font.color");
+ int rgb = getCharTextPropVal("font.color");
- int cidx = rgb >> 24;
- if (rgb % 0x1000000 == 0){
- ColorSchemeAtom ca = parentRun.getSheet().getColorScheme();
- if(cidx >= 0 && cidx <= 7) rgb = ca.getColor(cidx);
- }
- Color tmp = new Color(rgb, true);
- return new Color(tmp.getBlue(), tmp.getGreen(), tmp.getRed());
+ int cidx = rgb >> 24;
+ if (rgb % 0x1000000 == 0){
+ ColorSchemeAtom ca = parentRun.getSheet().getColorScheme();
+ if(cidx >= 0 && cidx <= 7) rgb = ca.getColor(cidx);
+ }
+ Color tmp = new Color(rgb, true);
+ return new Color(tmp.getBlue(), tmp.getGreen(), tmp.getRed());
}
/**
@@ -533,241 +532,241 @@ public final class RichTextRun {
setCharTextPropVal("font.color", bgr);
}
- /**
- * Sets color of the text, as a java.awt.Color
- */
- public void setFontColor(Color color) {
- // In PowerPont RGB bytes are swapped, as BGR
- int rgb = new Color(color.getBlue(), color.getGreen(), color.getRed(), 254).getRGB();
- setFontColor(rgb);
- }
+ /**
+ * Sets color of the text, as a java.awt.Color
+ */
+ public void setFontColor(Color color) {
+ // In PowerPont RGB bytes are swapped, as BGR
+ int rgb = new Color(color.getBlue(), color.getGreen(), color.getRed(), 254).getRGB();
+ setFontColor(rgb);
+ }
- /**
- * Sets the type of horizontal alignment for the text.
- * One of the Align* constants defined in the TextBox class.
- *
- * @param align - the type of alignment
- */
- public void setAlignment(int align) {
- setParaTextPropVal("alignment", align);
- }
- /**
- * Returns the type of horizontal alignment for the text.
- * One of the Align* constants defined in the TextBox class.
- *
- * @return the type of alignment
- */
- public int getAlignment() {
- return getParaTextPropVal("alignment");
- }
+ /**
+ * Sets the type of horizontal alignment for the text.
+ * One of the Align* constants defined in the TextBox class.
+ *
+ * @param align - the type of alignment
+ */
+ public void setAlignment(int align) {
+ setParaTextPropVal("alignment", align);
+ }
+ /**
+ * Returns the type of horizontal alignment for the text.
+ * One of the Align* constants defined in the TextBox class.
+ *
+ * @return the type of alignment
+ */
+ public int getAlignment() {
+ return getParaTextPropVal("alignment");
+ }
- /**
- *
- * @return indentation level
- */
- public int getIndentLevel() {
- return paragraphStyle == null ? 0 : paragraphStyle.getReservedField();
- }
+ /**
+ *
+ * @return indentation level
+ */
+ public int getIndentLevel() {
+ return paragraphStyle == null ? 0 : paragraphStyle.getReservedField();
+ }
- /**
- * Sets indentation level
- *
- * @param level indentation level. Must be in the range [0, 4]
- */
- public void setIndentLevel(int level) {
- if(paragraphStyle != null ) paragraphStyle.setReservedField((short)level);
- }
+ /**
+ * Sets indentation level
+ *
+ * @param level indentation level. Must be in the range [0, 4]
+ */
+ public void setIndentLevel(int level) {
+ if(paragraphStyle != null ) paragraphStyle.setReservedField((short)level);
+ }
- /**
- * Sets whether this rich text run has bullets
- */
- public void setBullet(boolean flag) {
- setFlag(false, ParagraphFlagsTextProp.BULLET_IDX, flag);
- }
+ /**
+ * Sets whether this rich text run has bullets
+ */
+ public void setBullet(boolean flag) {
+ setFlag(false, ParagraphFlagsTextProp.BULLET_IDX, flag);
+ }
- /**
- * Returns whether this rich text run has bullets
- */
- public boolean isBullet() {
- return getFlag(false, ParagraphFlagsTextProp.BULLET_IDX);
- }
+ /**
+ * Returns whether this rich text run has bullets
+ */
+ public boolean isBullet() {
+ return getFlag(false, ParagraphFlagsTextProp.BULLET_IDX);
+ }
- /**
- * Returns whether this rich text run has bullets
- */
- public boolean isBulletHard() {
- return getFlag(false, ParagraphFlagsTextProp.BULLET_IDX);
- }
+ /**
+ * Returns whether this rich text run has bullets
+ */
+ public boolean isBulletHard() {
+ return getFlag(false, ParagraphFlagsTextProp.BULLET_IDX);
+ }
- /**
- * Sets the bullet character
- */
- public void setBulletChar(char c) {
- setParaTextPropVal("bullet.char", c);
- }
+ /**
+ * Sets the bullet character
+ */
+ public void setBulletChar(char c) {
+ setParaTextPropVal("bullet.char", c);
+ }
- /**
- * Returns the bullet character
- */
- public char getBulletChar() {
- return (char)getParaTextPropVal("bullet.char");
- }
+ /**
+ * Returns the bullet character
+ */
+ public char getBulletChar() {
+ return (char)getParaTextPropVal("bullet.char");
+ }
- /**
- * Sets the bullet offset
- */
- public void setBulletOffset(int offset) {
- setParaTextPropVal("bullet.offset", offset*Shape.MASTER_DPI/Shape.POINT_DPI);
- }
+ /**
+ * Sets the bullet offset
+ */
+ public void setBulletOffset(int offset) {
+ setParaTextPropVal("bullet.offset", offset*Shape.MASTER_DPI/Shape.POINT_DPI);
+ }
- /**
- * Returns the bullet offset
- */
- public int getBulletOffset() {
- return getParaTextPropVal("bullet.offset")*Shape.POINT_DPI/Shape.MASTER_DPI;
- }
+ /**
+ * Returns the bullet offset
+ */
+ public int getBulletOffset() {
+ return getParaTextPropVal("bullet.offset")*Shape.POINT_DPI/Shape.MASTER_DPI;
+ }
- /**
- * Sets the text offset
- */
- public void setTextOffset(int offset) {
- setParaTextPropVal("text.offset", offset*Shape.MASTER_DPI/Shape.POINT_DPI);
- }
+ /**
+ * Sets the text offset
+ */
+ public void setTextOffset(int offset) {
+ setParaTextPropVal("text.offset", offset*Shape.MASTER_DPI/Shape.POINT_DPI);
+ }
- /**
- * Returns the text offset
- */
- public int getTextOffset() {
- return getParaTextPropVal("text.offset")*Shape.POINT_DPI/Shape.MASTER_DPI;
- }
+ /**
+ * Returns the text offset
+ */
+ public int getTextOffset() {
+ return getParaTextPropVal("text.offset")*Shape.POINT_DPI/Shape.MASTER_DPI;
+ }
- /**
- * Sets the bullet size
- */
- public void setBulletSize(int size) {
- setParaTextPropVal("bullet.size", size);
- }
+ /**
+ * Sets the bullet size
+ */
+ public void setBulletSize(int size) {
+ setParaTextPropVal("bullet.size", size);
+ }
- /**
- * Returns the bullet size
- */
- public int getBulletSize() {
- return getParaTextPropVal("bullet.size");
- }
+ /**
+ * Returns the bullet size
+ */
+ public int getBulletSize() {
+ return getParaTextPropVal("bullet.size");
+ }
- /**
- * Sets the bullet color
- */
- public void setBulletColor(Color color) {
- int rgb = new Color(color.getBlue(), color.getGreen(), color.getRed(), 254).getRGB();
- setParaTextPropVal("bullet.color", rgb);
- }
+ /**
+ * Sets the bullet color
+ */
+ public void setBulletColor(Color color) {
+ int rgb = new Color(color.getBlue(), color.getGreen(), color.getRed(), 254).getRGB();
+ setParaTextPropVal("bullet.color", rgb);
+ }
- /**
- * Returns the bullet color
- */
- public Color getBulletColor() {
- int rgb = getParaTextPropVal("bullet.color");
- if(rgb == -1) return getFontColor();
+ /**
+ * Returns the bullet color
+ */
+ public Color getBulletColor() {
+ int rgb = getParaTextPropVal("bullet.color");
+ if(rgb == -1) return getFontColor();
- int cidx = rgb >> 24;
- if (rgb % 0x1000000 == 0){
- ColorSchemeAtom ca = parentRun.getSheet().getColorScheme();
- if(cidx >= 0 && cidx <= 7) rgb = ca.getColor(cidx);
- }
- Color tmp = new Color(rgb, true);
- return new Color(tmp.getBlue(), tmp.getGreen(), tmp.getRed());
- }
+ int cidx = rgb >> 24;
+ if (rgb % 0x1000000 == 0){
+ ColorSchemeAtom ca = parentRun.getSheet().getColorScheme();
+ if(cidx >= 0 && cidx <= 7) rgb = ca.getColor(cidx);
+ }
+ Color tmp = new Color(rgb, true);
+ return new Color(tmp.getBlue(), tmp.getGreen(), tmp.getRed());
+ }
- /**
- * Sets the bullet font
- */
- public void setBulletFont(int idx) {
- setParaTextPropVal("bullet.font", idx);
- setFlag(false, ParagraphFlagsTextProp.BULLET_HARDFONT_IDX, true);
- }
+ /**
+ * Sets the bullet font
+ */
+ public void setBulletFont(int idx) {
+ setParaTextPropVal("bullet.font", idx);
+ setFlag(false, ParagraphFlagsTextProp.BULLET_HARDFONT_IDX, true);
+ }
- /**
- * Returns the bullet font
- */
- public int getBulletFont() {
- return getParaTextPropVal("bullet.font");
- }
+ /**
+ * Returns the bullet font
+ */
+ public int getBulletFont() {
+ return getParaTextPropVal("bullet.font");
+ }
- /**
- * Sets the line spacing.
- *
- * If linespacing >= 0, then linespacing is a percentage of normal line height.
- * If linespacing < 0, the absolute value of linespacing is the spacing in master coordinates.
- *
- */
- public void setLineSpacing(int val) {
- setParaTextPropVal("linespacing", val);
- }
+ /**
+ * Sets the line spacing.
+ *
+ * If linespacing >= 0, then linespacing is a percentage of normal line height.
+ * If linespacing < 0, the absolute value of linespacing is the spacing in master coordinates.
+ *
+ */
+ public void setLineSpacing(int val) {
+ setParaTextPropVal("linespacing", val);
+ }
- /**
- * Returns the line spacing
- *
- * If linespacing >= 0, then linespacing is a percentage of normal line height.
- * If linespacing < 0, the absolute value of linespacing is the spacing in master coordinates.
- *
- *
- * @return the spacing between lines
- */
- public int getLineSpacing() {
- int val = getParaTextPropVal("linespacing");
- return val == -1 ? 0 : val;
- }
+ /**
+ * Returns the line spacing
+ *
+ * If linespacing >= 0, then linespacing is a percentage of normal line height.
+ * If linespacing < 0, the absolute value of linespacing is the spacing in master coordinates.
+ *
+ *
+ * @return the spacing between lines
+ */
+ public int getLineSpacing() {
+ int val = getParaTextPropVal("linespacing");
+ return val == -1 ? 0 : val;
+ }
- /**
- * Sets spacing before a paragraph.
- *
- * If spacebefore >= 0, then spacebefore is a percentage of normal line height.
- * If spacebefore < 0, the absolute value of spacebefore is the spacing in master coordinates.
- *
- */
- public void setSpaceBefore(int val) {
- setParaTextPropVal("spacebefore", val);
- }
+ /**
+ * Sets spacing before a paragraph.
+ *
+ * If spacebefore >= 0, then spacebefore is a percentage of normal line height.
+ * If spacebefore < 0, the absolute value of spacebefore is the spacing in master coordinates.
+ *
+ */
+ public void setSpaceBefore(int val) {
+ setParaTextPropVal("spacebefore", val);
+ }
- /**
- * Returns spacing before a paragraph
- *
- * If spacebefore >= 0, then spacebefore is a percentage of normal line height.
- * If spacebefore < 0, the absolute value of spacebefore is the spacing in master coordinates.
- *
- *
- * @return the spacing before a paragraph
- */
- public int getSpaceBefore() {
- int val = getParaTextPropVal("spacebefore");
- return val == -1 ? 0 : val;
- }
+ /**
+ * Returns spacing before a paragraph
+ *
+ * If spacebefore >= 0, then spacebefore is a percentage of normal line height.
+ * If spacebefore < 0, the absolute value of spacebefore is the spacing in master coordinates.
+ *
+ *
+ * @return the spacing before a paragraph
+ */
+ public int getSpaceBefore() {
+ int val = getParaTextPropVal("spacebefore");
+ return val == -1 ? 0 : val;
+ }
- /**
- * Sets spacing after a paragraph.
- *
- * If spaceafter >= 0, then spaceafter is a percentage of normal line height.
- * If spaceafter < 0, the absolute value of spaceafter is the spacing in master coordinates.
- *
- */
- public void setSpaceAfter(int val) {
- setParaTextPropVal("spaceafter", val);
- }
+ /**
+ * Sets spacing after a paragraph.
+ *
+ * If spaceafter >= 0, then spaceafter is a percentage of normal line height.
+ * If spaceafter < 0, the absolute value of spaceafter is the spacing in master coordinates.
+ *
+ */
+ public void setSpaceAfter(int val) {
+ setParaTextPropVal("spaceafter", val);
+ }
- /**
- * Returns spacing after a paragraph
- *
- * If spaceafter >= 0, then spaceafter is a percentage of normal line height.
- * If spaceafter < 0, the absolute value of spaceafter is the spacing in master coordinates.
- *
- *
- * @return the spacing before a paragraph
- */
- public int getSpaceAfter() {
- int val = getParaTextPropVal("spaceafter");
- return val == -1 ? 0 : val;
- }
+ /**
+ * Returns spacing after a paragraph
+ *
+ * If spaceafter >= 0, then spaceafter is a percentage of normal line height.
+ * If spaceafter < 0, the absolute value of spaceafter is the spacing in master coordinates.
+ *
+ *
+ * @return the spacing before a paragraph
+ */
+ public int getSpaceAfter() {
+ int val = getParaTextPropVal("spaceafter");
+ return val == -1 ? 0 : val;
+ }
// --------------- Internal HSLF methods, not intended for end-user use! -------
/**
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java
index 8399e48990..4aa9c0e345 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java
@@ -262,12 +262,11 @@ public final class SlideShow {
if (coreRecordId != null) {
Record r = _mostRecentCoreRecords[coreRecordId.intValue()];
return r;
- } else {
- logger.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;
}
+ logger.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;
}
/**
@@ -989,9 +988,8 @@ public final class SlideShow {
}
if (ppt2007 && _notes.length > 0) {
return new HeadersFooters(hdd, _notes[0], newRecord, ppt2007);
- } else {
- return new HeadersFooters(hdd, this, newRecord, ppt2007);
}
+ return new HeadersFooters(hdd, this, newRecord, ppt2007);
}
/**
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java
index 12d0e2e77d..ffc62d0fa7 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java
@@ -49,12 +49,9 @@ public final class ComplexFileTable
{
throw new IOException("The text piece table is corrupted");
}
- else
- {
- int pieceTableSize = LittleEndian.getInt(tableStream, ++offset);
- offset += LittleEndian.INT_SIZE;
- _tpt = new TextPieceTable(documentStream, tableStream, offset, pieceTableSize, fcMin);
- }
+ int pieceTableSize = LittleEndian.getInt(tableStream, ++offset);
+ offset += LittleEndian.INT_SIZE;
+ _tpt = new TextPieceTable(documentStream, tableStream, offset, pieceTableSize, fcMin);
}
public TextPieceTable getTextPieceTable()
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java
index 4bc8e74d5c..45e9fabc3d 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java
@@ -194,10 +194,9 @@ public final class ListTables
if(level < lst.numLevels()) {
ListLevel lvl = lst.getLevels()[level];
return lvl;
- } else {
- log.log(POILogger.WARN, "Requested level " + level + " which was greater than the maximum defined (" + lst.numLevels() + ")");
- return null;
}
+ log.log(POILogger.WARN, "Requested level " + level + " which was greater than the maximum defined (" + lst.numLevels() + ")");
+ return null;
}
public ListData getListData(int listID)
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
index 37f5e129b4..8d0b6854b6 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
@@ -226,13 +226,12 @@ public final class PAPFormattedDiskPage extends FormattedDiskPage {
throw new UnsupportedOperationException(
"This Paragraph has no dataStream storage.");
}
- else // we have some storage...
- {
- // get the size of the existing storage
- int maxHugeGrpprlSize = LittleEndian.getUShort(_dataStream,
- hugeGrpprlOffset);
+ // we have some storage...
- if (maxHugeGrpprlSize < grpprl.length-2) // grpprl.length-2 because we don't store the istd
+ // get the size of the existing storage
+ int maxHugeGrpprlSize = LittleEndian.getUShort(_dataStream, hugeGrpprlOffset);
+
+ if (maxHugeGrpprlSize < grpprl.length-2) { // grpprl.length-2 because we don't store the istd
throw new UnsupportedOperationException(
"This Paragraph's dataStream storage is too small.");
}
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java
index dcd2c18cf3..8d77ba5fb2 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java
@@ -112,10 +112,7 @@ public final class PAPX extends BytePropertyNode {
{
return 0;
}
- else
- {
return LittleEndian.getShort(buf);
- }
}
public SprmBuffer getSprmBuf()
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
index 6b1ef43657..434af76db8 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
@@ -67,7 +67,7 @@ public final class SprmBuffer
_buf[grpprlOffset] = operand;
return;
}
- else addSprm(opcode, operand);
+ addSprm(opcode, operand);
}
public void updateSprm(short opcode, short operand)
@@ -78,7 +78,7 @@ public final class SprmBuffer
LittleEndian.putShort(_buf, grpprlOffset, operand);
return;
}
- else addSprm(opcode, operand);
+ addSprm(opcode, operand);
}
public void updateSprm(short opcode, int operand)
@@ -89,7 +89,7 @@ public final class SprmBuffer
LittleEndian.putInt(_buf, grpprlOffset, operand);
return;
}
- else addSprm(opcode, operand);
+ addSprm(opcode, operand);
}
public void addSprm(short opcode, byte operand)
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java
index 41478c80ec..fedf98e9ab 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java
@@ -152,10 +152,7 @@ public final class SprmOperation
_gOffset += 2;
return retVal;
}
- else
- {
- return (0x000000ff & _grpprl[_gOffset++]) + 3;
- }
+ return (0x000000ff & _grpprl[_gOffset++]) + 3;
case 7:
return 5;
default:
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java b/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
index 0d5fbdc9bf..8da432fa7e 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
+
package org.apache.poi.hssf.usermodel;
@@ -93,10 +93,7 @@ public class SanityChecker
{
return matchRequired( firstRecord, records, recordIdx );
}
- else
- {
- return matchOptional( firstRecord, records, recordIdx );
- }
+ return matchOptional( firstRecord, records, recordIdx );
}
private int matchOptional( int firstRecord, List records, int recordIdx )
|