CellRef copy constructor (refactoring)

jxlsteam · Dec 28, 2023 · cdaed28 · cdaed28
1 parent ee75783
commit cdaed28
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/jxls/src/main/java/org/jxls/common/CellRef.java b/jxls/src/main/java/org/jxls/common/CellRef.java
@@ -27,6 +27,14 @@ public CellRef(int row, int col) {
         this(null, row, col);
     }
 
+    /**
+     * Copy constructor
+     * @param ref -
+     */
+    public CellRef(CellRef ref) {
+        this(ref.getSheetName(), ref.getRow(), ref.getCol());
+    }
+
     public CellRef(String cellRef) {
         if (cellRef.endsWith("#REF!")) {
             throw new IllegalArgumentException("Cell reference invalid: " + cellRef);

diff --git a/jxls/src/main/java/org/jxls/formula/FastFormulaProcessor.java b/jxls/src/main/java/org/jxls/formula/FastFormulaProcessor.java
@@ -111,12 +111,7 @@ public void processAreaFormulas(Transformer transformer, Area area) {
                         && (!formulaCellData.isParameterizedFormulaCell() || formulaCellData.isJointedFormulaCell())) {
                     targetFormulaString = formulaCellData.getDefaultValue() != null ? formulaCellData.getDefaultValue() : "0";
                 }
-                transformer.setFormula(
-                        new CellRef(
-                                targetFormulaCellRef.getSheetName(),
-                                targetFormulaCellRef.getRow(),
-                                targetFormulaCellRef.getCol()),
-                        targetFormulaString);
+                transformer.setFormula(new CellRef(targetFormulaCellRef), targetFormulaString);
             }
         }
     }

diff --git a/jxls/src/main/java/org/jxls/formula/StandardFormulaProcessor.java b/jxls/src/main/java/org/jxls/formula/StandardFormulaProcessor.java
@@ -114,12 +114,7 @@ && countOccurences(replacementString, ',') >= MAX_NUM_ARGS_FOR_SUM) {
                     targetFormulaString = formulaCellData.getDefaultValue() != null ? formulaCellData.getDefaultValue() : "0";
                 }
                 if (!targetFormulaString.isEmpty()) {
-                    transformer.setFormula(
-                            new CellRef(
-                                    targetFormulaCellRef.getSheetName(),
-                                    targetFormulaCellRef.getRow(),
-                                    targetFormulaCellRef.getCol()),
-                            targetFormulaString);
+                    transformer.setFormula(new CellRef(targetFormulaCellRef), targetFormulaString);
                 }
             }
         }