Remove hideCycle

asciidocfx · Mar 18, 2015 · d0f10c1 · d0f10c1
1 parent 3aa53c8
commit d0f10c1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 20 deletions.
diff --git a/src/main/java/com/kodcu/service/convert/Epub3Service.java b/src/main/java/com/kodcu/service/convert/Epub3Service.java
@@ -142,7 +142,6 @@ private CompletableFuture<Path> produceEpub3(boolean askPath, boolean isTemp) {
 
                         if (!isTemp) {
                             indikatorService.completeCycle();
-                            indikatorService.hideIndikator();
                             threadService.runActionLater(() -> {
                                 asciiDocController.getRecentFiles().remove(epubPath.toString());
                                 asciiDocController.getRecentFiles().add(0, epubPath.toString());
@@ -160,7 +159,7 @@ private CompletableFuture<Path> produceEpub3(boolean askPath, boolean isTemp) {
 
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
-            indikatorService.hideIndikator();
+            indikatorService.completeCycle();
         }
 
         return completableFuture;

diff --git a/src/main/java/com/kodcu/service/convert/Html5ArticleService.java b/src/main/java/com/kodcu/service/convert/Html5ArticleService.java
@@ -62,7 +62,7 @@ public void convertHtmlArticle(boolean askPath) {
                     IOHelper.writeToFile(htmlArticlePath, html, CREATE, TRUNCATE_EXISTING, WRITE);
 
                     threadService.runActionLater(() -> {
-                        indikatorService.hideIndikator();
+                        indikatorService.completeCycle();
                         asciiDocController.getRecentFiles().remove(htmlArticlePath.toString());
                         asciiDocController.getRecentFiles().add(0, htmlArticlePath.toString());
                     });

diff --git a/src/main/java/com/kodcu/service/convert/Html5BookService.java b/src/main/java/com/kodcu/service/convert/Html5BookService.java
@@ -108,7 +108,7 @@ public void convertHtmlBook(boolean askPath) {
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
         } finally {
-            indikatorService.hideIndikator();
+            indikatorService.completeCycle();
         }
 
     }

diff --git a/src/main/java/com/kodcu/service/convert/KindleMobiService.java b/src/main/java/com/kodcu/service/convert/KindleMobiService.java
@@ -94,15 +94,15 @@ public void produceMobi(boolean askPath) {
                     } catch (Exception e) {
                         logger.error(e.getMessage(), e);
                     } finally {
-                        indikatorService.hideIndikator();
+                        indikatorService.completeCycle();
                     }
 
                 });
             });
 
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
-            indikatorService.hideIndikator();
+            indikatorService.completeCycle();
         }
     }
 }
diff --git a/src/main/java/com/kodcu/service/ui/IndikatorService.java b/src/main/java/com/kodcu/service/ui/IndikatorService.java
@@ -11,34 +11,25 @@
 @Component
 public class IndikatorService {
 
-    private final ApplicationController asciiDocController;
+    private final ApplicationController applicationContoller;
     private final ThreadService threadService;
 
     @Autowired
-    public IndikatorService(final ApplicationController asciiDocController, final ThreadService threadService) {
+    public IndikatorService(final ApplicationController applicationContoller, final ThreadService threadService) {
-        this.asciiDocController = asciiDocController;
+        this.applicationContoller = applicationContoller;
         this.threadService = threadService;
     }
 
     public void startCycle() {
         threadService.runActionLater(() -> {
-            asciiDocController.getPreviewView().getEngine().executeScript("startProgressBar()");
+            applicationContoller.getPreviewView().getEngine().executeScript("startProgressBar()");
-//            asciiDocController.getIndikator().setVisible(true);
-//            asciiDocController.getIndikator().setManaged(true);
         });
     }
 
     public void completeCycle() {
         threadService.runActionLater(() -> {
-            asciiDocController.getPreviewView().getEngine().executeScript("stopProgressBar()");
+            applicationContoller.getPreviewView().getEngine().executeScript("stopProgressBar()");
-//            asciiDocController.getIndikator().setManaged(false);
-//            asciiDocController.getIndikator().setVisible(false);
         });
     }
 
-    public void hideIndikator() {
-        completeCycle();
-    }
-
-
 }