rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://github.com/rusefi/web_backend/issues/83

This commit is contained in:
rusefi 2020-07-26 16:58:53 -04:00
parent 9721033f2c
commit 23a659b0c9
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java
View File

@ -20,8 +20,6 @@ import org.putgemin.VerticalFlowLayout;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@ -56,15 +54,12 @@ public class RemoteTab {
JButton refresh = new JButton("Refresh List"); JButton refresh = new JButton("Refresh List");
refresh.addActionListener(e -> requestListDownload()); refresh.addActionListener(e -> requestListDownload());
disconnect.addActionListener(new ActionListener() { disconnect.addActionListener(e -> {
@Override LocalApplicationProxy localApplicationProxy = RemoteTabController.INSTANCE.getLocalApplicationProxy();
public void actionPerformed(ActionEvent e) { if (localApplicationProxy != null)
LocalApplicationProxy localApplicationProxy = RemoteTabController.INSTANCE.getLocalApplicationProxy(); localApplicationProxy.close();
if (localApplicationProxy != null) RemoteTabController.INSTANCE.setState(RemoteTabController.State.NOT_CONNECTED);
localApplicationProxy.close(); requestListDownload();
RemoteTabController.INSTANCE.setState(RemoteTabController.State.NOT_CONNECTED);
requestListDownload();
}
}); });
@ -173,17 +168,14 @@ public class RemoteTab {
RemoteTabController.INSTANCE.setState(RemoteTabController.State.CONNECTING); RemoteTabController.INSTANCE.setState(RemoteTabController.State.CONNECTING);
setStatus("Connecting to " + publicSession.getUserDetails().getUserName()); setStatus("Connecting to " + publicSession.getUserDetails().getUserName());
LocalApplicationProxy.ConnectionListener connectionListener = new LocalApplicationProxy.ConnectionListener() { LocalApplicationProxy.ConnectionListener connectionListener = localApplicationProxy -> {
@Override RemoteTabController.INSTANCE.setConnected(localApplicationProxy);
public void onConnected(LocalApplicationProxy localApplicationProxy) { SwingUtilities.invokeLater(new Runnable() {
RemoteTabController.INSTANCE.setConnected(localApplicationProxy); @Override
SwingUtilities.invokeLater(new Runnable() { public void run() {
@Override setConnectedStatus(publicSession.getUserDetails());
public void run() { }
setConnectedStatus(publicSession.getUserDetails()); });
}
});
}
}; };
new Thread(() -> { new Thread(() -> {
@ -214,7 +206,7 @@ public class RemoteTab {
try { try {
AtomicReference<ServerSocketReference> serverHolderAtomicReference = new AtomicReference<>(); AtomicReference<ServerSocketReference> serverHolderAtomicReference = new AtomicReference<>();
TcpIoStream.DisconnectListener disconnectListener = () -> SwingUtilities.invokeLater(() -> { TcpIoStream.DisconnectListener disconnectListener = message -> SwingUtilities.invokeLater(() -> {
setStatus("Disconnected"); setStatus("Disconnected");
RemoteTabController.INSTANCE.setState(RemoteTabController.State.NOT_CONNECTED); RemoteTabController.INSTANCE.setState(RemoteTabController.State.NOT_CONNECTED);
ServerSocketReference serverHolder = serverHolderAtomicReference.get(); ServerSocketReference serverHolder = serverHolderAtomicReference.get();