Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Conditional check for logging to avoid creating too many temporary objects. 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@353559 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Glen Stampoultzis 2004-06-20 10:18:50 +00:00
parent 6d4852661f
commit 5548b2ff90
5 changed files with 170 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/java/org/apache/poi/hssf/model/Sheet.java
View File

@ -135,18 +135,21 @@ public class Sheet implements Model
if (rec.getSid() == LabelRecord.sid) if (rec.getSid() == LabelRecord.sid)
{ {
log.log(POILogger.DEBUG, "Hit label record."); if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "Hit label record.");
retval.containsLabels = true; retval.containsLabels = true;
} }
else if (rec.getSid() == BOFRecord.sid) else if (rec.getSid() == BOFRecord.sid)
{ {
bofEofNestingLevel++; bofEofNestingLevel++;
log.log(POILogger.DEBUG, "Hit BOF record. Nesting increased to " + bofEofNestingLevel); if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "Hit BOF record. Nesting increased to " + bofEofNestingLevel);
} }
else if (rec.getSid() == EOFRecord.sid) else if (rec.getSid() == EOFRecord.sid)
{ {
--bofEofNestingLevel; --bofEofNestingLevel;
log.log(POILogger.DEBUG, "Hit EOF record. Nesting decreased to " + bofEofNestingLevel); if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "Hit EOF record. Nesting decreased to " + bofEofNestingLevel);
if (bofEofNestingLevel == 0) { if (bofEofNestingLevel == 0) {
records.add(rec); records.add(rec);
retval.eofLoc = k; retval.eofLoc = k;
@ -285,7 +288,8 @@ public class Sheet implements Model
{ {
retval.cells = new ValueRecordsAggregate(); retval.cells = new ValueRecordsAggregate();
} }
log.log(POILogger.DEBUG, "sheet createSheet (existing file) exited"); if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "sheet createSheet (existing file) exited");
return retval; return retval;
} }
@ -344,7 +348,8 @@ public class Sheet implements Model
public static Sheet createSheet(List records, int sheetnum) public static Sheet createSheet(List records, int sheetnum)
{ {
log.log(POILogger.DEBUG, if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG,
"Sheet createSheet (exisiting file) assumed offset 0"); "Sheet createSheet (exisiting file) assumed offset 0");
return createSheet(records, sheetnum, 0); return createSheet(records, sheetnum, 0);
} }
@ -359,7 +364,8 @@ public class Sheet implements Model
public static Sheet createSheet() public static Sheet createSheet()
{ {
log.log(POILogger.DEBUG, "Sheet createsheet from scratch called"); if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "Sheet createsheet from scratch called");
Sheet retval = new Sheet(); Sheet retval = new Sheet();
ArrayList records = new ArrayList(30); ArrayList records = new ArrayList(30);
@ -409,7 +415,8 @@ public class Sheet implements Model
records.add(retval.protect); records.add(retval.protect);
records.add(retval.createEOF()); records.add(retval.createEOF());
retval.records = records; retval.records = records;
log.log(POILogger.DEBUG, "Sheet createsheet from scratch exit"); if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "Sheet createsheet from scratch exit");
return retval; return retval;
} }
@ -553,7 +560,8 @@ public class Sheet implements Model
public void convertLabelRecords(Workbook wb) public void convertLabelRecords(Workbook wb)
{ {
log.log(POILogger.DEBUG, "convertLabelRecords called"); if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "convertLabelRecords called");
if (containsLabels) if (containsLabels)
{ {
for (int k = 0; k < records.size(); k++) for (int k = 0; k < records.size(); k++)
@ -577,7 +585,8 @@ public class Sheet implements Model
} }
} }
} }
log.log(POILogger.DEBUG, "convertLabelRecords exit"); if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "convertLabelRecords exit");
} }
/** /**
@ -591,14 +600,17 @@ public class Sheet implements Model
{ {
checkCells(); checkCells();
checkRows(); checkRows();
log.log(POILogger.DEBUG, "Sheet.getNumRecords"); if (log.check( POILogger.DEBUG ))
log.logFormatted(POILogger.DEBUG, "returning % + % + % - 2 = %", new int[]
{ {
records.size(), cells.getPhysicalNumberOfCells(), log.log(POILogger.DEBUG, "Sheet.getNumRecords");
rows.getPhysicalNumberOfRows(), log.logFormatted(POILogger.DEBUG, "returning % + % + % - 2 = %", new int[]
records.size() + cells.getPhysicalNumberOfCells() {
+ rows.getPhysicalNumberOfRows() - 2 records.size(), cells.getPhysicalNumberOfCells(),
}); rows.getPhysicalNumberOfRows(),
records.size() + cells.getPhysicalNumberOfCells()
+ rows.getPhysicalNumberOfRows() - 2
});
}
return records.size() + cells.getPhysicalNumberOfCells() return records.size() + cells.getPhysicalNumberOfCells()
+ rows.getPhysicalNumberOfRows() - 2; + rows.getPhysicalNumberOfRows() - 2;
} }
@ -615,17 +627,23 @@ public class Sheet implements Model
public void setDimensions(int firstrow, short firstcol, int lastrow, public void setDimensions(int firstrow, short firstcol, int lastrow,
short lastcol) short lastcol)
{ {
log.log(POILogger.DEBUG, "Sheet.setDimensions"); if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, {
(new StringBuffer("firstrow")).append(firstrow) log.log(POILogger.DEBUG, "Sheet.setDimensions");
.append("firstcol").append(firstcol).append("lastrow") log.log(POILogger.DEBUG,
.append(lastrow).append("lastcol").append(lastcol) (new StringBuffer("firstrow")).append(firstrow)
.toString()); .append("firstcol").append(firstcol).append("lastrow")
.append(lastrow).append("lastcol").append(lastcol)
.toString());
}
dims.setFirstCol(firstcol); dims.setFirstCol(firstcol);
dims.setFirstRow(firstrow); dims.setFirstRow(firstrow);
dims.setLastCol(lastcol); dims.setLastCol(lastcol);
dims.setLastRow(lastrow); dims.setLastRow(lastrow);
log.log(log.DEBUG, "Sheet.setDimensions exiting"); if (log.check( POILogger.DEBUG ))
{
log.log(POILogger.DEBUG, "Sheet.setDimensions exiting");
}
} }
/** /**
@ -647,7 +665,8 @@ public class Sheet implements Model
public void setLoc(int loc) public void setLoc(int loc)
{ {
valueRecIterator = null; valueRecIterator = null;
log.log(log.DEBUG, "sheet.setLoc(): " + loc); if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "sheet.setLoc(): " + loc);
this.loc = loc; this.loc = loc;
} }
@ -658,7 +677,8 @@ public class Sheet implements Model
public int getLoc() public int getLoc()
{ {
log.log(log.DEBUG, "sheet.getLoc():" + loc); if (log.check( POILogger.DEBUG ))
log.log(POILogger.DEBUG, "sheet.getLoc():" + loc);
return loc; return loc;
} }
@ -697,7 +717,8 @@ public class Sheet implements Model
public int serialize(int offset, byte [] data) public int serialize(int offset, byte [] data)
{ {
log.log(log.DEBUG, "Sheet.serialize using offsets"); if (log.check( POILogger.DEBUG ))
log.log(log.DEBUG, "Sheet.serialize using offsets");
int pos = offset; int pos = offset;
boolean haveSerializedIndex = false; boolean haveSerializedIndex = false;
@ -725,7 +746,8 @@ public class Sheet implements Model
} }
} }
} }
log.log(log.DEBUG, "Sheet.serialize returning "); if (log.check( POILogger.DEBUG ))
log.log(log.DEBUG, "Sheet.serialize returning ");
return pos-offset; return pos-offset;
} }
@ -774,7 +796,8 @@ public class Sheet implements Model
public RowRecord createRow(int row) public RowRecord createRow(int row)
{ {
log.log(log.DEBUG, "create row number " + row); if (log.check( POILogger.DEBUG ))
log.log(log.DEBUG, "create row number " + row);
RowRecord rowrec = new RowRecord(); RowRecord rowrec = new RowRecord();
//rowrec.setRowNumber(( short ) row); //rowrec.setRowNumber(( short ) row);
@ -1020,7 +1043,8 @@ public class Sheet implements Model
{ {
checkCells(); checkCells();
setLoc(dimsloc); setLoc(dimsloc);
log.log(log.DEBUG, "replaceValueRecord "); if (log.check( POILogger.DEBUG ))
log.log(log.DEBUG, "replaceValueRecord ");
cells.insertCell(newval); cells.insertCell(newval);
/* /*
@ -1056,7 +1080,8 @@ public class Sheet implements Model
public void addRow(RowRecord row) public void addRow(RowRecord row)
{ {
checkRows(); checkRows();
log.log(log.DEBUG, "addRow "); if (log.check( POILogger.DEBUG ))
log.log(log.DEBUG, "addRow ");
DimensionsRecord d = ( DimensionsRecord ) records.get(getDimsLoc()); DimensionsRecord d = ( DimensionsRecord ) records.get(getDimsLoc());
if (row.getRowNumber() > d.getLastRow()) if (row.getRowNumber() > d.getLastRow())
@ -1110,7 +1135,8 @@ public class Sheet implements Model
* } * }
* } * }
*/ */
log.log(log.DEBUG, "exit addRow"); if (log.check( POILogger.DEBUG ))
log.log(log.DEBUG, "exit addRow");
} }
/** /**
@ -1171,7 +1197,8 @@ public class Sheet implements Model
public CellValueRecordInterface getNextValueRecord() public CellValueRecordInterface getNextValueRecord()
{ {
log.log(log.DEBUG, "getNextValue loc= " + loc); if (log.check( POILogger.DEBUG ))
log.log(log.DEBUG, "getNextValue loc= " + loc);
if (valueRecIterator == null) if (valueRecIterator == null)
{ {
valueRecIterator = cells.getIterator(); valueRecIterator = cells.getIterator();
@ -1258,7 +1285,8 @@ public class Sheet implements Model
public RowRecord getNextRow() public RowRecord getNextRow()
{ {
log.log(log.DEBUG, "getNextRow loc= " + loc); if (log.check( POILogger.DEBUG ))
log.log(log.DEBUG, "getNextRow loc= " + loc);
if (rowRecIterator == null) if (rowRecIterator == null)
{ {
rowRecIterator = rows.getIterator(); rowRecIterator = rows.getIterator();
@ -1304,7 +1332,8 @@ public class Sheet implements Model
//public RowRecord getRow(short rownum) //public RowRecord getRow(short rownum)
public RowRecord getRow(int rownum) public RowRecord getRow(int rownum)
{ {
log.log(log.DEBUG, "getNextRow loc= " + loc); if (log.check( POILogger.DEBUG ))
log.log(log.DEBUG, "getNextRow loc= " + loc);
if (rows == null) { if (rows == null) {
return null; return null;
} }
@ -2072,7 +2101,8 @@ public class Sheet implements Model
public int getDimsLoc() public int getDimsLoc()
{ {
log.log(log.DEBUG, "getDimsLoc dimsloc= " + dimsloc); if (log.check( POILogger.DEBUG ))
log.log(log.DEBUG, "getDimsLoc dimsloc= " + dimsloc);
return dimsloc; return dimsloc;
} }
@ -2525,7 +2555,8 @@ public class Sheet implements Model
protected Record createProtect() protected Record createProtect()
{ {
log.log(log.DEBUG, "create protect record with protection disabled"); if (log.check( POILogger.DEBUG ))
log.log(log.DEBUG, "create protect record with protection disabled");
ProtectRecord retval = new ProtectRecord(); ProtectRecord retval = new ProtectRecord();
retval.setProtect(false); retval.setProtect(false);

104
src/java/org/apache/poi/hssf/model/Workbook.java
View File

@ -121,8 +121,9 @@ public class Workbook implements Model {
* @return Workbook object * @return Workbook object
*/ */
public static Workbook createWorkbook(List recs) { public static Workbook createWorkbook(List recs) {
log.log(DEBUG, "Workbook (readfile) created with reclen=", if (log.check( POILogger.DEBUG ))
new Integer(recs.size())); log.log(DEBUG, "Workbook (readfile) created with reclen=",
new Integer(recs.size()));
Workbook retval = new Workbook(); Workbook retval = new Workbook();
ArrayList records = new ArrayList(recs.size() / 3); ArrayList records = new ArrayList(recs.size() / 3);
@ -131,85 +132,100 @@ public class Workbook implements Model {
if (rec.getSid() == EOFRecord.sid) { if (rec.getSid() == EOFRecord.sid) {
records.add(rec); records.add(rec);
log.log(DEBUG, "found workbook eof record at " + k); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found workbook eof record at " + k);
break; break;
} }
switch (rec.getSid()) { switch (rec.getSid()) {
case BoundSheetRecord.sid : case BoundSheetRecord.sid :
log.log(DEBUG, "found boundsheet record at " + k); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found boundsheet record at " + k);
retval.boundsheets.add(rec); retval.boundsheets.add(rec);
retval.records.setBspos( k ); retval.records.setBspos( k );
break; break;
case SSTRecord.sid : case SSTRecord.sid :
log.log(DEBUG, "found sst record at " + k); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found sst record at " + k);
retval.sst = ( SSTRecord ) rec; retval.sst = ( SSTRecord ) rec;
break; break;
case FontRecord.sid : case FontRecord.sid :
log.log(DEBUG, "found font record at " + k); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found font record at " + k);
retval.records.setFontpos( k ); retval.records.setFontpos( k );
retval.numfonts++; retval.numfonts++;
break; break;
case ExtendedFormatRecord.sid : case ExtendedFormatRecord.sid :
log.log(DEBUG, "found XF record at " + k); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found XF record at " + k);
retval.records.setXfpos( k ); retval.records.setXfpos( k );
retval.numxfs++; retval.numxfs++;
break; break;
case TabIdRecord.sid : case TabIdRecord.sid :
log.log(DEBUG, "found tabid record at " + k); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found tabid record at " + k);
retval.records.setTabpos( k ); retval.records.setTabpos( k );
break; break;
case ProtectRecord.sid : case ProtectRecord.sid :
log.log(DEBUG, "found protect record at " + k); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found protect record at " + k);
retval.records.setProtpos( k ); retval.records.setProtpos( k );
break; break;
case BackupRecord.sid : case BackupRecord.sid :
log.log(DEBUG, "found backup record at " + k); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found backup record at " + k);
retval.records.setBackuppos( k ); retval.records.setBackuppos( k );
break; break;
case ExternSheetRecord.sid : case ExternSheetRecord.sid :
log.log(DEBUG, "found extern sheet record at " + k); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found extern sheet record at " + k);
retval.externSheet = ( ExternSheetRecord ) rec; retval.externSheet = ( ExternSheetRecord ) rec;
break; break;
case NameRecord.sid : case NameRecord.sid :
log.log(DEBUG, "found name record at " + k); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found name record at " + k);
retval.names.add(rec); retval.names.add(rec);
// retval.records.namepos = k; // retval.records.namepos = k;
break; break;
case SupBookRecord.sid : case SupBookRecord.sid :
log.log(DEBUG, "found SupBook record at " + k); if (log.check( POILogger.DEBUG ))
// retval.records.supbookpos = k; log.log(DEBUG, "found SupBook record at " + k);
// retval.records.supbookpos = k;
break;
case FormatRecord.sid :
if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found format record at " + k);
retval.formats.add(rec);
retval.maxformatid = retval.maxformatid >= ((FormatRecord)rec).getIndexCode() ? retval.maxformatid : ((FormatRecord)rec).getIndexCode();
break; break;
case FormatRecord.sid :
log.log(DEBUG, "found format record at " + k);
retval.formats.add(rec);
retval.maxformatid = retval.maxformatid >= ((FormatRecord)rec).getIndexCode() ? retval.maxformatid : ((FormatRecord)rec).getIndexCode();
break;
case DateWindow1904Record.sid : case DateWindow1904Record.sid :
log.log(DEBUG, "found datewindow1904 record at " + k); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found datewindow1904 record at " + k);
retval.uses1904datewindowing = ((DateWindow1904Record)rec).getWindowing() == 1; retval.uses1904datewindowing = ((DateWindow1904Record)rec).getWindowing() == 1;
break; break;
case PaletteRecord.sid: case PaletteRecord.sid:
log.log(DEBUG, "found palette record at " + k); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "found palette record at " + k);
retval.records.setPalettepos( k ); retval.records.setPalettepos( k );
default : default :
} }
records.add(rec); records.add(rec);
} }
//What if we dont have any ranges and supbooks //What if we dont have any ranges and supbooks
// if (retval.records.supbookpos == 0) { // if (retval.records.supbookpos == 0) {
// retval.records.supbookpos = retval.records.bspos + 1; // retval.records.supbookpos = retval.records.bspos + 1;
// retval.records.namepos = retval.records.supbookpos + 1; // retval.records.namepos = retval.records.supbookpos + 1;
// } // }
retval.records.setRecords(records); retval.records.setRecords(records);
log.log(DEBUG, "exit create workbook from existing file function"); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "exit create workbook from existing file function");
return retval; return retval;
} }
@ -219,7 +235,8 @@ public class Workbook implements Model {
*/ */
public static Workbook createWorkbook() public static Workbook createWorkbook()
{ {
log.log( DEBUG, "creating new workbook from scratch" ); if (log.check( POILogger.DEBUG ))
log.log( DEBUG, "creating new workbook from scratch" );
Workbook retval = new Workbook(); Workbook retval = new Workbook();
ArrayList records = new ArrayList( 30 ); ArrayList records = new ArrayList( 30 );
ArrayList formats = new ArrayList( 8 ); ArrayList formats = new ArrayList( 8 );
@ -295,7 +312,8 @@ public class Workbook implements Model {
records.add( retval.createEOF() ); records.add( retval.createEOF() );
retval.records.setRecords(records); retval.records.setRecords(records);
log.log( DEBUG, "exit create new workbook from scratch" ); if (log.check( POILogger.DEBUG ))
log.log( DEBUG, "exit create new workbook from scratch" );
return retval; return retval;
} }
@ -402,8 +420,9 @@ public class Workbook implements Model {
*/ */
public void setSheetBof(int sheetnum, int pos) { public void setSheetBof(int sheetnum, int pos) {
log.log(DEBUG, "setting bof for sheetnum =", new Integer(sheetnum), if (log.check( POILogger.DEBUG ))
" at pos=", new Integer(pos)); log.log(DEBUG, "setting bof for sheetnum =", new Integer(sheetnum),
" at pos=", new Integer(pos));
checkSheets(sheetnum); checkSheets(sheetnum);
(( BoundSheetRecord ) boundsheets.get(sheetnum)) (( BoundSheetRecord ) boundsheets.get(sheetnum))
.setPositionOfBof(pos); .setPositionOfBof(pos);
@ -534,7 +553,8 @@ public class Workbook implements Model {
*/ */
public int getNumSheets() { public int getNumSheets() {
log.log(DEBUG, "getNumSheets=", new Integer(boundsheets.size())); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "getNumSheets=", new Integer(boundsheets.size()));
return boundsheets.size(); return boundsheets.size();
} }
@ -545,7 +565,8 @@ public class Workbook implements Model {
*/ */
public int getNumExFormats() { public int getNumExFormats() {
log.log(DEBUG, "getXF=", new Integer(numxfs)); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "getXF=", new Integer(numxfs));
return numxfs; return numxfs;
} }
@ -592,7 +613,8 @@ public class Workbook implements Model {
*/ */
public int addSSTString(String string, boolean use16bits) { public int addSSTString(String string, boolean use16bits) {
log.log(DEBUG, "insert to sst string='", string, "' and use16bits= ", if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "insert to sst string='", string, "' and use16bits= ",
new Boolean(use16bits)); new Boolean(use16bits));
if (sst == null) { if (sst == null) {
insertSST(); insertSST();
@ -625,8 +647,9 @@ public class Workbook implements Model {
} }
String retval = sst.getString(str); String retval = sst.getString(str);
log.log(DEBUG, "Returning SST for index=", new Integer(str), if (log.check( POILogger.DEBUG ))
" String= ", retval); log.log(DEBUG, "Returning SST for index=", new Integer(str),
" String= ", retval);
return retval; return retval;
} }
@ -638,7 +661,8 @@ public class Workbook implements Model {
*/ */
public void insertSST() { public void insertSST() {
log.log(DEBUG, "creating new SST via insertSST!"); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "creating new SST via insertSST!");
sst = ( SSTRecord ) createSST(); sst = ( SSTRecord ) createSST();
records.add(records.size() - 1, createExtendedSST()); records.add(records.size() - 1, createExtendedSST());
records.add(records.size() - 2, sst); records.add(records.size() - 2, sst);
@ -691,7 +715,8 @@ public class Workbook implements Model {
public int serialize( int offset, byte[] data ) public int serialize( int offset, byte[] data )
{ {
log.log( DEBUG, "Serializing Workbook with offsets" ); if (log.check( POILogger.DEBUG ))
log.log( DEBUG, "Serializing Workbook with offsets" );
int pos = 0; int pos = 0;
@ -716,7 +741,8 @@ public class Workbook implements Model {
pos += record.serialize( pos + offset, data ); // rec.length; pos += record.serialize( pos + offset, data ); // rec.length;
} }
} }
log.log( DEBUG, "Exiting serialize workbook" ); if (log.check( POILogger.DEBUG ))
log.log( DEBUG, "Exiting serialize workbook" );
return pos; return pos;
} }

42
src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
View File

@ -133,12 +133,14 @@ public class EscherGraphics
public void clipRect(int x, int y, int width, int height) public void clipRect(int x, int y, int width, int height)
{ {
logger.log(POILogger.WARN,"clipRect not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"clipRect not supported");
} }
public void copyArea(int x, int y, int width, int height, int dx, int dy) public void copyArea(int x, int y, int width, int height, int dx, int dy)
{ {
logger.log(POILogger.WARN,"copyArea not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"copyArea not supported");
} }
public Graphics create() public Graphics create()
@ -155,7 +157,8 @@ public class EscherGraphics
public void drawArc(int x, int y, int width, int height, public void drawArc(int x, int y, int width, int height,
int startAngle, int arcAngle) int startAngle, int arcAngle)
{ {
logger.log(POILogger.WARN,"drawArc not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"drawArc not supported");
} }
public boolean drawImage(Image img, public boolean drawImage(Image img,
@ -164,7 +167,8 @@ public class EscherGraphics
Color bgcolor, Color bgcolor,
ImageObserver observer) ImageObserver observer)
{ {
logger.log(POILogger.WARN,"drawImage not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"drawImage not supported");
return true; return true;
} }
@ -174,7 +178,8 @@ public class EscherGraphics
int sx1, int sy1, int sx2, int sy2, int sx1, int sy1, int sx2, int sy2,
ImageObserver observer) ImageObserver observer)
{ {
logger.log(POILogger.WARN,"drawImage not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"drawImage not supported");
return true; return true;
} }
@ -241,18 +246,21 @@ public class EscherGraphics
public void drawPolyline(int xPoints[], int yPoints[], public void drawPolyline(int xPoints[], int yPoints[],
int nPoints) int nPoints)
{ {
logger.log(POILogger.WARN,"drawPolyline not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"drawPolyline not supported");
} }
public void drawRect(int x, int y, int width, int height) public void drawRect(int x, int y, int width, int height)
{ {
logger.log(POILogger.WARN,"drawRect not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"drawRect not supported");
} }
public void drawRoundRect(int x, int y, int width, int height, public void drawRoundRect(int x, int y, int width, int height,
int arcWidth, int arcHeight) int arcWidth, int arcHeight)
{ {
logger.log(POILogger.WARN,"drawRoundRect not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"drawRoundRect not supported");
} }
public void drawString(String str, int x, int y) public void drawString(String str, int x, int y)
@ -318,13 +326,15 @@ public class EscherGraphics
public void drawString(AttributedCharacterIterator iterator, public void drawString(AttributedCharacterIterator iterator,
int x, int y) int x, int y)
{ {
logger.log(POILogger.WARN,"drawString not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"drawString not supported");
} }
public void fillArc(int x, int y, int width, int height, public void fillArc(int x, int y, int width, int height,
int startAngle, int arcAngle) int startAngle, int arcAngle)
{ {
logger.log(POILogger.WARN,"fillArc not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"fillArc not supported");
} }
public void fillOval(int x, int y, int width, int height) public void fillOval(int x, int y, int width, int height)
@ -384,7 +394,8 @@ public class EscherGraphics
public void fillRoundRect(int x, int y, int width, int height, public void fillRoundRect(int x, int y, int width, int height,
int arcWidth, int arcHeight) int arcWidth, int arcHeight)
{ {
logger.log(POILogger.WARN,"fillRoundRect not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"fillRoundRect not supported");
} }
public Shape getClip() public Shape getClip()
@ -439,17 +450,20 @@ public class EscherGraphics
public void setPaintMode() public void setPaintMode()
{ {
logger.log(POILogger.WARN,"setPaintMode not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"setPaintMode not supported");
} }
public void setXORMode(Color color) public void setXORMode(Color color)
{ {
logger.log(POILogger.WARN,"setXORMode not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"setXORMode not supported");
} }
public void translate(int x, int y) public void translate(int x, int y)
{ {
logger.log(POILogger.WARN,"translate not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"translate not supported");
} }
public Color getBackground() public Color getBackground()

13
src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
View File

@ -142,7 +142,8 @@ public class EscherGraphics2d extends Graphics2D
public void draw(Shape shape) public void draw(Shape shape)
{ {
logger.log(POILogger.WARN,"copyArea not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"copyArea not supported");
} }
public void drawArc(int x, int y, int width, int height, public void drawArc(int x, int y, int width, int height,
@ -159,19 +160,20 @@ public class EscherGraphics2d extends Graphics2D
public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1,
int sx2, int sy2, Color bgColor, ImageObserver imageobserver) int sx2, int sy2, Color bgColor, ImageObserver imageobserver)
{ {
logger.log(POILogger.WARN,"drawImage() not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"drawImage() not supported");
return true; return true;
} }
public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1,
int sx2, int sy2, ImageObserver imageobserver) int sx2, int sy2, ImageObserver imageobserver)
{ {
logger.log(POILogger.WARN,"drawImage() not supported");
return drawImage(image, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, null, imageobserver); return drawImage(image, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, null, imageobserver);
} }
public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, Color bgColor, ImageObserver imageobserver) public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, Color bgColor, ImageObserver imageobserver)
{ {
logger.log(POILogger.WARN,"drawImage() not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"drawImage() not supported");
return true; return true;
} }
@ -286,7 +288,8 @@ public class EscherGraphics2d extends Graphics2D
public void fill(Shape shape) public void fill(Shape shape)
{ {
logger.log(POILogger.WARN,"fill(Shape) not supported"); if (logger.check( POILogger.WARN ))
logger.log(POILogger.WARN,"fill(Shape) not supported");
} }
public void fillArc(int i, int j, int k, int l, int i1, int j1) public void fillArc(int i, int j, int k, int l, int i1, int j1)

3
src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
View File

@ -754,7 +754,8 @@ public class HSSFWorkbook
public byte[] getBytes() public byte[] getBytes()
{ {
log.log(DEBUG, "HSSFWorkbook.getBytes()"); if (log.check( POILogger.DEBUG ))
log.log(DEBUG, "HSSFWorkbook.getBytes()");
int wbsize = workbook.getSize(); int wbsize = workbook.getSize();
// log.debug("REMOVEME: old sizing method "+workbook.serialize().length); // log.debug("REMOVEME: old sizing method "+workbook.serialize().length);