From 4915118529ba16d4920b9844a1d18e331a8c5b1a Mon Sep 17 00:00:00 2001
From: iMoHax <born19th@gmail.com>
Date: Mon, 3 Aug 2015 15:38:22 +0300
Subject: [PATCH] set text for analysis callback

---
 .../src/main/java/ru/trader/services/AnalyzerTask.java |  7 ++++---
 client/src/main/resources/lang/locale_en_US.properties | 10 +++-------
 client/src/main/resources/lang/locale_ru_RU.properties |  9 +++------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/client/src/main/java/ru/trader/services/AnalyzerTask.java b/client/src/main/java/ru/trader/services/AnalyzerTask.java
index 7dd790f..25501b4 100644
--- a/client/src/main/java/ru/trader/services/AnalyzerTask.java
+++ b/client/src/main/java/ru/trader/services/AnalyzerTask.java
@@ -13,7 +13,8 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
 public abstract class AnalyzerTask<T> extends Task<T> {
-    private final AnalyzerCallBack callback;                    protected final MarketAnalyzer analyzer;
+    private final AnalyzerCallBack callback;
+    protected final MarketAnalyzer analyzer;
 
     private final LongProperty found;
     private final AtomicReference<Long> foundUpdate;
@@ -70,12 +71,12 @@ public abstract class AnalyzerTask<T> extends Task<T> {
 
         @Override
         public String getMessage(String key) {
-            return Localization.getString(key);
+            return Localization.getString("analyzer."+key);
         }
 
         @Override
         public void print(String message) {
-            super.print(message);
+            updateMessage(message);
         }
 
         @Override
diff --git a/client/src/main/resources/lang/locale_en_US.properties b/client/src/main/resources/lang/locale_en_US.properties
index 31999cb..3fa4e2b 100644
--- a/client/src/main/resources/lang/locale_en_US.properties
+++ b/client/src/main/resources/lang/locale_en_US.properties
@@ -151,13 +151,9 @@ filter.excludes=Excludes stations:
 # analyzer progress
 analyzer.orders.title=Search orders
 analyzer.routes.title=Search paths
-analyzer.find.route=Finding paths from %s (%s) to %s (%s)
-analyzer.find.routes=Finding paths from %s (%s)
-analyzer.find.success=%d paths found
-analyzer.graph.station.build=Building graph from %s (%s)
-analyzer.graph.build=Building graph from %s
-analyzer.graph.success=Graph is built
-analyser.finish=Finish
+analyzer.market.stage.analysis=Start analysis
+analyzer.graph.stage.build=Building graph from %s
+analyzer.crawler.stage.search=Search routes from %s to %s
 
 # search.fxml
 search.text.from=From:
diff --git a/client/src/main/resources/lang/locale_ru_RU.properties b/client/src/main/resources/lang/locale_ru_RU.properties
index 10bd82b..ab60530 100644
--- a/client/src/main/resources/lang/locale_ru_RU.properties
+++ b/client/src/main/resources/lang/locale_ru_RU.properties
@@ -151,12 +151,9 @@ filter.excludes=\u0418\u0441\u043A\u043B\u044E\u0447\u0430\u0435\u043C\u044B\u04
 # analyzer progress
 analyzer.orders.title=\u041F\u043E\u0438\u0441\u043A \u0437\u0430\u043A\u0430\u0437\u043E\u0432
 analyzer.routes.title=\u041F\u043E\u0438\u0441\u043A \u043C\u0430\u0440\u0448\u0440\u0443\u0442\u043E\u0432
-analyzer.find.route=\u041F\u043E\u0438\u0441\u043A \u043F\u0443\u0442\u0435\u0439 \u043E\u0442 %s (%s) \u0434\u043E %s (%s)
-analyzer.find.routes=\u041F\u043E\u0438\u0441\u043A \u043F\u0443\u0442\u0435\u0439 \u043E\u0442 %s (%s)
-analyzer.find.success=%d \u043F\u0443\u0442\u0435\u0439 \u043D\u0430\u0439\u0434\u0435\u043D\u043E
-analyzer.graph.station.build=\u041F\u043E\u0441\u0442\u0440\u043E\u0439\u043A\u0430 \u0433\u0440\u0430\u0444\u0430 \u043E\u0442 %s (%s)
-analyzer.graph.build=\u041F\u043E\u0441\u0442\u0440\u043E\u0439\u043A\u0430 \u0433\u0440\u0430\u0444\u0430 \u043E\u0442 %s
-analyzer.graph.success=\u0413\u0440\u0430\u0444 \u043F\u043E\u0441\u0442\u0440\u043E\u0435\u043D
+analyzer.market.stage.analysis=\u0410\u043D\u0430\u043B\u0438\u0437\u0438\u0440\u0443\u044E
+analyzer.graph.stage.build=\u041F\u043E\u0441\u0442\u0440\u043E\u0439\u043A\u0430 \u0433\u0440\u0430\u0444\u0430 \u043E\u0442 %s
+analyzer.crawler.stage.search=\u041F\u043E\u0438\u0441\u043A \u043C\u0430\u0440\u0448\u0440\u0443\u0442\u043E\u0432 \u043E\u0442 %s \u0434\u043E %s
 analyser.finish=\u0413\u043E\u0442\u043E\u0432\u043E
 
 # search.fxml