From 4345b06cabc13a8139a3bec83b9e69ceec572c89 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Sun, 20 Jul 2014 18:14:47 +0000 Subject: [PATCH] Rename missing from previous commit git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1612140 13f79535-47bb-0310-9956-ffa450edef68 --- .../{NameXEval.java => ExternalNameEval.java} | 16 ++++++++-------- .../{NameEval.java => FunctionNameEval.java} | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) rename src/java/org/apache/poi/ss/formula/eval/{NameXEval.java => ExternalNameEval.java} (80%) rename src/java/org/apache/poi/ss/formula/eval/{NameEval.java => FunctionNameEval.java} (92%) diff --git a/src/java/org/apache/poi/ss/formula/eval/NameXEval.java b/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java similarity index 80% rename from src/java/org/apache/poi/ss/formula/eval/NameXEval.java rename to src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java index e7e9bf881a..f65a3f83dc 100644 --- a/src/java/org/apache/poi/ss/formula/eval/NameXEval.java +++ b/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java @@ -17,26 +17,26 @@ package org.apache.poi.ss.formula.eval; -import org.apache.poi.ss.formula.ptg.NameXPtg; +import org.apache.poi.ss.formula.EvaluationName; /** * Evaluation of a Name defined in a Sheet or Workbook scope */ -public final class NameXEval implements ValueEval { - private final NameXPtg _ptg; +public final class ExternalNameEval implements ValueEval { + private final EvaluationName _name; - public NameXEval(NameXPtg ptg) { - _ptg = ptg; + public ExternalNameEval(EvaluationName name) { + _name = name; } - public NameXPtg getPtg() { - return _ptg; + public EvaluationName getName() { + return _name; } public String toString() { StringBuffer sb = new StringBuffer(64); sb.append(getClass().getName()).append(" ["); - sb.append(_ptg.getSheetRefIndex()).append(", ").append(_ptg.getNameIndex()); + sb.append(_name.getNameText()); sb.append("]"); return sb.toString(); } diff --git a/src/java/org/apache/poi/ss/formula/eval/NameEval.java b/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java similarity index 92% rename from src/java/org/apache/poi/ss/formula/eval/NameEval.java rename to src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java index decefb9366..8a9e48042a 100644 --- a/src/java/org/apache/poi/ss/formula/eval/NameEval.java +++ b/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java @@ -20,14 +20,14 @@ package org.apache.poi.ss.formula.eval; /** * @author Josh Micich */ -public final class NameEval implements ValueEval { +public final class FunctionNameEval implements ValueEval { private final String _functionName; /** * Creates a NameEval representing a function name */ - public NameEval(String functionName) { + public FunctionNameEval(String functionName) { _functionName = functionName; } -- 2.39.5