From fcdfed793eada40a53216267d7c7f36afbfc202c Mon Sep 17 00:00:00 2001 From: Rohit Awate Date: Fri, 24 Aug 2018 22:40:22 +0530 Subject: [PATCH] Fix issue where partially filled KeyValue fields were not searched in HistoryPane --- .../rohitawate/everest/controllers/DashboardController.java | 2 +- .../rohitawate/everest/controllers/FormDataTabController.java | 4 ++-- .../rohitawate/everest/controllers/HeaderTabController.java | 2 +- .../com/rohitawate/everest/controllers/URLTabController.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/rohitawate/everest/controllers/DashboardController.java b/src/main/java/com/rohitawate/everest/controllers/DashboardController.java index 2121d5a..e6bdfa4 100644 --- a/src/main/java/com/rohitawate/everest/controllers/DashboardController.java +++ b/src/main/java/com/rohitawate/everest/controllers/DashboardController.java @@ -539,7 +539,7 @@ public class DashboardController implements Initializable { ArrayList states = new ArrayList<>(); for (StringKeyValueFieldController controller : paramsControllers) { - if (!controller.isKeyFieldEmpty() && !controller.isValueFieldEmpty()) + if (!(controller.isKeyFieldEmpty() && controller.isValueFieldEmpty())) states.add(controller.getState()); } diff --git a/src/main/java/com/rohitawate/everest/controllers/FormDataTabController.java b/src/main/java/com/rohitawate/everest/controllers/FormDataTabController.java index 082b04a..804d442 100644 --- a/src/main/java/com/rohitawate/everest/controllers/FormDataTabController.java +++ b/src/main/java/com/rohitawate/everest/controllers/FormDataTabController.java @@ -214,7 +214,7 @@ public class FormDataTabController implements Initializable { ArrayList states = new ArrayList<>(); for (StringKeyValueFieldController controller : stringControllers) { - if (!controller.isKeyFieldEmpty() && !controller.isValueFieldEmpty()) + if (!(controller.isKeyFieldEmpty() && controller.isValueFieldEmpty())) states.add(controller.getState()); } @@ -229,7 +229,7 @@ public class FormDataTabController implements Initializable { ArrayList states = new ArrayList<>(); for (FileKeyValueFieldController controller : fileControllers) { - if (!controller.isFileKeyFieldEmpty() && !controller.isFileValueFieldEmpty()) + if (!(controller.isFileKeyFieldEmpty() && controller.isFileValueFieldEmpty())) states.add(controller.getState()); } diff --git a/src/main/java/com/rohitawate/everest/controllers/HeaderTabController.java b/src/main/java/com/rohitawate/everest/controllers/HeaderTabController.java index a2ab1e1..68b36d8 100644 --- a/src/main/java/com/rohitawate/everest/controllers/HeaderTabController.java +++ b/src/main/java/com/rohitawate/everest/controllers/HeaderTabController.java @@ -133,7 +133,7 @@ public class HeaderTabController implements Initializable { ArrayList states = new ArrayList<>(); for (StringKeyValueFieldController controller : controllers) { - if (!controller.isKeyFieldEmpty() && !controller.isValueFieldEmpty()) + if (!(controller.isKeyFieldEmpty() && controller.isValueFieldEmpty())) states.add(controller.getState()); } diff --git a/src/main/java/com/rohitawate/everest/controllers/URLTabController.java b/src/main/java/com/rohitawate/everest/controllers/URLTabController.java index 218500f..ac6e19f 100644 --- a/src/main/java/com/rohitawate/everest/controllers/URLTabController.java +++ b/src/main/java/com/rohitawate/everest/controllers/URLTabController.java @@ -134,7 +134,7 @@ public class URLTabController implements Initializable { ArrayList states = new ArrayList<>(); for (StringKeyValueFieldController controller : controllers) { - if (!controller.isKeyFieldEmpty() && !controller.isValueFieldEmpty()) + if (!(controller.isKeyFieldEmpty() && controller.isValueFieldEmpty())) states.add(controller.getState()); }