From 7e7b5b09c2e8231c52814633eda7bd5a181e82c6 Mon Sep 17 00:00:00 2001
From: Javen O'Neal <onealj@apache.org>
Date: Mon, 20 Jun 2016 00:25:29 +0000
Subject: [PATCH] mv o.a.p.hssf.record.cf.CellRangeUtil
 o.a.p.ss.util.CellRangeUtil

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1749240 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/poi/hssf/record/CFHeaderBase.java      | 2 +-
 .../poi/{hssf/record/cf => ss/util}/CellRangeUtil.java     | 7 +------
 .../poi/xssf/usermodel/XSSFSheetConditionalFormatting.java | 2 +-
 .../org/apache/poi/hssf/record/cf/TestCellRange.java       | 1 +
 4 files changed, 4 insertions(+), 8 deletions(-)
 rename src/java/org/apache/poi/{hssf/record/cf => ss/util}/CellRangeUtil.java (98%)

diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderBase.java b/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
index dc7052de45..3784638657 100644
--- a/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
+++ b/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
@@ -17,9 +17,9 @@
 
 package org.apache.poi.hssf.record;
 
-import org.apache.poi.hssf.record.cf.CellRangeUtil;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.ss.util.CellRangeUtil;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**
diff --git a/src/java/org/apache/poi/hssf/record/cf/CellRangeUtil.java b/src/java/org/apache/poi/ss/util/CellRangeUtil.java
similarity index 98%
rename from src/java/org/apache/poi/hssf/record/cf/CellRangeUtil.java
rename to src/java/org/apache/poi/ss/util/CellRangeUtil.java
index cde666a8ed..3ecba186a0 100644
--- a/src/java/org/apache/poi/hssf/record/cf/CellRangeUtil.java
+++ b/src/java/org/apache/poi/ss/util/CellRangeUtil.java
@@ -15,16 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record.cf;
+package org.apache.poi.ss.util;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * TODO Should this move to org.apache.poi.ss.util ?
- */
 public final class CellRangeUtil {
     private CellRangeUtil() {
         // no instance of this class
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
index 82eddd46d8..a3781d22dd 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
@@ -22,7 +22,6 @@ package org.apache.poi.xssf.usermodel;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.poi.hssf.record.cf.CellRangeUtil;
 import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.poi.ss.usermodel.ComparisonOperator;
 import org.apache.poi.ss.usermodel.ConditionalFormatting;
@@ -31,6 +30,7 @@ import org.apache.poi.ss.usermodel.ExtendedColor;
 import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
 import org.apache.poi.ss.usermodel.SheetConditionalFormatting;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellRangeUtil;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCfRule;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTConditionalFormatting;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
diff --git a/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java b/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java
index f01a2a3912..54f1702e23 100644
--- a/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java
+++ b/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java
@@ -23,6 +23,7 @@ import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellRangeUtil;
 
 /**
  * Tests CellRange operations.
-- 
2.39.5