Rename missing from previous commit

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1612140 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java b/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
new file mode 100644 (file)
index 0000000..f65a3f8
--- /dev/null
+++ b/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
@@ -0,0 +1,43 @@
+/* ====================================================================
+   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.ss.formula.eval;
+
+import org.apache.poi.ss.formula.EvaluationName;
+
+/**
+ * Evaluation of a Name defined in a Sheet or Workbook scope
+ */
+public final class ExternalNameEval implements ValueEval {
+       private final EvaluationName _name;
+
+       public ExternalNameEval(EvaluationName name) {
+               _name = name;
+       }
+
+       public EvaluationName getName() {
+               return _name;
+       }
+
+       public String toString() {
+               StringBuffer sb = new StringBuffer(64);
+               sb.append(getClass().getName()).append(" [");
+               sb.append(_name.getNameText());
+               sb.append("]");
+               return sb.toString();
+       }
+}

diff --git a/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java b/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
new file mode 100644 (file)
index 0000000..8a9e480
--- /dev/null
+++ b/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
@@ -0,0 +1,46 @@
+/* ====================================================================
+   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.ss.formula.eval;
+
+/**
+ * @author Josh Micich
+ */
+public final class FunctionNameEval implements ValueEval {
+
+       private final String _functionName;
+
+       /**
+        * Creates a NameEval representing a function name
+        */
+       public FunctionNameEval(String functionName) {
+               _functionName = functionName;
+       }
+
+
+       public String getFunctionName() {
+               return _functionName;
+       }
+
+       public String toString() {
+               StringBuffer sb = new StringBuffer(64);
+               sb.append(getClass().getName()).append(" [");
+               sb.append(_functionName);
+               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/NameEval.java
deleted file mode 100644 (file)
index decefb9..0000000
--- a/src/java/org/apache/poi/ss/formula/eval/NameEval.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   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.ss.formula.eval;
-
-/**
- * @author Josh Micich
- */
-public final class NameEval implements ValueEval {
-
-       private final String _functionName;
-
-       /**
-        * Creates a NameEval representing a function name
-        */
-       public NameEval(String functionName) {
-               _functionName = functionName;
-       }
-
-
-       public String getFunctionName() {
-               return _functionName;
-       }
-
-       public String toString() {
-               StringBuffer sb = new StringBuffer(64);
-               sb.append(getClass().getName()).append(" [");
-               sb.append(_functionName);
-               sb.append("]");
-               return sb.toString();
-       }
-}

diff --git a/src/java/org/apache/poi/ss/formula/eval/NameXEval.java b/src/java/org/apache/poi/ss/formula/eval/NameXEval.java
deleted file mode 100644 (file)
index e7e9bf8..0000000
--- a/src/java/org/apache/poi/ss/formula/eval/NameXEval.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   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.ss.formula.eval;
-
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-
-/**
- * Evaluation of a Name defined in a Sheet or Workbook scope
- */
-public final class NameXEval implements ValueEval {
-       private final NameXPtg _ptg;
-
-       public NameXEval(NameXPtg ptg) {
-               _ptg = ptg;
-       }
-
-       public NameXPtg getPtg() {
-               return _ptg;
-       }
-
-       public String toString() {
-               StringBuffer sb = new StringBuffer(64);
-               sb.append(getClass().getName()).append(" [");
-               sb.append(_ptg.getSheetRefIndex()).append(", ").append(_ptg.getNameIndex());
-               sb.append("]");
-               return sb.toString();
-       }
-}