Resolve merge conflict

Author: georgweiss

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/JFXPreferences.java

@@ -22,6 +22,8 @@ public class JFXPreferences
     @Preference public static int tooltip_delay_ms;
     /** Tooltip duration */
     @Preference public static int tooltip_display_sec;
+    /** make the transparent parts of symbols clickable */
+    @Preference public static boolean pick_on_bounds;
 
     static
     {

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/WidgetInfoDialog.java

@@ -658,14 +658,19 @@ private ArchivedStatus getFromArchiver(String pvName) {
         }
         // Prepend "archiver://"
         pvName = "archive://" + pvName + "(" + TimestampFormats.SECONDS_FORMAT.format(Instant.now()) + ")";
+        PV pv = null;
         try {
-            PV pv = PVPool.getPV(pvName);
+            pv = PVPool.getPV(pvName);
             VType pvValue = pv.read();
-            PVPool.releasePV(pv);
             return pvValue == null ? ArchivedStatus.NO : ArchivedStatus.YES;
         } catch (Exception e) {
             return ArchivedStatus.UNKNOWN;
         }
+        finally {
+            if(pv != null){
+                PVPool.releasePV(pv);
+            }
+        }
     }
 
     private enum ArchivedStatus {

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ActionButtonRepresentation.java

@@ -166,9 +166,17 @@ private ButtonBase makeBaseButton() {
             final Button button = new Button();
             button.setOnAction(event -> confirm(() -> handleActions(actions.getActions())));
             result = button;
+            if (actions.getActions().size() == 1) {
+                // If the ActionButton only has a single action and that is to 
+                // write to a PV then is_writePV should be true.
+                // This means that if the PV is non-writable then the
+                // ActionButton will be disabled.
+                if (actions.getActions().get(0).getType().equals("write_pv"))
+                    is_writePV = true;
+            }
         } else {
             // If there is at least one non-WritePVAction then is_writePV should be false
-            is_writePV = !has_non_writePVAction;
+            is_writePV = has_non_writePVAction;
 
             final MenuButton button = new MenuButton();
 
@@ -461,11 +469,7 @@ public void updateChanges() {
             // Don't disable the widget, because that would also remove the
             // tooltip
             // Just apply a style that matches the disabled look.
-            Styles.update(base, Styles.NOT_ENABLED, !enabled);
-            // Apply the cursor to the pane and not to the button
-            if (!toolkit.isEditMode()) {
-                jfx_node.setCursor(enabled ? Cursor.HAND : Cursors.NO_WRITE);
-            }
+            setDisabledLook(enabled, jfx_node.getChildren());
         }
     }
 }

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/BoolButtonRepresentation.java

@@ -83,6 +83,7 @@ public class BoolButtonRepresentation extends RegionBaseRepresentation<Pane, Boo
     private volatile String value_label;
     private volatile ImageView[] state_images;
     private volatile ImageView value_image;
+    protected volatile boolean enabled = true;
 
     private final UntypedWidgetPropertyListener imagesChangedListener = this::imagesChanged;
     private final UntypedWidgetPropertyListener representationChangedListener = this::representationChanged;
@@ -138,8 +139,10 @@ protected void attachTooltip()
      */
     private void handlePress(final boolean pressed)
     {
-        logger.log(Level.FINE, "{0} pressed", model_widget);
-        Platform.runLater(() -> confirm(pressed));
+        if (enabled) {
+            logger.log(Level.FINE, "{0} pressed", model_widget);
+            Platform.runLater(() -> confirm(pressed));
+        }
     }
 
     /** Check for confirmation, then perform the button action
@@ -403,10 +406,9 @@ public void updateChanges()
         }
         if (dirty_enablement.checkAndClear())
         {
-            final boolean enabled = model_widget.propEnabled().getValue()  &&
+            enabled = model_widget.propEnabled().getValue()  &&
                                     model_widget.runtimePropPVWritable().getValue();
-            button.setDisable(! enabled);
-            Styles.update(button, Styles.NOT_ENABLED, !enabled);
+            setDisabledLook(enabled, jfx_node.getChildren());        
         }
         if (update_value)
         {

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/CheckBoxRepresentation.java

@@ -229,7 +229,7 @@ public void updateChanges()
             // Just apply a style that matches the disabled look.
             enabled = model_widget.propEnabled().getValue() &&
                       model_widget.runtimePropPVWritable().getValue();
-            Styles.update(jfx_node, Styles.NOT_ENABLED, !enabled);
+            setDisabledLook(enabled, jfx_node.getChildrenUnmodifiable());
             if (model_widget.propAutoSize().getValue())
                 sizeChanged(null, null, null);
         }

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ChoiceButtonRepresentation.java

@@ -181,6 +181,14 @@ private void selectionChanged(final ObservableValue<? extends Toggle> obs, final
             {
                 active = false;
             }
+        } 
+        else if (!enabled && newval == null) 
+        {
+            // If the choice button is not enabled (no write allowed)
+            // we still have to ensure the 'oldval' stays selected
+            // as otherwise clicking on the same value will set an 
+            // unselected look on the ChoiceButton.
+        	toggle.selectToggle(oldval);
         }
     }
 
@@ -332,8 +340,7 @@ public void updateChanges()
             // Just apply a style that matches the disabled look.
             enabled = model_widget.propEnabled().getValue() &&
                       model_widget.runtimePropPVWritable().getValue();
-            Styles.update(jfx_node, Styles.NOT_ENABLED, !enabled);
-            jfx_node.setCursor(enabled ? Cursor.DEFAULT : Cursors.NO_WRITE);
+            setDisabledLook(enabled, jfx_node.getChildren());
             for (Node node : jfx_node.getChildren())
             {
                 final ButtonBase b = (ButtonBase) node;

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ComboRepresentation.java

@@ -296,8 +296,7 @@ public void updateChanges()
             // and the cursor will be ignored
             //  jfx_node.setDisable(! enabled);
             // So keep enabled, but indicate that trying to operate the widget is futile
-            Styles.update(jfx_node, Styles.NOT_ENABLED, !enabled);
-            jfx_node.setCursor(enabled ? Cursor.DEFAULT : Cursors.NO_WRITE);
+            setDisabledLook(enabled, jfx_node.getChildrenUnmodifiable());
             if (model_widget.propEditable().getValue())
             {
                 jfx_node.getEditor().setEditable(enabled ? model_widget.propEditable().getValue() : false);

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/JFXBaseRepresentation.java

@@ -26,14 +26,17 @@
 import org.csstudio.display.builder.model.widgets.TabsWidget;
 import org.csstudio.display.builder.model.widgets.TabsWidget.TabItemProperty;
 import org.csstudio.display.builder.representation.WidgetRepresentation;
+import org.csstudio.display.builder.representation.javafx.Cursors;
 import org.csstudio.display.builder.representation.javafx.JFXRepresentation;
 
 import javafx.collections.ObservableList;
 import javafx.event.EventHandler;
+import javafx.scene.Cursor;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import org.phoebus.core.types.ProcessVariable;
 import org.phoebus.ui.dnd.DataFormats;
+import org.phoebus.ui.javafx.Styles;
 
 /** Base class for all JavaFX widget representations
  *  @param <JFX> JFX Widget
@@ -356,4 +359,22 @@ public void updateOrder()
             addToParent(parent);
         }
     }
+
+    /**
+     * We do not want to disable widgets if they cannot be written to as this
+     * removes the context menu. Instead we replicate the disabled look from Java FX
+     * and set the cursor to the 'NO_WRITE' cursor to indicate this.
+     * 
+     * @param enabled  boolean as to whether widget interaction is allowed
+     * @param children list of children nodes under the parent widget
+     */
+    public void setDisabledLook(Boolean enabled, ObservableList<Node> children) {
+        jfx_node.setCursor(enabled ? Cursor.DEFAULT : Cursors.NO_WRITE);
+        if (children != null) {
+            for (Node node : children)
+            {
+                Styles.update(node, Styles.NOT_ENABLED, !enabled);
+            }   
+        }
+    }
 }

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/RadioRepresentation.java

@@ -299,7 +299,7 @@ public void updateChanges()
             // Just apply a style that matches the disabled look.
             enabled = model_widget.propEnabled().getValue() &&
                       model_widget.runtimePropPVWritable().getValue();
-            Styles.update(jfx_node, Styles.NOT_ENABLED, !enabled);
+            setDisabledLook(enabled, jfx_node.getChildren());
             for (Node rb_node : jfx_node.getChildren())
             {
                 final RadioButton rb = (RadioButton) rb_node;

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ScaledSliderRepresentation.java

@@ -407,8 +407,11 @@ private void valueChanged(final WidgetProperty<? extends VType> property, final
     public void updateChanges()
     {
         super.updateChanges();
-        if (dirty_enablement.checkAndClear())
+        if (dirty_enablement.checkAndClear()) {
             slider.setDisable(!enabled);
+            setDisabledLook(enabled, jfx_node.getChildrenUnmodifiable());
+        }
+
         if (dirty_layout.checkAndClear())
         {
             final boolean horizontal = model_widget.propHorizontal().getValue();