You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2007/10/15 15:48:51 UTC
svn commit: r584788 - in /poi/trunk: legal/NOTICE
src/java/org/apache/poi/hssf/model/FormulaParser.java
Author: nick
Date: Mon Oct 15 06:48:51 2007
New Revision: 584788
URL: http://svn.apache.org/viewvc?rev=584788&view=rev
Log:
In FormulaParser, add in non-static methods too for toFormulaString, which use the existing Workbook. Also tweak licence notice for hdgf
Modified:
poi/trunk/legal/NOTICE
poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java
Modified: poi/trunk/legal/NOTICE
URL: http://svn.apache.org/viewvc/poi/trunk/legal/NOTICE?rev=584788&r1=584787&r2=584788&view=diff
==============================================================================
--- poi/trunk/legal/NOTICE (original)
+++ poi/trunk/legal/NOTICE Mon Oct 15 06:48:51 2007
@@ -10,7 +10,10 @@
http://www.opensource.org/licenses/cpl.php
See http://www.junit.org/
-Small parts of the POI component HDGF are based on VSDump,
-and are under the GNU General Public Licence version 3 (GPL v3):
+A single data file of the POI component HDGF is based on VSDump,
+ and is under the GNU General Public Licence version 3 (GPL v3):
http://gplv3.fsf.org/
+Since this is a data file, and has no compiled version (the original
+ file is distributed in both source and binary versions), there should
+ be little difference in licencing requirements compared to the ASL.
See http://www.gnome.ru/projects/vsdump_en.html
Modified: poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java?rev=584788&r1=584787&r2=584788&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java Mon Oct 15 06:48:51 2007
@@ -889,8 +889,8 @@
}
}
/**
- * Convience method which takes in a list then passes it to the other toFormulaString
- * signature.
+ * Convience method which takes in a list then passes it to the
+ * other toFormulaString signature.
* @param book workbook for 3D and named references
* @param lptgs list of Ptg, can be null or empty
* @return a human readable String
@@ -903,6 +903,16 @@
retval = toFormulaString(book, ptgs);
return retval;
}
+ /**
+ * Convience method which takes in a list then passes it to the
+ * other toFormulaString signature. Works on the current
+ * workbook for 3D and named references
+ * @param lptgs list of Ptg, can be null or empty
+ * @return a human readable String
+ */
+ public String toFormulaString(List lptgs) {
+ return toFormulaString(book, lptgs);
+ }
/**
* Static method to convert an array of Ptgs in RPN order
@@ -967,6 +977,16 @@
}
// TODO: catch stack underflow and throw parse exception.
return (String) stack.pop();
+ }
+ /**
+ * Static method to convert an array of Ptgs in RPN order
+ * to a human readable string format in infix mode. Works
+ * on the current workbook for named and 3D references.
+ * @param ptgs array of Ptg, can be null or empty
+ * @return a human readable String
+ */
+ public String toFormulaString(Ptg[] ptgs) {
+ return toFormulaString(book, ptgs);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org