summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew C. Oliver <acoliver@apache.org>2002-04-28 15:52:58 +0000
committerAndrew C. Oliver <acoliver@apache.org>2002-04-28 15:52:58 +0000
commitace1aa96f0ace8785dea3da72105c5ce8f4f63c2 (patch)
treeee7f2905797bbcb60a788705a38232860cb96578
parent98d4379b0c875dab894889d0f4773160fbdb72d2 (diff)
downloadpoi-ace1aa96f0ace8785dea3da72105c5ce8f4f63c2.tar.gz
poi-ace1aa96f0ace8785dea3da72105c5ce8f4f63c2.zip
rollign out some of my stuff. Like Avik's stuff better. (for formulas)
git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352524 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/poi/hssf/record/formula/AddPtg.java7
-rw-r--r--src/java/org/apache/poi/hssf/record/formula/DividePtg.java6
-rw-r--r--src/java/org/apache/poi/hssf/record/formula/DummyFunctionPtg.java6
-rw-r--r--src/java/org/apache/poi/hssf/record/formula/IntPtg.java6
-rw-r--r--src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java6
-rw-r--r--src/java/org/apache/poi/hssf/record/formula/OperationPtg.java2
-rw-r--r--src/java/org/apache/poi/hssf/record/formula/PowerPtg.java4
-rw-r--r--src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java3
8 files changed, 5 insertions, 35 deletions
diff --git a/src/java/org/apache/poi/hssf/record/formula/AddPtg.java b/src/java/org/apache/poi/hssf/record/formula/AddPtg.java
index 81ff876c6a..39f9389841 100644
--- a/src/java/org/apache/poi/hssf/record/formula/AddPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/AddPtg.java
@@ -140,12 +140,7 @@ public class AddPtg
buffer.append(operands[ 1 ].toFormulaString());
return buffer.toString();
}
-
-
- public int getPrecedence() {
- return 5;
- }
-
+
public int getStringLength() {
return 1;
}
diff --git a/src/java/org/apache/poi/hssf/record/formula/DividePtg.java b/src/java/org/apache/poi/hssf/record/formula/DividePtg.java
index 6ee743fb58..0a2b699e25 100644
--- a/src/java/org/apache/poi/hssf/record/formula/DividePtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/DividePtg.java
@@ -119,11 +119,7 @@ public class DividePtg
buffer.append(operands[ 1 ].toFormulaString());
return buffer.toString();
}
-
- public int getPrecedence() {
- return 4;
- }
-
+
public int getStringLength() {
return 1;
}
diff --git a/src/java/org/apache/poi/hssf/record/formula/DummyFunctionPtg.java b/src/java/org/apache/poi/hssf/record/formula/DummyFunctionPtg.java
index 08bf4f6749..64814803ef 100644
--- a/src/java/org/apache/poi/hssf/record/formula/DummyFunctionPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/DummyFunctionPtg.java
@@ -26,11 +26,7 @@ public class DummyFunctionPtg extends OperationPtg {
name=pName;
numOperands = pNumOperands;
}
-
- public int getPrecedence() {
- return 1;
- }
-
+
public int getType() {
return -1;
}
diff --git a/src/java/org/apache/poi/hssf/record/formula/IntPtg.java b/src/java/org/apache/poi/hssf/record/formula/IntPtg.java
index 261d1b2d4e..933077c1ea 100644
--- a/src/java/org/apache/poi/hssf/record/formula/IntPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/IntPtg.java
@@ -154,11 +154,7 @@ public class IntPtg
public static boolean isNextStringToken(String formula, int pos) {
return (parseString(formula,pos) != null);
}
-
- public int getPrecedence() {
- return 5;
- }
-
+
public int getStringLength() {
return strlen;
}
diff --git a/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java b/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java
index bd3e412230..f25ecfb786 100644
--- a/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java
@@ -145,11 +145,7 @@ public class MultiplyPtg
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))) {
diff --git a/src/java/org/apache/poi/hssf/record/formula/OperationPtg.java b/src/java/org/apache/poi/hssf/record/formula/OperationPtg.java
index 0cb1ed0bdc..13669c93cf 100644
--- a/src/java/org/apache/poi/hssf/record/formula/OperationPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/OperationPtg.java
@@ -77,8 +77,6 @@ public abstract class OperationPtg extends Ptg
public abstract String toFormulaString(String[] operands);
- public abstract int getPrecedence();
-
public abstract int getNumberOfOperands();
/**
diff --git a/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java b/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java
index aab2cef433..32f5954b3d 100644
--- a/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java
@@ -110,10 +110,6 @@ public class PowerPtg
return "^";
}
- public int getPrecedence() {
- return 3;
- }
-
public String toFormulaString(Ptg [] operands)
{
StringBuffer buffer = new StringBuffer();
diff --git a/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java b/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java
index f2e7f51983..8fa7300665 100644
--- a/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java
@@ -120,9 +120,6 @@ public class SubtractPtg
return buffer.toString();
}
- public int getPrecedence() {
- return 5;
- }
public int getStringLength() {
return 1;