Merge pull request #6958 from oyarzun/flatlaf-options-rcp

FlatLAF properties fallback to Openable for rcp apps without editors
apache · Jan 15, 2024 · 82c6c8f · 82c6c8f
2 parents 1400bff + 4384695
commit 82c6c8f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLafOptionsPanel.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLafOptionsPanel.java
@@ -30,6 +30,7 @@
 import java.util.Properties;
 import javax.swing.UIManager;
 import org.netbeans.api.actions.Editable;
+import org.netbeans.api.actions.Openable;
 import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.LifecycleManager;
 import org.openide.awt.Notification;
@@ -299,7 +300,13 @@ private void customPropertiesButtonActionPerformed(java.awt.event.ActionEvent ev
                 }
                 DataObject dob = DataObject.find(customProp);
                 Editable editable = dob.getLookup().lookup(Editable.class);
-                editable.edit();
+                if (editable != null) {
+                  editable.edit();
+                } else {
+                  // fallback to openable for platform apps without editor modules
+                  Openable openable = dob.getLookup().lookup(Openable.class);
+                  openable.open();
+                }
             } catch (Exception ex) {
                 Exceptions.printStackTrace(ex);
             }