gui - moved dialogs into their own package, cleaned up node movement check
This commit is contained in:
parent
e96c0b4758
commit
0d4356ae55
19 changed files with 33 additions and 23 deletions
|
@ -10,6 +10,7 @@ import com.core.data.CoreNode;
|
||||||
import com.core.data.MobilityConfig;
|
import com.core.data.MobilityConfig;
|
||||||
import com.core.graph.NetworkGraph;
|
import com.core.graph.NetworkGraph;
|
||||||
import com.core.ui.*;
|
import com.core.ui.*;
|
||||||
|
import com.core.ui.dialogs.*;
|
||||||
import com.core.utils.ConfigUtils;
|
import com.core.utils.ConfigUtils;
|
||||||
import com.core.websocket.CoreWebSocket;
|
import com.core.websocket.CoreWebSocket;
|
||||||
import javafx.application.Application;
|
import javafx.application.Application;
|
||||||
|
|
|
@ -144,13 +144,12 @@ public class NetworkGraph {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void graphReleased(CoreNode node, MouseEvent mouseEvent) {
|
public void graphReleased(CoreNode node, MouseEvent mouseEvent) {
|
||||||
logger.info("graph released mouse event: {}", mouseEvent);
|
|
||||||
if (SwingUtilities.isLeftMouseButton(mouseEvent)) {
|
if (SwingUtilities.isLeftMouseButton(mouseEvent)) {
|
||||||
double newX = graphLayout.getX(node);
|
Double newX = graphLayout.getX(node);
|
||||||
double newY = graphLayout.getY(node);
|
Double newY = graphLayout.getY(node);
|
||||||
double oldX = node.getPosition().getX();
|
Double oldX = node.getPosition().getX();
|
||||||
double oldY = node.getPosition().getY();
|
Double oldY = node.getPosition().getY();
|
||||||
if (oldX == newX && oldY == newY) {
|
if (newX.equals(oldX) && newY.equals(oldY)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
logger.debug("graph moved node({}): {},{}", node.getName(), newX, newY);
|
logger.debug("graph moved node({}): {},{}", node.getName(), newX, newY);
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.data.CoreLink;
|
import com.core.data.CoreLink;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.datavis.*;
|
import com.core.datavis.*;
|
|
@ -1,10 +1,11 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.client.rest.ConfigGroup;
|
import com.core.client.rest.ConfigGroup;
|
||||||
import com.core.client.rest.ConfigOption;
|
import com.core.client.rest.ConfigOption;
|
||||||
import com.core.client.rest.GetConfig;
|
import com.core.client.rest.GetConfig;
|
||||||
import com.core.data.CoreNode;
|
import com.core.data.CoreNode;
|
||||||
|
import com.core.ui.ConfigItem;
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXScrollPane;
|
import com.jfoenix.controls.JFXScrollPane;
|
||||||
import com.jfoenix.controls.JFXTabPane;
|
import com.jfoenix.controls.JFXTabPane;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.client.ICoreClient;
|
import com.core.client.ICoreClient;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.data.Hook;
|
import com.core.data.Hook;
|
|
@ -1,9 +1,10 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.client.rest.GetHooks;
|
import com.core.client.rest.GetHooks;
|
||||||
import com.core.data.Hook;
|
import com.core.data.Hook;
|
||||||
import com.core.data.SessionState;
|
import com.core.data.SessionState;
|
||||||
|
import com.core.ui.Toast;
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.scene.control.TableColumn;
|
import javafx.scene.control.TableColumn;
|
|
@ -1,7 +1,8 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.data.LocationConfig;
|
import com.core.data.LocationConfig;
|
||||||
|
import com.core.ui.Toast;
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXTextField;
|
import com.jfoenix.controls.JFXTextField;
|
||||||
import com.jfoenix.validation.DoubleValidator;
|
import com.jfoenix.validation.DoubleValidator;
|
|
@ -1,8 +1,9 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.data.CoreNode;
|
import com.core.data.CoreNode;
|
||||||
import com.core.data.MobilityConfig;
|
import com.core.data.MobilityConfig;
|
||||||
|
import com.core.ui.Toast;
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXTextField;
|
import com.jfoenix.controls.JFXTextField;
|
||||||
import com.jfoenix.controls.JFXToggleButton;
|
import com.jfoenix.controls.JFXToggleButton;
|
|
@ -1,9 +1,10 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.client.rest.ConfigOption;
|
import com.core.client.rest.ConfigOption;
|
||||||
import com.core.client.rest.GetConfig;
|
import com.core.client.rest.GetConfig;
|
||||||
import com.core.data.CoreNode;
|
import com.core.data.CoreNode;
|
||||||
|
import com.core.ui.Toast;
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXComboBox;
|
import com.jfoenix.controls.JFXComboBox;
|
||||||
import javafx.event.ActionEvent;
|
import javafx.event.ActionEvent;
|
|
@ -1,8 +1,9 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.client.rest.GetServices;
|
import com.core.client.rest.GetServices;
|
||||||
import com.core.data.CoreNode;
|
import com.core.data.CoreNode;
|
||||||
|
import com.core.ui.ServiceItem;
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXListView;
|
import com.jfoenix.controls.JFXListView;
|
||||||
import com.jfoenix.controls.JFXScrollPane;
|
import com.jfoenix.controls.JFXScrollPane;
|
|
@ -1,8 +1,9 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.data.CoreNode;
|
import com.core.data.CoreNode;
|
||||||
import com.core.data.NodeType;
|
import com.core.data.NodeType;
|
||||||
|
import com.core.ui.Toast;
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXListView;
|
import com.jfoenix.controls.JFXListView;
|
||||||
import com.jfoenix.controls.JFXTextField;
|
import com.jfoenix.controls.JFXTextField;
|
|
@ -1,8 +1,9 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.client.rest.WlanConfig;
|
import com.core.client.rest.WlanConfig;
|
||||||
import com.core.data.CoreNode;
|
import com.core.data.CoreNode;
|
||||||
|
import com.core.ui.Toast;
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXTextField;
|
import com.jfoenix.controls.JFXTextField;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.client.rest.ServiceFile;
|
import com.core.client.rest.ServiceFile;
|
|
@ -1,9 +1,10 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.client.rest.GetSessions;
|
import com.core.client.rest.GetSessions;
|
||||||
import com.core.client.rest.GetSessionsData;
|
import com.core.client.rest.GetSessionsData;
|
||||||
import com.core.data.SessionState;
|
import com.core.data.SessionState;
|
||||||
|
import com.core.ui.Toast;
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.scene.control.TableColumn;
|
import javafx.scene.control.TableColumn;
|
|
@ -1,9 +1,10 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.client.rest.GetSessions;
|
import com.core.client.rest.GetSessions;
|
||||||
import com.core.client.rest.GetSessionsData;
|
import com.core.client.rest.GetSessionsData;
|
||||||
import com.core.data.SessionState;
|
import com.core.data.SessionState;
|
||||||
|
import com.core.ui.dialogs.CoreFoenixDialog;
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.scene.control.TableColumn;
|
import javafx.scene.control.TableColumn;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.core.ui;
|
package com.core.ui.dialogs;
|
||||||
|
|
||||||
import com.core.Controller;
|
import com.core.Controller;
|
||||||
import com.core.client.ICoreClient;
|
import com.core.client.ICoreClient;
|
Loading…
Add table
Add a link
Reference in a new issue