Skip to content

Commit b1eba29

Browse files
wenjunchewenjunche
authored
Merge branch 'master' into develop
2 parents 6fc5ee1 + 4aca66d commit b1eba29

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

‎README.md‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
# java-example
2-
Examples for OpenFin Java adapter
1+
# Java Adapter Example
32

4-
## Run the example of connecting to OpenFin and creating applications
3+
## Overview
4+
The following repo contains examples for OpenFin's Java adapter.
5+
6+
## Guidelines
7+
Run the example of connecting to OpenFin and creating applications
58

69
1. Clone this repository
710

@@ -224,9 +227,12 @@ Source code for the example is located in /src/main/java/com/openfin/desktop/dem
224227
```
225228

226229
## More Info
227-
228230
More information and API documentation can be found at https://openfin.co/java-api/
229231

230-
## Getting help
232+
## Disclaimers
233+
* This is a starter example and intended to demonstrate to app providers a sample of how to approach an implementation. There are potentially other ways to approach it and alternatives could be considered.
234+
* Its possible that the repo is not actively maintained.
231235

232-
Please contact [email protected]
236+
## Support
237+
Please enter an issue in the repo for any questions or problems.
238+
<br> Alternatively, please contact us at [email protected]

‎RELEASENOTES-ADAPTER.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* Added error message to DesktopStateListener.onClose (breaking change)
1111
* Added OpenFinRuntime.getRuntimeInfo
1212
* Added OpenFinRuntime.getRvmInfo
13+
* Improved thread safety with concurrent collection classes.
1314

1415
## Bug Fixes
1516
* Fixed an issue with passing arguments in System.launchExternalProcess

‎release/embed.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java -cp openfin-desktop-java-example-6.0.1.3-SNAPSHOT.jar;openfin-desktop-java-adapter-7.0.1.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.embed.URL=https://openfin.co -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.WindowEmbedDemo
1+
java -cp openfin-desktop-java-example-6.0.1.3-SNAPSHOT.jar;openfin-desktop-java-adapter-7.0.1.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.embed.URL=https://openfin.co -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.WindowEmbedDemo

0 commit comments

Comments
 (0)