From f939654309c3d186d95f7e7bd2b3621029003758 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Sun, 15 Sep 2019 11:23:08 +0200
Subject: [PATCH] Demo: OptionPanePanel: use EmptyBorder instead of null-border
 to make sure that it is not replaces when switching LaF

---
 .../src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java | 2 +-
 .../src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java
index ed2297b8..6a5f9031 100644
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java
@@ -83,7 +83,7 @@ class OptionPanePanel
 		OptionPanePanel.ShowDialogLinkLabel customShowDialogLabel = new OptionPanePanel.ShowDialogLinkLabel();
 
 		//======== this ========
-		setBorder(null);
+		setBorder(BorderFactory.createEmptyBorder());
 
 		//======== panel9 ========
 		{
diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd
index 9688a8ad..59231d01 100644
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd
@@ -8,7 +8,7 @@ new FormModel {
 		}
 		add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
 			name: "this"
-			"border": sfield com.jformdesigner.model.FormObject NULL_VALUE
+			"border": new javax.swing.border.EmptyBorder( 0, 0, 0, 0 )
 			add( new FormContainer( "com.formdev.flatlaf.demo.ScrollablePanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 				"$layoutConstraints": "flowy,hidemode 3"
 				"$columnConstraints": "[][][fill]"