CSSTUDIO-2072 Move the context menu-items for copying and appending P…

…V names to the clipboard from 'org.phoebus.applications.probe' to 'org.csstudio.display.builder.runtime'.
ControlSystemStudio · Jun 26, 2024 · 505f951 · 505f951
1 parent ca0ccdc
commit 505f951
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 29 deletions.
diff --git a/...probe/ContextMenuAppendPvToClipboard.java → ...ntime/ContextMenuAppendPvToClipboard.java b/...probe/ContextMenuAppendPvToClipboard.java → ...ntime/ContextMenuAppendPvToClipboard.java
@@ -1,4 +1,4 @@
-package org.phoebus.applications.probe;
+package org.csstudio.display.builder.runtime;
 
 import javafx.scene.image.Image;
 import javafx.scene.input.Clipboard;

diff --git a/...nuAppendPvToClipboardWithDescription.java → ...nuAppendPvToClipboardWithDescription.java b/...nuAppendPvToClipboardWithDescription.java → ...nuAppendPvToClipboardWithDescription.java
@@ -1,4 +1,4 @@
-package org.phoebus.applications.probe;
+package org.csstudio.display.builder.runtime;
 
 import javafx.application.Platform;
 import javafx.scene.control.Alert;

diff --git a/...ContextMenuCopyPvAndValueToClipboard.java → ...ContextMenuCopyPvAndValueToClipboard.java b/...ContextMenuCopyPvAndValueToClipboard.java → ...ContextMenuCopyPvAndValueToClipboard.java
@@ -5,13 +5,13 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.phoebus.applications.probe;
-
-import static org.phoebus.applications.probe.Probe.logger;
+package org.csstudio.display.builder.runtime;
 
 import java.util.List;
 import java.util.logging.Level;
 
+import static org.csstudio.display.builder.runtime.WidgetRuntime.logger;
+
 import org.epics.vtype.Alarm;
 import org.epics.vtype.AlarmSeverity;
 import org.epics.vtype.Time;

diff --git a/...s/probe/ContextMenuCopyPvToClipboard.java → ...runtime/ContextMenuCopyPvToClipboard.java b/...s/probe/ContextMenuCopyPvToClipboard.java → ...runtime/ContextMenuCopyPvToClipboard.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.phoebus.applications.probe;
+package org.csstudio.display.builder.runtime;
 
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/...MenuCopyPvToClipboardWithDescription.java → ...MenuCopyPvToClipboardWithDescription.java b/...MenuCopyPvToClipboardWithDescription.java → ...MenuCopyPvToClipboardWithDescription.java
@@ -1,4 +1,4 @@
-package org.phoebus.applications.probe;
+package org.csstudio.display.builder.runtime;
 
 import javafx.scene.image.Image;
 import javafx.scene.input.Clipboard;

diff --git a/...cations/probe/ContextMenuCopySubMenu.java → ...ilder/runtime/ContextMenuCopySubMenu.java b/...cations/probe/ContextMenuCopySubMenu.java → ...ilder/runtime/ContextMenuCopySubMenu.java
@@ -1,4 +1,4 @@
-package org.phoebus.applications.probe;
+package org.csstudio.display.builder.runtime;
 
 import javafx.scene.image.Image;
 import org.phoebus.core.types.ProcessVariable;

diff --git a/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/Messages.java b/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/Messages.java
@@ -14,7 +14,13 @@ public class Messages
 {
     // Keep in alphabetical order and aligned with messages.properties
     /** Localized message */
-    public static String NavigateBack_TT,
+    public static String AppendPVNameToClipboard,
+                         AppendPVNameToClipboardWithDescription,
+                         Copy,
+                         CopyPVNameToClipboardWithDescription,
+                         CopySubMenu,
+                         CopyWithValue,
+                         NavigateBack_TT,
                          NavigateForward_TT,
                          OpenDataBrowser,
                          OpenInEditor,

diff --git a/app/display/runtime/src/main/resources/META-INF/services/org.phoebus.ui.spi.ContextMenuEntry b/app/display/runtime/src/main/resources/META-INF/services/org.phoebus.ui.spi.ContextMenuEntry
@@ -1 +1,2 @@
-org.csstudio.display.builder.runtime.app.ProbeDisplayContextMenuEntry
+org.csstudio.display.builder.runtime.ContextMenuCopySubMenu
+org.csstudio.display.builder.runtime.app.ProbeDisplayContextMenuEntry
diff --git a/...splay/runtime/src/main/resources/org/csstudio/display/builder/runtime/messages.properties b/...splay/runtime/src/main/resources/org/csstudio/display/builder/runtime/messages.properties
@@ -1,3 +1,9 @@
+AppendPVNameToClipboard=Append PV Name to Clipboard
+AppendPVNameToClipboardWithDescription=Append PV Name to Clipboard with Description...
+Copy=Copy PV Name to Clipboard
+CopyPVNameToClipboardWithDescription=Copy PV Name to Clipboard with Description...
+CopySubMenu=Copy PV Name...
+CopyWithValue=Copy PV Name to Clipboard with Value
 NavigateBack_TT=Open previous display
 NavigateForward_TT=Open next display
 OpenDataBrowser=Open Data Browser

diff --git a/app/probe/pom.xml b/app/probe/pom.xml
@@ -22,11 +22,5 @@
       <artifactId>core-types</artifactId>
       <version>4.7.4-SNAPSHOT</version>
     </dependency>
-      <dependency>
-          <groupId>org.phoebus</groupId>
-          <artifactId>app-display-runtime</artifactId>
-          <version>4.7.4-SNAPSHOT</version>
-          <scope>compile</scope>
-      </dependency>
   </dependencies>
 </project>
diff --git a/app/probe/src/main/java/org/phoebus/applications/probe/Messages.java b/app/probe/src/main/java/org/phoebus/applications/probe/Messages.java
@@ -20,13 +20,7 @@ public class Messages
     // ---
     public static String Alarm;
     public static String Alarms;
-    public static String AppendPVNameToClipboard;
-    public static String AppendPVNameToClipboardWithDescription;
     public static String ControlRange;
-    public static String Copy;
-    public static String CopyPVNameToClipboardWithDescription;
-    public static String CopySubMenu;
-    public static String CopyWithValue;
     public static String DisplayRange;
     public static String EnumLbls;
     public static String Format;

diff --git a/app/probe/src/main/resources/META-INF/services/org.phoebus.ui.spi.ContextMenuEntry b/app/probe/src/main/resources/META-INF/services/org.phoebus.ui.spi.ContextMenuEntry
@@ -1,2 +1 @@
-org.phoebus.applications.probe.ContextMenuCopySubMenu
 org.phoebus.applications.probe.ContextLaunchProbe
diff --git a/app/probe/src/main/resources/org/phoebus/applications/probe/messages.properties b/app/probe/src/main/resources/org/phoebus/applications/probe/messages.properties
@@ -1,12 +1,6 @@
 Alarm=Alarm:
 Alarms=Alarms: 
-AppendPVNameToClipboard=Append PV Name to Clipboard
-AppendPVNameToClipboardWithDescription=Append PV Name to Clipboard with Description...
 ControlRange=Control Range: 
-Copy=Copy PV Name to Clipboard
-CopyPVNameToClipboardWithDescription=Copy PV Name to Clipboard with Description...
-CopySubMenu=Copy PV Name...
-CopyWithValue=Copy PV Name to Clipboard with Value
 DisplayRange=Display Range: 
 EnumLbls=Enumeration Labels:
 Format=Format: