Skip to content

Commit 88c1b7c

Browse files
committed
use 'x.class.getName()' so IDEs catch package refactoring
1 parent e4eaa8f commit 88c1b7c

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

app/ux-analytics/monitor/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,12 @@
133133
<version>2.1.1</version>
134134
<scope>compile</scope>
135135
</dependency>
136+
<dependency>
137+
<groupId>org.phoebus</groupId>
138+
<artifactId>app-filebrowser</artifactId>
139+
<version>4.7.4-SNAPSHOT</version>
140+
<scope>compile</scope>
141+
</dependency>
136142
</dependencies>
137143

138144
<build>

app/ux-analytics/monitor/src/main/java/org/phoebus/applications/uxanalytics/monitor/UXAToolkitListener.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ public class UXAToolkitListener implements ToolkitListener {
1818

1919
public static final HashMap<String, ResourceOpenSources> openSources = new HashMap<>(
2020
Map.of(
21-
"org.csstudio.display.builder.runtime.app.actionhandlers.OpenDisplayActionHandler.handleAction", ResourceOpenSources.ACTION_BUTTON,
22-
"org.phoebus.applications.filebrowser.FileBrowserController.openResource", ResourceOpenSources.FILE_BROWSER,
23-
"org.phoebus.ui.application.PhoebusApplication.fileOpen", ResourceOpenSources.FILE_BROWSER,
24-
"org.csstudio.display.builder.runtime.app.NavigationAction.navigate", ResourceOpenSources.NAVIGATION_BUTTON,
25-
"org.phoebus.ui.internal.MementoHelper.restoreDockItem", ResourceOpenSources.RESTORED,
26-
"org.phoebus.ui.application.PhoebusApplication.createTopResourcesMenu", ResourceOpenSources.TOP_RESOURCES,
27-
"org.csstudio.display.builder.runtime.app.DisplayRuntimeInstance.reload", ResourceOpenSources.RELOAD
21+
org.csstudio.display.builder.runtime.app.actionhandlers.OpenDisplayActionHandler.class.getName()+".handleAction", ResourceOpenSources.ACTION_BUTTON,
22+
org.phoebus.applications.filebrowser.FileBrowserController.class.getName()+".openResource", ResourceOpenSources.FILE_BROWSER,
23+
org.phoebus.ui.application.PhoebusApplication.class.getName()+".fileOpen", ResourceOpenSources.FILE_BROWSER,
24+
org.csstudio.display.builder.runtime.app.NavigationAction.class.getName()+".navigate", ResourceOpenSources.NAVIGATION_BUTTON,
25+
org.phoebus.ui.internal.MementoHelper.class.getName()+".restoreDockItem", ResourceOpenSources.RESTORED,
26+
org.phoebus.ui.application.PhoebusApplication.class.getName()+".createTopResourcesMenu", ResourceOpenSources.TOP_RESOURCES,
27+
org.csstudio.display.builder.runtime.app.DisplayRuntimeInstance.class.getName()+".reload", ResourceOpenSources.RELOAD
2828
)
2929
);
3030

@@ -51,6 +51,7 @@ public void handleClick(Widget widget, boolean with_control) {
5151

5252
//Traverse down a given call stack to find out what caused the display to open
5353
private static ResourceOpenSources getSourceOfOpen(StackTraceElement[] stackTrace){
54+
5455
for(StackTraceElement e: stackTrace){
5556
String methodName = unmangleLambda(e.getMethodName());
5657
String fullName = e.getClassName()+"."+methodName;

0 commit comments

Comments
 (0)