Skip to content

Commit 2743ebe

Browse files
committed
* moved the private static Map field in Trans2QuikLibrary.java into the static initializer block;
* introduced two method signatures -- TRANS2QUIK_ORDER_FILETIME and TRANS2QUIK_ORDER_WITHDRAW_FILETIME -- in the library interface.
1 parent 49b892b commit 2743ebe

4 files changed

Lines changed: 26 additions & 12 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.idea/
22
*.iml
3+
/target/

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<groupId>net.java.dev.jna</groupId>
2020
<artifactId>jna-platform</artifactId>
2121
<version>${version.jna-platform}</version>
22+
<scope>compile</scope>
2223
</dependency>
2324

2425
</dependencies>

src/main/java/org/jtrans2quik/loader/Trans2QuikLibraryLoader.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,22 @@
1111

1212
/**
1313
* Created by Arsentii Nerushev on 14.05.2015.
14-
* @version 1.0.0
14+
* @version 1.0.1
1515
*/
1616
public final class Trans2QuikLibraryLoader {
1717

18-
private static final Map<Object, Object> NAME_MAPPING = new HashMap<Object, Object>();
1918
public static final Trans2QuikLibrary LIBRARY;
2019

2120
static {
22-
NAME_MAPPING.put(Library.OPTION_FUNCTION_MAPPER, StdCallLibrary.FUNCTION_MAPPER);
23-
NAME_MAPPING.put(Library.OPTION_CALLING_CONVENTION, Function.C_CONVENTION);
21+
22+
final Map<Object, Object> nameMapping = new HashMap<Object, Object>();
23+
nameMapping.put(Library.OPTION_FUNCTION_MAPPER, StdCallLibrary.FUNCTION_MAPPER);
24+
nameMapping.put(Library.OPTION_CALLING_CONVENTION, Function.C_CONVENTION);
2425
System.setProperty("java.library.path", "lib/win32-x86");
2526
LIBRARY = (Trans2QuikLibrary) Native.loadLibrary(
2627
"TRANS2QUIK",
2728
Trans2QuikLibrary.class,
28-
NAME_MAPPING);
29+
nameMapping);
2930
}
3031

3132
private Trans2QuikLibraryLoader() {

src/main/java/org/jtrans2quik/wrapper/Trans2QuikLibrary.java

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
* @version 1.0.1
1111
*/
1212
public interface Trans2QuikLibrary extends StdCallLibrary {
13+
14+
/*
15+
* Java Native Access (JNA) overview:
16+
* https://jna.java.net/javadoc/overview-summary.html
17+
*/
1318

1419
/**
1520
* @since 1.0.0
@@ -23,8 +28,8 @@ public interface OrderStatusCallback extends StdCallCallback {
2328
* @param nMode
2429
* @param dwTransID
2530
* @param dNumber
26-
* @param ClassCode
27-
* @param SecCode
31+
* @param classCode
32+
* @param secCode
2833
* @param dPrice
2934
* @param nBalance
3035
* @param dValue
@@ -37,8 +42,8 @@ void callback(
3742
NativeLong nMode,
3843
int dwTransID,
3944
double dNumber,
40-
String ClassCode,
41-
String SecCode,
45+
String classCode,
46+
String secCode,
4247
double dPrice,
4348
NativeLong nBalance,
4449
double dValue,
@@ -149,7 +154,7 @@ NativeLong TRANS2QUIK_DISCONNECT(
149154
* @return terminal connection status
150155
* @since 1.0.0
151156
*/
152-
public abstract NativeLong TRANS2QUIK_IS_QUIK_CONNECTED(
157+
public NativeLong TRANS2QUIK_IS_QUIK_CONNECTED(
153158
NativeLongByReference pnExtendedErrorCode,
154159
byte[] lpstrErrorMessage,
155160
int dwErrorMessageSize
@@ -397,8 +402,11 @@ NativeLong TRANS2QUIK_SUBSCRIBE_TRADES(
397402

398403
/**
399404
* FILETIME TRANS2QUIK_API __stdcall TRANS2QUIK_ORDER_FILETIME (long nOrderDescriptor);
405+
* @param nOrderDescriptor
406+
* @return FILETIME structure value
407+
* @since 1.0.1
400408
*/
401-
//void TRANS2QUIK_ORDER_FILETIME(NativeLong nOrderDescriptor);
409+
Structure TRANS2QUIK_ORDER_FILETIME(NativeLong nOrderDescriptor);
402410

403411
/**
404412
* long TRANS2QUIK_API __stdcall TRANS2QUIK_ORDER_DATE_TIME (long nOrderDescriptor, long nTimeType);
@@ -411,8 +419,11 @@ NativeLong TRANS2QUIK_SUBSCRIBE_TRADES(
411419

412420
/**
413421
* FILETIME TRANS2QUIK_API __stdcall TRANS2QUIK_ORDER_WITHDRAW_FILETIME (long nOrderDescriptor);
422+
* @param nOrderDescriptor
423+
* @return FILETIME structure value
424+
* @since 1.0.1
414425
*/
415-
//void TRANS2QUIK_ORDER_WITHDRAW_FILETIME(NativeLong nOrderDescriptor);
426+
Structure TRANS2QUIK_ORDER_WITHDRAW_FILETIME(NativeLong nOrderDescriptor);
416427

417428
/**
418429
* LPTSTR TRANS2QUIK_API __stdcall TRANS2QUIK_ORDER_USERID (long nOrderDescriptor);

0 commit comments

Comments
 (0)