Skip to content

Commit 22ded17

Browse files
committed
connect to a middleware application instead of directly to the servers. Add an explicit opt-in that appears every startup unless 'remember' is checked.
1 parent 88c1b7c commit 22ded17

21 files changed

+205
-1072
lines changed

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

+8-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
import javafx.stage.Stage;
88
import org.csstudio.display.builder.runtime.RuntimeUtil;
99
import org.phoebus.applications.uxanalytics.monitor.backend.database.BackendConnection;
10-
import org.phoebus.applications.uxanalytics.monitor.backend.database.MongoDBConnection;
11-
import org.phoebus.applications.uxanalytics.monitor.backend.database.Neo4JConnection;
1210
import org.phoebus.applications.uxanalytics.monitor.representation.ActiveWindowsService;
13-
import org.phoebus.framework.preferences.PhoebusPreferenceService;
1411

1512
/**
1613
* Singleton Class to capture UI events (clicks, PV Writes, Display open/close)
@@ -47,6 +44,14 @@ public void setPhoebusConnection(BackendConnection phoebusConnection) {
4744
this.phoebusConnection = phoebusConnection;
4845
}
4946

47+
public void disableTracking(){
48+
activeWindowsService.stop();
49+
}
50+
51+
public void enableTracking(){
52+
activeWindowsService.start();
53+
}
54+
5055
public void setJfxConnection(BackendConnection jfxConnection) {
5156
this.jfxConnection = jfxConnection;
5257
}

app/ux-analytics/monitor/src/main/java/org/phoebus/applications/uxanalytics/monitor/backend/database/BackendConnection.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public default void handleClick(ActiveTab who, Widget widget, Integer x, Integer
4747
public default void handleClick(ActiveTab who, Integer x, Integer y){this.handleClick(who, null, x, y);}
4848
public default void handleAction(ActiveTab who, Widget widget, ActionInfo info){}
4949
public default void handlePVWrite(ActiveTab who, Widget widget, String PVName, String value){};
50-
public default void handleDisplayOpen(DisplayInfo target, DisplayInfo src, ResourceOpenSources how){};
51-
50+
public default void handleDisplayOpen(DisplayInfo target, DisplayInfo src, ResourceOpenSources how){}
51+
public default void consentToCollection(boolean consent){}
5252

5353
}

app/ux-analytics/monitor/src/main/java/org/phoebus/applications/uxanalytics/monitor/backend/database/MongoDBConnection.java

-175
This file was deleted.

0 commit comments

Comments
 (0)