afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gui - updated single annotations on class variables to be on the same line

Browse source
This commit is contained in:
Blake J. Harnden 2018-09-20 13:47:16 -07:00
parent 9f5495ba10
commit 9830d63ff3
19 changed files with 91 additions and 283 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
corefx/src/main/java/com/core/ui/AnnotationToolbar.java
View file

@ -20,18 +20,10 @@ import java.io.IOException;
public class AnnotationToolbar extends GridPane {
private static final Logger logger = LogManager.getLogger();
private NetworkGraph graph;
@FXML
private JFXComboBox<String> shapeCombo;
@FXML
private JFXColorPicker colorPicker;
@FXML
private JFXComboBox<String> layerCombo;
@FXML
private JFXToggleButton fillToggle;
@FXML private JFXComboBox<String> shapeCombo;
@FXML private JFXColorPicker colorPicker;
@FXML private JFXComboBox<String> layerCombo;
@FXML private JFXToggleButton fillToggle;
public AnnotationToolbar(NetworkGraph graph) {
this.graph = graph;

14
corefx/src/main/java/com/core/ui/BackgroundDialog.java
View file

@ -19,20 +19,12 @@ import java.nio.file.Paths;
public class BackgroundDialog extends StageDialog {
private static final Logger logger = LogManager.getLogger();
@FXML
private ImageView imageView;
@FXML
private JFXTextField fileTextField;
@FXML
private JFXButton fileButton;
@FXML private ImageView imageView;
@FXML private JFXTextField fileTextField;
@FXML private JFXButton fileButton;
private JFXButton saveButton;
private JFXButton clearButton;
public BackgroundDialog(Controller controller) {
super(controller, "/fxml/background_dialog.fxml");
setTitle("Background Configuration");

13
corefx/src/main/java/com/core/ui/ChartDialog.java
View file

@ -21,16 +21,9 @@ public class ChartDialog extends StageDialog {
private final AtomicBoolean running = new AtomicBoolean(false);
private final Random numbers = new Random();
private final List<String> chartNames = Arrays.asList("Name 1", "Name 2", "Name 3", "Name 4", "Name 5");
@FXML
private JFXComboBox<String> chartCombo;
@FXML
private Pane chartPane;
@FXML
private JFXButton stopButton;
@FXML private JFXComboBox<String> chartCombo;
@FXML private Pane chartPane;
@FXML private JFXButton stopButton;
private CoreGraph coreGraph;
public ChartDialog(Controller controller) {

11
corefx/src/main/java/com/core/ui/ConfigDialog.java
View file

@ -1,10 +1,10 @@
package com.core.ui;
import com.core.Controller;
import com.core.data.CoreNode;
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.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXScrollPane;
import com.jfoenix.controls.JFXTabPane;
@ -24,16 +24,11 @@ import java.util.stream.Collectors;
public class ConfigDialog extends StageDialog {
private static final Logger logger = LogManager.getLogger();
private CoreNode coreNode;
private List<ConfigItem> configItems = new ArrayList<>();
private JFXButton saveButton;
@FXML
private JFXTabPane tabPane;
@FXML
private HBox buttonBar;
@FXML private JFXTabPane tabPane;
@FXML private HBox buttonBar;
public ConfigDialog(Controller controller) {
super(controller, "/fxml/config_dialog.fxml");

28
corefx/src/main/java/com/core/ui/GraphToolbar.java
View file

@ -44,27 +44,13 @@ public class GraphToolbar extends VBox {
private JFXButton selectedEditButton;
private NodeType selectedNodeType;
private boolean isEditing = false;
@FXML
private JFXButton runButton;
@FXML
private JFXButton pickingButton;
@FXML
private JFXButton editingButton;
@FXML
private JFXButton drawingButton;
@FXML
private ComboBox<String> graphModeCombo;
@FXML
private JFXButton nodesButton;
@FXML
private JFXButton devicesButton;
@FXML private JFXButton runButton;
@FXML private JFXButton pickingButton;
@FXML private JFXButton editingButton;
@FXML private JFXButton drawingButton;
@FXML private ComboBox<String> graphModeCombo;
@FXML private JFXButton nodesButton;
@FXML private JFXButton devicesButton;
public GraphToolbar(Controller controller) {
this.controller = controller;

13
corefx/src/main/java/com/core/ui/HookDialog.java
View file

@ -19,16 +19,9 @@ public class HookDialog extends StageDialog {
private static final String DEFAULT_DATA = "#!/bin/sh\n" +
"# session hook script; write commands here to execute\n" +
"# on the host at the specified state\n";
@FXML
private JFXComboBox<String> stateCombo;
@FXML
private JFXTextField fileTextField;
@FXML
private JFXTextArea fileData;
@FXML private JFXComboBox<String> stateCombo;
@FXML private JFXTextField fileTextField;
@FXML private JFXTextArea fileData;
private JFXButton saveButton;
public HookDialog(Controller controller) {

14
corefx/src/main/java/com/core/ui/HooksDialog.java
View file

@ -1,9 +1,9 @@
package com.core.ui;
import com.core.Controller;
import com.core.client.rest.GetHooks;
import com.core.data.Hook;
import com.core.data.SessionState;
import com.core.client.rest.GetHooks;
import com.jfoenix.controls.JFXButton;
import javafx.fxml.FXML;
import javafx.scene.control.TableColumn;
@ -20,15 +20,9 @@ public class HooksDialog extends StageDialog {
private static final Logger logger = LogManager.getLogger();
private HookDialog hookDialog;
private int fileCount = 0;
@FXML
private TableView<Hook> hooksTable;
@FXML
private TableColumn<Hook, Integer> fileColumn;
@FXML
private TableColumn<Hook, Integer> stateColumn;
@FXML private TableView<Hook> hooksTable;
@FXML private TableColumn<Hook, Integer> fileColumn;
@FXML private TableColumn<Hook, Integer> stateColumn;
public HooksDialog(Controller controller) {
super(controller, "/fxml/hooks_dialog.fxml");

7
corefx/src/main/java/com/core/ui/LinkDetails.java
View file

@ -13,8 +13,6 @@ import javafx.scene.control.Label;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.Separator;
import javafx.scene.layout.GridPane;
import javafx.scene.text.Font;
import javafx.scene.text.FontWeight;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -23,12 +21,9 @@ import java.io.IOException;
public class LinkDetails extends ScrollPane {
private static final Logger logger = LogManager.getLogger();
private static final int START_INDEX = 1;
private NetworkGraph graph;
private int index = START_INDEX;
@FXML
private GridPane gridPane;
@FXML private GridPane gridPane;
public LinkDetails(NetworkGraph graph) {
this.graph = graph;

25
corefx/src/main/java/com/core/ui/LocationDialog.java
View file

@ -13,25 +13,12 @@ import java.io.IOException;
public class LocationDialog extends StageDialog {
private static final Logger logger = LogManager.getLogger();
@FXML
private JFXTextField scaleTextField;
@FXML
private JFXTextField xTextField;
@FXML
private JFXTextField yTextField;
@FXML
private JFXTextField latTextField;
@FXML
private JFXTextField lonTextField;
@FXML
private JFXTextField altTextField;
@FXML private JFXTextField scaleTextField;
@FXML private JFXTextField xTextField;
@FXML private JFXTextField yTextField;
@FXML private JFXTextField latTextField;
@FXML private JFXTextField lonTextField;
@FXML private JFXTextField altTextField;
private JFXButton saveButton;
public LocationDialog(Controller controller) {

34
corefx/src/main/java/com/core/ui/MobilityDialog.java
View file

@ -22,37 +22,19 @@ import java.util.Map;
@Data
public class MobilityDialog extends StageDialog {
private static final Logger logger = LogManager.getLogger();
@FXML
private JFXTextField fileTextField;
@FXML
private JFXTextField refreshTextField;
@FXML
private JFXToggleButton loopToggleButton;
@FXML
private JFXTextField nodeMappingTextField;
@FXML
private JFXTextField autoStartTextField;
@FXML
private JFXTextField startTextField;
@FXML
private JFXTextField pauseTextField;
@FXML
private JFXTextField stopTextField;
@FXML private JFXTextField fileTextField;
@FXML private JFXTextField refreshTextField;
@FXML private JFXToggleButton loopToggleButton;
@FXML private JFXTextField nodeMappingTextField;
@FXML private JFXTextField autoStartTextField;
@FXML private JFXTextField startTextField;
@FXML private JFXTextField pauseTextField;
@FXML private JFXTextField stopTextField;
private Map<Integer, MobilityConfig> mobilityScripts = new HashMap<>();
private CoreNode node;
public MobilityDialog(Controller controller) {
super(controller, "/fxml/mobility_dialog.fxml");
setTitle("Mobility Script");
JFXButton saveButton = createButton("Save");

17
corefx/src/main/java/com/core/ui/MobilityPlayer.java
View file

@ -18,19 +18,10 @@ public class MobilityPlayer extends HBox {
private static final Logger logger = LogManager.getLogger();
private static final int ICON_SIZE = 20;
private static final String ICON_FILL = "white";
@FXML
private Label label;
@FXML
private JFXButton playButton;
@FXML
private JFXButton pauseButton;
@FXML
private JFXButton stopButton;
@FXML private Label label;
@FXML private JFXButton playButton;
@FXML private JFXButton pauseButton;
@FXML private JFXButton stopButton;
private Controller controller;
private CoreNode node;
private MobilityConfig mobilityConfig;

9
corefx/src/main/java/com/core/ui/NodeDetails.java
View file

@ -28,13 +28,8 @@ public class NodeDetails extends ScrollPane {
private static final Logger logger = LogManager.getLogger();
private static final int START_INDEX = 1;
private final Controller controller;
@FXML
private ScrollPane scrollPane;
@FXML
private GridPane gridPane;
@FXML private ScrollPane scrollPane;
@FXML private GridPane gridPane;
private int index = START_INDEX;
public NodeDetails(Controller controller) {

13
corefx/src/main/java/com/core/ui/NodeEmaneDialog.java
View file

@ -16,17 +16,10 @@ import java.util.List;
public class NodeEmaneDialog extends StageDialog {
private static final Logger logger = LogManager.getLogger();
private CoreNode coreNode;
@FXML
private JFXComboBox<String> modelCombo;
@FXML
private JFXButton modelButton;
@FXML
private JFXButton emaneButton;
@FXML private JFXComboBox<String> modelCombo;
@FXML private JFXButton modelButton;
@FXML private JFXButton emaneButton;
public NodeEmaneDialog(Controller controller) {
super(controller, "/fxml/node_emane_dialog.fxml");

25
corefx/src/main/java/com/core/ui/NodeServicesDialog.java
View file

@ -22,26 +22,13 @@ public class NodeServicesDialog extends StageDialog {
// TODO: get this from core itself
private final Map<String, Set<String>> defaultServices = new HashMap<>();
private CoreNode node;
@FXML
private GridPane gridPane;
@FXML
private ScrollPane scrollPane;
@FXML
private JFXListView<String> groupListView;
@FXML
private JFXListView<String> activeListView;
@FXML
private JFXButton removeButton;
@FXML
private JFXButton editButton;
private int index = 0;
@FXML private GridPane gridPane;
@FXML private ScrollPane scrollPane;
@FXML private JFXListView<String> groupListView;
@FXML private JFXListView<String> activeListView;
@FXML private JFXButton removeButton;
@FXML private JFXButton editButton;
public NodeServicesDialog(Controller controller) {
super(controller, "/fxml/node_services_dialog.fxml");

37
corefx/src/main/java/com/core/ui/NodeTypesDialog.java
View file

@ -19,36 +19,17 @@ import java.util.Map;
public class NodeTypesDialog extends StageDialog {
private static final Logger logger = LogManager.getLogger();
private final Map<String, NodeType> nodeTypeMap = new HashMap<>();
private NodeType selectedNodeType;
@FXML
private JFXListView<String> listView;
@FXML
private JFXTextField modelTextField;
@FXML
private JFXTextField displayTextField;
@FXML
private JFXTextField iconTextField;
@FXML
private JFXButton iconButton;
@FXML
private ImageView iconImage;
@FXML
private JFXButton saveButton;
@FXML
private JFXButton addButton;
@FXML
private JFXButton deleteButton;
@FXML private JFXListView<String> listView;
@FXML private JFXTextField modelTextField;
@FXML private JFXTextField displayTextField;
@FXML private JFXTextField iconTextField;
@FXML private JFXButton iconButton;
@FXML private ImageView iconImage;
@FXML private JFXButton saveButton;
@FXML private JFXButton addButton;
@FXML private JFXButton deleteButton;
public NodeTypesDialog(Controller controller) {
super(controller, "/fxml/node_types_dialog.fxml");

23
corefx/src/main/java/com/core/ui/NodeWlanDialog.java
View file

@ -1,8 +1,8 @@
package com.core.ui;
import com.core.Controller;
import com.core.data.CoreNode;
import com.core.client.rest.WlanConfig;
import com.core.data.CoreNode;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXTextField;
import javafx.fxml.FXML;
@ -13,23 +13,12 @@ import java.io.IOException;
public class NodeWlanDialog extends StageDialog {
private static final Logger logger = LogManager.getLogger();
private CoreNode coreNode;
@FXML
private JFXTextField rangeTextField;
@FXML
private JFXTextField bandwidthTextField;
@FXML
private JFXTextField delayTextField;
@FXML
private JFXTextField lossTextField;
@FXML
private JFXTextField jitterTextField;
@FXML private JFXTextField rangeTextField;
@FXML private JFXTextField bandwidthTextField;
@FXML private JFXTextField delayTextField;
@FXML private JFXTextField lossTextField;
@FXML private JFXTextField jitterTextField;
public NodeWlanDialog(Controller controller) {
super(controller, "/fxml/wlan_dialog.fxml");

43
corefx/src/main/java/com/core/ui/ServiceDialog.java
View file

@ -1,9 +1,9 @@
package com.core.ui;
import com.core.Controller;
import com.core.client.rest.ServiceFile;
import com.core.data.CoreNode;
import com.core.data.CoreService;
import com.core.client.rest.ServiceFile;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXComboBox;
import com.jfoenix.controls.JFXTextArea;
@ -19,40 +19,19 @@ import java.util.stream.Collectors;
public class ServiceDialog extends StageDialog {
private static final Logger logger = LogManager.getLogger();
private CoreNode coreNode;
private CoreService coreService;
private String serviceName;
@FXML
private JFXComboBox<String> executablesComboBox;
@FXML
private JFXComboBox<String> dependenciesComboBox;
@FXML
private JFXTextField validationModeTextField;
@FXML
private JFXTextField validationTimerTextField;
@FXML
private JFXComboBox<String> directoriesComboBox;
@FXML
private JFXComboBox<String> filesComboBox;
@FXML
private JFXTextArea fileTextArea;
@FXML
private JFXTextArea startupTextArea;
@FXML
private JFXTextArea validateTextArea;
@FXML
private JFXTextArea shutdownTextArea;
@FXML private JFXComboBox<String> executablesComboBox;
@FXML private JFXComboBox<String> dependenciesComboBox;
@FXML private JFXTextField validationModeTextField;
@FXML private JFXTextField validationTimerTextField;
@FXML private JFXComboBox<String> directoriesComboBox;
@FXML private JFXComboBox<String> filesComboBox;
@FXML private JFXTextArea fileTextArea;
@FXML private JFXTextArea startupTextArea;
@FXML private JFXTextArea validateTextArea;
@FXML private JFXTextArea shutdownTextArea;
public ServiceDialog(Controller controller) {
super(controller, "/fxml/service_dialog.fxml");

16
corefx/src/main/java/com/core/ui/SessionsDialog.java
View file

@ -18,18 +18,10 @@ import java.util.stream.Collectors;
public class SessionsDialog extends StageDialog {
private static final Logger logger = LogManager.getLogger();
@FXML
private TableView<SessionRow> sessionsTable;
@FXML
private TableColumn<SessionRow, Integer> sessionIdColumn;
@FXML
private TableColumn<SessionRow, String> stateColumn;
@FXML
private TableColumn<SessionRow, Integer> nodeCountColumn;
@FXML private TableView<SessionRow> sessionsTable;
@FXML private TableColumn<SessionRow, Integer> sessionIdColumn;
@FXML private TableColumn<SessionRow, String> stateColumn;
@FXML private TableColumn<SessionRow, Integer> nodeCountColumn;
public SessionsDialog(Controller controller) {
super(controller, "/fxml/sessions_dialog.fxml");

16
corefx/src/main/java/com/core/ui/SessionsFoenixDialog.java
View file

@ -18,18 +18,10 @@ import java.util.stream.Collectors;
public class SessionsFoenixDialog extends CoreFoenixDialog {
private static final Logger logger = LogManager.getLogger();
@FXML
private TableView<SessionRow> sessionsTable;
@FXML
private TableColumn<SessionRow, Integer> sessionIdColumn;
@FXML
private TableColumn<SessionRow, String> stateColumn;
@FXML
private TableColumn<SessionRow, Integer> nodeCountColumn;
@FXML private TableView<SessionRow> sessionsTable;
@FXML private TableColumn<SessionRow, Integer> sessionIdColumn;
@FXML private TableColumn<SessionRow, String> stateColumn;
@FXML private TableColumn<SessionRow, Integer> nodeCountColumn;
public SessionsFoenixDialog(Controller controller) {
super(controller, "/fxml/sessions_dialog.fxml");