Author: fanningpj
Date: Sat Mar 3 01:48:46 2018
New Revision: 1825749
URL: http://svn.apache.org/viewvc?rev=1825749&view=rev
Log:
remove some casts to short
Modified:
poi/trunk/src/java/org/apache/poi/ss/util/PropertyTemplate.java
poi/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
Modified: poi/trunk/src/java/org/apache/poi/ss/util/PropertyTemplate.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/PropertyTemplate.java?rev=1825749&r1=1825748&r2=1825749&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/PropertyTemplate.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/PropertyTemplate.java Sat Mar 3
01:48:46 2018
@@ -958,8 +958,8 @@ public final class PropertyTemplate {
* @return short value, or 0 if not a short
*/
private static short getShort(Object value) {
- if (value instanceof Short) {
- return ((Short) value).shortValue();
+ if (value instanceof Number) {
+ return ((Number) value).shortValue();
}
return 0;
}
Modified: poi/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java?rev=1825749&r1=1825748&r2=1825749&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java Sat Mar 3
01:48:46 2018
@@ -42,7 +42,7 @@ public final class RegionUtil {
public CellPropertySetter(String propertyName, int value) {
_propertyName = propertyName;
- _propertyValue = Short.valueOf((short) value);
+ _propertyValue = Integer.valueOf(value);
}
public CellPropertySetter(String propertyName, BorderStyle value) {
_propertyName = propertyName;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java?rev=1825749&r1=1825748&r2=1825749&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java Sat
Mar 3 01:48:46 2018
@@ -613,7 +613,7 @@ public class SXSSFCell implements Cell {
{
if(_style == null){
SXSSFWorkbook wb =
(SXSSFWorkbook)getRow().getSheet().getWorkbook();
- return wb.getCellStyleAt((short)0);
+ return wb.getCellStyleAt(0);
} else {
return _style;
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java?rev=1825749&r1=1825748&r2=1825749&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
Sat Mar 3 01:48:46 2018
@@ -138,7 +138,7 @@ public class XSSFFontFormatting implemen
if(_font.sizeOfSzArray() == 0) return -1;
CTFontSize sz = _font.getSzArray(0);
- return (short)(20*sz.getVal());
+ return (int)(20*sz.getVal());
}
/**
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1825749&r1=1825748&r2=1825749&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
Sat Mar 3 01:48:46 2018
@@ -876,7 +876,7 @@ public final class TestXSSFBugs extends
font1.setColor((short) 20);
Font font2 = wb1.createFont();
font2.setColor(Font.COLOR_RED);
- Font font3 = wb1.getFontAt((short) 0);
+ Font font3 = wb1.getFontAt(0);
XSSFRow row = sheet.createRow(2);
XSSFCell cell = row.createCell(2);
@@ -1750,9 +1750,9 @@ public final class TestXSSFBugs extends
// run some method on the font to verify if it is "disconnected"
already
//for(short i = 0;i < 256;i++)
{
- Font font = wb.getFontAt((short) 0);
+ Font font = wb.getFontAt(0);
if (font instanceof XSSFFont) {
- XSSFFont xfont = (XSSFFont) wb.getFontAt((short) 0);
+ XSSFFont xfont = (XSSFFont) wb.getFontAt(0);
CTFontImpl ctFont = (CTFontImpl) xfont.getCTFont();
assertEquals(0, ctFont.sizeOfBArray());
}
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java?rev=1825749&r1=1825748&r2=1825749&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java
Sat Mar 3 01:48:46 2018
@@ -35,7 +35,7 @@ public final class TestXSSFColor {
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("48779.xlsx");
// Check the CTColor is as expected
- XSSFColor indexed =
wb.getCellStyleAt((short)1).getFillBackgroundXSSFColor();
+ XSSFColor indexed = wb.getCellStyleAt(1).getFillBackgroundXSSFColor();
assertEquals(true, indexed.getCTColor().isSetIndexed());
assertEquals(64, indexed.getCTColor().getIndexed());
assertEquals(false, indexed.getCTColor().isSetRgb());
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java?rev=1825749&r1=1825748&r2=1825749&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
Sat Mar 3 01:48:46 2018
@@ -323,7 +323,7 @@ public final class TestXSSFFont extends
Workbook wb = new XSSFWorkbook();
// cannot check on result because on some machines we get back false
here!
- SheetUtil.canComputeColumnWidth(wb.getFontAt((short)0));
+ SheetUtil.canComputeColumnWidth(wb.getFontAt(0));
wb.close();
}
@@ -354,16 +354,16 @@ public final class TestXSSFFont extends
assertEquals(1, wb.getNumberOfFonts());
- XSSFFont f1 = wb.getFontAt((short) 0);
+ XSSFFont f1 = wb.getFontAt(0);
assertFalse(f1.getBold());
// Check that asking for the same font
// multiple times gives you the same thing.
// Otherwise, our tests wouldn't work!
- assertSame(wb.getFontAt((short) 0), wb.getFontAt((short) 0));
+ assertSame(wb.getFontAt(0), wb.getFontAt(0));
assertEquals(
- wb.getFontAt((short) 0),
- wb.getFontAt((short) 0)
+ wb.getFontAt(0),
+ wb.getFontAt(0)
);
// Look for a new font we have
@@ -384,8 +384,8 @@ public final class TestXSSFFont extends
XSSFFont nf = wb.createFont();
assertEquals(2, wb.getNumberOfFonts());
- assertEquals(1, nf.getIndex());
- assertEquals(nf, wb.getFontAt((short) 1));
+ assertEquals(1, nf.getIndexAsInt());
+ assertEquals(nf, wb.getFontAt(1));
nf.setBold(false);
nf.setColor(IndexedColors.INDIGO.getIndex());
@@ -397,12 +397,12 @@ public final class TestXSSFFont extends
nf.setUnderline((byte) 2);
assertEquals(2, wb.getNumberOfFonts());
- assertEquals(nf, wb.getFontAt((short) 1));
+ assertEquals(nf, wb.getFontAt(1));
assertTrue(
- wb.getFontAt((short) 0)
+ wb.getFontAt(0)
!=
- wb.getFontAt((short) 1)
+ wb.getFontAt(1)
);
// Find it now
@@ -426,7 +426,7 @@ public final class TestXSSFFont extends
assertNotNull(font);
assertEquals(
1,
- font.getIndex()
+ font.getIndexAsInt()
);
assertEquals(nf,
wb.findFont(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
