switched javafx Pair to Kotlin Pair for OpenJDK compat

Author: anixon604

Accounts/tictacthor/contracts/src/main/java/com/tictacthor/states/BoardState.java

@@ -1,7 +1,9 @@
 package com.tictacthor.states;
 
 import com.tictacthor.contracts.BoardContract;
-import javafx.util.Pair;
+//import javafx.util.Pair;
+
+import kotlin.Pair;
 import net.corda.core.contracts.BelongsToContract;
 import net.corda.core.contracts.LinearState;
 import net.corda.core.contracts.UniqueIdentifier;
@@ -91,14 +93,14 @@ public char[][] deepCopy(){
     }
 
     public BoardState returnNewBoardAfterMove(Pair<Integer,Integer> pos, AnonymousParty me, AnonymousParty competitor){
-        if((pos.getKey() > 2) ||(pos.getValue()> 2)){
+        if((pos.getFirst() > 2) ||(pos.getSecond()> 2)){
             throw new IllegalStateException("Invalid board index.");
         }
         char[][] newborad = this.deepCopy();
         if(isPlayerXTurn){
-            newborad[pos.getKey()][pos.getValue()] = 'X';
+            newborad[pos.getFirst()][pos.getSecond()] = 'X';
         }else{
-            newborad[pos.getKey()][pos.getValue()] = 'O';
+            newborad[pos.getFirst()][pos.getSecond()] = 'O';
         }
         if(BoardContract.BoardUtils.isGameOver(newborad)){
             BoardState b = new BoardState(this.playerO,this.playerX,me,competitor,!this.isPlayerXTurn,this.linearId, newborad,Status.GAME_OVER);

Accounts/tictacthor/workflows/src/main/java/com/tictacthor/flows/EndGameFlow.java

@@ -14,6 +14,7 @@
 import net.corda.core.crypto.TransactionSignature;
 import net.corda.core.flows.*;
 import net.corda.core.identity.AnonymousParty;
+import net.corda.core.identity.Party;
 import net.corda.core.node.services.Vault;
 import net.corda.core.node.services.vault.QueryCriteria;
 import net.corda.core.transactions.SignedTransaction;

Accounts/tictacthor/workflows/src/main/java/com/tictacthor/flows/StartGameFlow.java

@@ -14,6 +14,7 @@
 import net.corda.core.crypto.TransactionSignature;
 import net.corda.core.flows.*;
 import net.corda.core.identity.AnonymousParty;
+import net.corda.core.identity.Party;
 import net.corda.core.node.services.vault.QueryCriteria;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.core.transactions.TransactionBuilder;

Accounts/tictacthor/workflows/src/main/java/com/tictacthor/flows/SubmitTurnFlow.java

@@ -9,12 +9,14 @@
 import com.tictacthor.accountUtilities.NewKeyForAccount;
 import com.tictacthor.contracts.BoardContract;
 import com.tictacthor.states.BoardState;
-import javafx.util.Pair;
+//import javafx.util.Pair;
+import kotlin.Pair;
 import net.corda.core.contracts.StateAndRef;
 import net.corda.core.contracts.UniqueIdentifier;
 import net.corda.core.crypto.TransactionSignature;
 import net.corda.core.flows.*;
 import net.corda.core.identity.AnonymousParty;
+import net.corda.core.identity.Party;
 import net.corda.core.node.services.Vault;
 import net.corda.core.node.services.vault.QueryCriteria;
 import net.corda.core.transactions.SignedTransaction;