Skip to content

Commit e9b53ea

Browse files
committed
ADAP-77: update adapter to 6.0.1.1-SNAPSHOT
1 parent f0bd89e commit e9b53ea

File tree

6 files changed

+7
-5
lines changed

6 files changed

+7
-5
lines changed

RELEASENOTES-ADAPTER.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11

22
# Version 6.0.1.1-SNAPSHOT
3+
## New Features
4+
* Add browser-style navigation to Window class
35

46
## Bug Fixes
57
* Fixed an issue with loop of re-connecting to Runtime

release/junit.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ set RuntimeVersion="stable"
66
set RuntimeVersion="%1"
77
)
88

9-
java -cp openfin-desktop-java-example-6.0.0.3-tests.jar;openfin-desktop-java-adapter-6.0.1.0.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.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.test.runtime.version=%RuntimeVersion% org.junit.runner.JUnitCore com.openfin.desktop.AllTests
9+
java -cp openfin-desktop-java-example-6.0.1.1-tests.jar;openfin-desktop-java-adapter-6.0.1.1-SNAPSHOT.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.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.test.runtime.version=%RuntimeVersion% org.junit.runner.JUnitCore com.openfin.desktop.AllTests
311 KB
Binary file not shown.
123 KB
Binary file not shown.
0 Bytes
Binary file not shown.

src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ public void run() {
406406
private void closeDesktop() {
407407
if (desktopConnection != null && desktopConnection.isConnected()) {
408408
try {
409-
desktopConnection.exit();
409+
desktopConnection.disconnect();
410410
// this.desktopConnection.disconnect();
411411
// Application app = Application.wrap(this.startupUUID, this.desktopConnection);
412412
// app.close();
@@ -423,7 +423,7 @@ private void closeDesktop() {
423423
SwingUtilities.invokeLater(new Runnable() {
424424
@Override
425425
public void run() {
426-
// jFrame.dispose();
426+
jFrame.dispose();
427427
}
428428
});
429429
try {
@@ -772,8 +772,8 @@ private String getBooleanString(boolean value) {
772772
private static void createAndShowGUI() {
773773

774774
//Create and set up the window.
775-
jFrame = new JFrame("Java Login Demo");
776-
jFrame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
775+
jFrame = new JFrame("Java OpenFin Demo");
776+
// jFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
777777

778778
//Create and set up the content pane.
779779
OpenFinDesktopDemo newContentPane = new OpenFinDesktopDemo();

0 commit comments

Comments
 (0)