Skip to content

Commit 5ba6326

Browse files
author
[a561842] hubert marteau
committed
MultiChain alignment
1 parent fca240a commit 5ba6326

File tree

5 files changed

+120
-42
lines changed

5 files changed

+120
-42
lines changed

‎src/main/java/multichain/object/AssetWalletTransaction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class AssetWalletTransaction extends BalanceAssetWalletTransaction {
1919
Boolean open = null;
2020

2121
Object details;
22-
long raw;
22+
Long raw = null;
2323
List<String> addresses;
2424

2525

‎src/main/java/multichain/object/BalanceAsset.java‎

Lines changed: 80 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,19 @@ public class BalanceAsset {
1919
Double units = null;
2020
Boolean open = null;
2121
Object details = null;
22-
Double issueqty = null;
23-
Long issueraw = null;
22+
Double qty = null;
23+
Long raw = null;
2424
Boolean subscribed = null;
25+
String type = null;
2526

2627
/* (non-Javadoc)
2728
* @see java.lang.Object#toString()
2829
*/
2930
@Override
3031
public String toString() {
3132
return "BalanceAsset [name=" + name + ", issuetxid=" + issuetxid + ", assetref=" + assetref + ", multiple="
32-
+ multiple + ", units=" + units + ", open=" + open + ", details=" + details + ", issueqty=" + issueqty
33-
+ ", issueraw=" + issueraw + ", subscribed=" + subscribed + "]";
33+
+ multiple + ", units=" + units + ", open=" + open + ", details=" + details + ", qty=" + qty
34+
+ ", raw=" + raw + ", subscribed=" + subscribed + "]";
3435
}
3536

3637
/**
@@ -116,90 +117,130 @@ public void setAssetref(String assetref) {
116117
}
117118

118119
/**
119-
* @return the raw
120+
* @return the issuetxid
120121
*/
121-
public long getRaw() {
122-
return issueraw;
122+
public String getIssuetxid() {
123+
return issuetxid;
123124
}
124125

125126
/**
126-
* @param raw
127-
* the raw to set
127+
* @param issuetxid
128+
* the issuetxid to set
128129
*/
129-
public void setRaw(long raw) {
130-
this.issueraw = raw;
130+
public void setIssuetxid(String issuetxid) {
131+
this.issuetxid = issuetxid;
131132
}
132133

133134
/**
134-
* @return the raw
135+
* @return the subscribed
135136
*/
136-
public long getIssueraw() {
137-
return issueraw;
137+
public boolean isSubscribed() {
138+
return subscribed;
138139
}
139140

140141
/**
141-
* @param raw
142-
* the raw to set
142+
* @param subscribed the subscribed to set
143143
*/
144-
public void setIssueraw(long raw) {
145-
this.issueraw = raw;
144+
public void setSubscribed(boolean subscribed) {
145+
this.subscribed = subscribed;
146146
}
147147

148148
/**
149-
* @return the issuetxid
149+
* @return the name
150150
*/
151-
public String getIssuetxid() {
152-
return issuetxid;
151+
public String getName() {
152+
return name;
153153
}
154154

155155
/**
156-
* @param issuetxid
157-
* the issuetxid to set
156+
* @param name the name to set
158157
*/
159-
public void setIssuetxid(String issuetxid) {
160-
this.issuetxid = issuetxid;
158+
public void setName(String name) {
159+
this.name = name;
160+
}
161+
162+
/**
163+
* @return the open
164+
*/
165+
public Boolean getOpen() {
166+
return open;
167+
}
168+
169+
/**
170+
* @param open the open to set
171+
*/
172+
public void setOpen(Boolean open) {
173+
this.open = open;
174+
}
175+
176+
/**
177+
* @return the qty
178+
*/
179+
public Double getQty() {
180+
return qty;
181+
}
182+
183+
/**
184+
* @param qty the qty to set
185+
*/
186+
public void setQty(Double qty) {
187+
this.qty = qty;
188+
}
189+
190+
/**
191+
* @return the raw
192+
*/
193+
public Long getRaw() {
194+
return raw;
195+
}
196+
197+
/**
198+
* @param raw the raw to set
199+
*/
200+
public void setRaw(Long raw) {
201+
this.raw = raw;
161202
}
162203

163204
/**
164205
* @return the subscribed
165206
*/
166-
public boolean isSubscribed() {
207+
public Boolean getSubscribed() {
167208
return subscribed;
168209
}
169210

170211
/**
171212
* @param subscribed the subscribed to set
172213
*/
173-
public void setSubscribed(boolean subscribed) {
214+
public void setSubscribed(Boolean subscribed) {
174215
this.subscribed = subscribed;
175216
}
176217

177218
/**
178-
* @return the name
219+
* @return the type
179220
*/
180-
public String getName() {
181-
return name;
221+
public String getType() {
222+
return type;
182223
}
183224

184225
/**
185-
* @param name the name to set
226+
* @param type the type to set
186227
*/
187-
public void setName(String name) {
188-
this.name = name;
228+
public void setType(String type) {
229+
this.type = type;
189230
}
190231

191232
/**
192-
* @return the issueqty
233+
* @param multiple the multiple to set
193234
*/
194-
public double getIssueqty() {
195-
return issueqty;
235+
public void setMultiple(Long multiple) {
236+
this.multiple = multiple;
196237
}
197238

198239
/**
199-
* @param issueqty the issueqty to set
240+
* @param units the units to set
200241
*/
201-
public void setIssueqty(double issueqty) {
202-
this.issueqty = issueqty;
242+
public void setUnits(Double units) {
243+
this.units = units;
203244
}
204245

205246
}

‎src/main/java/multichain/object/BalanceAssetWalletTransaction.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public class BalanceAssetWalletTransaction {
1515
String name = null;
1616
String assetref = null;
1717
Double qty = null;
18+
String type = null;
1819

1920
/* (non-Javadoc)
2021
* @see java.lang.Object#toString()
@@ -66,5 +67,26 @@ public void setQty(double qty) {
6667
this.qty = qty;
6768
}
6869

70+
/**
71+
* @return the type
72+
*/
73+
public String getType() {
74+
return type;
75+
}
76+
77+
/**
78+
* @param type the type to set
79+
*/
80+
public void setType(String type) {
81+
this.type = type;
82+
}
83+
84+
/**
85+
* @param qty the qty to set
86+
*/
87+
public void setQty(Double qty) {
88+
this.qty = qty;
89+
}
90+
6991

7092
}

‎src/main/java/multichain/object/PermissionDetailed.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
public class PermissionDetailed {
1717

18-
List<String> addresses = null;
1918
Boolean connect = null;
2019
Boolean send = null;
2120
Boolean receive = null;
@@ -27,7 +26,8 @@ public class PermissionDetailed {
2726
Long startblock = null;
2827
Long endblock = null;
2928
Long timestamp = null;
30-
29+
List<String> addresses = null;
30+
3131
/**
3232
*
3333
*/

‎src/main/java/multichain/object/TransactionRAW.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class TransactionRAW {
2020
Long locktime = null;
2121
List<TransactionRAWVin> vin;
2222
List<TransactionRAWVout> vout;
23+
AssetWalletTransaction issue = null;
2324
List<String> data;
2425

2526
/**
@@ -141,4 +142,18 @@ public void setVersion(int version) {
141142
this.version = version;
142143
}
143144

145+
/**
146+
* @return the issue
147+
*/
148+
public AssetWalletTransaction getIssue() {
149+
return issue;
150+
}
151+
152+
/**
153+
* @param issue the issue to set
154+
*/
155+
public void setIssue(AssetWalletTransaction issue) {
156+
this.issue = issue;
157+
}
158+
144159
}

0 commit comments

Comments
 (0)