From: Dominik Stadler Date: Fri, 23 Aug 2013 18:54:05 +0000 (+0000) Subject: Some Eclipse warnings removed X-Git-Tag: REL_3_10_BETA2~7 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fb90b50dbfc2e916401fd38c64a7f0f7461254d7;p=poi.git Some Eclipse warnings removed git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1516980 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/poi/ss/formula/FormulaRenderer.java b/src/java/org/apache/poi/ss/formula/FormulaRenderer.java index 13c1eef56f..78eb16ddbb 100644 --- a/src/java/org/apache/poi/ss/formula/FormulaRenderer.java +++ b/src/java/org/apache/poi/ss/formula/FormulaRenderer.java @@ -49,8 +49,7 @@ public class FormulaRenderer { } Stack stack = new Stack(); - for (int i=0 ; i < ptgs.length; i++) { - Ptg ptg = ptgs[i]; + for (Ptg ptg : ptgs) { // TODO - what about MemNoMemPtg? if(ptg instanceof MemAreaPtg || ptg instanceof MemFuncPtg || ptg instanceof MemErrPtg) { // marks the start of a list of area expressions which will be naturally combined diff --git a/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java b/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java index 2bee023b6e..a5f1001a16 100644 --- a/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java +++ b/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java @@ -17,10 +17,10 @@ package org.apache.poi.ss.formula.ptg; -import org.apache.poi.ss.util.AreaReference; import org.apache.poi.ss.formula.ExternSheetReferenceToken; import org.apache.poi.ss.formula.FormulaRenderingWorkbook; import org.apache.poi.ss.formula.WorkbookDependentFormula; +import org.apache.poi.ss.util.AreaReference; import org.apache.poi.util.LittleEndianInput; import org.apache.poi.util.LittleEndianOutput; @@ -61,6 +61,7 @@ public final class Area3DPtg extends AreaPtgBase implements WorkbookDependentFor setExternSheetIndex(externIdx); } + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append(getClass().getName()); @@ -72,12 +73,14 @@ public final class Area3DPtg extends AreaPtgBase implements WorkbookDependentFor return sb.toString(); } + @Override public void write(LittleEndianOutput out) { out.writeByte(sid + getPtgClass()); out.writeShort(field_1_index_extern_sheet); writeCoordinates(out); } + @Override public int getSize() { return SIZE; } @@ -99,6 +102,7 @@ public final class Area3DPtg extends AreaPtgBase implements WorkbookDependentFor public String toFormulaString(FormulaRenderingWorkbook book) { return ExternSheetNameResolver.prependSheetName(book, field_1_index_extern_sheet, formatReferenceAsString()); } + @Override public String toFormulaString() { throw new RuntimeException("3D references need a workbook to determine formula text"); } diff --git a/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java b/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java index 4499319b62..a0bb8f696e 100644 --- a/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java +++ b/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java @@ -39,6 +39,7 @@ public final class AreaPtg extends Area2DPtgBase { public AreaPtg(AreaReference areaRef) { super(areaRef); } + @Override protected byte getSid() { return sid; } diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java index a49502f737..f7ce4f9d18 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java @@ -17,10 +17,6 @@ package org.apache.poi.xssf.usermodel; -import org.apache.poi.ss.formula.functions.FreeRefFunction; -import org.apache.poi.ss.formula.ptg.NamePtg; -import org.apache.poi.ss.formula.ptg.NameXPtg; -import org.apache.poi.ss.formula.ptg.Ptg; import org.apache.poi.ss.SpreadsheetVersion; import org.apache.poi.ss.formula.EvaluationCell; import org.apache.poi.ss.formula.EvaluationName; @@ -30,8 +26,12 @@ import org.apache.poi.ss.formula.FormulaParser; import org.apache.poi.ss.formula.FormulaParsingWorkbook; import org.apache.poi.ss.formula.FormulaRenderingWorkbook; import org.apache.poi.ss.formula.FormulaType; -import org.apache.poi.ss.formula.udf.UDFFinder; +import org.apache.poi.ss.formula.functions.FreeRefFunction; +import org.apache.poi.ss.formula.ptg.NamePtg; +import org.apache.poi.ss.formula.ptg.NameXPtg; +import org.apache.poi.ss.formula.ptg.Ptg; import org.apache.poi.ss.formula.udf.IndexedUDFFinder; +import org.apache.poi.ss.formula.udf.UDFFinder; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDefinedName; /** @@ -67,7 +67,7 @@ public final class XSSFEvaluationWorkbook implements FormulaRenderingWorkbook, E * @return the external sheet index of the sheet with the given internal * index. Used by some of the more obscure formula and named range things. * Fairly easy on XSSF (we think...) since the internal and external - * indicies are the same + * indices are the same */ private int convertToExternalSheetIndex(int sheetIndex) { return sheetIndex;