From bd3115314953ea96f239a4de91032fe7c12da682 Mon Sep 17 00:00:00 2001
From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com>
Date: Tue, 3 May 2022 06:12:33 +0200
Subject: [PATCH] remove option to not use new structures

---
 .../internal_extensions/uilogger/UiLoggerController.java     | 5 ++---
 .../services/internal_extensions/uilogger/UiLogger.fxml      | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerController.java b/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerController.java
index ee1e54b..26b6af0 100644
--- a/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerController.java
+++ b/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerController.java
@@ -46,7 +46,6 @@ public class UiLoggerController implements Initializable {
     public CheckMenuItem chkMessageHash;
     public CheckMenuItem chkMessageId;
     public Label lblPacketInfo;
-    public CheckMenuItem chkUseNewStructures;
     public CheckMenuItem chkAlwaysOnTop;
 
     public CheckMenuItem chkOpenOnConnect;
@@ -130,7 +129,7 @@ public class UiLoggerController implements Initializable {
     public void initialize(URL arg0, ResourceBundle arg1) {
         allMenuItems.addAll(Arrays.asList(
                 chkViewIncoming, chkViewOutgoing, chkDisplayStructure, chkAutoscroll,
-                chkSkipBigPackets, chkMessageName, chkMessageHash, chkMessageId, chkUseNewStructures,
+                chkSkipBigPackets, chkMessageName, chkMessageHash, chkMessageId,
                 chkOpenOnConnect, chkResetOnConnect, chkHideOnDisconnect, chkResetOnDisconnect,
                 chkAntiSpam_none, chkAntiSpam_low, chkAntiSpam_medium, chkAntiSpam_high, chkAntiSpam_ultra,
                 chkTimestamp, chkReprHex, chkReprLegacy, chkReprRawHex, chkReprNone
@@ -286,7 +285,7 @@ public class UiLoggerController implements Initializable {
 
         if (packet.length() <= 2000) {
             try {
-                String expr = packet.toExpression(isIncoming ? HMessage.Direction.TOCLIENT : HMessage.Direction.TOSERVER, uiLogger.getPacketInfoManager(), chkUseNewStructures.isSelected());
+                String expr = packet.toExpression(isIncoming ? HMessage.Direction.TOCLIENT : HMessage.Direction.TOSERVER, uiLogger.getPacketInfoManager(), true);
                 String cleaned = cleanTextContent(expr);
                 if (cleaned.equals(expr)) {
                     if (!expr.equals("") && chkDisplayStructure.isSelected()) {
diff --git a/G-Earth/src/main/resources/gearth/services/internal_extensions/uilogger/UiLogger.fxml b/G-Earth/src/main/resources/gearth/services/internal_extensions/uilogger/UiLogger.fxml
index 405c104..c257d5e 100644
--- a/G-Earth/src/main/resources/gearth/services/internal_extensions/uilogger/UiLogger.fxml
+++ b/G-Earth/src/main/resources/gearth/services/internal_extensions/uilogger/UiLogger.fxml
@@ -67,7 +67,6 @@
                        </items>
                      </Menu>
                      <CheckMenuItem fx:id="chkDisplayStructure" mnemonicParsing="false" selected="true" text="Structure" />
-                     <CheckMenuItem fx:id="chkUseNewStructures" mnemonicParsing="false" selected="true" text="New structures" />
                      <CheckMenuItem fx:id="chkTimestamp" mnemonicParsing="false" text="Timestamp" />
                  </items>
                </Menu>