From e0eca7331e958809dbc4ff6c880eab2ff9813613 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Mon, 4 Jun 2018 01:46:00 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=8A=D0=B5=D0=B4=D0=B8=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D1=8F=D1=87=D0=B5=D0=B5=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/dmitriymx/corrector1s/Corrector1S.java  | 13 +++++++++++++
 src/main/java/ru/dmitriymx/corrector1s/Main.java    |  1 +
 .../dmitriymx/corrector1s/gui/MainController.java   |  7 ++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/dmitriymx/corrector1s/Corrector1S.java b/src/main/java/ru/dmitriymx/corrector1s/Corrector1S.java
index c843fc9..fbe7a35 100644
--- a/src/main/java/ru/dmitriymx/corrector1s/Corrector1S.java
+++ b/src/main/java/ru/dmitriymx/corrector1s/Corrector1S.java
@@ -8,6 +8,7 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.ss.util.CellRangeAddress;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -95,4 +96,16 @@ public class Corrector1S {
             mapRecords.put(key, record);
         }
     }
+
+    public void removeMergedCells() {
+        while (sheet.getNumMergedRegions() > 5) {
+            for(int m = 0; m < sheet.getNumMergedRegions(); m++) {
+                CellRangeAddress cellRangeAddress = sheet.getMergedRegion(m);
+                if (cellRangeAddress.getFirstColumn() >= 10) {
+                    sheet.removeMergedRegion(m);
+                    break;
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/java/ru/dmitriymx/corrector1s/Main.java b/src/main/java/ru/dmitriymx/corrector1s/Main.java
index 1821a81..229cf32 100644
--- a/src/main/java/ru/dmitriymx/corrector1s/Main.java
+++ b/src/main/java/ru/dmitriymx/corrector1s/Main.java
@@ -80,6 +80,7 @@ public class Main {
             corrector1S.setHonorarium((Double) optionSet.valueOf("fee"));
             corrector1S.check();
             corrector1S.createSnapshotData();
+            corrector1S.removeMergedCells();
         }
     }
 }
diff --git a/src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java b/src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java
index 465ff2f..816ed58 100644
--- a/src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java
+++ b/src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java
@@ -138,7 +138,7 @@ public class MainController {
                 }
                 corrector.setHonorarium(gonorar.getValue());
 
-                progressBar.setProgress(0.3d);
+                progressBar.setProgress(0.10d);
 
                 try {
                     corrector.check();
@@ -150,6 +150,8 @@ public class MainController {
                     return;
                 }
 
+                progressBar.setProgress(0.20d);
+
                 try {
                     corrector.createSnapshotData();
                 } catch (IOException | InvalidFormatException e) {
@@ -160,6 +162,9 @@ public class MainController {
                     return;
                 }
 
+                progressBar.setProgress(0.30d);
+                corrector.removeMergedCells();
+
                 progressBar.setProgress(1.0d);
                 buildInfoDialog("Информация", "Преобразование завершено успешно")
                         .showAndWait();