gui - moved dialogs into their own package, cleaned up node movement check

This commit is contained in:
Blake J. Harnden 2018-09-21 11:02:08 -07:00
parent e96c0b4758
commit 0d4356ae55
19 changed files with 33 additions and 23 deletions

View file

@ -10,6 +10,7 @@ import com.core.data.CoreNode;
import com.core.data.MobilityConfig;
import com.core.graph.NetworkGraph;
import com.core.ui.*;
import com.core.ui.dialogs.*;
import com.core.utils.ConfigUtils;
import com.core.websocket.CoreWebSocket;
import javafx.application.Application;

View file

@ -144,13 +144,12 @@ public class NetworkGraph {
@Override
public void graphReleased(CoreNode node, MouseEvent mouseEvent) {
logger.info("graph released mouse event: {}", mouseEvent);
if (SwingUtilities.isLeftMouseButton(mouseEvent)) {
double newX = graphLayout.getX(node);
double newY = graphLayout.getY(node);
double oldX = node.getPosition().getX();
double oldY = node.getPosition().getY();
if (oldX == newX && oldY == newY) {
Double newX = graphLayout.getX(node);
Double newY = graphLayout.getY(node);
Double oldX = node.getPosition().getX();
Double oldY = node.getPosition().getY();
if (newX.equals(oldX) && newY.equals(oldY)) {
return;
}
logger.debug("graph moved node({}): {},{}", node.getName(), newX, newY);

View file

@ -1,4 +1,4 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.data.CoreLink;

View file

@ -1,4 +1,4 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.datavis.*;

View file

@ -1,10 +1,11 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.ConfigGroup;
import com.core.client.rest.ConfigOption;
import com.core.client.rest.GetConfig;
import com.core.data.CoreNode;
import com.core.ui.ConfigItem;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXScrollPane;
import com.jfoenix.controls.JFXTabPane;

View file

@ -1,4 +1,4 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.ICoreClient;

View file

@ -1,4 +1,4 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.jfoenix.controls.JFXButton;

View file

@ -1,4 +1,4 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.data.Hook;

View file

@ -1,9 +1,10 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.GetHooks;
import com.core.data.Hook;
import com.core.data.SessionState;
import com.core.ui.Toast;
import com.jfoenix.controls.JFXButton;
import javafx.fxml.FXML;
import javafx.scene.control.TableColumn;

View file

@ -1,7 +1,8 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.data.LocationConfig;
import com.core.ui.Toast;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXTextField;
import com.jfoenix.validation.DoubleValidator;

View file

@ -1,8 +1,9 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.data.CoreNode;
import com.core.data.MobilityConfig;
import com.core.ui.Toast;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXTextField;
import com.jfoenix.controls.JFXToggleButton;

View file

@ -1,9 +1,10 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.ConfigOption;
import com.core.client.rest.GetConfig;
import com.core.data.CoreNode;
import com.core.ui.Toast;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXComboBox;
import javafx.event.ActionEvent;

View file

@ -1,8 +1,9 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.GetServices;
import com.core.data.CoreNode;
import com.core.ui.ServiceItem;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXListView;
import com.jfoenix.controls.JFXScrollPane;

View file

@ -1,8 +1,9 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.data.CoreNode;
import com.core.data.NodeType;
import com.core.ui.Toast;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXListView;
import com.jfoenix.controls.JFXTextField;

View file

@ -1,8 +1,9 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.WlanConfig;
import com.core.data.CoreNode;
import com.core.ui.Toast;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXTextField;
import javafx.fxml.FXML;

View file

@ -1,4 +1,4 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.ServiceFile;

View file

@ -1,9 +1,10 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.GetSessions;
import com.core.client.rest.GetSessionsData;
import com.core.data.SessionState;
import com.core.ui.Toast;
import com.jfoenix.controls.JFXButton;
import javafx.fxml.FXML;
import javafx.scene.control.TableColumn;

View file

@ -1,9 +1,10 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.GetSessions;
import com.core.client.rest.GetSessionsData;
import com.core.data.SessionState;
import com.core.ui.dialogs.CoreFoenixDialog;
import com.jfoenix.controls.JFXButton;
import javafx.fxml.FXML;
import javafx.scene.control.TableColumn;

View file

@ -1,4 +1,4 @@
package com.core.ui;
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.ICoreClient;