You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2015/02/09 23:33:24 UTC
svn commit: r1658594 - in /poi/trunk/src/java/org/apache/poi: hssf/dev/
hssf/eventusermodel/ hssf/extractor/ hssf/model/ hssf/record/
hssf/record/aggregates/ hssf/record/chart/ hssf/usermodel/ hssf/util/
ss/formula/functions/ ss/usermodel/ ss/util/
Author: centic
Date: Mon Feb 9 22:33:24 2015
New Revision: 1658594
URL: http://svn.apache.org/r1658594
Log:
Bug 57480: Fix some unnecessary casts, generics, Eclipse warnings, ...
Modified:
poi/trunk/src/java/org/apache/poi/hssf/dev/RecordLister.java
poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
poi/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
poi/trunk/src/java/org/apache/poi/hssf/model/DrawingManager.java
poi/trunk/src/java/org/apache/poi/hssf/model/RowBlocksReader.java
poi/trunk/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java
poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
poi/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Code.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/ImReal.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/PPMT.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/TextFunction.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/FractionFormat.java
poi/trunk/src/java/org/apache/poi/ss/util/SheetReferences.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/dev/RecordLister.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/dev/RecordLister.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/dev/RecordLister.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/dev/RecordLister.java Mon Feb 9 22:33:24 2015
@@ -154,7 +154,7 @@ public class RecordLister
return s.toString();
}
private static String byteToHex(byte b) {
- int i = (int)b;
+ int i = b;
if(i<0) {
i += 256;
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java Mon Feb 9 22:33:24 2015
@@ -92,11 +92,10 @@ public class HSSFRequest {
* @throws HSSFUserException User exception condition
*/
protected short processRecord(Record rec) throws HSSFUserException {
- Object obj = _records.get(Short.valueOf(rec.getSid()));
+ List<HSSFListener> listeners = _records.get(Short.valueOf(rec.getSid()));
short userCode = 0;
- if (obj != null) {
- List listeners = (List) obj;
+ if (listeners != null) {
for (int k = 0; k < listeners.size(); k++) {
Object listenObj = listeners.get(k);
Modified: poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java Mon Feb 9 22:33:24 2015
@@ -68,7 +68,6 @@ public class EventBasedExcelExtractor ex
* @deprecated Use {@link #EventBasedExcelExtractor(DirectoryNode)} instead
*/
@Deprecated
- @SuppressWarnings( "unused" )
public EventBasedExcelExtractor( DirectoryNode dir, POIFSFileSystem fs )
{
this( dir );
Modified: poi/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java Mon Feb 9 22:33:24 2015
@@ -72,7 +72,6 @@ public class ExcelExtractor extends POIO
* @deprecated Use {@link #ExcelExtractor(DirectoryNode)} instead
*/
@Deprecated
- @SuppressWarnings( "unused" )
public ExcelExtractor(DirectoryNode dir, POIFSFileSystem fs) throws IOException {
this( dir );
}
@@ -241,6 +240,7 @@ public class ExcelExtractor extends POIO
extractor.setIncludeBlankCells(cmdArgs.shouldShowBlankCells());
extractor.setIncludeHeadersFooters(cmdArgs.shouldIncludeHeadersFooters());
System.out.println(extractor.getText());
+ extractor.close();
} catch (Exception e) {
e.printStackTrace();
System.exit(1);
Modified: poi/trunk/src/java/org/apache/poi/hssf/model/DrawingManager.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/model/DrawingManager.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/model/DrawingManager.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/model/DrawingManager.java Mon Feb 9 22:33:24 2015
@@ -29,7 +29,7 @@ import java.util.HashMap;
public class DrawingManager
{
EscherDggRecord dgg;
- Map dgMap = new HashMap(); // key = Short(drawingId), value=EscherDgRecord
+ Map<Short, EscherDgRecord> dgMap = new HashMap<Short, EscherDgRecord>(); // key = Short(drawingId), value=EscherDgRecord
public DrawingManager( EscherDggRecord dgg )
{
@@ -46,7 +46,7 @@ public class DrawingManager
dg.setLastMSOSPID( -1 );
dgg.addCluster( dgId, 0 );
dgg.setDrawingsSaved( dgg.getDrawingsSaved() + 1 );
- dgMap.put( Short.valueOf( dgId ), dg );
+ dgMap.put( dgId, dg );
return dg;
}
@@ -58,7 +58,7 @@ public class DrawingManager
public int allocateShapeId(short drawingGroupId)
{
// Get the last shape id for this drawing group.
- EscherDgRecord dg = (EscherDgRecord) dgMap.get(Short.valueOf(drawingGroupId));
+ EscherDgRecord dg = dgMap.get(drawingGroupId);
int lastShapeId = dg.getLastMSOSPID();
Modified: poi/trunk/src/java/org/apache/poi/hssf/model/RowBlocksReader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/model/RowBlocksReader.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/model/RowBlocksReader.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/model/RowBlocksReader.java Mon Feb 9 22:33:24 2015
@@ -36,7 +36,7 @@ import org.apache.poi.ss.util.CellRefere
*/
public final class RowBlocksReader {
- private final List _plainRecords;
+ private final List<Record> _plainRecords;
private final SharedValueManager _sfm;
private final MergeCellsRecord[] _mergedCellsRecords;
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java Mon Feb 9 22:33:24 2015
@@ -19,7 +19,6 @@ package org.apache.poi.hssf.record;
import org.apache.poi.ddf.EscherRecord;
import org.apache.poi.ddf.NullEscherSerializationListener;
-import org.apache.poi.util.ArrayUtil;
import org.apache.poi.util.LittleEndian;
import java.util.Iterator;
@@ -60,9 +59,9 @@ public final class DrawingGroupRecord ex
}
byte[] buffer = new byte[getRawDataSize()];
int pos = 0;
- for ( Iterator iterator = getEscherRecords().iterator(); iterator.hasNext(); )
+ for ( Iterator<EscherRecord> iterator = getEscherRecords().iterator(); iterator.hasNext(); )
{
- EscherRecord r = (EscherRecord) iterator.next();
+ EscherRecord r = iterator.next();
pos += r.serialize(pos, buffer, new NullEscherSerializationListener() );
}
@@ -85,16 +84,16 @@ public final class DrawingGroupRecord ex
}
private int getRawDataSize() {
- List escherRecords = getEscherRecords();
+ List<EscherRecord> escherRecords = getEscherRecords();
byte[] rawData = getRawData();
if (escherRecords.size() == 0 && rawData != null)
{
return rawData.length;
}
int size = 0;
- for ( Iterator iterator = escherRecords.iterator(); iterator.hasNext(); )
+ for ( Iterator<EscherRecord> iterator = escherRecords.iterator(); iterator.hasNext(); )
{
- EscherRecord r = (EscherRecord) iterator.next();
+ EscherRecord r = iterator.next();
size += r.getRecordSize();
}
return size;
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java Mon Feb 9 22:33:24 2015
@@ -50,9 +50,9 @@ public final class HorizontalPageBreakRe
public Object clone() {
PageBreakRecord result = new HorizontalPageBreakRecord();
- Iterator iterator = getBreaksIterator();
+ Iterator<Break> iterator = getBreaksIterator();
while (iterator.hasNext()) {
- Break original = (Break) iterator.next();
+ Break original = iterator.next();
result.addBreak(original.main, original.subFrom, original.subTo);
}
return result;
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java Mon Feb 9 22:33:24 2015
@@ -49,9 +49,9 @@ public final class VerticalPageBreakReco
public Object clone() {
PageBreakRecord result = new VerticalPageBreakRecord();
- Iterator iterator = getBreaksIterator();
+ Iterator<Break> iterator = getBreaksIterator();
while (iterator.hasNext()) {
- Break original = (Break) iterator.next();
+ Break original = iterator.next();
result.addBreak(original.main, original.subFrom, original.subTo);
}
return result;
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java Mon Feb 9 22:33:24 2015
@@ -32,13 +32,13 @@ import org.apache.poi.ss.util.CellRangeA
public final class MergedCellsTable extends RecordAggregate {
private static int MAX_MERGED_REGIONS = 1027; // enforced by the 8224 byte limit
- private final List _mergedRegions;
+ private final List<CellRangeAddress> _mergedRegions;
/**
* Creates an empty aggregate
*/
public MergedCellsTable() {
- _mergedRegions = new ArrayList();
+ _mergedRegions = new ArrayList<CellRangeAddress>();
}
/**
@@ -46,7 +46,7 @@ public final class MergedCellsTable exte
* @param rs
*/
public void read(RecordStream rs) {
- List temp = _mergedRegions;
+ List<CellRangeAddress> temp = _mergedRegions;
while (rs.peekNextClass() == MergeCellsRecord.class) {
MergeCellsRecord mcr = (MergeCellsRecord) rs.getNext();
int nRegions = mcr.getNumAreas();
@@ -110,7 +110,7 @@ public final class MergedCellsTable exte
public CellRangeAddress get(int index) {
checkIndex(index);
- return (CellRangeAddress) _mergedRegions.get(index);
+ return _mergedRegions.get(index);
}
public void remove(int index) {
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java Mon Feb 9 22:33:24 2015
@@ -38,11 +38,6 @@ public class ChartTitleFormatRecord exte
private int _offset;
private int _fontIndex;
- protected CTFormat(short offset,short fontIdx){
- _offset = offset;
- _fontIndex = fontIdx;
- }
-
public CTFormat(RecordInputStream in) {
_offset = in.readShort();
_fontIndex = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java Mon Feb 9 22:33:24 2015
@@ -42,7 +42,7 @@ public class DummyGraphics2d
g2D = (Graphics2D)img.getGraphics();
}
- public void addRenderingHints(Map hints)
+ public void addRenderingHints(Map<?,?> hints)
{
System.out.println( "addRenderingHinds(Map):" );
System.out.println( " hints = " + hints );
@@ -275,7 +275,7 @@ public class DummyGraphics2d
g2D.setRenderingHint( hintKey, hintValue );
}
- public void setRenderingHints(Map hints)
+ public void setRenderingHints(Map<?,?> hints)
{
System.out.println( "setRenderingHints(Map):" );
System.out.println( "hints = " + hints );
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java Mon Feb 9 22:33:24 2015
@@ -431,7 +431,6 @@ public class EscherGraphics
return null;
}
- @SuppressWarnings("deprecation")
public Rectangle getClipRect()
{
return getClipBounds();
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java Mon Feb 9 22:33:24 2015
@@ -89,7 +89,7 @@ public final class EscherGraphics2d exte
setColor(Color.black);
}
- public void addRenderingHints(Map map)
+ public void addRenderingHints(Map<?, ?> map)
{
getG2D().addRenderingHints(map);
}
@@ -514,7 +514,7 @@ public final class EscherGraphics2d exte
getG2D().setRenderingHint(key, obj);
}
- public void setRenderingHints(Map map)
+ public void setRenderingHints(Map<?, ?> map)
{
getG2D().setRenderingHints(map);
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java Mon Feb 9 22:33:24 2015
@@ -63,7 +63,6 @@ public final class HSSFDataFormat implem
HSSFDataFormat(InternalWorkbook workbook) {
_workbook = workbook;
- @SuppressWarnings("unchecked")
Iterator<FormatRecord> i = workbook.getFormats().iterator();
while (i.hasNext()) {
FormatRecord r = i.next();
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java Mon Feb 9 22:33:24 2015
@@ -309,7 +309,7 @@ public final class HSSFFont implements F
{
byte charset = font.getCharset();
if(charset >= 0) {
- return (int)charset;
+ return charset;
} else {
return charset + 256;
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPalette.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPalette.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPalette.java Mon Feb 9 22:33:24 2015
@@ -134,7 +134,7 @@ public final class HSSFPalette {
* 0 and 255, so distance calculations work as expected.
*/
private int unsignedInt(byte b) {
- return 0xFF & ((int) b);
+ return 0xFF & b;
}
/**
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java Mon Feb 9 22:33:24 2015
@@ -617,7 +617,7 @@ public final class HSSFRow implements Ro
* Alias for {@link #cellIterator} to allow
* foreach loops
*/
- public Iterator iterator() {
+ public Iterator<Cell> iterator() {
return cellIterator();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java Mon Feb 9 22:33:24 2015
@@ -305,8 +305,8 @@ public class HSSFShapeGroup extends HSSF
*/
public int countOfAllChildren() {
int count = shapes.size();
- for (Iterator iterator = shapes.iterator(); iterator.hasNext(); ) {
- HSSFShape shape = (HSSFShape) iterator.next();
+ for (Iterator<HSSFShape> iterator = shapes.iterator(); iterator.hasNext(); ) {
+ HSSFShape shape = iterator.next();
count += shape.countOfAllChildren();
}
return count;
Modified: poi/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java Mon Feb 9 22:33:24 2015
@@ -75,7 +75,7 @@ public class HSSFColor implements Color
Integer index1 = Integer.valueOf(color.getIndex());
if (result.containsKey(index1)) {
- HSSFColor prevColor = (HSSFColor)result.get(index1);
+ HSSFColor prevColor = result.get(index1);
throw new RuntimeException("Dup color index (" + index1
+ ") for colors (" + prevColor.getClass().getName()
+ "),(" + color.getClass().getName() + ")");
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Code.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Code.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Code.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Code.java Mon Feb 9 22:33:24 2015
@@ -46,7 +46,7 @@ public class Code extends Fixed1ArgFunct
return ErrorEval.VALUE_INVALID;
}
- int code = (int)text.charAt(0);
+ int code = text.charAt(0);
return new StringEval(String.valueOf(code));
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/ImReal.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/ImReal.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/ImReal.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/ImReal.java Mon Feb 9 22:33:24 2015
@@ -17,11 +17,14 @@
package org.apache.poi.ss.formula.functions;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.*;
-
import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+
+import org.apache.poi.ss.formula.OperationEvaluationContext;
+import org.apache.poi.ss.formula.eval.ErrorEval;
+import org.apache.poi.ss.formula.eval.EvaluationException;
+import org.apache.poi.ss.formula.eval.OperandResolver;
+import org.apache.poi.ss.formula.eval.StringEval;
+import org.apache.poi.ss.formula.eval.ValueEval;
/**
* Implementation for Excel ImReal() function.<p/>
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/PPMT.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/PPMT.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/PPMT.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/PPMT.java Mon Feb 9 22:33:24 2015
@@ -19,8 +19,6 @@
package org.apache.poi.ss.formula.functions;
-import org.apache.poi.ss.formula.*;
-import org.apache.poi.ss.formula.functions.*;
import org.apache.poi.ss.formula.eval.*;
/**
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/TextFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/TextFunction.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/TextFunction.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/TextFunction.java Mon Feb 9 22:33:24 2015
@@ -182,7 +182,7 @@ public abstract class TextFunction imple
* @return whether the character is printable
*/
private boolean isPrintable(char c){
- int charCode = (int)c ;
+ int charCode = c;
return charCode >= 32;
}
};
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/FractionFormat.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/FractionFormat.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/FractionFormat.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/FractionFormat.java Mon Feb 9 22:33:24 2015
@@ -130,7 +130,7 @@ public class FractionFormat extends Form
if (exactDenom > 0){
fract = SimpleFraction.buildFractionExactDenominator(decPart, exactDenom);
} else {
- fract = SimpleFraction.buildFractionMaxDenominator((double)decPart, maxDenom);
+ fract = SimpleFraction.buildFractionMaxDenominator(decPart, maxDenom);
}
} catch (RuntimeException e){
e.printStackTrace();
Modified: poi/trunk/src/java/org/apache/poi/ss/util/SheetReferences.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/SheetReferences.java?rev=1658594&r1=1658593&r2=1658594&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/SheetReferences.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/SheetReferences.java Mon Feb 9 22:33:24 2015
@@ -29,17 +29,17 @@ import java.util.Map;
*/
public class SheetReferences
{
- Map map;
+ Map<Integer, String> map;
public SheetReferences()
{
- map = new HashMap(5);
+ map = new HashMap<Integer, String>(5);
}
public void addSheetReference(String sheetName, int number) {
- map.put(Integer.valueOf(number), sheetName);
+ map.put(number, sheetName);
}
public String getSheetName(int number) {
- return (String)map.get(Integer.valueOf(number));
+ return map.get(number);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org