Skip to content

Commit bbb2582

Browse files
daykindaykin
committed
reorganize
1 parent 476e9ac commit bbb2582

23 files changed

+115
-47
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import java.util.concurrent.ExecutorService;
66

77
import javafx.stage.Stage;
8-
import org.csstudio.display.builder.model.Widget;
9-
import org.csstudio.display.builder.model.properties.ActionInfo;
108
import org.csstudio.display.builder.runtime.RuntimeUtil;
9+
import org.phoebus.applications.uxanalytics.monitor.backend.BackendConnection;
10+
import org.phoebus.applications.uxanalytics.monitor.backend.database.MongoDBConnection;
11+
import org.phoebus.applications.uxanalytics.monitor.backend.database.Neo4JConnection;
12+
import org.phoebus.applications.uxanalytics.monitor.representation.ActiveWindowsService;
1113

1214
/**
1315
* Singleton Class to capture UI events (clicks, PV Writes, Display open/close)

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package org.phoebus.applications.uxanalytics.monitor;
22

3-
import javafx.event.Event;
43
import javafx.event.EventHandler;
54
import javafx.scene.input.MouseEvent;
6-
import org.phoebus.ui.docking.DockItem;
7-
import org.phoebus.ui.docking.DockItemWithInput;
8-
import org.phoebus.ui.docking.DockPane;
5+
import org.phoebus.applications.uxanalytics.monitor.representation.ActiveTab;
96

107
public class UXAMouseMonitor implements EventHandler<MouseEvent>{
118

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
package org.phoebus.applications.uxanalytics.monitor;
22

3-
import javafx.application.Platform;
43
import org.csstudio.display.builder.model.Widget;
54
import org.csstudio.display.builder.model.properties.ActionInfo;
6-
import org.csstudio.display.builder.model.properties.OpenDisplayActionInfo;
7-
import org.csstudio.display.builder.model.util.ModelResourceUtil;
85
import org.csstudio.display.builder.representation.ToolkitListener;
96
import org.csstudio.display.builder.runtime.app.DisplayInfo;
10-
import org.csstudio.display.builder.runtime.app.DisplayRuntimeInstance;
11-
import org.epics.vtype.Display;
12-
import org.phoebus.ui.docking.DockItemWithInput;
7+
import org.phoebus.applications.uxanalytics.monitor.representation.ActiveTab;
8+
import org.phoebus.applications.uxanalytics.monitor.util.ResourceOpenSources;
139

14-
import javax.lang.model.type.ArrayType;
15-
import java.io.File;
16-
import java.io.InputStream;
1710
import java.util.*;
18-
import java.util.concurrent.*;
1911
import java.util.logging.Logger;
2012

2113

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
package org.phoebus.applications.uxanalytics.monitor;
1+
package org.phoebus.applications.uxanalytics.monitor.backend;
22

33
import org.csstudio.display.builder.model.Widget;
44
import org.csstudio.display.builder.model.properties.ActionInfo;
55
import org.csstudio.display.builder.runtime.app.DisplayInfo;
6-
import org.epics.vtype.VType;
6+
import org.phoebus.applications.uxanalytics.monitor.backend.image.ImageClient;
7+
import org.phoebus.applications.uxanalytics.monitor.util.ResourceOpenSources;
8+
import org.phoebus.applications.uxanalytics.monitor.representation.ActiveTab;
79

810
@FunctionalInterface
911
public interface BackendConnection {

‎app/ux-analytics/monitor/src/main/java/org/phoebus/applications/uxanalytics/monitor/backend/authentication/MongoDBAuthenticationProvider.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.phoebus.applications.uxanalytics.monitor.backend.authentication;
2+
3+
import org.phoebus.security.authorization.ServiceAuthenticationProvider;
4+
import org.phoebus.security.tokens.AuthenticationScope;
5+
6+
public class MongoDBAuthenticationProvider implements ServiceAuthenticationProvider {
7+
@Override
8+
public void authenticate(String username, String password) {
9+
10+
}
11+
12+
@Override
13+
public void logout(String token) {
14+
15+
}
16+
17+
@Override
18+
public AuthenticationScope getAuthenticationScope() {
19+
return null;
20+
}
21+
}

‎app/ux-analytics/monitor/src/main/java/org/phoebus/applications/uxanalytics/monitor/backend/authentication/Neo4JAuthenticationProvider.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.phoebus.applications.uxanalytics.monitor.backend.authentication;
2+
3+
import org.phoebus.security.authorization.ServiceAuthenticationProvider;
4+
import org.phoebus.security.tokens.AuthenticationScope;
5+
6+
public class Neo4JAuthenticationProvider implements ServiceAuthenticationProvider {
7+
@Override
8+
public void authenticate(String username, String password) {
9+
10+
}
11+
12+
@Override
13+
public void logout(String token) {
14+
15+
}
16+
17+
@Override
18+
public AuthenticationScope getAuthenticationScope() {
19+
return null;
20+
}
21+
}

‎app/ux-analytics/monitor/src/main/java/org/phoebus/applications/uxanalytics/monitor/backend/authentication/S3AuthenticationProvider.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.phoebus.applications.uxanalytics.monitor.backend.authentication;
2+
3+
import org.phoebus.security.authorization.ServiceAuthenticationProvider;
4+
import org.phoebus.security.tokens.AuthenticationScope;
5+
6+
public class S3AuthenticationProvider implements ServiceAuthenticationProvider {
7+
@Override
8+
public void authenticate(String username, String password) {
9+
10+
}
11+
12+
@Override
13+
public void logout(String token) {
14+
15+
}
16+
17+
@Override
18+
public AuthenticationScope getAuthenticationScope() {
19+
return null;
20+
}
21+
}

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package org.phoebus.applications.uxanalytics.monitor;
1+
package org.phoebus.applications.uxanalytics.monitor.backend.database;
22

33
import com.mongodb.ConnectionString;
44
import com.mongodb.MongoClientSettings;
5-
import com.mongodb.client.ClientSession;
65
import com.mongodb.client.MongoClient;
76
import com.mongodb.client.MongoClients;
87
import com.mongodb.client.MongoDatabase;
@@ -14,7 +13,6 @@
1413

1514
import java.awt.image.BufferedImage;
1615
import java.net.URI;
17-
import java.nio.Buffer;
1816
import java.time.Instant;
1917
import java.util.UUID;
2018
import java.util.concurrent.TimeUnit;
@@ -24,8 +22,14 @@
2422
import org.bson.Document;
2523
import org.bson.UuidRepresentation;
2624
import org.csstudio.display.builder.runtime.app.DisplayRuntimeInstance;
27-
28-
public class MongoDBConnection implements BackendConnection{
25+
import org.phoebus.applications.uxanalytics.monitor.backend.BackendConnection;
26+
import org.phoebus.applications.uxanalytics.monitor.util.FileUtils;
27+
import org.phoebus.applications.uxanalytics.monitor.backend.image.ImageClient;
28+
import org.phoebus.applications.uxanalytics.monitor.backend.image.MongoDBImageClient;
29+
import org.phoebus.applications.uxanalytics.monitor.UXAMonitor;
30+
import org.phoebus.applications.uxanalytics.monitor.representation.ActiveTab;
31+
32+
public class MongoDBConnection implements BackendConnection {
2933

3034
Logger logger = Logger.getLogger(MongoDBConnection.class.getName());
3135

‎app/ux-analytics/monitor/src/main/java/org/phoebus/applications/uxanalytics/monitor/Neo4JConnection.java‎ renamed to ‎app/ux-analytics/monitor/src/main/java/org/phoebus/applications/uxanalytics/monitor/backend/database/Neo4JConnection.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.phoebus.applications.uxanalytics.monitor;
1+
package org.phoebus.applications.uxanalytics.monitor.backend.database;
22

33
import javafx.application.Platform;
44
import org.csstudio.display.builder.model.Widget;
@@ -7,15 +7,18 @@
77
import org.csstudio.display.builder.model.properties.WritePVActionInfo;
88
import org.csstudio.display.builder.model.util.ModelResourceUtil;
99
import org.csstudio.display.builder.runtime.app.DisplayInfo;
10-
import org.epics.vtype.VType;
1110
import org.neo4j.driver.*;
11+
import org.phoebus.applications.uxanalytics.monitor.backend.BackendConnection;
12+
import org.phoebus.applications.uxanalytics.monitor.util.FileUtils;
13+
import org.phoebus.applications.uxanalytics.monitor.util.ResourceOpenSources;
14+
import org.phoebus.applications.uxanalytics.monitor.representation.ActiveTab;
1215

1316
import java.time.Instant;
1417
import java.util.Map;
1518
import java.util.logging.Level;
1619
import java.util.logging.Logger;
1720

18-
public class Neo4JConnection implements BackendConnection{
21+
public class Neo4JConnection implements BackendConnection {
1922

2023
Logger logger = Logger.getLogger(Neo4JConnection.class.getName());
2124
Driver driver;

‎app/ux-analytics/monitor/src/main/java/org/phoebus/applications/uxanalytics/monitor/NoopBackendConnection.java‎ renamed to ‎app/ux-analytics/monitor/src/main/java/org/phoebus/applications/uxanalytics/monitor/backend/database/NoopBackendConnection.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
package org.phoebus.applications.uxanalytics.monitor;
1+
package org.phoebus.applications.uxanalytics.monitor.backend.database;
22

33
import org.csstudio.display.builder.model.Widget;
44
import org.csstudio.display.builder.model.properties.ActionInfo;
5+
import org.phoebus.applications.uxanalytics.monitor.backend.BackendConnection;
6+
import org.phoebus.applications.uxanalytics.monitor.representation.ActiveTab;
57

68
import java.util.logging.Level;
79
import java.util.logging.Logger;
810

9-
public class NoopBackendConnection implements BackendConnection{
11+
public class NoopBackendConnection implements BackendConnection {
1012

1113
Logger logger = Logger.getLogger(NoopBackendConnection.class.getName());
1214

0 commit comments

Comments
 (0)