Remove changes from app/display

Author: DenSinH

app/display/actions/src/main/java/org/csstudio/display/actions/WritePVAction.java

@@ -5,14 +5,11 @@
 package org.csstudio.display.actions;
 
 import javafx.scene.image.Image;
-import org.csstudio.display.builder.model.Widget;
 import org.csstudio.display.builder.model.persist.ModelReader;
 import org.csstudio.display.builder.model.persist.ModelWriter;
 import org.csstudio.display.builder.model.persist.XMLTags;
 import org.csstudio.display.builder.model.properties.ActionInfoBase;
 import org.csstudio.display.builder.representation.javafx.actionsdialog.ActionsDialog;
-import org.phoebus.framework.macros.MacroHandler;
-import org.phoebus.framework.macros.MacroValueProvider;
 import org.phoebus.framework.persistence.XMLUtil;
 import org.phoebus.ui.javafx.ImageCache;
 import org.w3c.dom.Element;
@@ -110,33 +107,4 @@ public void setPv(String pv) {
     public void setValue(String value) {
         this.value = value;
     }
-
-    public String formatPv(Widget widget) {
-        final MacroValueProvider macros = widget.getMacrosOrProperties();
-        String pvName = getPV();
-        try
-        {
-            pvName = MacroHandler.replace(macros, pvName);
-        }
-        catch (Exception ignore)
-        {
-            // NOP
-        }
-        return pvName;
-    }
-
-    public String formatValue(Widget widget) {
-        final MacroValueProvider macros = widget.getMacrosOrProperties();
-        value = getValue();
-
-        try
-        {
-            value = MacroHandler.replace(macros, value);
-        }
-        catch (Exception ignore)
-        {
-            // NOP
-        }
-        return value;
-    }
 }

app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/ContextMenuSupport.java

@@ -61,7 +61,7 @@
  * @author Kay Kasemir
  */
 @SuppressWarnings("nls")
-class ContextMenuSupport {
+public class ContextMenuSupport {
     private final DisplayRuntimeInstance instance;
     private final ContextMenu menu = new ContextMenu();
 

app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/actionhandlers/WritePVActionHandler.java

@@ -25,8 +25,23 @@ public void handleAction(Widget sourceWidget, ActionInfo pluggableActionInfo) {
         // System.out.println(action.getDescription() + ": Set " + action.getPV() + " = " + action.getValue());
         final MacroValueProvider macros = sourceWidget.getMacrosOrProperties();
         WritePVAction writePVAction = (WritePVAction)pluggableActionInfo;
-        String pvName = writePVAction.formatPv(sourceWidget);
-        String value = writePVAction.formatValue(sourceWidget);
+        String pvName = writePVAction.getPV(), value = writePVAction.getValue();
+        try
+        {
+            pvName = MacroHandler.replace(macros, pvName);
+        }
+        catch (Exception ignore)
+        {
+            // NOP
+        }
+        try
+        {
+            value = MacroHandler.replace(macros, value);
+        }
+        catch (Exception ignore)
+        {
+            // NOP
+        }
         try
         {
             runtime.writePV(pvName,value);

app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/internal/BaseWidgetRuntimes.java

@@ -13,7 +13,6 @@
 
 import org.csstudio.display.builder.model.DisplayModel;
 import org.csstudio.display.builder.model.Widget;
-import org.csstudio.display.builder.model.widgets.ActionButtonWidget;
 import org.csstudio.display.builder.model.widgets.ArrayWidget;
 import org.csstudio.display.builder.model.widgets.EmbeddedDisplayWidget;
 import org.csstudio.display.builder.model.widgets.GroupWidget;