Return-Path: Delivered-To: apmail-poi-commits-archive@minotaur.apache.org Received: (qmail 72720 invoked from network); 13 Feb 2009 22:11:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Feb 2009 22:11:39 -0000 Received: (qmail 44708 invoked by uid 500); 13 Feb 2009 22:11:39 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 44665 invoked by uid 500); 13 Feb 2009 22:11:39 -0000 Mailing-List: contact commits-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@poi.apache.org Delivered-To: mailing list commits@poi.apache.org Received: (qmail 44656 invoked by uid 99); 13 Feb 2009 22:11:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Feb 2009 14:11:39 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Feb 2009 22:11:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 269B123889D0; Fri, 13 Feb 2009 22:11:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r744257 - in /poi/trunk/src/java/org/apache/poi/hssf/usermodel: HSSFComment.java HSSFPatriarch.java HSSFPicture.java HSSFShape.java HSSFSheet.java Date: Fri, 13 Feb 2009 22:11:16 -0000 To: commits@poi.apache.org From: josh@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090213221117.269B123889D0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: josh Date: Fri Feb 13 22:11:16 2009 New Revision: 744257 URL: http://svn.apache.org/viewvc?rev=744257&view=rev Log: fixed compiler warnings. added some TODO comments Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java?rev=744257&r1=744256&r2=744257&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java Fri Feb 13 22:11:16 2009 @@ -57,7 +57,7 @@ setShapeType(OBJECT_TYPE_COMMENT); //default color for comments - fillColor = 0x08000050; + _fillColor = 0x08000050; //by default comments are hidden _visible = false; Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java?rev=744257&r1=744256&r2=744257&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java Fri Feb 13 22:11:16 2009 @@ -35,32 +35,29 @@ * * @author Glen Stampoultzis (glens at apache.org) */ -public class HSSFPatriarch - implements HSSFShapeContainer, Drawing -{ - List shapes = new ArrayList(); - HSSFSheet sheet; - int x1 = 0; - int y1 = 0 ; - int x2 = 1023; - int y2 = 255; +public final class HSSFPatriarch implements HSSFShapeContainer, Drawing { + private final List _shapes = new ArrayList(); + private int _x1 = 0; + private int _y1 = 0 ; + private int _x2 = 1023; + private int _y2 = 255; /** * The EscherAggregate we have been bound to. * (This will handle writing us out into records, * and building up our shapes from the records) */ - private EscherAggregate boundAggregate; + private EscherAggregate _boundAggregate; + final HSSFSheet _sheet; // TODO make private /** * Creates the patriarch. * * @param sheet the sheet this patriarch is stored in. */ - HSSFPatriarch(HSSFSheet sheet, EscherAggregate boundAggregate) - { - this.boundAggregate = boundAggregate; - this.sheet = sheet; + HSSFPatriarch(HSSFSheet sheet, EscherAggregate boundAggregate){ + _sheet = sheet; + _boundAggregate = boundAggregate; } /** @@ -74,7 +71,7 @@ { HSSFShapeGroup group = new HSSFShapeGroup(null, anchor); group.anchor = anchor; - shapes.add(group); + _shapes.add(group); return group; } @@ -90,7 +87,7 @@ { HSSFSimpleShape shape = new HSSFSimpleShape(null, anchor); shape.anchor = anchor; - shapes.add(shape); + _shapes.add(shape); return shape; } @@ -106,8 +103,8 @@ HSSFPicture shape = new HSSFPicture(null, anchor); shape.setPictureIndex( pictureIndex ); shape.anchor = anchor; - shape.patriarch = this; - shapes.add(shape); + shape._patriarch = this; + _shapes.add(shape); return shape; } public HSSFPicture createPicture(ClientAnchor anchor, int pictureIndex) @@ -126,7 +123,7 @@ { HSSFPolygon shape = new HSSFPolygon(null, anchor); shape.anchor = anchor; - shapes.add(shape); + _shapes.add(shape); return shape; } @@ -141,7 +138,7 @@ { HSSFTextbox shape = new HSSFTextbox(null, anchor); shape.anchor = anchor; - shapes.add(shape); + _shapes.add(shape); return shape; } @@ -156,41 +153,38 @@ { HSSFComment shape = new HSSFComment(null, anchor); shape.anchor = anchor; - shapes.add(shape); + _shapes.add(shape); return shape; } /** * Returns a list of all shapes contained by the patriarch. */ - public List getChildren() + public List getChildren() { - return shapes; + return _shapes; } /** * Total count of all children and their children's children. */ - public int countOfAllChildren() - { - int count = shapes.size(); - for ( Iterator iterator = shapes.iterator(); iterator.hasNext(); ) - { - HSSFShape shape = (HSSFShape) iterator.next(); + public int countOfAllChildren() { + int count = _shapes.size(); + for (Iterator iterator = _shapes.iterator(); iterator.hasNext();) { + HSSFShape shape = iterator.next(); count += shape.countOfAllChildren(); } return count; } /** - * Sets the coordinate space of this group. All children are contrained + * Sets the coordinate space of this group. All children are constrained * to these coordinates. */ - public void setCoordinates( int x1, int y1, int x2, int y2 ) - { - this.x1 = x1; - this.y1 = y1; - this.x2 = x2; - this.y2 = y2; + public void setCoordinates(int x1, int y1, int x2, int y2){ + _x1 = x1; + _y1 = y1; + _x2 = x2; + _y2 = y2; } /** @@ -205,18 +199,18 @@ // We're looking for a EscherOptRecord EscherOptRecord optRecord = (EscherOptRecord) - boundAggregate.findFirstWithId(EscherOptRecord.RECORD_ID); + _boundAggregate.findFirstWithId(EscherOptRecord.RECORD_ID); if(optRecord == null) { // No opt record, can't have chart return false; } - for(Iterator it = optRecord.getEscherProperties().iterator(); it.hasNext();) { - EscherProperty prop = (EscherProperty)it.next(); + for(Iterator it = optRecord.getEscherProperties().iterator(); it.hasNext();) { + EscherProperty prop = it.next(); if(prop.getPropertyNumber() == 896 && prop.isComplex()) { EscherComplexProperty cp = (EscherComplexProperty)prop; String str = StringUtil.getFromUnicodeLE(cp.getComplexData()); - //System.err.println(str); + if(str.equals("Chart 1\0")) { return true; } @@ -231,7 +225,7 @@ */ public int getX1() { - return x1; + return _x1; } /** @@ -239,7 +233,7 @@ */ public int getY1() { - return y1; + return _y1; } /** @@ -247,7 +241,7 @@ */ public int getX2() { - return x2; + return _x2; } /** @@ -255,13 +249,13 @@ */ public int getY2() { - return y2; + return _y2; } /** * Returns the aggregate escher record we're bound to */ protected EscherAggregate _getBoundAggregate() { - return boundAggregate; + return _boundAggregate; } } Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java?rev=744257&r1=744256&r2=744257&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java Fri Feb 13 22:11:16 2009 @@ -1,19 +1,20 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one or more -* contributor license agreements. See the NOTICE file distributed with -* this work for additional information regarding copyright ownership. -* The ASF licenses this file to You under the Apache License, Version 2.0 -* (the "License"); you may not use this file except in compliance with -* the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ + package org.apache.poi.hssf.usermodel; import org.apache.poi.ddf.EscherBSERecord; @@ -38,9 +39,7 @@ * @author Glen Stampoultzis * @author Yegor Kozlov (yegor at apache.org) */ -public class HSSFPicture - extends HSSFSimpleShape implements Picture -{ +public final class HSSFPicture extends HSSFSimpleShape implements Picture { public static final int PICTURE_TYPE_EMF = HSSFWorkbook.PICTURE_TYPE_EMF; // Windows Enhanced Metafile public static final int PICTURE_TYPE_WMF = HSSFWorkbook.PICTURE_TYPE_WMF; // Windows Metafile public static final int PICTURE_TYPE_PICT = HSSFWorkbook.PICTURE_TYPE_PICT; // Macintosh PICT @@ -62,8 +61,8 @@ */ private static final int PX_ROW = 15; - int pictureIndex; - HSSFPatriarch patriarch; + private int _pictureIndex; + HSSFPatriarch _patriarch; // TODO make private private static final POILogger log = POILogFactory.getLogger(HSSFPicture.class); @@ -78,12 +77,12 @@ public int getPictureIndex() { - return pictureIndex; + return _pictureIndex; } public void setPictureIndex( int pictureIndex ) { - this.pictureIndex = pictureIndex; + this._pictureIndex = pictureIndex; } /** @@ -185,7 +184,7 @@ private float getColumnWidthInPixels(int column){ - int cw = patriarch.sheet.getColumnWidth(column); + int cw = _patriarch._sheet.getColumnWidth(column); float px = getPixelWidth(column); return cw/px; @@ -193,18 +192,18 @@ private float getRowHeightInPixels(int i){ - HSSFRow row = patriarch.sheet.getRow(i); + HSSFRow row = _patriarch._sheet.getRow(i); float height; if(row != null) height = row.getHeight(); - else height = patriarch.sheet.getDefaultRowHeight(); + else height = _patriarch._sheet.getDefaultRowHeight(); return height/PX_ROW; } private float getPixelWidth(int column){ - int def = patriarch.sheet.getDefaultColumnWidth()*256; - int cw = patriarch.sheet.getColumnWidth(column); + int def = _patriarch._sheet.getDefaultColumnWidth()*256; + int cw = _patriarch._sheet.getColumnWidth(column); return cw == def ? PX_DEFAULT : PX_MODIFIED; } @@ -238,7 +237,7 @@ * @return image dimension */ public Dimension getImageDimension(){ - EscherBSERecord bse = patriarch.sheet.book.getBSERecord(pictureIndex); + EscherBSERecord bse = _patriarch._sheet._book.getBSERecord(_pictureIndex); byte[] data = bse.getBlipRecord().getPicturedata(); int type = bse.getBlipTypeWin32(); Dimension size = new Dimension(); @@ -252,8 +251,8 @@ try { //read the image using javax.imageio.* ImageInputStream iis = ImageIO.createImageInputStream( new ByteArrayInputStream(data) ); - Iterator i = ImageIO.getImageReaders( iis ); - ImageReader r = (ImageReader) i.next(); + Iterator i = ImageIO.getImageReaders( iis ); + ImageReader r = i.next(); r.setInput( iis ); BufferedImage img = r.read(0); Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java?rev=744257&r1=744256&r2=744257&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java Fri Feb 13 22:11:16 2009 @@ -22,8 +22,7 @@ * * @author Glen Stampoultzis (glens at apache.org) */ -public abstract class HSSFShape -{ +public abstract class HSSFShape { public static final int LINEWIDTH_ONE_PT = 12700; public static final int LINEWIDTH_DEFAULT = 9525; @@ -40,13 +39,14 @@ public static final int LINESTYLE_LONGDASHDOTDOTGEL = 10; // long dash short dash short dash public static final int LINESTYLE_NONE = -1; - HSSFShape parent; + // TODO - make all these fields private + final HSSFShape parent; HSSFAnchor anchor; - int lineStyleColor = 0x08000040; - int fillColor = 0x08000009; - int lineWidth = LINEWIDTH_DEFAULT; // 12700 = 1pt - int lineStyle = LINESTYLE_SOLID; - boolean noFill = false; + private int _lineStyleColor = 0x08000040; + int _fillColor = 0x08000009; + private int _lineWidth = LINEWIDTH_DEFAULT; // 12700 = 1pt + private int _lineStyle = LINESTYLE_SOLID; + private boolean _noFill = false; /** * Create a new shape with the specified parent and anchor. @@ -103,25 +103,22 @@ /** * The color applied to the lines of this shape. */ - public int getLineStyleColor() - { - return lineStyleColor; + public int getLineStyleColor() { + return _lineStyleColor; } /** * The color applied to the lines of this shape. */ - public void setLineStyleColor( int lineStyleColor ) - { - this.lineStyleColor = lineStyleColor; + public void setLineStyleColor(int lineStyleColor) { + _lineStyleColor = lineStyleColor; } /** * The color applied to the lines of this shape. */ - public void setLineStyleColor( int red, int green, int blue ) - { - this.lineStyleColor = ((blue) << 16) | ((green) << 8) | red; + public void setLineStyleColor(int red, int green, int blue) { + this._lineStyleColor = ((blue) << 16) | ((green) << 8) | red; } /** @@ -129,15 +126,14 @@ */ public int getFillColor() { - return fillColor; + return _fillColor; } /** * The color used to fill this shape. */ - public void setFillColor( int fillColor ) - { - this.fillColor = fillColor; + public void setFillColor(int fillColor) { + _fillColor = fillColor; } /** @@ -145,15 +141,14 @@ */ public void setFillColor( int red, int green, int blue ) { - this.fillColor = ((blue) << 16) | ((green) << 8) | red; + this._fillColor = ((blue) << 16) | ((green) << 8) | red; } /** * @return returns with width of the line in EMUs. 12700 = 1 pt. */ - public int getLineWidth() - { - return lineWidth; + public int getLineWidth() { + return _lineWidth; } /** @@ -163,17 +158,15 @@ * * @see HSSFShape#LINEWIDTH_ONE_PT */ - public void setLineWidth( int lineWidth ) - { - this.lineWidth = lineWidth; + public void setLineWidth(int lineWidth) { + _lineWidth = lineWidth; } /** * @return One of the constants in LINESTYLE_* */ - public int getLineStyle() - { - return lineStyle; + public int getLineStyle() { + return _lineStyle; } /** @@ -181,32 +174,28 @@ * * @param lineStyle One of the constants in LINESTYLE_* */ - public void setLineStyle( int lineStyle ) - { - this.lineStyle = lineStyle; + public void setLineStyle(int lineStyle) { + _lineStyle = lineStyle; } /** - * @return true if this shape is not filled with a color. + * @return true if this shape is not filled with a color. */ - public boolean isNoFill() - { - return noFill; + public boolean isNoFill() { + return _noFill; } /** * Sets whether this shape is filled or transparent. */ - public void setNoFill( boolean noFill ) - { - this.noFill = noFill; + public void setNoFill(boolean noFill) { + _noFill = noFill; } /** - * Count of all children and their childrens children. + * Count of all children and their children's children. */ - public int countOfAllChildren() - { + public int countOfAllChildren() { return 1; } } Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=744257&r1=744256&r2=744257&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Fri Feb 13 22:11:16 2009 @@ -87,15 +87,15 @@ public final static int INITIAL_CAPACITY = 20; /** - * reference to the low level Sheet object + * reference to the low level {@link Sheet} object */ - private final Sheet sheet; + private final Sheet _sheet; /** stores rows by zero-based row number */ - private final TreeMap rows; - protected final Workbook book; - protected final HSSFWorkbook workbook; - private int firstrow; - private int lastrow; + private final TreeMap _rows; + protected final Workbook _book; + protected final HSSFWorkbook _workbook; + private int _firstrow; + private int _lastrow; /** * Creates new HSSFSheet - called by HSSFWorkbook to create a sheet from @@ -105,10 +105,10 @@ * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#createSheet() */ protected HSSFSheet(HSSFWorkbook workbook) { - sheet = Sheet.createSheet(); - rows = new TreeMap(); - this.workbook = workbook; - this.book = workbook.getWorkbook(); + _sheet = Sheet.createSheet(); + _rows = new TreeMap(); + this._workbook = workbook; + this._book = workbook.getWorkbook(); } /** @@ -120,15 +120,15 @@ * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#createSheet() */ protected HSSFSheet(HSSFWorkbook workbook, Sheet sheet) { - this.sheet = sheet; - rows = new TreeMap(); - this.workbook = workbook; - this.book = workbook.getWorkbook(); + this._sheet = sheet; + _rows = new TreeMap(); + this._workbook = workbook; + this._book = workbook.getWorkbook(); setPropertiesFromSheet(sheet); } HSSFSheet cloneSheet(HSSFWorkbook workbook) { - return new HSSFSheet(workbook, sheet.cloneSheet()); + return new HSSFSheet(workbook, _sheet.cloneSheet()); } /** @@ -137,7 +137,7 @@ * @return the parent workbook */ public HSSFWorkbook getWorkbook(){ - return workbook; + return _workbook; } /** @@ -208,7 +208,7 @@ */ public HSSFRow createRow(int rownum) { - HSSFRow row = new HSSFRow(workbook, this, rownum); + HSSFRow row = new HSSFRow(_workbook, this, rownum); addRow(row, true); return row; @@ -223,7 +223,7 @@ private HSSFRow createRowFromRecord(RowRecord row) { - HSSFRow hrow = new HSSFRow(workbook, this, row); + HSSFRow hrow = new HSSFRow(_workbook, this, row); addRow(hrow, false); return hrow; @@ -236,24 +236,24 @@ */ public void removeRow(Row row) { HSSFRow hrow = (HSSFRow) row; - if (rows.size() > 0) { + if (_rows.size() > 0) { Integer key = new Integer(row.getRowNum()); - HSSFRow removedRow = rows.remove(key); + HSSFRow removedRow = _rows.remove(key); if (removedRow != row) { if (removedRow != null) { - rows.put(key, removedRow); + _rows.put(key, removedRow); } throw new RuntimeException("Specified row does not belong to this sheet"); } if (hrow.getRowNum() == getLastRowNum()) { - lastrow = findLastRow(lastrow); + _lastrow = findLastRow(_lastrow); } if (hrow.getRowNum() == getFirstRowNum()) { - firstrow = findFirstRow(firstrow); + _firstrow = findFirstRow(_firstrow); } - sheet.removeRow(hrow.getRowRecord()); + _sheet.removeRow(hrow.getRowRecord()); } } @@ -304,18 +304,18 @@ private void addRow(HSSFRow row, boolean addLow) { - rows.put(new Integer(row.getRowNum()), row); + _rows.put(new Integer(row.getRowNum()), row); if (addLow) { - sheet.addRow(row.getRowRecord()); + _sheet.addRow(row.getRowRecord()); } if (row.getRowNum() > getLastRowNum()) { - lastrow = row.getRowNum(); + _lastrow = row.getRowNum(); } if (row.getRowNum() < getFirstRowNum()) { - firstrow = row.getRowNum(); + _firstrow = row.getRowNum(); } } @@ -326,14 +326,14 @@ * @return HSSFRow representing the row number or null if its not defined on the sheet */ public HSSFRow getRow(int rowIndex) { - return rows.get(new Integer(rowIndex)); + return _rows.get(new Integer(rowIndex)); } /** * Returns the number of physically defined rows (NOT the number of rows in the sheet) */ public int getPhysicalNumberOfRows() { - return rows.size(); + return _rows.size(); } /** @@ -341,7 +341,7 @@ * @return the number of the first logical row on the sheet, zero based */ public int getFirstRowNum() { - return firstrow; + return _firstrow; } /** @@ -357,7 +357,7 @@ * @return the number of the last row contained in this sheet, zero based. */ public int getLastRowNum() { - return lastrow; + return _lastrow; } /** @@ -368,7 +368,7 @@ if (dataValidation == null) { throw new IllegalArgumentException("objValidation must not be null"); } - DataValidityTable dvt = sheet.getOrCreateDataValidityTable(); + DataValidityTable dvt = _sheet.getOrCreateDataValidityTable(); DVRecord dvRecord = dataValidation.createDVRecord(this); dvt.addDataValidation(dvRecord); @@ -416,7 +416,7 @@ * @param hidden - the visiblity state of the column */ public void setColumnHidden(int columnIndex, boolean hidden) { - sheet.setColumnHidden(columnIndex, hidden); + _sheet.setColumnHidden(columnIndex, hidden); } /** @@ -425,7 +425,7 @@ * @return hidden - false if the column is visible */ public boolean isColumnHidden(int columnIndex) { - return sheet.isColumnHidden(columnIndex); + return _sheet.isColumnHidden(columnIndex); } /** @@ -441,7 +441,7 @@ * @throws IllegalArgumentException if width > 65536 (the maximum column width in Excel) */ public void setColumnWidth(int columnIndex, int width) { - sheet.setColumnWidth(columnIndex, width); + _sheet.setColumnWidth(columnIndex, width); } /** @@ -450,7 +450,7 @@ * @return width - the width in units of 1/256th of a character width */ public int getColumnWidth(int columnIndex) { - return sheet.getColumnWidth(columnIndex); + return _sheet.getColumnWidth(columnIndex); } /** @@ -459,7 +459,7 @@ * @return default column width */ public int getDefaultColumnWidth() { - return sheet.getDefaultColumnWidth(); + return _sheet.getDefaultColumnWidth(); } /** * set the default column width for the sheet (if the columns do not define their own width) in @@ -467,7 +467,7 @@ * @param width default column width */ public void setDefaultColumnWidth(int width) { - sheet.setDefaultColumnWidth(width); + _sheet.setDefaultColumnWidth(width); } @@ -477,7 +477,7 @@ * @return default row height */ public short getDefaultRowHeight() { - return sheet.getDefaultRowHeight(); + return _sheet.getDefaultRowHeight(); } /** @@ -488,7 +488,7 @@ public float getDefaultRowHeightInPoints() { - return (sheet.getDefaultRowHeight() / 20); + return (_sheet.getDefaultRowHeight() / 20); } /** @@ -499,7 +499,7 @@ public void setDefaultRowHeight(short height) { - sheet.setDefaultRowHeight(height); + _sheet.setDefaultRowHeight(height); } /** @@ -510,7 +510,7 @@ public void setDefaultRowHeightInPoints(float height) { - sheet.setDefaultRowHeight((short) (height * 20)); + _sheet.setDefaultRowHeight((short) (height * 20)); } /** @@ -519,15 +519,15 @@ * set for that column */ public HSSFCellStyle getColumnStyle(int column) { - short styleIndex = sheet.getXFIndexForColAt((short)column); + short styleIndex = _sheet.getXFIndexForColAt((short)column); if(styleIndex == 0xf) { // None set return null; } - ExtendedFormatRecord xf = book.getExFormatAt(styleIndex); - return new HSSFCellStyle(styleIndex, xf, book); + ExtendedFormatRecord xf = _book.getExFormatAt(styleIndex); + return new HSSFCellStyle(styleIndex, xf, _book); } /** @@ -537,7 +537,7 @@ public boolean isGridsPrinted() { - return sheet.isGridsPrinted(); + return _sheet.isGridsPrinted(); } /** @@ -547,7 +547,7 @@ public void setGridsPrinted(boolean value) { - sheet.setGridsPrinted(value); + _sheet.setGridsPrinted(value); } /** @@ -555,7 +555,7 @@ */ public int addMergedRegion(org.apache.poi.ss.util.Region region) { - return sheet.addMergedRegion( region.getRowFrom(), + return _sheet.addMergedRegion( region.getRowFrom(), region.getColumnFrom(), //(short) region.getRowTo(), region.getRowTo(), @@ -568,7 +568,7 @@ */ public int addMergedRegion(CellRangeAddress region) { - return sheet.addMergedRegion( region.getFirstRow(), + return _sheet.addMergedRegion( region.getFirstRow(), region.getFirstColumn(), region.getLastRow(), region.getLastColumn()); @@ -581,7 +581,7 @@ */ public void setForceFormulaRecalculation(boolean value) { - sheet.setUncalced(value); + _sheet.setUncalced(value); } /** * Whether a record must be inserted or not at generation to indicate that @@ -590,7 +590,7 @@ */ public boolean getForceFormulaRecalculation() { - return sheet.getUncalced(); + return _sheet.getUncalced(); } @@ -601,7 +601,7 @@ public void setVerticallyCenter(boolean value) { - sheet.getPageSettings().getVCenter().setVCenter(value); + _sheet.getPageSettings().getVCenter().setVCenter(value); } /** @@ -617,7 +617,7 @@ */ public boolean getVerticallyCenter() { - return sheet.getPageSettings().getVCenter().getVCenter(); + return _sheet.getPageSettings().getVCenter().getVCenter(); } /** @@ -627,7 +627,7 @@ public void setHorizontallyCenter(boolean value) { - sheet.getPageSettings().getHCenter().setHCenter(value); + _sheet.getPageSettings().getHCenter().setHCenter(value); } /** @@ -637,7 +637,7 @@ public boolean getHorizontallyCenter() { - return sheet.getPageSettings().getHCenter().getHCenter(); + return _sheet.getPageSettings().getHCenter().getHCenter(); } @@ -649,7 +649,7 @@ public void removeMergedRegion(int index) { - sheet.removeMergedRegion(index); + _sheet.removeMergedRegion(index); } /** @@ -659,7 +659,7 @@ public int getNumMergedRegions() { - return sheet.getNumMergedRegions(); + return _sheet.getNumMergedRegions(); } /** @@ -675,7 +675,7 @@ * @return the merged region at the specified index */ public CellRangeAddress getMergedRegion(int index) { - return sheet.getMergedRegionAt(index); + return _sheet.getMergedRegionAt(index); } /** @@ -685,7 +685,7 @@ */ public Iterator rowIterator() { @SuppressWarnings("unchecked") // can this clumsy generic syntax be improved? - Iterator result = (Iterator)(Iterator)rows.values().iterator(); + Iterator result = (Iterator)(Iterator)_rows.values().iterator(); return result; } /** @@ -703,7 +703,7 @@ * @return Sheet - low level representation of this HSSFSheet. */ Sheet getSheet() { - return sheet; + return _sheet; } /** @@ -712,7 +712,7 @@ */ public void setAlternativeExpression(boolean b) { WSBoolRecord record = - (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid); + (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid); record.setAlternateExpression(b); } @@ -723,7 +723,7 @@ */ public void setAlternativeFormula(boolean b) { WSBoolRecord record = - (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid); + (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid); record.setAlternateFormula(b); } @@ -734,7 +734,7 @@ */ public void setAutobreaks(boolean b) { WSBoolRecord record = - (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid); + (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid); record.setAutobreaks(b); } @@ -745,7 +745,7 @@ */ public void setDialog(boolean b) { WSBoolRecord record = - (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid); + (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid); record.setDialog(b); } @@ -757,7 +757,7 @@ */ public void setDisplayGuts(boolean b) { WSBoolRecord record = - (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid); + (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid); record.setDisplayGuts(b); } @@ -768,7 +768,7 @@ */ public void setFitToPage(boolean b) { WSBoolRecord record = - (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid); + (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid); record.setFitToPage(b); } @@ -779,7 +779,7 @@ */ public void setRowSumsBelow(boolean b) { WSBoolRecord record = - (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid); + (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid); record.setRowSumsBelow(b); } @@ -790,7 +790,7 @@ */ public void setRowSumsRight(boolean b) { WSBoolRecord record = - (WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid); + (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid); record.setRowSumsRight(b); } @@ -800,7 +800,7 @@ * @return alternative expression evaluation or not */ public boolean getAlternateExpression() { - return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid)) + return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid)) .getAlternateExpression(); } @@ -809,7 +809,7 @@ * @return alternative formulas or not */ public boolean getAlternateFormula() { - return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid)) + return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid)) .getAlternateFormula(); } @@ -818,7 +818,7 @@ * @return whether to show auto page breaks */ public boolean getAutobreaks() { - return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid)) + return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid)) .getAutobreaks(); } @@ -827,7 +827,7 @@ * @return isDialog or not */ public boolean getDialog() { - return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid)) + return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid)) .getDialog(); } @@ -837,7 +837,7 @@ * @return guts or no guts (or glory) */ public boolean getDisplayGuts() { - return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid)) + return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid)) .getDisplayGuts(); } @@ -846,7 +846,7 @@ * @return fit or not */ public boolean getFitToPage() { - return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid)) + return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid)) .getFitToPage(); } @@ -855,7 +855,7 @@ * @return below or not */ public boolean getRowSumsBelow() { - return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid)) + return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid)) .getRowSumsBelow(); } @@ -864,7 +864,7 @@ * @return right or not */ public boolean getRowSumsRight() { - return ((WSBoolRecord) sheet.findFirstRecordBySid(WSBoolRecord.sid)) + return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid)) .getRowSumsRight(); } @@ -890,7 +890,7 @@ * @return The user model for the print setup object. */ public HSSFPrintSetup getPrintSetup() { - return new HSSFPrintSetup(sheet.getPageSettings().getPrintSetup()); + return new HSSFPrintSetup(_sheet.getPageSettings().getPrintSetup()); } /** @@ -898,7 +898,7 @@ * @return The Document header. */ public HSSFHeader getHeader() { - return new HSSFHeader(sheet.getPageSettings().getHeader()); + return new HSSFHeader(_sheet.getPageSettings().getHeader()); } /** @@ -906,7 +906,7 @@ * @return The Document footer. */ public HSSFFooter getFooter() { - return new HSSFFooter(sheet.getPageSettings().getFooter()); + return new HSSFFooter(_sheet.getPageSettings().getFooter()); } /** @@ -943,7 +943,7 @@ * @return the size of the margin */ public double getMargin(short margin) { - return sheet.getPageSettings().getMargin(margin); + return _sheet.getPageSettings().getMargin(margin); } /** @@ -952,7 +952,7 @@ * @param size the size of the margin */ public void setMargin(short margin, double size) { - sheet.getPageSettings().setMargin(margin, size); + _sheet.getPageSettings().setMargin(margin, size); } /** @@ -1030,7 +1030,7 @@ * @return short indicating the rownum (0 based) of the top row */ public short getTopRow() { - return sheet.getTopRow(); + return _sheet.getTopRow(); } /** @@ -1039,7 +1039,7 @@ * @return short indicating the rownum (0 based) of the top row */ public short getLeftCol() { - return sheet.getLeftCol(); + return _sheet.getLeftCol(); } /** @@ -1049,8 +1049,8 @@ * @param leftcol the left column to show in desktop window pane */ public void showInPane(short toprow, short leftcol){ - sheet.setTopRow(toprow); - sheet.setLeftCol(leftcol); + _sheet.setTopRow(toprow); + _sheet.setLeftCol(leftcol); } /** @@ -1088,9 +1088,9 @@ } //read so it doesn't get shifted again - Iterator iterator = shiftedRegions.iterator(); + Iterator iterator = shiftedRegions.iterator(); while (iterator.hasNext()) { - CellRangeAddress region = (CellRangeAddress)iterator.next(); + CellRangeAddress region = iterator.next(); this.addMergedRegion(region); } @@ -1171,13 +1171,13 @@ } NoteRecord[] noteRecs; if (moveComments) { - noteRecs = sheet.getNoteRecords(); + noteRecs = _sheet.getNoteRecords(); } else { noteRecs = NoteRecord.EMPTY_ARRAY; } shiftMerged(startRow, endRow, n, true); - sheet.getPageSettings().shiftRowBreaks(startRow, endRow, n); + _sheet.getPageSettings().shiftRowBreaks(startRow, endRow, n); for ( int rowNum = s; rowNum >= startRow && rowNum <= endRow && rowNum >= 0 && rowNum < 65536; rowNum += inc ) { HSSFRow row = getRow( rowNum ); @@ -1213,7 +1213,7 @@ CellValueRecordInterface cellRecord = cell.getCellValueRecord(); cellRecord.setRow( rowNum + n ); row2Replace.createCellFromRecord( cellRecord ); - sheet.addValueRecord( rowNum + n, cellRecord ); + _sheet.addValueRecord( rowNum + n, cellRecord ); HSSFHyperlink link = cell.getHyperlink(); if(link != null){ @@ -1241,31 +1241,31 @@ } } } - if ( endRow == lastrow || endRow + n > lastrow ) lastrow = Math.min( endRow + n, 65535 ); - if ( startRow == firstrow || startRow + n < firstrow ) firstrow = Math.max( startRow + n, 0 ); + if ( endRow == _lastrow || endRow + n > _lastrow ) _lastrow = Math.min( endRow + n, 65535 ); + if ( startRow == _firstrow || startRow + n < _firstrow ) _firstrow = Math.max( startRow + n, 0 ); // Update any formulas on this sheet that point to // rows which have been moved - int sheetIndex = workbook.getSheetIndex(this); - short externSheetIndex = book.checkExternSheet(sheetIndex); + int sheetIndex = _workbook.getSheetIndex(this); + short externSheetIndex = _book.checkExternSheet(sheetIndex); FormulaShifter shifter = FormulaShifter.createForRowShift(externSheetIndex, startRow, endRow, n); - sheet.updateFormulasAfterCellShift(shifter, externSheetIndex); + _sheet.updateFormulasAfterCellShift(shifter, externSheetIndex); - int nSheets = workbook.getNumberOfSheets(); + int nSheets = _workbook.getNumberOfSheets(); for(int i=0; i records) { - int window2Loc = sheet.findFirstRecordLocBySid(WindowTwoRecord.sid); - sheet.getRecords().addAll(window2Loc, records); + int window2Loc = _sheet.findFirstRecordLocBySid(WindowTwoRecord.sid); + _sheet.getRecords().addAll(window2Loc, records); } /** @@ -1322,7 +1322,7 @@ * @param show whether to show gridlines or not */ public void setDisplayGridlines(boolean show) { - sheet.setDisplayGridlines(show); + _sheet.setDisplayGridlines(show); } /** @@ -1330,7 +1330,7 @@ * @return whether gridlines are displayed */ public boolean isDisplayGridlines() { - return sheet.isDisplayGridlines(); + return _sheet.isDisplayGridlines(); } /** @@ -1338,7 +1338,7 @@ * @param show whether to show formulas or not */ public void setDisplayFormulas(boolean show) { - sheet.setDisplayFormulas(show); + _sheet.setDisplayFormulas(show); } /** @@ -1346,7 +1346,7 @@ * @return whether formulas are displayed */ public boolean isDisplayFormulas() { - return sheet.isDisplayFormulas(); + return _sheet.isDisplayFormulas(); } /** @@ -1354,7 +1354,7 @@ * @param show whether to show RowColHeadings or not */ public void setDisplayRowColHeadings(boolean show) { - sheet.setDisplayRowColHeadings(show); + _sheet.setDisplayRowColHeadings(show); } /** @@ -1362,7 +1362,7 @@ * @return whether RowColHeadings are displayed */ public boolean isDisplayRowColHeadings() { - return sheet.isDisplayRowColHeadings(); + return _sheet.isDisplayRowColHeadings(); } /** @@ -1371,21 +1371,21 @@ */ public void setRowBreak(int row) { validateRow(row); - sheet.getPageSettings().setRowBreak(row, (short)0, (short)255); + _sheet.getPageSettings().setRowBreak(row, (short)0, (short)255); } /** * @return true if there is a page break at the indicated row */ public boolean isRowBroken(int row) { - return sheet.getPageSettings().isRowBroken(row); + return _sheet.getPageSettings().isRowBroken(row); } /** * Removes the page break at the indicated row */ public void removeRowBreak(int row) { - sheet.getPageSettings().removeRowBreak(row); + _sheet.getPageSettings().removeRowBreak(row); } /** @@ -1393,7 +1393,7 @@ */ public int[] getRowBreaks() { //we can probably cache this information, but this should be a sparsely used function - return sheet.getPageSettings().getRowBreaks(); + return _sheet.getPageSettings().getRowBreaks(); } /** @@ -1401,7 +1401,7 @@ */ public int[] getColumnBreaks() { //we can probably cache this information, but this should be a sparsely used function - return sheet.getPageSettings().getColumnBreaks(); + return _sheet.getPageSettings().getColumnBreaks(); } @@ -1411,7 +1411,7 @@ */ public void setColumnBreak(short column) { validateColumn(column); - sheet.getPageSettings().setColumnBreak(column, (short)0, (short)65535); + _sheet.getPageSettings().setColumnBreak(column, (short)0, (short)65535); } /** @@ -1420,7 +1420,7 @@ * @return FIXME: Document this! */ public boolean isColumnBroken(short column) { - return sheet.getPageSettings().isColumnBroken(column); + return _sheet.getPageSettings().isColumnBroken(column); } /** @@ -1428,7 +1428,7 @@ * @param column */ public void removeColumnBreak(short column) { - sheet.getPageSettings().removeColumnBreak(column); + _sheet.getPageSettings().removeColumnBreak(column); } /** @@ -1454,18 +1454,18 @@ * to the standard output. */ public void dumpDrawingRecords(boolean fat) { - sheet.aggregateDrawingRecords(book.getDrawingManager(), false); + _sheet.aggregateDrawingRecords(_book.getDrawingManager(), false); EscherAggregate r = (EscherAggregate) getSheet().findFirstRecordBySid(EscherAggregate.sid); - List escherRecords = r.getEscherRecords(); + List escherRecords = r.getEscherRecords(); PrintWriter w = new PrintWriter(System.out); - for ( Iterator iterator = escherRecords.iterator(); iterator.hasNext(); ) - { - EscherRecord escherRecord = (EscherRecord) iterator.next(); - if (fat) - System.out.println(escherRecord.toString()); - else - escherRecord.display(w, 0); + for (Iterator iterator = escherRecords.iterator(); iterator.hasNext();) { + EscherRecord escherRecord = iterator.next(); + if (fat) { + System.out.println(escherRecord.toString()); + } else { + escherRecord.display(w, 0); + } } w.flush(); } @@ -1479,10 +1479,10 @@ */ public HSSFPatriarch createDrawingPatriarch() { // Create the drawing group if it doesn't already exist. - book.createDrawingGroup(); + _book.createDrawingGroup(); - sheet.aggregateDrawingRecords(book.getDrawingManager(), true); - EscherAggregate agg = (EscherAggregate) sheet.findFirstRecordBySid(EscherAggregate.sid); + _sheet.aggregateDrawingRecords(_book.getDrawingManager(), true); + EscherAggregate agg = (EscherAggregate) _sheet.findFirstRecordBySid(EscherAggregate.sid); HSSFPatriarch patriarch = new HSSFPatriarch(this, agg); agg.clear(); // Initially the behaviour will be to clear out any existing shapes in the sheet when // creating a new patriarch. @@ -1499,16 +1499,16 @@ * certainly be lost or corrupted when written out. */ public EscherAggregate getDrawingEscherAggregate() { - book.findDrawingGroup(); + _book.findDrawingGroup(); // If there's now no drawing manager, then there's // no drawing escher records on the workbook - if(book.getDrawingManager() == null) { + if(_book.getDrawingManager() == null) { return null; } - int found = sheet.aggregateDrawingRecords( - book.getDrawingManager(), false + int found = _sheet.aggregateDrawingRecords( + _book.getDrawingManager(), false ); if(found == -1) { // Workbook has drawing stuff, but this sheet doesn't @@ -1516,7 +1516,7 @@ } // Grab our aggregate record, and wire it up - EscherAggregate agg = (EscherAggregate) sheet.findFirstRecordBySid(EscherAggregate.sid); + EscherAggregate agg = (EscherAggregate) _sheet.findFirstRecordBySid(EscherAggregate.sid); return agg; } @@ -1574,7 +1574,7 @@ * @param collapsed true = collapse group, false = expand group. */ public void setColumnGroupCollapsed(int columnNumber, boolean collapsed) { - sheet.setColumnGroupCollapsed(columnNumber, collapsed); + _sheet.setColumnGroupCollapsed(columnNumber, collapsed); } /** @@ -1584,11 +1584,11 @@ * @param toColumn end of the column range. */ public void groupColumn(int fromColumn, int toColumn) { - sheet.groupColumnRange(fromColumn, toColumn, true); + _sheet.groupColumnRange(fromColumn, toColumn, true); } public void ungroupColumn(int fromColumn, int toColumn) { - sheet.groupColumnRange(fromColumn, toColumn, false); + _sheet.groupColumnRange(fromColumn, toColumn, false); } /** @@ -1598,18 +1598,18 @@ * @param toRow end row (0-based) */ public void groupRow(int fromRow, int toRow) { - sheet.groupRowRange(fromRow, toRow, true); + _sheet.groupRowRange(fromRow, toRow, true); } public void ungroupRow(int fromRow, int toRow) { - sheet.groupRowRange(fromRow, toRow, false); + _sheet.groupRowRange(fromRow, toRow, false); } public void setRowGroupCollapsed(int rowIndex, boolean collapse) { if (collapse) { - sheet.getRowsAggregate().collapseRow(rowIndex); + _sheet.getRowsAggregate().collapseRow(rowIndex); } else { - sheet.getRowsAggregate().expandRow(rowIndex); + _sheet.getRowsAggregate().expandRow(rowIndex); } } @@ -1620,7 +1620,7 @@ * @param style the style to set */ public void setDefaultColumnStyle(int column, CellStyle style) { - sheet.setDefaultColumnStyle(column, ((HSSFCellStyle)style).getIndex()); + _sheet.setDefaultColumnStyle(column, ((HSSFCellStyle)style).getIndex()); } /** @@ -1667,7 +1667,7 @@ FontRenderContext frc = new FontRenderContext(null, true, true); - HSSFWorkbook wb = new HSSFWorkbook(book); + HSSFWorkbook wb = new HSSFWorkbook(_book); HSSFFont defaultFont = wb.getFontAt((short) 0); str = new AttributedString("" + defaultChar); @@ -1677,7 +1677,7 @@ double width = -1; rows: - for (Iterator it = rowIterator(); it.hasNext();) { + for (Iterator it = rowIterator(); it.hasNext();) { HSSFRow row = (HSSFRow) it.next(); HSSFCell cell = row.getCell(column); @@ -1788,7 +1788,7 @@ if (width > Short.MAX_VALUE) { //width can be bigger that Short.MAX_VALUE! width = Short.MAX_VALUE; } - sheet.setColumnWidth(column, (short) (width)); + _sheet.setColumnWidth(column, (short) (width)); } } @@ -1817,11 +1817,10 @@ HSSFCell c = r.getCell(column); if(c != null) { return c.getCellComment(); - } else { - // No cell, so you will get new - // objects every time, sorry... - return HSSFCell.findCellComment(sheet, row, column); } + // No cell, so you will get new + // objects every time, sorry... + return HSSFCell.findCellComment(_sheet, row, column); } return null; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org