acoliver 2002/07/06 11:45:16
Modified: src/java/org/apache/poi/hssf/model Workbook.java
src/java/org/apache/poi/hssf/record/formula Area3DPtg.java
FormulaParser.java Ref3DPtg.java
src/java/org/apache/poi/hssf/usermodel HSSFCell.java
HSSFName.java
Log:
removed thread safety stuff. We still need to revisit how this is being
done. I dislike "currentBook" and would prefer some kind of context
mechanism or directly passing the book to the PTGs etc. Perhaps a
"PTGWorkbookContextInterface" that defines set/getWorkbook etc etc.
Revision Changes Path
1.10 +1 -1 jakarta-poi/src/java/org/apache/poi/hssf/model/Workbook.java
Index: Workbook.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/model/Workbook.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Workbook.java 26 Jun 2002 18:05:39 -0000 1.9
+++ Workbook.java 6 Jul 2002 18:45:16 -0000 1.10
@@ -88,7 +88,7 @@
public class Workbook {
private static final int DEBUG = POILogger.DEBUG;
- public static ThreadLocal currentBook = new ThreadLocal();
+ public static Workbook currentBook = null;
/**
* constant used to set the "codepage" wherever "codepage" is set in records
1.8 +1 -1
jakarta-poi/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java
Index: Area3DPtg.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Area3DPtg.java 1 Jul 2002 17:29:31 -0000 1.7
+++ Area3DPtg.java 6 Jul 2002 18:45:16 -0000 1.8
@@ -289,7 +289,7 @@
public String toFormulaString()
{
StringBuffer retval = new StringBuffer();
- Object book = Workbook.currentBook.get();
+ Object book = Workbook.currentBook;
if (book != null) {
retval.append(((Workbook)
book).findSheetNameFromExternSheet(this.field_1_index_extern_sheet));
retval.append('!');
1.23 +0 -2
jakarta-poi/src/java/org/apache/poi/hssf/record/formula/FormulaParser.java
Index: FormulaParser.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/FormulaParser.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- FormulaParser.java 25 Jun 2002 08:35:16 -0000 1.22
+++ FormulaParser.java 6 Jul 2002 18:45:16 -0000 1.23
@@ -107,8 +107,6 @@
* later call the parse() method to return ptg list in rpn order
* then call the getRPNPtg() to retrive the parse results
* This class is recommended only for single threaded use
- * The parse and getPRNPtg are internally synchronized for safety, thus
- * while it is safe to use in a multithreaded environment, you will get long
lock waits.
*/
public FormulaParser(String formula, Workbook book){
formulaString = formula;
1.7 +1 -1
jakarta-poi/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
Index: Ref3DPtg.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Ref3DPtg.java 1 Jul 2002 17:29:31 -0000 1.6
+++ Ref3DPtg.java 6 Jul 2002 18:45:16 -0000 1.7
@@ -192,7 +192,7 @@
public String toFormulaString() {
StringBuffer retval = new StringBuffer();
- Object book = Workbook.currentBook.get();
+ Object book = Workbook.currentBook;
if (book != null) {
retval.append(((Workbook)
book).findSheetNameFromExternSheet(this.field_1_index_extern_sheet));
retval.append('!');
1.14 +4 -4 jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
Index: HSSFCell.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HSSFCell.java 5 Jul 2002 05:30:30 -0000 1.13
+++ HSSFCell.java 6 Jul 2002 18:45:16 -0000 1.14
@@ -693,7 +693,7 @@
}
public void setCellFormula(String formula) {
- Workbook.currentBook.set(book);
+ Workbook.currentBook=book;
if (formula==null) {
setCellType(CELL_TYPE_BLANK,false);
} else {
@@ -712,14 +712,14 @@
rec.pushExpressionToken(ptg[ k ]);
}
rec.setExpressionLength(( short ) size);
- Workbook.currentBook.set(null);
+ Workbook.currentBook = null;
}
}
public String getCellFormula() {
- Workbook.currentBook.set(book);
+ Workbook.currentBook=book;
String retval =
FormulaParser.toFormulaString(((FormulaRecord)record).getParsedExpression());
- Workbook.currentBook.set(null);
+ Workbook.currentBook=null;
return retval;
}
1.3 +2 -2 jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
Index: HSSFName.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFName.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HSSFName.java 1 Jul 2002 17:29:31 -0000 1.2
+++ HSSFName.java 6 Jul 2002 18:45:16 -0000 1.3
@@ -257,14 +257,14 @@
*/
public String getReference() {
- Workbook.currentBook.set(book);
+ Workbook.currentBook=book;
String result;
result = name.getAreaReference();
- Workbook.currentBook.set(null);
+ Workbook.currentBook=null;
return result;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
