Fix up the visualiser tool after the net.corda move and broken instructions from the repo moves

docs/source/network-simulator.rst

@@ -7,11 +7,15 @@ map service and are notified of the changes to the map. The network simulator is
 
 **Windows**::
 
-    gradlew.bat network-simulator:run
+    gradlew.bat :samples:network-visualiser:run
 
 **Other**::
 
-    ./gradlew network-simulator:run
+    ./gradlew :samples:network-visualiser:run
+
+You can produce a standalone JAR of the tool by using the ``:samples:network-visualiser:deployVisualiser`` target
+and then using the ``samples/network-visualiser/build/libs/network-visualiser-*-capsule.jar`` file, where * is
+whatever the current Corda version is.
 
 Interface
 ---------

samples/network-visualiser/README.md

@@ -3,48 +3,6 @@
 This package contains a network visualiser that uses a simulation to visualise the interaction and messages between
 nodes on the Corda network.
 
-## Prerequisites
+Please see the documentation site for more info on the simulator tool. You can run it like this:
 
-You will need to have [JDK 8](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) 
-installed and available on your path.
-
-## Getting Started
-
-First clone this repository and the Corda repository locally. Then open a terminal window in the Corda directory and run:
- 
-Unix: 
-
-     ./gradlew publishToMavenLocal
-     
-Windows:
-
-     gradle.bat publishToMavenLocal
-     
-This will publish a copy of Corda to your local Maven repository for your Cordapp to use. Next open a terminal window
-in your Cordapp directory (this one) and run:
-
-Unix:
-
-     ./gradlew deployNodes
-     
-Windows:
-
-     gradlew.bat deployNodes
-     
-This command will create several nodes in `build/nodes` that you can now run with:
-
-Unix:
-
-     cd build/nodes
-     ./runnodes
-
-Windows:
-
-Windows users currently have to manually enter each directory in `build/nodes` and run `java -jar corda.jar` in each.
-This will be updated soon.
-
-This will now have nodes running on your machine running this Cordapp. You can now begin developing your Cordapp. 
-
-## Further Reading
-
-Tutorials and developer docs for Cordapps and Corda are [here](https://docs.corda.r3cev.com).
+    gradle samples:network-visualiser:run

samples/network-visualiser/build.gradle

@@ -14,6 +14,7 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'kotlin'
 apply plugin: 'idea'
+apply plugin: 'application'
 apply plugin: 'net.corda.plugins.quasar-utils'
 apply plugin: 'us.kirchmeier.capsule'
 
@@ -57,11 +58,13 @@ idea {
     }
 }
 
+mainClassName = 'net.corda.netmap.NetworkMapVisualiser'
+
 task deployVisualiser(type: FatCapsule) {
-    applicationClass 'net.corda.netmap.NetworkExplorerKt'
+    applicationClass 'net.corda.netmap.NetworkMapVisualiser'
     reallyExecutable
     capsuleManifest {
         minJavaVersion = '1.8.0'
         javaAgents = [configurations.quasar.singleFile.name]
     }
-}
+}

samples/network-visualiser/src/main/kotlin/net/corda/netmap/NetworkMapVisualiser.kt

@@ -1,14 +1,6 @@
-/*
- * Copyright 2015 Distributed Ledger Group LLC.  Distributed as Licensed Company IP to DLG Group Members
- * pursuant to the August 7, 2015 Advisory Services Agreement and subject to the Company IP License terms
- * set forth therein.
- *
- * All other rights reserved.
- */
+package net.corda.netmap
 
-package com.r3cev.corda.netmap
-
-import com.r3cev.corda.netmap.VisualiserViewModel.Style
+import net.corda.netmap.VisualiserViewModel.Style
 import net.corda.core.messaging.SingleMessageRecipient
 import net.corda.core.serialization.deserialize
 import net.corda.core.then

samples/network-visualiser/src/main/kotlin/net/corda/netmap/VisualiserUtils.kt

@@ -1,4 +1,4 @@
-package com.r3cev.corda.netmap
+package net.corda.netmap
 
 import javafx.scene.paint.Color
 

samples/network-visualiser/src/main/kotlin/net/corda/netmap/VisualiserView.kt

@@ -1,7 +1,5 @@
-package com.r3cev.corda.netmap
+package net.corda.netmap
 
-import com.r3cev.corda.netmap.VisualiserViewModel.Style
-import net.corda.core.utilities.ProgressTracker
 import javafx.animation.KeyFrame
 import javafx.animation.Timeline
 import javafx.application.Platform
@@ -22,6 +20,8 @@ import javafx.scene.shape.Polygon
 import javafx.scene.text.Font
 import javafx.stage.Stage
 import javafx.util.Duration
+import net.corda.core.utilities.ProgressTracker
+import net.corda.netmap.VisualiserViewModel.Style
 
 data class TrackerWidget(val vbox: VBox, val cursorBox: Pane, val label: Label, val cursor: Polygon)
 

samples/network-visualiser/src/main/kotlin/net/corda/netmap/VisualiserViewModel.kt

@@ -1,4 +1,4 @@
-package com.r3cev.corda.netmap
+package net.corda.netmap
 
 import net.corda.core.utilities.ProgressTracker
 import net.corda.simulation.IRSSimulation