src/main/java/org/embulk/parser/poi_excel/bean/PoiExcelColumnBean.java in embulk-parser-poi_excel-0.1.10 vs src/main/java/org/embulk/parser/poi_excel/bean/PoiExcelColumnBean.java in embulk-parser-poi_excel-0.1.11

@@ -10,10 +10,12 @@
 import org.embulk.parser.poi_excel.PoiExcelParserPlugin.ColumnCommonOptionTask;
 import org.embulk.parser.poi_excel.PoiExcelParserPlugin.ColumnOptionTask;
 import org.embulk.parser.poi_excel.PoiExcelParserPlugin.FormulaReplaceTask;
 import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean.ErrorStrategy.Strategy;
 import org.embulk.parser.poi_excel.bean.util.PoiExcelCellAddress;
+import org.embulk.parser.poi_excel.bean.util.SearchMergedCell;
+import org.embulk.parser.poi_excel.visitor.util.MergedRegionFinder;
 import org.embulk.spi.Column;
 
 import com.google.common.base.Optional;
 
 public class PoiExcelColumnBean {
@@ -266,14 +268,10 @@
 
 	public String getNumericFormat() {
 		return numericFormat.get();
 	}
 
-	public enum SearchMergedCell {
-		NONE, LINEAR_SEARCH, TREE_SEARCH
-	}
-
 	private CacheValue<SearchMergedCell> searchMergedCell = new CacheValue<SearchMergedCell>() {
 
 		@Override
 		protected Optional<SearchMergedCell> getTaskValue(ColumnCommonOptionTask task) {
 			Optional<String> option = task.getSearchMergedCell();
@@ -300,15 +298,24 @@
 			}
 		}
 
 		@Override
 		protected SearchMergedCell getDefaultValue() {
-			return SearchMergedCell.TREE_SEARCH;
+			return SearchMergedCell.HASH_SEARCH;
 		}
 	};
 
 	public SearchMergedCell getSearchMergedCell() {
 		return searchMergedCell.get();
+	}
+
+	private MergedRegionFinder mergedRegionFinder;
+
+	public MergedRegionFinder getMergedRegionFinder() {
+		if (mergedRegionFinder == null) {
+			this.mergedRegionFinder = getSearchMergedCell().getMergedRegionFinder();
+		}
+		return mergedRegionFinder;
 	}
 
 	public enum FormulaHandling {
 		EVALUATE, CASHED_VALUE
 	}