[patch] patch file based on svn diff

patch.diff (text/plain), 48.68 KB, created by PJ Fanning on 2017-06-26 23:03:03 UTC

(hide)

Description: patch file based on svn diff

Filename:

MIME Type:

Creator: PJ Fanning

Created: 2017-06-26 23:03:03 UTC

Size: 48.68 KB

patch

obsolete

>Index: src/examples/src/org/apache/poi/hssf/usermodel/examples/RepeatingRowsAndColumns.java >=================================================================== >--- src/examples/src/org/apache/poi/hssf/usermodel/examples/RepeatingRowsAndColumns.java (revision 1799998) >+++ src/examples/src/org/apache/poi/hssf/usermodel/examples/RepeatingRowsAndColumns.java (working copy) >@@ -37,7 +37,7 @@ > > HSSFFont boldFont = wb.createFont(); > boldFont.setFontHeightInPoints((short)22); >- boldFont.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); >+ boldFont.setBold(true); > > HSSFCellStyle boldStyle = wb.createCellStyle(); > boldStyle.setFont(boldFont); >Index: src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java >=================================================================== >--- src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java (revision 1799998) >+++ src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java (working copy) >@@ -330,7 +330,7 @@ > hssfColor = workbook.getCustomPalette().findSimilarColor((byte)foreground.getRed(), (byte)foreground.getGreen(), (byte)foreground.getBlue()); > boolean bold = (matchFont.getStyle() & Font.BOLD) != 0; > boolean italic = (matchFont.getStyle() & Font.ITALIC) != 0; >- HSSFFont hssfFont = workbook.findFont(bold ? HSSFFont.BOLDWEIGHT_BOLD : 0, >+ HSSFFont hssfFont = workbook.findFont(bold, > hssfColor.getIndex(), > (short)(matchFont.getSize() * 20), > matchFont.getName(), >@@ -341,7 +341,7 @@ > if (hssfFont == null) > { > hssfFont = workbook.createFont(); >- hssfFont.setBoldweight(bold ? HSSFFont.BOLDWEIGHT_BOLD : 0); >+ hssfFont.setBold(bold); > hssfFont.setColor(hssfColor.getIndex()); > hssfFont.setFontHeight((short)(matchFont.getSize() * 20)); > hssfFont.setFontName(matchFont.getName()); >Index: src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java >=================================================================== >--- src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java (revision 1799998) >+++ src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java (working copy) >@@ -21,7 +21,6 @@ > import org.apache.poi.ddf.EscherRecord; > import org.apache.poi.ss.SpreadsheetVersion; > import org.apache.poi.ss.usermodel.ClientAnchor; >-import org.apache.poi.util.Removal; > > /** > * A client anchor is attached to an excel worksheet. It anchors against a >@@ -268,16 +267,6 @@ > public void setAnchorType(AnchorType anchorType) { > _escherClientAnchor.setFlag(anchorType.value); > } >- /** >- * Sets the anchor type >- * @param anchorType the anchor type to set >- * @deprecated POI 3.15. Use {@link #setAnchorType(AnchorType)} instead. >- */ >- @Removal(version="3.17") >- @Override >- public void setAnchorType(int anchorType) { >- _escherClientAnchor.setFlag((short) anchorType); >- } > > private void checkRange(int value, int minRange, int maxRange, String varName) { > if (value < minRange || value > maxRange) >Index: src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java >=================================================================== >--- src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java (revision 1799998) >+++ src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java (working copy) >@@ -21,7 +21,6 @@ > import org.apache.poi.hssf.record.common.ExtendedColor; > import org.apache.poi.ss.usermodel.CreationHelper; > import org.apache.poi.util.Internal; >-import org.apache.poi.util.Removal; > > public class HSSFCreationHelper implements CreationHelper { > private final HSSFWorkbook workbook; >@@ -46,17 +45,7 @@ > return workbook.createDataFormat(); > } > >- /** >- * {@inheritDoc} >- * @deprecated POI 3.15 beta 3. Use {@link #createHyperlink(HyperlinkType)} instead. >- */ >- @Deprecated >- @Removal(version="3.17") > @Override >- public HSSFHyperlink createHyperlink(int type) { >- return new HSSFHyperlink(type); >- } >- @Override > public HSSFHyperlink createHyperlink(HyperlinkType type) { > return new HSSFHyperlink(type); > } >Index: src/java/org/apache/poi/hssf/usermodel/HSSFFont.java >=================================================================== >--- src/java/org/apache/poi/hssf/usermodel/HSSFFont.java (revision 1799998) >+++ src/java/org/apache/poi/hssf/usermodel/HSSFFont.java (working copy) >@@ -31,9 +31,18 @@ > public final class HSSFFont implements Font { > > /** >+ * Normal boldness (not bold) >+ */ >+ final static short BOLDWEIGHT_NORMAL = 0x190; >+ >+ /** >+ * Bold boldness (bold) >+ */ >+ final static short BOLDWEIGHT_BOLD = 0x2bc; >+ >+ /** > * Arial font > */ >- > public final static String FONT_ARIAL = "Arial"; > > >@@ -199,18 +208,6 @@ > HSSFPalette pallette = wb.getCustomPalette(); > return pallette.getColor( getColor() ); > } >- >- /** >- * set the boldness to use >- * @param boldweight >- * @see #BOLDWEIGHT_NORMAL >- * @see #BOLDWEIGHT_BOLD >- * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. Use {@link #setBold(boolean)} instead. >- */ >- public void setBoldweight(short boldweight) >- { >- font.setBoldWeight(boldweight); >- } > > /** > * sets the font to be bold or not >@@ -222,18 +219,6 @@ > else > font.setBoldWeight(BOLDWEIGHT_NORMAL); > } >- >- /** >- * get the boldness to use >- * @return boldweight >- * @see #BOLDWEIGHT_NORMAL >- * @see #BOLDWEIGHT_BOLD >- * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. Use {@link #getBold} instead. >- */ >- public short getBoldweight() >- { >- return font.getBoldWeight(); >- } > > /** > * get if the font is bold or not >@@ -240,7 +225,7 @@ > */ > public boolean getBold() > { >- return getBoldweight() == BOLDWEIGHT_BOLD; >+ return font.getBoldWeight() == BOLDWEIGHT_BOLD; > } > > /** >Index: src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java >=================================================================== >--- src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (revision 1799998) >+++ src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (working copy) >@@ -2172,19 +2172,7 @@ > } > setColumnWidth(column, (int) (width)); > } >- > } >- >- /** >- * Returns cell comment for the specified row and column >- * >- * @return cell comment or <code>null</code> if not found >- * @deprecated as of 2015-11-23 (circa POI 3.14beta1). Use {@link #getCellComment(CellAddress)} instead. >- */ >- @Override >- public HSSFComment getCellComment(int row, int column) { >- return findCellComment(row, column); >- } > > /** > * Returns cell comment for the specified row and column >Index: src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java >=================================================================== >--- src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (revision 1799998) >+++ src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (working copy) >@@ -1207,41 +1207,8 @@ > > /** > * Finds a font that matches the one with the supplied attributes >- * @deprecated 3.15 beta 2. Use {@link #findFont(boolean, short, short, String, boolean, boolean, short, byte)} instead. > */ >- @Deprecated > @Override >- public HSSFFont findFont(short boldWeight, short color, short fontHeight, >- String name, boolean italic, boolean strikeout, >- short typeOffset, byte underline) >- { >- short numberOfFonts = getNumberOfFonts(); >- for (short i=0; i<=numberOfFonts; i++) { >- // Remember - there is no 4! >- if(i == 4) { >- continue; >- } >- >- HSSFFont hssfFont = getFontAt(i); >- if (hssfFont.getBoldweight() == boldWeight >- && hssfFont.getColor() == color >- && hssfFont.getFontHeight() == fontHeight >- && hssfFont.getFontName().equals(name) >- && hssfFont.getItalic() == italic >- && hssfFont.getStrikeout() == strikeout >- && hssfFont.getTypeOffset() == typeOffset >- && hssfFont.getUnderline() == underline) >- { >- return hssfFont; >- } >- } >- >- return null; >- } >- /** >- * Finds a font that matches the one with the supplied attributes >- */ >- @Override > public HSSFFont findFont(boolean bold, short color, short fontHeight, > String name, boolean italic, boolean strikeout, > short typeOffset, byte underline) >Index: src/java/org/apache/poi/ss/usermodel/ClientAnchor.java >=================================================================== >--- src/java/org/apache/poi/ss/usermodel/ClientAnchor.java (revision 1799998) >+++ src/java/org/apache/poi/ss/usermodel/ClientAnchor.java (working copy) >@@ -17,7 +17,6 @@ > package org.apache.poi.ss.usermodel; > > import org.apache.poi.util.Internal; >-import org.apache.poi.util.Removal; > > /** > * A client anchor is attached to an excel worksheet. It anchors against >@@ -35,51 +34,6 @@ > public interface ClientAnchor { > > /** >- * Move and Resize With Anchor Cells >- * <p> >- * Specifies that the current drawing shall move and >- * resize to maintain its row and column anchors (i.e. the >- * object is anchored to the actual from and to row and column) >- * </p> >- * @deprecated since POI 3.14beta1 (circa 2015-11-24). Use {@link AnchorType#MOVE_AND_RESIZE} instead. >- */ >- @Removal(version="3.17") >- public static final AnchorType MOVE_AND_RESIZE = AnchorType.MOVE_AND_RESIZE; >- >- /** >- * Move With Cells but Do Not Resize >- * <p> >- * Specifies that the current drawing shall move with its >- * row and column (i.e. the object is anchored to the >- * actual from row and column), but that the size shall remain absolute. >- * </p> >- * <p> >- * If additional rows/columns are added between the from and to locations of the drawing, >- * the drawing shall move its to anchors as needed to maintain this same absolute size. >- * </p> >- * @deprecated since POI 3.14beta1 (circa 2015-11-24). Use {@link AnchorType#MOVE_DONT_RESIZE} instead. >- */ >- @Removal(version="3.17") >- public static final AnchorType MOVE_DONT_RESIZE = AnchorType.MOVE_DONT_RESIZE; >- >- /** >- * Do Not Move or Resize With Underlying Rows/Columns >- * <p> >- * Specifies that the current start and end positions shall >- * be maintained with respect to the distances from the >- * absolute start point of the worksheet. >- * </p> >- * <p> >- * If additional rows/columns are added before the >- * drawing, the drawing shall move its anchors as needed >- * to maintain this same absolute position. >- * </p> >- * @deprecated since POI 3.14beta1 (circa 2015-11-24). Use {@link AnchorType#DONT_MOVE_AND_RESIZE} instead. >- */ >- @Removal(version="3.17") >- public static final AnchorType DONT_MOVE_AND_RESIZE = AnchorType.DONT_MOVE_AND_RESIZE; >- >- /** > * @since POI 3.14beta1 > */ > public static enum AnchorType { >@@ -309,13 +263,6 @@ > * @since POI 3.14 > */ > public void setAnchorType( AnchorType anchorType ); >- /** >- * Sets the anchor type >- * @param anchorType the anchor type to set >- * @deprecated POI 3.15. Use {@link #setAnchorType(AnchorType)} instead. >- */ >- @Removal(version="3.17") >- public void setAnchorType( int anchorType ); > > /** > * Gets the anchor type >Index: src/java/org/apache/poi/ss/usermodel/CreationHelper.java >=================================================================== >--- src/java/org/apache/poi/ss/usermodel/CreationHelper.java (revision 1799998) >+++ src/java/org/apache/poi/ss/usermodel/CreationHelper.java (working copy) >@@ -17,7 +17,6 @@ > package org.apache.poi.ss.usermodel; > > import org.apache.poi.common.usermodel.HyperlinkType; >-import org.apache.poi.util.Removal; > > /** > * An object that handles instantiating concrete >@@ -41,14 +40,6 @@ > * Creates a new DataFormat instance > */ > DataFormat createDataFormat(); >- >- /** >- * Creates a new Hyperlink, of the given type >- * @deprecated POI 3.15 beta 3. Use {@link #createHyperlink(HyperlinkType)} instead. >- */ >- @Removal(version="3.17") >- @Deprecated >- Hyperlink createHyperlink(int type); > > /** > * Creates a new Hyperlink, of the given type >Index: src/java/org/apache/poi/ss/usermodel/Font.java >=================================================================== >--- src/java/org/apache/poi/ss/usermodel/Font.java (revision 1799998) >+++ src/java/org/apache/poi/ss/usermodel/Font.java (working copy) >@@ -19,21 +19,8 @@ > > > public interface Font { >- /** >- * Normal boldness (not bold) >- * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. >- * Boldweight constants no longer needed due to {@link #getBold} and {@link #setBold(boolean)} >- */ >- public final static short BOLDWEIGHT_NORMAL = 0x190; > > /** >- * Bold boldness (bold) >- * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. >- * Boldweight constants no longer needed due to {@link #getBold} and {@link #setBold(boolean)} >- */ >- public final static short BOLDWEIGHT_BOLD = 0x2bc; >- >- /** > * normal type of black color. > */ > >@@ -283,15 +270,7 @@ > */ > public short getIndex(); > >- /** >- * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. Use {@link #setBold(boolean)}. >- */ >- public void setBoldweight(short boldweight); > public void setBold(boolean bold); > >- /** >- * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. Use {@link #getBold()}. >- */ >- public short getBoldweight(); > public boolean getBold(); > } >Index: src/java/org/apache/poi/ss/usermodel/Sheet.java >=================================================================== >--- src/java/org/apache/poi/ss/usermodel/Sheet.java (revision 1799998) >+++ src/java/org/apache/poi/ss/usermodel/Sheet.java (working copy) >@@ -615,19 +615,6 @@ > * @return true =&gt; protection enabled; false =&gt; protection disabled > */ > boolean getScenarioProtect(); >- >- /** >- * Sets the zoom magnication for the sheet. The zoom is expressed as a >- * fraction. For example to express a zoom of 75% use 3 for the numerator >- * and 4 for the denominator. >- * >- * @param numerator The numerator for the zoom magnification. >- * @param denominator The denominator for the zoom magnification. >- * @deprecated 2015-11-23 (circa POI 3.14beta1). Use {@link #setZoom(int)} instead. >- */ >- @Removal(version="3.16") >- @Deprecated >- void setZoom(int numerator, int denominator); > > /** > * Window zoom magnification for current view representing percent values. >@@ -941,15 +928,6 @@ > * @param useMergedCells whether to use the contents of merged cells when calculating the width of the column > */ > void autoSizeColumn(int column, boolean useMergedCells); >- >- /** >- * Returns cell comment for the specified row and column >- * >- * @return cell comment or <code>null</code> if not found >- * @deprecated as of 2015-11-23 (circa POI 3.14beta1). Use {@link #getCellComment(CellAddress)} instead. >- */ >- @Deprecated >- Comment getCellComment(int row, int column); > > /** > * Returns cell comment for the specified location >Index: src/java/org/apache/poi/ss/usermodel/Workbook.java >=================================================================== >--- src/java/org/apache/poi/ss/usermodel/Workbook.java (revision 1799998) >+++ src/java/org/apache/poi/ss/usermodel/Workbook.java (working copy) >@@ -289,15 +289,6 @@ > * @return new font object > */ > Font createFont(); >- >- /** >- * Finds a font that matches the one with the supplied attributes >- * >- * @return the font with the matched attributes or <code>null</code> >- * @deprecated POI 3.15 beta 2. Use {@link #findFont(boolean, short, short, String, boolean, boolean, short, byte)} instead. >- */ >- @Deprecated >- Font findFont(short boldWeight, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline); > > /** > * Finds a font that matches the one with the supplied attributes >Index: src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java >=================================================================== >--- src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java (revision 1799998) >+++ src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java (working copy) >@@ -835,27 +835,6 @@ > int indexXf = putCellXf(xf); > return new XSSFCellStyle(indexXf - 1, xfSize - 1, this, theme); > } >- >- /** >- * Finds a font that matches the one with the supplied attributes >- * @deprecated POI 3.15 beta 2. Use {@link #findFont(boolean, short, short, String, boolean, boolean, short, byte)} instead. >- */ >- public XSSFFont findFont(short boldWeight, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline) { >- for (XSSFFont font : fonts) { >- if ( (font.getBoldweight() == boldWeight) >- && font.getColor() == color >- && font.getFontHeight() == fontHeight >- && font.getFontName().equals(name) >- && font.getItalic() == italic >- && font.getStrikeout() == strikeout >- && font.getTypeOffset() == typeOffset >- && font.getUnderline() == underline) >- { >- return font; >- } >- } >- return null; >- } > > /** > * Finds a font that matches the one with the supplied attributes >Index: src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java >=================================================================== >--- src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java (revision 1799998) >+++ src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java (working copy) >@@ -38,12 +38,10 @@ > import org.apache.poi.ss.util.CellAddress; > import org.apache.poi.ss.util.CellRangeAddress; > import org.apache.poi.ss.util.CellReference; >-import org.apache.poi.util.Internal; > import org.apache.poi.util.LocaleUtil; > import org.apache.poi.util.NotImplemented; > import org.apache.poi.util.POILogFactory; > import org.apache.poi.util.POILogger; >-import org.apache.poi.util.Removal; > import org.apache.poi.xssf.usermodel.XSSFHyperlink; > import org.apache.poi.xssf.usermodel.XSSFRichTextString; > >@@ -58,17 +56,6 @@ > private CellStyle _style; > private Property _firstProperty; > >- /** >- * @deprecated POI 3.15 beta 3. >- * Will be deleted when we make the CellType enum transition. See bug 59791. >- */ >- @Removal(version="3.17") >- @Deprecated >- public SXSSFCell(SXSSFRow row, int cellType) >- { >- this(row, CellType.forInt((cellType))); >- } >- > public SXSSFCell(SXSSFRow row,CellType cellType) > { > _row=row; >Index: src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java >=================================================================== >--- src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java (revision 1799998) >+++ src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java (working copy) >@@ -68,17 +68,7 @@ > public DataFormat createDataFormat() { > return helper.createDataFormat(); > } >- /** >- * {@inheritDoc} >- * @deprecated POI 3.15 beta 3. Use {@link #createHyperlink(HyperlinkType)} instead. >- */ >- @Deprecated >- @Removal(version="3.17") > @Override >- public Hyperlink createHyperlink(int type) { >- return helper.createHyperlink(type); >- } >- @Override > public Hyperlink createHyperlink(HyperlinkType type) { > return helper.createHyperlink(type); > } >Index: src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java >=================================================================== >--- src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java (revision 1799998) >+++ src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java (working copy) >@@ -47,18 +47,6 @@ > // use Boolean to have a tri-state for on/off/undefined > private Boolean _hidden = UNDEFINED; > private Boolean _collapsed = UNDEFINED; >- >- /** >- * >- * @param sheet the parent sheet the row belongs to >- * @param initialSize - no longer needed >- * @deprecated 2015-11-30 (circa POI 3.14beta1). Use {@link #SXSSFRow(SXSSFSheet)} instead. >- */ >- @Deprecated >- public SXSSFRow(SXSSFSheet sheet, @SuppressWarnings("UnusedParameters") int initialSize) >- { >- this(sheet); >- } > > public SXSSFRow(SXSSFSheet sheet) > { >@@ -273,7 +261,7 @@ > case CREATE_NULL_AS_BLANK: > return (cell == null) ? createCell(cellnum, CellType.BLANK) : cell; > default: >- throw new IllegalArgumentException("Illegal policy " + policy + " (" + policy.id + ")"); >+ throw new IllegalArgumentException("Illegal policy " + policy); > } > } > >Index: src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java >=================================================================== >--- src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java (revision 1799998) >+++ src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java (working copy) >@@ -47,7 +47,6 @@ > import org.apache.poi.ss.util.SheetUtil; > import org.apache.poi.util.Internal; > import org.apache.poi.util.NotImplemented; >-import org.apache.poi.util.Removal; > import org.apache.poi.xssf.usermodel.XSSFColor; > import org.apache.poi.xssf.usermodel.XSSFComment; > import org.apache.poi.xssf.usermodel.XSSFDataValidation; >@@ -870,23 +869,6 @@ > { > return _sh.getScenarioProtect(); > } >- >- /** >- * Sets the zoom magnification for the sheet. The zoom is expressed as a >- * fraction. For example to express a zoom of 75% use 3 for the numerator >- * and 4 for the denominator. >- * >- * @param numerator The numerator for the zoom magnification. >- * @param denominator The denominator for the zoom magnification. >- * @deprecated 2015-11-23 (circa POI 3.14beta1). Use {@link #setZoom(int)} instead. >- */ >- @Deprecated >- @Removal(version="3.16") >- @Override >- public void setZoom(int numerator, int denominator) >- { >- _sh.setZoom(numerator,denominator); >- } > > /** > * Window zoom magnification for current view representing percent values. >@@ -1630,20 +1612,6 @@ > setColumnWidth(column, width); > } > } >- >- /** >- * Returns cell comment for the specified row and column >- * >- * @return cell comment or <code>null</code> if not found >- * @deprecated as of 2015-11-23 (circa POI 3.14beta1). Use {@link #getCellComment(CellAddress)} instead. >- */ >- @Deprecated >- @Removal(version="3.16") >- @Override >- public XSSFComment getCellComment(int row, int column) >- { >- return getCellComment(new CellAddress(row, column)); >- } > > /** > * Returns cell comment for the specified row and column >Index: src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java >=================================================================== >--- src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java (revision 1799998) >+++ src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java (working copy) >@@ -811,21 +811,6 @@ > { > return _wb.createFont(); > } >- >- /** >- * Finds a font that matches the one with the supplied attributes >- * >- * @return the font with the matched attributes or <code>null</code> >- * @deprecated POI 3.15 beta 2. Use {@link #findFont(boolean, short, short, String, boolean, boolean, short, byte)} instead. >- */ >- @Deprecated >- @Override >- @Removal(version="3.17") >- public Font findFont(short boldWeight, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline) >- { >- //noinspection deprecation >- return _wb.findFont(boldWeight, color, fontHeight, name, italic, strikeout, typeOffset, underline); >- } > > /** > * Finds a font that matches the one with the supplied attributes >Index: src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java >=================================================================== >--- src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java (revision 1799998) >+++ src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java (working copy) >@@ -18,7 +18,6 @@ > package org.apache.poi.xssf.usermodel; > > import org.apache.poi.ss.usermodel.ClientAnchor; >-import org.apache.poi.ss.usermodel.Row; > import org.apache.poi.util.Internal; > import org.apache.poi.util.Removal; > import org.apache.poi.util.Units; >@@ -412,17 +411,6 @@ > { > this.anchorType = anchorType; > } >- /** >- * Sets the anchor type >- * @param anchorType the anchor type to set >- * @deprecated POI 3.15. Use {@link #setAnchorType(AnchorType)} instead >- */ >- @Removal(version="3.17") >- @Override >- public void setAnchorType( int anchorType ) >- { >- this.anchorType = AnchorType.byId(anchorType); >- } > > /** > * Gets the anchor type >Index: src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java >=================================================================== >--- src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java (revision 1799998) >+++ src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java (working copy) >@@ -55,19 +55,6 @@ > public XSSFColor createExtendedColor() { > return new XSSFColor(CTColor.Factory.newInstance(), workbook.getStylesSource().getIndexedColors()); > } >- >- /** >- * Create a new XSSFHyperlink. >- * >- * @param type - the type of hyperlink to create, see {@link HyperlinkType} >- * @deprecated POI 3.15 beta 3. Use {@link #createHyperlink(HyperlinkType)} instead. >- */ >- @Deprecated >- @Removal(version="3.17") >- @Override >- public XSSFHyperlink createHyperlink(int type) { >- return new XSSFHyperlink(type); >- } > > /** > * Create a new XSSFHyperlink. >Index: src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java >=================================================================== >--- src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java (revision 1799998) >+++ src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java (working copy) >@@ -306,26 +306,6 @@ > } > > /** >- * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. Use {@link #setBold(boolean)} instead. >- */ >- public void setBoldweight(short boldweight) >- { >- setBold(boldweight == BOLDWEIGHT_BOLD); >- } >- >- /** >- * get the boldness to use >- * @return boldweight >- * @see #BOLDWEIGHT_NORMAL >- * @see #BOLDWEIGHT_BOLD >- * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. Use {@link #getBold} instead. >- */ >- public short getBoldweight() >- { >- return getBold() ? BOLDWEIGHT_BOLD : BOLDWEIGHT_NORMAL; >- } >- >- /** > * set character-set to use. > * > * @param charset - charset >Index: src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java >=================================================================== >--- src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java (revision 1799998) >+++ src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java (working copy) >@@ -761,20 +761,6 @@ > getPane().setState(STPaneState.SPLIT); > getPane().setActivePane(STPane.Enum.forInt(activePane)); > } >- >- /** >- * Return cell comment at row, column, if one exists. Otherwise returns null. >- * @param row the row where the comment is located >- * @param column the column where the comment is located >- * @return the cell comment, if one exists. Otherwise return null. >- * @deprecated as of 2015-11-23 (circa POI 3.14beta1). Use {@link #getCellComment(CellAddress)} instead. >- */ >- @Deprecated >- @Override >- @Removal(version="3.16") >- public XSSFComment getCellComment(int row, int column) { >- return getCellComment(new CellAddress(row, column)); >- } > > /** > * Return cell comment at row, column, if one exists. Otherwise returns null. >@@ -2781,23 +2767,6 @@ > } > > /** >- * Sets the zoom magnification for the sheet. The zoom is expressed as a >- * fraction. For example to express a zoom of 75% use 3 for the numerator >- * and 4 for the denominator. >- * >- * @param numerator The numerator for the zoom magnification. >- * @param denominator The denominator for the zoom magnification. >- * @deprecated 2015-11-23 (circa POI 3.14beta1). Use {@link #setZoom(int)} instead. >- */ >- @Deprecated >- @Removal(version="3.16") >- @Override >- public void setZoom(int numerator, int denominator) { >- int zoom = 100*numerator/denominator; >- setZoom(zoom); >- } >- >- /** > * Window zoom magnification for current view representing percent values. > * Valid values range from 10 to 400. Horizontal & Vertical scale together. > * >Index: src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java >=================================================================== >--- src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java (revision 1799998) >+++ src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java (working copy) >@@ -901,16 +901,6 @@ > sheet.setName(sheetname); > return sheet; > } >- >- /** >- * Finds a font that matches the one with the supplied attributes >- * @deprecated POI 3.15. Use {@link #findFont(boolean, short, short, String, boolean, boolean, short, byte)} instead. >- */ >- @Deprecated >- @Override >- public XSSFFont findFont(short boldWeight, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline) { >- return stylesSource.findFont(boldWeight, color, fontHeight, name, italic, strikeout, typeOffset, underline); >- } > > /** > * Finds a font that matches the one with the supplied attributes >Index: src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java >=================================================================== >--- src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java (revision 1799998) >+++ src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java (working copy) >@@ -57,8 +57,6 @@ > assertEquals(0, sheet.getNumMergedRegions()); > assertNull(sheet.getActiveCell()); > assertTrue(sheet.getAutobreaks()); >- //noinspection deprecation >- assertNull(sheet.getCellComment(0, 0)); > assertNull(sheet.getCellComment(new CellAddress(0, 0))); > assertEquals(0, sheet.getColumnBreaks().length); > assertTrue(sheet.getRowSumsBelow()); >Index: src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java >=================================================================== >--- src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java (revision 1799998) >+++ src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java (working copy) >@@ -385,8 +385,7 @@ > public void testLineBreaks_bug48877() throws IOException{ > > XSSFFont font = new XSSFFont(); >- //noinspection deprecation >- font.setBoldweight(XSSFFont.BOLDWEIGHT_BOLD); >+ font.setBold(true); > font.setFontHeightInPoints((short) 14); > XSSFRichTextString str; > STXstring t1, t2, t3; >Index: src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java >=================================================================== >--- src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java (revision 1799998) >+++ src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java (working copy) >@@ -404,23 +404,9 @@ > { > Triplet triplet = new Triplet(); > triplet.fontName = font.getFontName(); >+ triplet.bold = font.getBold(); >+ triplet.italic = font.getItalic(); > >- switch ( font.getBoldweight() ) >- { >- case HSSFFont.BOLDWEIGHT_BOLD: >- triplet.bold = true; >- break; >- case HSSFFont.BOLDWEIGHT_NORMAL: >- default: >- triplet.bold = false; >- break; >- } >- >- if ( font.getItalic() ) >- { >- triplet.italic = true; >- } >- > getFontReplacer().update( triplet ); > setBlockProperties( blockTarget, triplet ); > >Index: src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java >=================================================================== >--- src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java (revision 1799998) >+++ src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java (working copy) >@@ -251,15 +251,9 @@ > void buildStyle_font( HSSFWorkbook workbook, StringBuilder style, > HSSFFont font ) > { >- switch ( font.getBoldweight() ) >+ if ( font.getBold() ) > { >- case HSSFFont.BOLDWEIGHT_BOLD: > style.append( "font-weight:bold;" ); >- break; >- case HSSFFont.BOLDWEIGHT_NORMAL: >- // by default, not not increase HTML size >- // style.append( "font-weight: normal; " ); >- break; > } > > final HSSFColor fontColor = workbook.getCustomPalette().getColor( >Index: src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java >=================================================================== >--- src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java (revision 1799998) >+++ src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java (working copy) >@@ -154,7 +154,7 @@ > anchor.setAnchorType(AnchorType.MOVE_DONT_RESIZE); > assertEquals(AnchorType.MOVE_DONT_RESIZE, anchor.getAnchorType()); > //noinspection deprecation >- anchor.setAnchorType(AnchorType.MOVE_DONT_RESIZE.value); >+ anchor.setAnchorType(AnchorType.MOVE_DONT_RESIZE); > assertEquals(AnchorType.MOVE_DONT_RESIZE, anchor.getAnchorType()); > > HSSFSimpleShape rectangle = drawing.createSimpleShape(anchor); >Index: src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java >=================================================================== >--- src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java (revision 1799998) >+++ src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java (working copy) >@@ -17,6 +17,7 @@ > > package org.apache.poi.hssf.usermodel; > >+import static org.apache.poi.POITestCase.assertContains; > import static org.junit.Assert.assertEquals; > import static org.junit.Assert.assertFalse; > import static org.junit.Assert.assertNotNull; >@@ -24,7 +25,6 @@ > import static org.junit.Assert.assertSame; > import static org.junit.Assert.assertTrue; > import static org.junit.Assert.fail; >-import static org.apache.poi.POITestCase.assertContains; > > import java.awt.image.BufferedImage; > import java.io.ByteArrayInputStream; >@@ -98,7 +98,6 @@ > * <b>YK: If a bug can be tested in terms of common ss interfaces, > * define the test in the base class {@link BaseTestBugzillaIssues}</b> > */ >-@SuppressWarnings("deprecation") > public final class TestBugs extends BaseTestBugzillaIssues { > // to not affect other tests running in the same JVM > @After >@@ -996,7 +995,7 @@ > assertEquals(4, wb.getNumberOfFonts()); > > HSSFFont f1 = wb.getFontAt((short)0); >- assertEquals(400, f1.getBoldweight()); >+ assertFalse(f1.getBold()); > > // Check that asking for the same font > // multiple times gives you the same thing. >@@ -1020,7 +1019,7 @@ > // yet to add > assertNull( > wb.findFont( >- (short)11, (short)123, (short)22, >+ false, (short)123, (short)22, > "Thingy", false, true, (short)2, (byte)2 > ) > ); >@@ -1031,7 +1030,7 @@ > assertEquals(5, nf.getIndex()); > assertEquals(nf, wb.getFontAt((short)5)); > >- nf.setBoldweight((short)11); >+ nf.setBold(false); > nf.setColor((short)123); > nf.setFontHeight((short)22); > nf.setFontName("Thingy"); >@@ -1046,12 +1045,12 @@ > // Find it now > assertNotNull( > wb.findFont( >- (short)11, (short)123, (short)22, >+ false, (short)123, (short)22, > "Thingy", false, true, (short)2, (byte)2 > ) > ); > HSSFFont font = wb.findFont( >- (short) 11, (short) 123, (short) 22, >+ false, (short) 123, (short) 22, > "Thingy", false, true, (short) 2, (byte) 2 > ); > assertNotNull(font); >@@ -1061,7 +1060,7 @@ > ); > assertEquals(nf, > wb.findFont( >- (short)11, (short)123, (short)22, >+ false, (short)123, (short)22, > "Thingy", false, true, (short)2, (byte)2 > ) > ); >Index: src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java >=================================================================== >--- src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java (revision 1799998) >+++ src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java (working copy) >@@ -70,7 +70,7 @@ > HSSFCellStyle cs = wb.createCellStyle(); > > fnt.setColor(HSSFFont.COLOR_RED); >- fnt.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); >+ fnt.setBold(true); > cs.setFont(fnt); > for (int rownum = 0; rownum < 100; rownum++) { > r = s.createRow(rownum); >Index: src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java >=================================================================== >--- src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java (revision 1799998) >+++ src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java (working copy) >@@ -25,7 +25,6 @@ > import static org.junit.Assert.assertSame; > import static org.junit.Assert.assertTrue; > import static org.junit.Assert.fail; >-import static org.apache.poi.POITestCase.assertBetween; > > import java.io.IOException; > import java.util.List; >@@ -59,7 +58,13 @@ > import org.apache.poi.hssf.usermodel.RecordInspector.RecordCollector; > import org.apache.poi.ss.formula.ptg.Area3DPtg; > import org.apache.poi.ss.formula.ptg.Ptg; >-import org.apache.poi.ss.usermodel.*; >+import org.apache.poi.ss.usermodel.AutoFilter; >+import org.apache.poi.ss.usermodel.BaseTestSheet; >+import org.apache.poi.ss.usermodel.DataValidation; >+import org.apache.poi.ss.usermodel.DataValidationConstraint; >+import org.apache.poi.ss.usermodel.DataValidationHelper; >+import org.apache.poi.ss.usermodel.Sheet; >+import org.apache.poi.ss.usermodel.Workbook; > import org.apache.poi.ss.util.CellRangeAddress; > import org.apache.poi.ss.util.CellRangeAddressList; > import org.junit.Test; >@@ -505,7 +510,6 @@ > workbook.close(); > } > >- @SuppressWarnings("deprecation") > @Test > public void zoom() throws IOException { > HSSFWorkbook wb = new HSSFWorkbook(); >@@ -945,7 +949,7 @@ > assertEquals(11*20, bs.getFont(wbSimple).getFontHeight()); > assertEquals(8, bs.getFont(wbSimple).getColor()); > assertFalse(bs.getFont(wbSimple).getItalic()); >- assertEquals(HSSFFont.BOLDWEIGHT_NORMAL, bs.getFont(wbSimple).getBoldweight()); >+ assertFalse(bs.getFont(wbSimple).getBold()); > > > HSSFCellStyle cs = wbComplex.getSheetAt(0).getColumnStyle(1); >Index: src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java >=================================================================== >--- src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java (revision 1799998) >+++ src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java (working copy) >@@ -17,11 +17,12 @@ > > package org.apache.poi.hssf.usermodel; > >-import junit.framework.TestCase; >- > import org.apache.poi.hssf.HSSFTestDataSamples; > import org.apache.poi.ss.usermodel.BorderStyle; >+import org.apache.poi.util.IOUtils; > >+import junit.framework.TestCase; >+ > /** > * Class to test row styling functionality > * >@@ -36,7 +37,6 @@ > * Last row, first row is tested against the correct values (99,0).<P> > * FAILURE: HSSF does not create a sheet or excepts. Filesize does not match the known good. > * HSSFSheet last row or first row is incorrect. <P> >- * > */ > public void testWriteSheetFont() { > HSSFWorkbook wb = new HSSFWorkbook(); >@@ -46,7 +46,7 @@ > HSSFCellStyle cs = wb.createCellStyle(); > > fnt.setColor(HSSFFont.COLOR_RED); >- fnt.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); >+ fnt.setBold(true); > cs.setFont(fnt); > for (int rownum = 0; rownum < 100; rownum++) > { >@@ -54,12 +54,14 @@ > r.setRowStyle(cs); > r.createCell(0); > } >- wb = HSSFTestDataSamples.writeOutAndReadBack(wb); >+ HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb); >+ IOUtils.closeQuietly(wb); > > SanityChecker sanityChecker = new SanityChecker(); >- sanityChecker.checkHSSFWorkbook(wb); >+ sanityChecker.checkHSSFWorkbook(wb2); > assertEquals("LAST ROW == 99", 99, s.getLastRowNum()); > assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum()); >+ IOUtils.closeQuietly(wb2); > } > > /** >@@ -83,14 +85,15 @@ > row.setRowStyle(cs); > row.createCell(0); > >- wb = HSSFTestDataSamples.writeOutAndReadBack(wb); >+ HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb); >+ IOUtils.closeQuietly(wb); > > SanityChecker sanityChecker = new SanityChecker(); >- sanityChecker.checkHSSFWorkbook(wb); >+ sanityChecker.checkHSSFWorkbook(wb2); > > assertEquals("LAST ROW ", 1, s.getLastRowNum()); > assertEquals("FIRST ROW ", 0, s.getFirstRowNum()); >- >+ IOUtils.closeQuietly(wb2); > } > > /** >@@ -101,7 +104,6 @@ > * Last row, first row is tested against the correct values (99,0).<P> > * FAILURE: HSSF does not create a sheet or excepts. Filesize does not match the known good. > * HSSFSheet last row or first row is incorrect. <P> >- * > */ > public void testWriteSheetStyle() { > HSSFWorkbook wb = new HSSFWorkbook(); >@@ -135,14 +137,15 @@ > r.setRowStyle(cs2); > r.createCell(0); > } >- wb = HSSFTestDataSamples.writeOutAndReadBack(wb); >+ HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb); >+ IOUtils.closeQuietly(wb); > > SanityChecker sanityChecker = new SanityChecker(); >- sanityChecker.checkHSSFWorkbook(wb); >+ sanityChecker.checkHSSFWorkbook(wb2); > assertEquals("LAST ROW == 99", 99, s.getLastRowNum()); > assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum()); > >- s = wb.getSheetAt(0); >+ s = wb2.getSheetAt(0); > assertNotNull("Sheet is not null", s); > > for (int rownum = 0; rownum < 100; rownum++) >@@ -167,5 +170,6 @@ > assertEquals("FillForegroundColor for row: ", cs2.getFillForegroundColor(), (short) 0x0); > assertEquals("FillPattern for row: ", cs2.getFillPattern(), (short) 0x1); > } >+ IOUtils.closeQuietly(wb2); > } > } >Index: src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java >=================================================================== >--- src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java (revision 1799998) >+++ src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java (working copy) >@@ -38,19 +38,19 @@ > protected final void baseTestDefaultFont(String defaultName, short defaultSize, short defaultColor) throws IOException { > //get default font and check against default value > Workbook workbook = _testDataProvider.createWorkbook(); >- Font fontFind=workbook.findFont(Font.BOLDWEIGHT_NORMAL, defaultColor, defaultSize, defaultName, false, false, Font.SS_NONE, Font.U_NONE); >+ Font fontFind=workbook.findFont(false, defaultColor, defaultSize, defaultName, false, false, Font.SS_NONE, Font.U_NONE); > assertNotNull(fontFind); > > //get default font, then change 2 values and check against different values (height changes) > Font font=workbook.createFont(); >- font.setBoldweight(Font.BOLDWEIGHT_BOLD); >- assertEquals(Font.BOLDWEIGHT_BOLD, font.getBoldweight()); >+ font.setBold(true); >+ assertTrue(font.getBold()); > font.setUnderline(Font.U_DOUBLE); > assertEquals(Font.U_DOUBLE, font.getUnderline()); > font.setFontHeightInPoints((short)15); > assertEquals(15*20, font.getFontHeight()); > assertEquals(15, font.getFontHeightInPoints()); >- fontFind=workbook.findFont(Font.BOLDWEIGHT_BOLD, defaultColor, (short)(15*20), defaultName, false, false, Font.SS_NONE, Font.U_DOUBLE); >+ fontFind=workbook.findFont(true, defaultColor, (short)(15*20), defaultName, false, false, Font.SS_NONE, Font.U_DOUBLE); > assertNotNull(fontFind); > workbook.close(); > } >@@ -61,7 +61,7 @@ > int num0 = wb.getNumberOfFonts(); > > Font f1=wb.createFont(); >- f1.setBoldweight(Font.BOLDWEIGHT_BOLD); >+ f1.setBold(true); > short idx1 = f1.getIndex(); > wb.createCellStyle().setFont(f1); > >@@ -76,7 +76,7 @@ > wb.createCellStyle().setFont(f3); > > assertEquals(num0 + 3,wb.getNumberOfFonts()); >- assertEquals(Font.BOLDWEIGHT_BOLD,wb.getFontAt(idx1).getBoldweight()); >+ assertTrue(wb.getFontAt(idx1).getBold()); > assertEquals(Font.U_DOUBLE,wb.getFontAt(idx2).getUnderline()); > assertEquals(23,wb.getFontAt(idx3).getFontHeightInPoints()); > wb.close(); >@@ -97,7 +97,7 @@ > int num0 = wb1.getNumberOfFonts(); > > Font font=wb1.createFont(); >- font.setBoldweight(Font.BOLDWEIGHT_BOLD); >+ font.setBold(true); > font.setStrikeout(true); > font.setColor(IndexedColors.YELLOW.getIndex()); > font.setFontName("Courier"); >@@ -161,7 +161,7 @@ > > //default font > Font f1 = wb.getFontAt((short)0); >- assertEquals(Font.BOLDWEIGHT_NORMAL, f1.getBoldweight()); >+ assertFalse(f1.getBold()); > > // Check that asking for the same font > // multiple times gives you the same thing. >@@ -172,7 +172,7 @@ > // yet to add > assertNull( > wb.findFont( >- Font.BOLDWEIGHT_BOLD, (short)123, (short)(22*20), >+ true, (short)123, (short)(22*20), > "Thingy", false, true, (short)2, (byte)2 > ) > ); >@@ -183,7 +183,7 @@ > > assertSame(nf, wb.getFontAt(nfIdx)); > >- nf.setBoldweight(Font.BOLDWEIGHT_BOLD); >+ nf.setBold(true); > nf.setColor((short)123); > nf.setFontHeightInPoints((short)22); > nf.setFontName("Thingy"); >@@ -201,13 +201,13 @@ > // Find it now > assertNotNull( > wb.findFont( >- Font.BOLDWEIGHT_BOLD, (short)123, (short)(22*20), >+ true, (short)123, (short)(22*20), > "Thingy", false, true, (short)2, (byte)2 > ) > ); > assertSame(nf, > wb.findFont( >- Font.BOLDWEIGHT_BOLD, (short)123, (short)(22*20), >+ true, (short)123, (short)(22*20), > "Thingy", false, true, (short)2, (byte)2 > ) > ); >Index: src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java >=================================================================== >--- src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java (revision 1799998) >+++ src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java (working copy) >@@ -78,7 +78,7 @@ > HSSFRow row = sheet.createRow(0); > HSSFCellStyle style = wb.createCellStyle(); > HSSFFont font = wb.createFont(); >- font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); >+ font.setBold(true); > style.setFont(font); > writeHeaderCell(row, 0, "Raw Long Bits A", style); > writeHeaderCell(row, 1, "Raw Long Bits B", style); >Index: src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java >=================================================================== >--- src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java (revision 1799998) >+++ src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java (working copy) >@@ -97,7 +97,7 @@ > HSSFRow row = sheet.createRow(0); > HSSFCellStyle style = wb.createCellStyle(); > HSSFFont font = wb.createFont(); >- font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); >+ font.setBold(true); > style.setFont(font); > writeHeaderCell(row, 0, "Value", style); > writeHeaderCell(row, 1, "Raw Long Bits", style); View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]