From 61f80ffb9c06cceabbe7924ccc515c7681046e55 Mon Sep 17 00:00:00 2001
From: "Blake J. Harnden" <bharnden@users.noreply.github.com>
Date: Mon, 26 Nov 2018 10:54:34 -0800
Subject: [PATCH] corefx - consolidated menu bar

---
 .../com/core/client/rest/GetSessionsData.java | 12 ----------
 corefx/src/main/resources/fxml/main.fxml      | 24 ++++++++-----------
 2 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 corefx/src/main/java/com/core/client/rest/GetSessionsData.java

diff --git a/corefx/src/main/java/com/core/client/rest/GetSessionsData.java b/corefx/src/main/java/com/core/client/rest/GetSessionsData.java
deleted file mode 100644
index 74a20314..00000000
--- a/corefx/src/main/java/com/core/client/rest/GetSessionsData.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.core.client.rest;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class GetSessionsData {
-    private Integer id;
-    private Integer state;
-    private Integer nodes;
-}
diff --git a/corefx/src/main/resources/fxml/main.fxml b/corefx/src/main/resources/fxml/main.fxml
index ee1ed044..49bd78be 100644
--- a/corefx/src/main/resources/fxml/main.fxml
+++ b/corefx/src/main/resources/fxml/main.fxml
@@ -18,17 +18,20 @@
                <children>
                     <MenuBar>
                         <menus>
-                        <Menu mnemonicParsing="false" text="Main">
+                        <Menu mnemonicParsing="false" text="Menu">
                           <items>
                               <MenuItem mnemonicParsing="false" onAction="#onCoreMenuConnect" text="Connection" />
+                                  <Menu mnemonicParsing="false" text="File">
+                                      <items>
+                                    <MenuItem fx:id="saveXmlMenuItem" disable="true" mnemonicParsing="false" onAction="#onSaveXmlAction" text="Save XML" />
+                                    <MenuItem mnemonicParsing="false" onAction="#onOpenXmlAction" text="Open XML" />
+                                      </items>
+                                  </Menu>
+                            <MenuItem mnemonicParsing="false" onAction="#onOptionsMenuNodeTypes" text="Nodes" />
+                              <MenuItem mnemonicParsing="false" onAction="#onOptionsMenuBackground" text="Background" />
+                              <MenuItem mnemonicParsing="false" onAction="#onOptionsMenuPreferences" text="Preferences" />
                           </items>
                         </Menu>
-                            <Menu mnemonicParsing="false" text="File">
-                                <items>
-                              <MenuItem fx:id="saveXmlMenuItem" disable="true" mnemonicParsing="false" onAction="#onSaveXmlAction" text="Save XML" />
-                              <MenuItem mnemonicParsing="false" onAction="#onOpenXmlAction" text="Open XML" />
-                                </items>
-                            </Menu>
                         <Menu mnemonicParsing="false" text="Session">
                           <items>
                             <MenuItem mnemonicParsing="false" onAction="#onJoinSessionMenu" text="Join" />
@@ -36,13 +39,6 @@
                               <MenuItem mnemonicParsing="false" onAction="#onOptionsMenuLocation" text="Location" />
                               <MenuItem mnemonicParsing="false" onAction="#onSessionOptionsMenu" text="Options" />
                           </items>
-                        </Menu>
-                        <Menu mnemonicParsing="false" text="Options">
-                          <items>
-                            <MenuItem mnemonicParsing="false" onAction="#onOptionsMenuNodeTypes" text="Nodes" />
-                              <MenuItem mnemonicParsing="false" onAction="#onOptionsMenuBackground" text="Background" />
-                              <MenuItem mnemonicParsing="false" onAction="#onOptionsMenuPreferences" text="Preferences" />
-                          </items>
                         </Menu>
                             <Menu mnemonicParsing="false" text="Help">
                                 <items>