ADAP-150: updated examples for Layout service

wenjunche · wenjunche · commit eb7e1be18e22 · 2019-03-27T17:02:06.000-04:00
diff --git a/release/docking.bat b/release/docking.bat
@@ -3,4 +3,4 @@ REM layout.html is a simple example of OpenFin window that uses Layout service.
 REM For this example to work, layout.html needs to be hosted by a web server and its URL needs to be configured with -Dcom.openfin.demo.layout.url
 REM To set RVM path, add  -Dcom.openfin.demo.layout.rvm=C:\Users\username\AppData\Local\OpenFin\OpenFinRVM.exe
 
-java -cp openfin-desktop-java-example-7.1.1.jar;openfin-desktop-java-adapter-7.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;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 -Dcom.openfin.demo.layout.url=http://localhost:8008/layout.html -Dcom.openfin.demo.layout.rvm=C:\Users\wenju\AppData\Local\OpenFin\OpenFinRVM.exe com.openfin.desktop.demo.LayoutServiceDemo
+java -cp openfin-desktop-java-example-7.1.1.jar;openfin-desktop-java-adapter-7.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;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 -Dcom.openfin.demo.layout.url=http://localhost:8008/layout.html -Dcom.openfin.demo.layout.rvm=C:\Users\username\AppData\Local\OpenFin\OpenFinRVM.exe com.openfin.desktop.demo.LayoutServiceDemo
diff --git a/release/openfin-desktop-java-example-7.1.1.jar b/release/openfin-desktop-java-example-7.1.1.jar
diff --git a/src/main/java/com/openfin/desktop/demo/LayoutServiceDemo.java b/src/main/java/com/openfin/desktop/demo/LayoutServiceDemo.java
@@ -136,7 +136,10 @@ public void actionPerformed(ActionEvent e) {
 		JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
 		pnl.add(btnCreateOpenfinWindow);
 		pnl.add(btnCreateJavaWindow);
-		pnl.add(btnCreateFramelessJavaWindow);
+		if (System.getProperty("com.openfin.demo.layout.frameless") != null) {
+			// This example is experimental and not available yet
+			pnl.add(btnCreateFramelessJavaWindow);
+		}
 		pnl.add(btnCreateJavaFxWindow);
 
 		contentPnl.add(new JLabel("Undock Openfin windows with global hotkey (CTRL+SHIFT+U or CMD+SHIFT+U)"),
