bike market revamp

Author: peterli-r3

…/bikemarket/contracts/FrameContract.java …/bikemarket/contracts/FrameContract.javaTokens/bikemarket/contracts/src/main/java/net/corda/examples/bikemarket/contracts/FrameContract.java renamed to Tokens/bikemarket/contracts/src/main/java/net/corda/samples/bikemarket/contracts/FrameContract.java Tokens/bikemarket/contracts/src/main/java/net/corda/examples/bikemarket/contracts/FrameContract.java renamed to Tokens/bikemarket/contracts/src/main/java/net/corda/samples/bikemarket/contracts/FrameContract.java

@@ -33,6 +33,7 @@ public String getModelNum() {
     public Party getIssuer() {
         return maintainer;
     }
+
     @Override
     public int getFractionDigits() {
         return this.fractionDigits;

…bikemarket/contracts/WheelsContract.java …bikemarket/contracts/WheelsContract.javaTokens/bikemarket/contracts/src/main/java/net/corda/examples/bikemarket/contracts/WheelsContract.java renamed to Tokens/bikemarket/contracts/src/main/java/net/corda/samples/bikemarket/contracts/WheelsContract.java Tokens/bikemarket/contracts/src/main/java/net/corda/examples/bikemarket/contracts/WheelsContract.java renamed to Tokens/bikemarket/contracts/src/main/java/net/corda/samples/bikemarket/contracts/WheelsContract.java

@@ -0,0 +1,2 @@
+package net.corda.samples.bikemarket.contracts;public class StateTests {
+}

…s/bikemarket/states/FrameTokenState.java …s/bikemarket/states/FrameTokenState.javaTokens/bikemarket/contracts/src/main/java/net/corda/examples/bikemarket/states/FrameTokenState.java renamed to Tokens/bikemarket/contracts/src/main/java/net/corda/samples/bikemarket/states/FrameTokenState.java Tokens/bikemarket/contracts/src/main/java/net/corda/examples/bikemarket/states/FrameTokenState.java renamed to Tokens/bikemarket/contracts/src/main/java/net/corda/samples/bikemarket/states/FrameTokenState.java

@@ -32,10 +32,10 @@ public String call() throws FlowException {
 
         //create non-fungible frame token
         UniqueIdentifier uuid = new UniqueIdentifier();
-        WheelsTokenState frame = new WheelsTokenState(getOurIdentity(), uuid, 0 , this.wheelModel);
+        WheelsTokenState wheel = new WheelsTokenState(getOurIdentity(), uuid, 0 , this.wheelModel);
 
         //wrap it with transaction state specifying the notary
-        TransactionState transactionState = new TransactionState(frame, notary);
+        TransactionState transactionState = new TransactionState(wheel, notary);
 
         //call built in sub flow CreateEvolvableTokens. This can be called via rpc or in unit testing
         subFlow(new CreateEvolvableTokens(transactionState));

…/bikemarket/states/WheelsTokenState.java …/bikemarket/states/WheelsTokenState.javaTokens/bikemarket/contracts/src/main/java/net/corda/examples/bikemarket/states/WheelsTokenState.java renamed to Tokens/bikemarket/contracts/src/main/java/net/corda/samples/bikemarket/states/WheelsTokenState.java Tokens/bikemarket/contracts/src/main/java/net/corda/examples/bikemarket/states/WheelsTokenState.java renamed to Tokens/bikemarket/contracts/src/main/java/net/corda/samples/bikemarket/states/WheelsTokenState.java

@@ -48,7 +48,7 @@ public String call() throws FlowException {
         FrameTokenState frametokentype = frameStateAndRef.getState().getData();
 
         //get the pointer to the frame
-        TokenPointer frametokenPointer = frametokentype.toPointer(frametokentype.getClass());
+        //TokenPointer frametokenPointer = frametokentype.toPointer(frametokentype.getClass());
 
         //mention the current holder also
         NonFungibleToken frametoken = new NonFungibleTokenBuilder()
@@ -66,7 +66,7 @@ public String call() throws FlowException {
         WheelsTokenState wheeltokentype = wheelStateStateAndRef.getState().getData();
 
         //get the pointer pointer to the wheel
-        TokenPointer wheeltokenPointer = wheeltokentype.toPointer(wheeltokentype.getClass());
+        //TokenPointer wheeltokenPointer = wheeltokentype.toPointer(wheeltokentype.getClass());
 
         //mention the current holder also
         NonFungibleToken wheeltoken = new NonFungibleTokenBuilder()