ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 21:17:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Moved PhysicalLocationStructures into finance (#1557)

Browse Source
This commit is contained in:
Shams Asari 2017-09-19 17:36:26 +01:00 committed by josecoll
parent 92e22ab5f8
commit 838e753164
10 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/changelog.rst
View File

@ -152,6 +152,8 @@ UNRELEASED
* ``X509CertificateHolder`` has been removed from the public API, replaced by ``java.security.X509Certificate``.
* Moved ``CityDatabase`` out of ``core`` and into ``finance``
Milestone 14
------------

2
core/src/main/kotlin/net/corda/core/node/PhysicalLocationStructures.kt → finance/src/main/kotlin/net/corda/finance/utils/PhysicalLocationStructures.kt
View File

@ -1,4 +1,4 @@
package net.corda.core.node
package net.corda.finance.utils
import net.corda.core.serialization.CordaSerializable
import java.util.*

0
core/src/main/resources/net/corda/core/node/cities.txt → finance/src/main/resources/net/corda/finance/utils/cities.txt
View File

2
core/src/test/kotlin/net/corda/core/node/CityDatabaseTest.kt → finance/src/test/kotlin/net/corda/finance/utils/CityDatabaseTest.kt
View File

@ -1,4 +1,4 @@
package net.corda.core.node
package net.corda.finance.utils
import org.junit.Assert.assertEquals
import org.junit.Test

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

@ -8,8 +8,8 @@ import javafx.scene.shape.Circle
import javafx.scene.shape.Line
import javafx.util.Duration
import net.corda.core.identity.CordaX500Name
import net.corda.core.node.ScreenCoordinate
import net.corda.core.utilities.ProgressTracker
import net.corda.finance.utils.ScreenCoordinate
import net.corda.netmap.simulation.IRSSimulation
import net.corda.testing.chooseIdentity
import net.corda.testing.node.MockNetwork

4
samples/network-visualiser/src/main/kotlin/net/corda/netmap/simulation/Simulation.kt
View File

@ -2,10 +2,10 @@ package net.corda.netmap.simulation
import net.corda.core.flows.FlowLogic
import net.corda.core.identity.CordaX500Name
import net.corda.finance.utils.CityDatabase
import net.corda.finance.utils.WorldMapLocation
import net.corda.core.internal.uncheckedCast
import net.corda.core.messaging.SingleMessageRecipient
import net.corda.core.node.CityDatabase
import net.corda.core.node.WorldMapLocation
import net.corda.core.node.services.ServiceInfo
import net.corda.core.node.services.ServiceType
import net.corda.core.utilities.ProgressTracker

2
testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
View File

@ -17,11 +17,11 @@ import net.corda.core.messaging.RPCOps
import net.corda.core.messaging.SingleMessageRecipient
import net.corda.core.node.CordaPluginRegistry
import net.corda.core.node.ServiceEntry
import net.corda.core.node.WorldMapLocation
import net.corda.core.node.services.*
import net.corda.core.utilities.NetworkHostAndPort
import net.corda.core.utilities.getOrThrow
import net.corda.core.utilities.loggerFor
import net.corda.finance.utils.WorldMapLocation
import net.corda.node.internal.AbstractNode
import net.corda.node.internal.StartedNode
import net.corda.node.services.config.NodeConfiguration

2
tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeData.kt
View File

@ -4,7 +4,7 @@ import javafx.beans.property.SimpleIntegerProperty
import javafx.beans.property.SimpleListProperty
import javafx.beans.property.SimpleObjectProperty
import javafx.beans.property.SimpleStringProperty
import net.corda.core.node.CityDatabase
import net.corda.finance.utils.CityDatabase
import tornadofx.*
object SuggestedDetails {

4
tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTabView.kt
View File

@ -15,8 +15,8 @@ import javafx.scene.layout.Priority
import javafx.stage.FileChooser
import javafx.util.StringConverter
import net.corda.core.internal.*
import net.corda.core.node.CityDatabase
import net.corda.core.node.WorldMapLocation
import net.corda.finance.utils.CityDatabase
import net.corda.finance.utils.WorldMapLocation
import net.corda.demobench.model.*
import net.corda.demobench.ui.CloseableTab
import org.controlsfx.control.CheckListView

6
tools/explorer/src/main/kotlin/net/corda/explorer/views/Network.kt
View File

@ -28,13 +28,13 @@ import net.corda.client.jfx.model.*
import net.corda.client.jfx.utils.*
import net.corda.core.contracts.ContractState
import net.corda.core.identity.Party
import net.corda.core.node.CityDatabase
import net.corda.core.node.NodeInfo
import net.corda.core.node.ScreenCoordinate
import net.corda.core.node.WorldMapLocation
import net.corda.core.utilities.toBase58String
import net.corda.explorer.formatters.PartyNameFormatter
import net.corda.explorer.model.CordaView
import net.corda.finance.utils.CityDatabase
import net.corda.finance.utils.ScreenCoordinate
import net.corda.finance.utils.WorldMapLocation
import tornadofx.*
class Network : CordaView() {