From 66a5ba497d24ac3bcb7ede4ff7ada0b74d3e3c61 Mon Sep 17 00:00:00 2001 From: "Nelson R. Perez" Date: Mon, 10 Apr 2017 12:08:51 -0500 Subject: [PATCH] Making the GetLimitOrders and TransactionBroadcastSequence implement the BaseGrapheneHandler interface --- .../graphenej/api/GetLimitOrders.java | 17 ++++++----- .../api/TransactionBroadcastSequence.java | 30 ++++++++++++------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/graphenej/src/main/java/de/bitsharesmunich/graphenej/api/GetLimitOrders.java b/graphenej/src/main/java/de/bitsharesmunich/graphenej/api/GetLimitOrders.java index 60c7f4d..eacdda9 100644 --- a/graphenej/src/main/java/de/bitsharesmunich/graphenej/api/GetLimitOrders.java +++ b/graphenej/src/main/java/de/bitsharesmunich/graphenej/api/GetLimitOrders.java @@ -3,9 +3,15 @@ package de.bitsharesmunich.graphenej.api; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.neovisionaries.ws.client.WebSocket; -import com.neovisionaries.ws.client.WebSocketAdapter; import com.neovisionaries.ws.client.WebSocketException; import com.neovisionaries.ws.client.WebSocketFrame; + +import java.io.Serializable; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import de.bitsharesmunich.graphenej.AssetAmount; import de.bitsharesmunich.graphenej.LimitOrder; import de.bitsharesmunich.graphenej.RPC; @@ -15,16 +21,10 @@ import de.bitsharesmunich.graphenej.models.ApiCall; import de.bitsharesmunich.graphenej.models.BaseResponse; import de.bitsharesmunich.graphenej.models.WitnessResponse; -import java.io.Serializable; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - /** * Created by nelson on 11/15/16. */ -public class GetLimitOrders extends WebSocketAdapter { +public class GetLimitOrders extends BaseGrapheneHandler { private String a; private String b; @@ -32,6 +32,7 @@ public class GetLimitOrders extends WebSocketAdapter { private WitnessResponseListener mListener; public GetLimitOrders(String a, String b, int limit, WitnessResponseListener mListener) { + super(mListener); this.a = a; this.b = b; this.limit = limit; diff --git a/graphenej/src/main/java/de/bitsharesmunich/graphenej/api/TransactionBroadcastSequence.java b/graphenej/src/main/java/de/bitsharesmunich/graphenej/api/TransactionBroadcastSequence.java index bd6bfc3..5b560f6 100644 --- a/graphenej/src/main/java/de/bitsharesmunich/graphenej/api/TransactionBroadcastSequence.java +++ b/graphenej/src/main/java/de/bitsharesmunich/graphenej/api/TransactionBroadcastSequence.java @@ -1,27 +1,36 @@ package de.bitsharesmunich.graphenej.api; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import com.neovisionaries.ws.client.WebSocket; +import com.neovisionaries.ws.client.WebSocketException; +import com.neovisionaries.ws.client.WebSocketFrame; + import java.io.Serializable; import java.lang.reflect.Type; import java.text.SimpleDateFormat; -import java.util.*; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.reflect.TypeToken; -import de.bitsharesmunich.graphenej.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; + +import de.bitsharesmunich.graphenej.Asset; +import de.bitsharesmunich.graphenej.AssetAmount; +import de.bitsharesmunich.graphenej.BlockData; +import de.bitsharesmunich.graphenej.RPC; +import de.bitsharesmunich.graphenej.Transaction; import de.bitsharesmunich.graphenej.interfaces.WitnessResponseListener; import de.bitsharesmunich.graphenej.models.ApiCall; import de.bitsharesmunich.graphenej.models.BaseResponse; import de.bitsharesmunich.graphenej.models.DynamicGlobalProperties; import de.bitsharesmunich.graphenej.models.WitnessResponse; -import com.neovisionaries.ws.client.WebSocket; -import com.neovisionaries.ws.client.WebSocketAdapter; -import com.neovisionaries.ws.client.WebSocketException; -import com.neovisionaries.ws.client.WebSocketFrame; /** * Class that will handle the transaction publication procedure. */ -public class TransactionBroadcastSequence extends WebSocketAdapter { +public class TransactionBroadcastSequence extends BaseGrapheneHandler { private final String TAG = this.getClass().getName(); private final static int LOGIN_ID = 1; @@ -45,6 +54,7 @@ public class TransactionBroadcastSequence extends WebSocketAdapter { * of the transaction broadcast operation. */ public TransactionBroadcastSequence(Transaction transaction, Asset feeAsset, WitnessResponseListener listener){ + super(listener); this.transaction = transaction; this.feeAsset = feeAsset; this.mListener = listener;