You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2015/11/22 13:30:43 UTC
svn commit: r1715626 - in /poi/trunk/src:
examples/src/org/apache/poi/hssf/usermodel/examples/
examples/src/org/apache/poi/hssf/view/
examples/src/org/apache/poi/poifs/poibrowser/
examples/src/org/apache/poi/xssf/usermodel/examples/ java/org/apache/poi...
Author: kiwiwings
Date: Sun Nov 22 12:30:42 2015
New Revision: 1715626
URL: http://svn.apache.org/viewvc?rev=1715626&view=rev
Log:
fix unnecessary cast warnings
Modified:
poi/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/AddDimensionedImage.java
poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVSheetTable.java
poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java
poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableUtils.java
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreatePivotTable.java
poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java
poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java
poi/trunk/src/java/org/apache/poi/ss/format/SimpleFraction.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java
Modified: poi/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/AddDimensionedImage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/AddDimensionedImage.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/AddDimensionedImage.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/AddDimensionedImage.java Sun Nov 22 12:30:42 2015
@@ -250,7 +250,6 @@ public class AddDimensionedImage {
String imageFile, double reqImageWidthMM, double reqImageHeightMM,
int resizeBehaviour) throws FileNotFoundException, IOException,
IllegalArgumentException {
- HSSFRow row = null;
HSSFClientAnchor anchor = null;
HSSFPatriarch patriarch = null;
ClientAnchorDetail rowClientAnchorDetail = null;
@@ -720,7 +719,6 @@ public class AddDimensionedImage {
public static void main(String[] args) {
String imageFile = null;
String outputFile = null;
- FileInputStream fis = null;
FileOutputStream fos = null;
HSSFWorkbook workbook = null;
HSSFSheet sheet = null;
@@ -753,14 +751,20 @@ public class AddDimensionedImage {
ioEx.printStackTrace(System.out);
}
finally {
- if(fos != null) {
- try {
+ try {
+ if (workbook != null) {
+ workbook.close();
+ }
+ } catch(IOException ioEx) {
+ // I G N O R E
+ }
+ try {
+ if(fos != null) {
fos.close();
fos = null;
}
- catch(IOException ioEx) {
- // I G N O R E
- }
+ } catch(IOException ioEx) {
+ // I G N O R E
}
}
}
@@ -912,7 +916,7 @@ public class AddDimensionedImage {
int pixels = (widthUnits / EXCEL_COLUMN_WIDTH_FACTOR)
* UNIT_OFFSET_LENGTH;
int offsetWidthUnits = widthUnits % EXCEL_COLUMN_WIDTH_FACTOR;
- pixels += Math.round((float) offsetWidthUnits /
+ pixels += Math.round(offsetWidthUnits /
((float) EXCEL_COLUMN_WIDTH_FACTOR / UNIT_OFFSET_LENGTH));
return pixels;
}
Modified: poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVSheetTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVSheetTable.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVSheetTable.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVSheetTable.java Sun Nov 22 12:30:42 2015
@@ -163,7 +163,7 @@ public class SVSheetTable extends JTable
Row row = sheet.getRow(i - sheet.getFirstRowNum());
if (row != null) {
short h = row.getHeight();
- int height = (int)Math.round(Math.max(1., ((double)h) / (((double)res) / 70. * 20.) + 3.));
+ int height = (int)Math.round(Math.max(1., h / (res / 70. * 20.) + 3.));
System.out.printf("%d: %d (%d @ %d)%n", i, height, h, res);
setRowHeight(i, height);
}
Modified: poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java Sun Nov 22 12:30:42 2015
@@ -18,14 +18,25 @@
package org.apache.poi.hssf.view;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-
-import javax.swing.*;
-import javax.swing.table.*;
-
-import org.apache.poi.hssf.usermodel.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.util.EventObject;
+import java.util.Map;
+
+import javax.swing.AbstractCellEditor;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+import javax.swing.table.TableCellEditor;
+
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFFont;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.util.HSSFColor;
/**
@@ -43,9 +54,6 @@ public class SVTableCellEditor extends A
private HSSFWorkbook wb;
private JTextField editor;
- private HSSFCell editorValue;
-
-
public SVTableCellEditor(HSSFWorkbook wb) {
this.wb = wb;
this.editor = new JTextField();
@@ -191,7 +199,7 @@ public class SVTableCellEditor extends A
*
*/
private final Color getAWTColor(int index, Color deflt) {
- HSSFColor clr = (HSSFColor)colors.get(Integer.valueOf(index));
+ HSSFColor clr = colors.get(index);
if (clr == null) return deflt;
return getAWTColor(clr);
}
Modified: poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableUtils.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableUtils.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableUtils.java Sun Nov 22 12:30:42 2015
@@ -72,7 +72,7 @@ public class SVTableUtils {
* @return The aWTColor value
*/
public final static Color getAWTColor(int index, Color deflt) {
- HSSFColor clr = (HSSFColor) colors.get(Integer.valueOf(index));
+ HSSFColor clr = colors.get(index);
if (clr == null) {
return deflt;
}
Modified: poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java Sun Nov 22 12:30:42 2015
@@ -182,7 +182,7 @@ public class TreeReaderListener implemen
final String fsName,
final MutableTreeNode root)
{
- MutableTreeNode n = (MutableTreeNode) pathToNode.get(path);
+ MutableTreeNode n = pathToNode.get(path);
if (n != null)
/* Node found in map, just return it. */
return n;
@@ -193,7 +193,7 @@ public class TreeReaderListener implemen
* the POI filesystem itself. This is a tree node with the
* POI filesystem's name (this the operating system file's
* name) as its key it the path-to-node map. */
- n = (MutableTreeNode) pathToNode.get(fsName);
+ n = pathToNode.get(fsName);
if (n == null)
{
/* A tree node for the POI filesystem does not yet
Modified: poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreatePivotTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreatePivotTable.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreatePivotTable.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreatePivotTable.java Sun Nov 22 12:30:42 2015
@@ -34,7 +34,7 @@ public class CreatePivotTable {
public static void main(String[] args) throws FileNotFoundException, IOException, InvalidFormatException {
XSSFWorkbook wb = new XSSFWorkbook();
- XSSFSheet sheet = (XSSFSheet) wb.createSheet();
+ XSSFSheet sheet = wb.createSheet();
//Create some data to build the pivot table on
setCellData(sheet);
@@ -53,6 +53,7 @@ public class CreatePivotTable {
FileOutputStream fileOut = new FileOutputStream("ooxml-pivottable.xlsx");
wb.write(fileOut);
fileOut.close();
+ wb.close();
}
public static void setCellData(XSSFSheet sheet){
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java Sun Nov 22 12:30:42 2015
@@ -440,10 +440,10 @@ public abstract class CFRuleBase extends
rec.formatting_options = formatting_options;
rec.formatting_not_used = formatting_not_used;
if (containsFontFormattingBlock()) {
- rec._fontFormatting = (FontFormatting) _fontFormatting.clone();
+ rec._fontFormatting = _fontFormatting.clone();
}
if (containsBorderFormattingBlock()) {
- rec._borderFormatting = (BorderFormatting) _borderFormatting.clone();
+ rec._borderFormatting = _borderFormatting.clone();
}
if (containsPatternFormattingBlock()) {
rec._patternFormatting = (PatternFormatting) _patternFormatting.clone();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java Sun Nov 22 12:30:42 2015
@@ -135,9 +135,9 @@ public final class DataBarFormatting imp
rec.options = options;
rec.percentMin = percentMin;
rec.percentMax = percentMax;
- rec.color = (ExtendedColor)color.clone();
- rec.thresholdMin = (DataBarThreshold)thresholdMin.clone();
- rec.thresholdMax = (DataBarThreshold)thresholdMax.clone();
+ rec.color = color.clone();
+ rec.thresholdMin = thresholdMin.clone();
+ rec.thresholdMax = thresholdMax.clone();
return rec;
}
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java Sun Nov 22 12:30:42 2015
@@ -176,7 +176,7 @@ public class CTSRgbColor {
*
*/
public void setVal(byte[] value) {
- this.val = ((byte[]) value);
+ this.val = (value != null) ? value.clone() : null;
}
public boolean isSetVal() {
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java Sun Nov 22 12:30:42 2015
@@ -209,7 +209,7 @@ public class CTSystemColor {
*
*/
public void setLastClr(byte[] value) {
- this.lastClr = ((byte[]) value);
+ this.lastClr = (value != null) ? value.clone() : null;
}
public boolean isSetLastClr() {
Modified: poi/trunk/src/java/org/apache/poi/ss/format/SimpleFraction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/SimpleFraction.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/SimpleFraction.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/SimpleFraction.java Sun Nov 22 12:30:42 2015
@@ -32,7 +32,7 @@ public class SimpleFraction {
* @return a SimpleFraction with the given values set.
*/
public static SimpleFraction buildFractionExactDenominator(double val, int exactDenom){
- int num = (int)Math.round(val*(double)exactDenom);
+ int num = (int)Math.round(val*exactDenom);
return new SimpleFraction(num,exactDenom);
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java Sun Nov 22 12:30:42 2015
@@ -19,21 +19,27 @@
package org.apache.poi.xssf.streaming;
-import java.io.IOException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-import junit.framework.TestCase;
+import java.io.IOException;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.junit.Test;
-public final class TestOutlining extends TestCase {
- public void testSetRowGroupCollapsed() throws Exception {
+public final class TestOutlining {
+ @Test
+ public void testSetRowGroupCollapsed() throws IOException {
SXSSFWorkbook wb2 = new SXSSFWorkbook(100);
wb2.setCompressTempFiles(true);
- SXSSFSheet sheet2 = (SXSSFSheet) wb2.createSheet("new sheet");
+ SXSSFSheet sheet2 = wb2.createSheet("new sheet");
int rowCount = 20;
for (int i = 0; i < rowCount; i++) {
@@ -45,21 +51,22 @@ public final class TestOutlining extends
sheet2.setRowGroupCollapsed(4, true);
- SXSSFRow r = (SXSSFRow) sheet2.getRow(8);
+ SXSSFRow r = sheet2.getRow(8);
assertTrue(r.getHidden());
- r = (SXSSFRow) sheet2.getRow(10);
+ r = sheet2.getRow(10);
assertTrue(r.getCollapsed());
- r = (SXSSFRow) sheet2.getRow(12);
+ r = sheet2.getRow(12);
assertNull(r.getHidden());
wb2.dispose();
wb2.close();
}
- public void testSetRowGroupCollapsedError() throws Exception {
+ @Test
+ public void testSetRowGroupCollapsedError() throws IOException {
SXSSFWorkbook wb2 = new SXSSFWorkbook(100);
wb2.setCompressTempFiles(true);
- SXSSFSheet sheet2 = (SXSSFSheet) wb2.createSheet("new sheet");
+ SXSSFSheet sheet2 = wb2.createSheet("new sheet");
int rowCount = 20;
for (int i = 0; i < rowCount; i++) {
@@ -98,18 +105,19 @@ public final class TestOutlining extends
e.getMessage().contains("Row does not exist"));
}
- SXSSFRow r = (SXSSFRow) sheet2.getRow(8);
+ SXSSFRow r = sheet2.getRow(8);
assertNotNull(r);
assertNull(r.getHidden());
- r = (SXSSFRow) sheet2.getRow(10);
+ r = sheet2.getRow(10);
assertNull(r.getCollapsed());
- r = (SXSSFRow) sheet2.getRow(12);
+ r = sheet2.getRow(12);
assertNull(r.getHidden());
wb2.dispose();
wb2.close();
}
+ @Test
public void testOutlineGettersHSSF() throws IOException {
HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
HSSFSheet hssfSheet = hssfWorkbook.createSheet();
@@ -129,6 +137,7 @@ public final class TestOutlining extends
hssfWorkbook.close();
}
+ @Test
public void testOutlineGettersXSSF() throws IOException {
XSSFWorkbook xssfWorkbook = new XSSFWorkbook();
XSSFSheet xssfSheet = xssfWorkbook.createSheet();
@@ -148,6 +157,7 @@ public final class TestOutlining extends
xssfWorkbook.close();
}
+ @Test
public void testOutlineGettersSXSSF() throws IOException {
SXSSFWorkbook sxssfWorkbook = new SXSSFWorkbook();
Sheet sxssfSheet = sxssfWorkbook.createSheet();
@@ -190,6 +200,7 @@ public final class TestOutlining extends
sxssfWorkbook.close();
}
+ @Test
public void testOutlineGettersSXSSFSetOutlineLevel() throws IOException {
SXSSFWorkbook sxssfWorkbook = new SXSSFWorkbook();
Sheet sxssfSheet = sxssfWorkbook.createSheet();
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java Sun Nov 22 12:30:42 2015
@@ -37,7 +37,6 @@ public final class OldSectionTable exten
* @deprecated Use {@link #OldSectionTable(byte[],int,int)} instead
*/
@Deprecated
- @SuppressWarnings( "unused" )
public OldSectionTable( byte[] documentStream, int offset, int size,
int fcMin, TextPieceTable tpt )
{
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java Sun Nov 22 12:30:42 2015
@@ -61,7 +61,6 @@ public class PAPBinTable
* {@link #PAPBinTable(byte[], byte[], byte[], int, int, CharIndexTranslator)}
* instead
*/
- @SuppressWarnings( "unused" )
public PAPBinTable( byte[] documentStream, byte[] tableStream,
byte[] dataStream, int offset, int size, int fcMin,
TextPieceTable tpt )
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java Sun Nov 22 12:30:42 2015
@@ -214,7 +214,7 @@ public class Sttb
if ( _fExtend )
{
- LittleEndian.putUShort( buffer, offset, (int) entry.length() );
+ LittleEndian.putUShort( buffer, offset, entry.length() );
offset += LittleEndian.SHORT_SIZE;
StringUtil.putUnicodeLE( entry, buffer, offset );
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java Sun Nov 22 12:30:42 2015
@@ -79,7 +79,7 @@ public abstract class FSPAAbstractType
LittleEndian.putInt(data, 0x8 + offset, field_3_yaTop);
LittleEndian.putInt(data, 0xc + offset, field_4_xaRight);
LittleEndian.putInt(data, 0x10 + offset, field_5_yaBottom);
- LittleEndian.putShort(data, 0x14 + offset, (short)field_6_flags);
+ LittleEndian.putShort(data, 0x14 + offset, field_6_flags);
LittleEndian.putInt(data, 0x16 + offset, field_7_cTxbx);
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java Sun Nov 22 12:30:42 2015
@@ -70,7 +70,7 @@ public final class TestCruddyExtractor e
// Ensure they match
assertEquals(allTheText.length,foundTextV.size());
for(int i=0; i<allTheText.length; i++) {
- String foundText = (String)foundTextV.get(i);
+ String foundText = foundTextV.get(i);
assertEquals(allTheText[i],foundText);
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java Sun Nov 22 12:30:42 2015
@@ -17,25 +17,29 @@
package org.apache.poi.hwpf.usermodel;
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import java.util.List;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.model.PicturesTable;
+import org.junit.Test;
/**
* Test the picture handling
*
* @author Nick Burch
*/
-public final class TestPictures extends TestCase {
+public final class TestPictures {
/**
* two jpegs
*/
+ @Test
public void testTwoImages() {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("two_images.doc");
List<Picture> pics = doc.getPicturesTable().getAllPictures();
@@ -43,7 +47,7 @@ public final class TestPictures extends
assertNotNull(pics);
assertEquals(pics.size(), 2);
for(int i=0; i<pics.size(); i++) {
- Picture pic = (Picture)pics.get(i);
+ Picture pic = pics.get(i);
assertNotNull(pic.suggestFileExtension());
assertNotNull(pic.suggestFullFileName());
}
@@ -51,20 +55,20 @@ public final class TestPictures extends
Picture picA = pics.get(0);
Picture picB = pics.get(1);
assertEquals("jpg", picA.suggestFileExtension());
- assertEquals("jpg", picA.suggestFileExtension());
+ assertEquals("png", picB.suggestFileExtension());
}
/**
* pngs and jpegs
*/
+ @Test
public void testDifferentImages() {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("testPictures.doc");
List<Picture> pics = doc.getPicturesTable().getAllPictures();
assertNotNull(pics);
assertEquals(7, pics.size());
- for(int i=0; i<pics.size(); i++) {
- Picture pic = (Picture)pics.get(i);
+ for(Picture pic : pics) {
assertNotNull(pic.suggestFileExtension());
assertNotNull(pic.suggestFullFileName());
}
@@ -86,6 +90,7 @@ public final class TestPictures extends
/**
* emf image, nice and simple
*/
+ @Test
public void testEmfImage() {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("vector_image.doc");
List<Picture> pics = doc.getPicturesTable().getAllPictures();
@@ -107,32 +112,37 @@ public final class TestPictures extends
}
}
- public void testPicturesWithTable() {
+ @Test
+ public void testPicturesWithTable() {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug44603.doc");
List<Picture> pics = doc.getPicturesTable().getAllPictures();
assertEquals(2, pics.size());
}
- public void testPicturesInHeader() {
+ @Test
+ public void testPicturesInHeader() {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("header_image.doc");
List<Picture> pics = doc.getPicturesTable().getAllPictures();
assertEquals(2, pics.size());
}
+ @Test
public void testFastSaved() {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("rasp.doc");
doc.getPicturesTable().getAllPictures(); // just check that we do not throw Exception
}
+ @Test
public void testFastSaved2() {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("o_kurs.doc");
doc.getPicturesTable().getAllPictures(); // just check that we do not throw Exception
}
+ @Test
public void testFastSaved3() {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("ob_is.doc");
@@ -146,7 +156,8 @@ public final class TestPictures extends
* then used as-is to speed things up.
* Check that we can properly read one of these
*/
- public void testEmbededDocumentIcon() throws Exception {
+ @Test
+ public void testEmbededDocumentIcon() {
// This file has two embeded excel files, an embeded powerpoint
// file and an embeded word file, in that order
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("word_with_embeded.doc");
@@ -231,6 +242,7 @@ public final class TestPictures extends
assertEquals( "image/x-emf", picture.getMimeType() );
}
+ @Test
public void testEquation()
{
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "equation.doc" );
@@ -256,7 +268,8 @@ public final class TestPictures extends
* \u0001 which has the offset. More than one can
* reference the same \u0001
*/
- public void testFloatingPictures() throws Exception {
+ @Test
+ public void testFloatingPictures() {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("FloatingPictures.doc");
PicturesTable pictures = doc.getPicturesTable();
@@ -290,6 +303,7 @@ public final class TestPictures extends
}
@SuppressWarnings( "deprecation" )
+ @Test
public void testCroppedPictures() {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("testCroppedPictures.doc");
List<Picture> pics = doc.getPicturesTable().getAllPictures();
@@ -323,7 +337,8 @@ public final class TestPictures extends
assertEquals(0, pic2.getDyaCropBottom());
}
- public void testPictureDetectionWithPNG() throws Exception {
+ @Test
+ public void testPictureDetectionWithPNG() {
HWPFDocument document = HWPFTestDataSamples.openSampleFile("PngPicture.doc");
PicturesTable pictureTable = document.getPicturesTable();
@@ -334,7 +349,8 @@ public final class TestPictures extends
assertEquals("png", p.suggestFileExtension());
}
- public void testPictureWithAlternativeText() throws Exception {
+ @Test
+ public void testPictureWithAlternativeText() {
HWPFDocument document = HWPFTestDataSamples.openSampleFile("Picture_Alternative_Text.doc");
PicturesTable pictureTable = document.getPicturesTable();
Picture picture = pictureTable.getAllPictures().get(0);
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java Sun Nov 22 12:30:42 2015
@@ -17,12 +17,12 @@
package org.apache.poi.hwpf.usermodel;
-import junit.framework.TestCase;
-
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.model.PAPX;
+import junit.framework.TestCase;
+
/**
* Test to see if Range.delete() works even if the Range contains a
* CharacterRun that uses Unicode characters.
@@ -93,7 +93,7 @@ public final class TestRangeDelete exten
assertEquals(fillerText, para.text());
- paraDef = (PAPX)daDoc.getParagraphTable().getParagraphs().get(2);
+ paraDef = daDoc.getParagraphTable().getParagraphs().get(2);
assertEquals(132, paraDef.getStart());
assertEquals(400, paraDef.getEnd());
@@ -102,7 +102,7 @@ public final class TestRangeDelete exten
assertEquals(originalText, para.text());
- paraDef = (PAPX)daDoc.getParagraphTable().getParagraphs().get(3);
+ paraDef = daDoc.getParagraphTable().getParagraphs().get(3);
assertEquals(400, paraDef.getStart());
assertEquals(438, paraDef.getEnd());
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java Sun Nov 22 12:30:42 2015
@@ -62,7 +62,7 @@ public class TestVariantSupport extends
PropertySet ps = PropertySetFactory.create(new ByteArrayInputStream(bytes));
DocumentSummaryInformation dsi = (DocumentSummaryInformation) ps;
- Section s = (Section) dsi.getSections().get(0);
+ Section s = dsi.getSections().get(0);
Object hdrs = s.getProperty(PropertyIDMap.PID_HEADINGPAIR);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java Sun Nov 22 12:30:42 2015
@@ -57,7 +57,7 @@ public final class TestAutoFilterInfoRec
record.setNumEntries((short)3);
byte[] src = record.serialize();
- AutoFilterInfoRecord cloned = (AutoFilterInfoRecord)record.clone();
+ AutoFilterInfoRecord cloned = record.clone();
assertEquals(3, record.getNumEntries());
byte[] cln = cloned.serialize();
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java Sun Nov 22 12:30:42 2015
@@ -437,7 +437,7 @@ public final class TestCFRuleRecord exte
CFRuleRecord record = CFRuleRecord.create(sheet, ComparisonOperator.BETWEEN, "2", "5");
- CFRuleRecord clone = (CFRuleRecord) record.clone();
+ CFRuleRecord clone = record.clone();
byte [] serializedRecord = record.serialize();
byte [] serializedClone = clone.serialize();
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java Sun Nov 22 12:30:42 2015
@@ -56,7 +56,7 @@ public final class TestFtCblsSubRecord e
FtCblsSubRecord record = new FtCblsSubRecord();
byte[] src = record.serialize();
- FtCblsSubRecord cloned = (FtCblsSubRecord)record.clone();
+ FtCblsSubRecord cloned = record.clone();
byte[] cln = cloned.serialize();
assertEquals(record.getDataSize(), cloned.getDataSize());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java Sun Nov 22 12:30:42 2015
@@ -432,7 +432,7 @@ public final class TestHyperlinkRecord {
for (int i = 0; i < data.length; i++) {
RecordInputStream is = TestcaseRecordInputStream.create(HyperlinkRecord.sid, data[i]);
HyperlinkRecord link = new HyperlinkRecord(is);
- HyperlinkRecord clone = (HyperlinkRecord)link.clone();
+ HyperlinkRecord clone = link.clone();
assertArrayEquals(link.serialize(), clone.serialize());
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java Sun Nov 22 12:30:42 2015
@@ -42,7 +42,7 @@ public final class TestMergeCellsRecord
public void testCloneReferences() {
CellRangeAddress[] cras = { new CellRangeAddress(0, 1, 0, 2), };
MergeCellsRecord merge = new MergeCellsRecord(cras, 0, cras.length);
- MergeCellsRecord clone = (MergeCellsRecord)merge.clone();
+ MergeCellsRecord clone = merge.clone();
assertNotSame("Merged and cloned objects are the same", merge, clone);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java Sun Nov 22 12:30:42 2015
@@ -73,7 +73,7 @@ public final class TestNoteRecord extend
record.setShapeId((short)1026);
record.setAuthor("Apache Software Foundation");
- NoteRecord cloned = (NoteRecord)record.clone();
+ NoteRecord cloned = record.clone();
assertEquals(record.getRow(), cloned.getRow());
assertEquals(record.getColumn(), cloned.getColumn());
assertEquals(record.getFlags(), cloned.getFlags());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java Sun Nov 22 12:30:42 2015
@@ -58,7 +58,7 @@ public final class TestNoteStructureSubR
NoteStructureSubRecord record = new NoteStructureSubRecord();
byte[] src = record.serialize();
- NoteStructureSubRecord cloned = (NoteStructureSubRecord)record.clone();
+ NoteStructureSubRecord cloned = record.clone();
byte[] cln = cloned.serialize();
assertEquals(record.getDataSize(), cloned.getDataSize());
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java Sun Nov 22 12:30:42 2015
@@ -159,10 +159,7 @@ public final class TestDocument extends
}
else
{
- copy = new OPOIFSDocument(
- "test" + input.length,
- ( SmallDocumentBlock [] ) document.getSmallBlocks(),
- input.length);
+ copy = new OPOIFSDocument("test"+input.length, document.getSmallBlocks(), input.length);
}
return copy;
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java?rev=1715626&r1=1715625&r2=1715626&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java Sun Nov 22 12:30:42 2015
@@ -20,8 +20,6 @@
*/
package org.apache.poi.ss.formula.functions;
-import java.lang.reflect.Constructor;
-
import org.apache.poi.ss.formula.functions.XYNumericFunction.Accumulator;
@@ -305,10 +303,10 @@ public class TestMathX extends AbstractN
assertEquals(0.0, MathX.mod(0, 2));
assertEquals(Double.NaN, MathX.mod(3, 0));
- assertEquals((double) 1.4, MathX.mod(3.4, 2));
- assertEquals((double) -1.4, MathX.mod(-3.4, -2));
- assertEquals((double) 0.6000000000000001, MathX.mod(-3.4, 2.0));// should actually be 0.6
- assertEquals((double) -0.6000000000000001, MathX.mod(3.4, -2.0));// should actually be -0.6
+ assertEquals(1.4, MathX.mod(3.4, 2));
+ assertEquals(-1.4, MathX.mod(-3.4, -2));
+ assertEquals(0.6000000000000001, MathX.mod(-3.4, 2.0));// should actually be 0.6
+ assertEquals(-0.6000000000000001, MathX.mod(3.4, -2.0));// should actually be -0.6
assertEquals(3.0, MathX.mod(3, Double.MAX_VALUE));
assertEquals(2.0, MathX.mod(Double.MAX_VALUE, 3));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org