acoliver 02/04/28 08:52:58
Modified: src/java/org/apache/poi/hssf/record/formula AddPtg.java
DividePtg.java DummyFunctionPtg.java IntPtg.java
MultiplyPtg.java OperationPtg.java PowerPtg.java
SubtractPtg.java
Log:
rollign out some of my stuff. Like Avik's stuff better. (for formulas)
Revision Changes Path
1.5 +1 -6
jakarta-poi/src/java/org/apache/poi/hssf/record/formula/AddPtg.java
Index: AddPtg.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/AddPtg.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AddPtg.java 27 Apr 2002 14:07:53 -0000 1.4
+++ AddPtg.java 28 Apr 2002 15:52:58 -0000 1.5
@@ -140,12 +140,7 @@
buffer.append(operands[ 1 ].toFormulaString());
return buffer.toString();
}
-
-
- public int getPrecedence() {
- return 5;
- }
-
+
public int getStringLength() {
return 1;
}
1.4 +1 -5
jakarta-poi/src/java/org/apache/poi/hssf/record/formula/DividePtg.java
Index: DividePtg.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/DividePtg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DividePtg.java 27 Apr 2002 14:07:53 -0000 1.3
+++ DividePtg.java 28 Apr 2002 15:52:58 -0000 1.4
@@ -119,11 +119,7 @@
buffer.append(operands[ 1 ].toFormulaString());
return buffer.toString();
}
-
- public int getPrecedence() {
- return 4;
- }
-
+
public int getStringLength() {
return 1;
}
1.2 +1 -5
jakarta-poi/src/java/org/apache/poi/hssf/record/formula/DummyFunctionPtg.java
Index: DummyFunctionPtg.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/DummyFunctionPtg.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DummyFunctionPtg.java 28 Apr 2002 05:37:39 -0000 1.1
+++ DummyFunctionPtg.java 28 Apr 2002 15:52:58 -0000 1.2
@@ -26,11 +26,7 @@
name=pName;
numOperands = pNumOperands;
}
-
- public int getPrecedence() {
- return 1;
- }
-
+
public int getType() {
return -1;
}
1.3 +1 -5
jakarta-poi/src/java/org/apache/poi/hssf/record/formula/IntPtg.java
Index: IntPtg.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/IntPtg.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IntPtg.java 18 Apr 2002 12:00:53 -0000 1.2
+++ IntPtg.java 28 Apr 2002 15:52:58 -0000 1.3
@@ -154,11 +154,7 @@
public static boolean isNextStringToken(String formula, int pos) {
return (parseString(formula,pos) != null);
}
-
- public int getPrecedence() {
- return 5;
- }
-
+
public int getStringLength() {
return strlen;
}
1.4 +1 -5
jakarta-poi/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java
Index: MultiplyPtg.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MultiplyPtg.java 27 Apr 2002 14:07:53 -0000 1.3
+++ MultiplyPtg.java 28 Apr 2002 15:52:58 -0000 1.4
@@ -145,11 +145,7 @@
public void manipulate(List source, List results, int pos) {
standardBinaryManipulation(source, results, pos);
}
-
- public int getPrecedence() {
- return 3;
- }
-
+
public static boolean isNextStringToken(String formula, int pos) {
boolean retval = false;
while (pos < formula.length() &&
Character.isWhitespace(formula.charAt(pos))) {
1.4 +0 -2
jakarta-poi/src/java/org/apache/poi/hssf/record/formula/OperationPtg.java
Index: OperationPtg.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/OperationPtg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OperationPtg.java 27 Apr 2002 14:07:53 -0000 1.3
+++ OperationPtg.java 28 Apr 2002 15:52:58 -0000 1.4
@@ -77,8 +77,6 @@
public abstract String toFormulaString(String[] operands);
- public abstract int getPrecedence();
-
public abstract int getNumberOfOperands();
/**
1.5 +0 -4
jakarta-poi/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java
Index: PowerPtg.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PowerPtg.java 28 Apr 2002 15:35:38 -0000 1.4
+++ PowerPtg.java 28 Apr 2002 15:52:58 -0000 1.5
@@ -110,10 +110,6 @@
return "^";
}
- public int getPrecedence() {
- return 3;
- }
-
public String toFormulaString(Ptg [] operands)
{
StringBuffer buffer = new StringBuffer();
1.4 +0 -3
jakarta-poi/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java
Index: SubtractPtg.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SubtractPtg.java 27 Apr 2002 14:07:53 -0000 1.3
+++ SubtractPtg.java 28 Apr 2002 15:52:58 -0000 1.4
@@ -120,9 +120,6 @@
return buffer.toString();
}
- public int getPrecedence() {
- return 5;
- }
public int getStringLength() {
return 1;
