From 26b458016ebc77a3a474e5fe67756a4c1fac6589 Mon Sep 17 00:00:00 2001 From: Josh Micich Date: Fri, 19 Sep 2008 00:02:21 +0000 Subject: [PATCH] code clean-up (removed compiler warnings/unused methods) git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@696860 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/hssf/record/formula/OperationPtg.java | 18 +++++------------- .../poi/hssf/record/formula/Ref3DPtg.java | 15 +++++++-------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/java/org/apache/poi/hssf/record/formula/OperationPtg.java b/src/java/org/apache/poi/hssf/record/formula/OperationPtg.java index 1457556e9..f8acc81df 100644 --- a/src/java/org/apache/poi/hssf/record/formula/OperationPtg.java +++ b/src/java/org/apache/poi/hssf/record/formula/OperationPtg.java @@ -17,8 +17,6 @@ package org.apache.poi.hssf.record.formula; -import org.apache.poi.ss.formula.FormulaRenderingWorkbook; - /** * defines a Ptg that is an operation instead of an operand * @author andy @@ -42,16 +40,10 @@ public abstract class OperationPtg extends Ptg { public abstract int getNumberOfOperands(); public byte getDefaultOperandClass() { - return Ptg.CLASS_VALUE; - } - public final int getType() { - // TODO remove "int getType();" from Eval hierarchy - throw new RuntimeException("remove this method"); + return Ptg.CLASS_VALUE; + } + public final int getType() { + // TODO remove "int getType();" from Eval hierarchy + throw new RuntimeException("remove this method"); } - - public String toFormulaString(FormulaRenderingWorkbook book) { - // TODO Auto-generated method stub - return null; - } - } diff --git a/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java b/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java index 05cdd0b13..7e780b823 100644 --- a/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java +++ b/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java @@ -18,7 +18,6 @@ package org.apache.poi.hssf.record.formula; import org.apache.poi.hssf.record.RecordInputStream; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.util.CellReference; import org.apache.poi.ss.formula.WorkbookDependentFormula; import org.apache.poi.ss.formula.FormulaRenderingWorkbook; @@ -67,9 +66,9 @@ public final class Ref3DPtg extends RefPtgBase implements WorkbookDependentFormu } public void writeBytes(byte [] array, int offset) { - LittleEndian.putByte(array, 0 + offset, sid + getPtgClass()); - LittleEndian.putUShort(array, 1 + offset, getExternSheetIndex()); - writeCoordinates(array, offset + 3); + LittleEndian.putByte(array, 0 + offset, sid + getPtgClass()); + LittleEndian.putUShort(array, 1 + offset, getExternSheetIndex()); + writeCoordinates(array, offset + 3); } public int getSize() { @@ -89,9 +88,9 @@ public final class Ref3DPtg extends RefPtgBase implements WorkbookDependentFormu * formulas. The sheet name will get properly delimited if required. */ public String toFormulaString(FormulaRenderingWorkbook book) { - return ExternSheetNameResolver.prependSheetName(book, field_1_index_extern_sheet, formatReferenceAsString()); + return ExternSheetNameResolver.prependSheetName(book, field_1_index_extern_sheet, formatReferenceAsString()); + } + public String toFormulaString() { + throw new RuntimeException("3D references need a workbook to determine formula text"); } - public String toFormulaString() { - throw new RuntimeException("3D references need a workbook to determine formula text"); - } }