OwnStatisticsPlugin calculates the figures with concurrency service

plugins/OwnStatisticsPlugin.groovy

@@ -1,5 +1,9 @@
 import de.frosch95.geofrogger.plugins.Plugin
 import javafx.collections.FXCollections
+import javafx.concurrent.Service
+import javafx.concurrent.Task
+import javafx.concurrent.WorkerStateEvent
+import javafx.event.EventHandler
 import javafx.geometry.Insets
 import javafx.scene.chart.PieChart
 import javafx.scene.control.Label
@@ -17,13 +21,20 @@ class OwnStatisticsPlugin implements Plugin {
 
   final String name = "Own Statistic"
   final String version = "0.0.1"
+  final CalculateService service = new CalculateService();
+
+  OwnStatisticsPlugin() {
+    service.onSucceeded = {
+      showDialog(createHeader(), createContent(it.source.value))
+    } as EventHandler<WorkerStateEvent>;
+  }
 
   @Override
   void run(final Map context) {
-    showDialog(createHeader(context.sessionContext), createContent(context.sessionContext))
+    calculateStats(context.sessionContext)
   }
 
-  private javafx.scene.Node createHeader(sessionContext) {
+  private javafx.scene.Node createHeader() {
     def pane = new Pane()
     def Label label = new Label()
     label.text = "This example plugin shows some stats based on the current list.\nThese statistics are found statistics, based on all found caches in the list."
@@ -31,64 +42,53 @@ class OwnStatisticsPlugin implements Plugin {
     pane
   }
 
+/**
+ * creates the statistic charts to show
+ * @param sessionContext context with the cache list in it
+ * @return
+ */
+  private void calculateStats(sessionContext) {
+    // get the cache list out of the context
+    def cacheList = sessionContext.getData("cache-list")
+    service.cacheList = cacheList;
+    service.restart();
+  }
+
   /**
    * creates the statistic charts to show
    * @param sessionContext context with the cache list in it
    * @return
    */
-  private javafx.scene.Node createContent(sessionContext) {
+  private javafx.scene.Node createContent(result) {
-
-    // get the cache list out of the context
-    def cacheList = sessionContext.getData("cache-list")
 
     // create a vbox as layout container
     VBox contenPane = new VBox()
     contenPane.prefWidth = 600
     VBox.setVgrow(contenPane, Priority.ALWAYS);
 
-
-    // groovy maps for selecting the statistic numbers
-    def typeStats = [:]
-    def difficultyStats = [:]
-    def terrainStats = [:]
-
-    def foundCount = 0
-
-    println cacheList.size()
-
-    // iterate over all the caches and count the data
-    for (def cache in cacheList) {
-      if (cache.found) {
-        foundCount++
-        incrementStats(typeStats, cache.type)
-        incrementStats(difficultyStats, cache.difficulty)
-        incrementStats(terrainStats, cache.terrain)
-      }
-    }
-
     // create javafx chart
     def typeData = FXCollections.observableArrayList()
-    typeStats.each() { key, value -> typeData.add(new Data(key.toString() + ' (' + value + ')', value as double)) }
+    result.typeStats.each() { key, value -> typeData.add(new Data(key.toString() + ' (' + value + ')', value as double)) }
     def typeChart = new PieChart(typeData);
-    typeChart.setTitle("Spreading of cache types found (${foundCount}).");
+    typeChart.setTitle("Spreading of cache types found (${result.foundCount}).");
 
     // create javafx chart
     def difficultyData = FXCollections.observableArrayList()
     difficultyTerrainValues.each {
-      def value = difficultyStats[it]
+      def value = result.difficultyStats[it]
       if (value) difficultyData.add(new Data(it+ ' (' + value + ')', value))
     }
     def difficultyChart = new PieChart(difficultyData);
-    difficultyChart.setTitle("Spreading of difficulties found (${foundCount}).");
+    difficultyChart.setTitle("Spreading of difficulties found (${result.foundCount}).");
 
     // create javafx chart
     def terrainData = FXCollections.observableArrayList()
     difficultyTerrainValues.each {
-      def value = terrainStats[it]
+      def value = result.terrainStats[it]
       if (value) terrainData.add(new Data(it+ ' (' + value + ')', value))
     }
     def terrainChart = new PieChart(terrainData);
-    terrainChart.setTitle("Spreeading of terrain found (${foundCount}).");
+    terrainChart.setTitle("Spreeading of terrain found (${result.foundCount}).");
 
     // add charts to layout container
     contenPane.children.addAll(typeChart, difficultyChart, terrainChart)
@@ -100,10 +100,6 @@ class OwnStatisticsPlugin implements Plugin {
     scrollPane
   }
 
-  private void incrementStats(map, key) {
-    map[key] = map[key] ? map[key] + 1 : 1
-  }
-
   private void showDialog(header, content) {
     Dialog dialog = new Dialog(null, name+" ("+version+")", true)
     dialog.setMasthead(header)
@@ -111,3 +107,38 @@ class OwnStatisticsPlugin implements Plugin {
     dialog.show()
   }
 }
+
+class CalculateService extends Service {
+
+  def cacheList
+
+  @Override
+  protected Task createTask() {
+    return new Task() {
+      @Override
+      protected LinkedHashMap call() throws Exception {
+
+        def typeStats = [:]
+        def difficultyStats = [:]
+        def terrainStats = [:]
+
+        def foundCount = 0
+
+        for (def cache in cacheList) {
+          if (cache.found) {
+            foundCount++
+            incrementStats(typeStats, cache.type)
+            incrementStats(difficultyStats, cache.difficulty)
+            incrementStats(terrainStats, cache.terrain)
+          }
+        }
+        ['foundCount': foundCount, 'typeStats': typeStats, 'difficultyStats': difficultyStats, 'terrainStats': terrainStats]
+      }
+    };
+  }
+
+  private void incrementStats(map, key) {
+    map[key] = map[key] ? map[key] + 1 : 1
+  }
+
+}