Renamed Network Tables Tree classes

* TreeRow is now NetworkTableTreeRow * The files have been renamed to be clearer
Gold872 · Dec 9, 2023 · 85bf310 · 85bf310
1 parent 3224e37
commit 85bf310
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 28 deletions.
diff --git a/lib/pages/dashboard_page.dart b/lib/pages/dashboard_page.dart
@@ -29,7 +29,7 @@ import 'package:elastic_dashboard/widgets/draggable_containers/draggable_layout_
 import 'package:elastic_dashboard/widgets/draggable_containers/draggable_nt4_widget_container.dart';
 import 'package:elastic_dashboard/widgets/draggable_dialog.dart';
 import 'package:elastic_dashboard/widgets/editable_tab_bar.dart';
-import 'package:elastic_dashboard/widgets/network_tree/network_table_tree.dart';
+import 'package:elastic_dashboard/widgets/network_tree/networktables_tree.dart';
 import 'package:elastic_dashboard/widgets/settings_dialog.dart';
 
 class DashboardPage extends StatefulWidget {

diff --git a/lib/services/shuffleboard_nt_listener.dart b/lib/services/shuffleboard_nt_listener.dart
@@ -4,7 +4,7 @@ import 'package:elastic_dashboard/services/nt4.dart';
 import 'package:elastic_dashboard/services/nt4_connection.dart';
 import 'package:elastic_dashboard/services/settings.dart';
 import 'package:elastic_dashboard/widgets/draggable_containers/draggable_widget_container.dart';
-import 'package:elastic_dashboard/widgets/network_tree/tree_row.dart';
+import 'package:elastic_dashboard/widgets/network_tree/networktables_tree_row.dart';
 import 'package:elastic_dashboard/widgets/nt4_widgets/nt4_widget.dart';
 
 class ShuffleboardNTListener {
@@ -22,7 +22,8 @@ class ShuffleboardNTListener {
 
   Map<String, Map<String, dynamic>> currentJsonData = {};
 
-  final TreeRow shuffleboardTreeRoot = TreeRow(topic: '/', rowName: '');
+  final NetworkTableTreeRow shuffleboardTreeRoot =
+      NetworkTableTreeRow(topic: '/', rowName: '');
 
   ShuffleboardNTListener({this.onTabChanged, this.onWidgetAdded});
 
@@ -262,18 +263,18 @@ class ShuffleboardNTListener {
     if (!shuffleboardTreeRoot.hasRow(shuffleboardTableRoot.substring(1))) {
       return;
     }
-    TreeRow shuffleboardRootRow =
+    NetworkTableTreeRow shuffleboardRootRow =
         shuffleboardTreeRoot.getRow(shuffleboardTableRoot.substring(1));
 
     if (!shuffleboardRootRow.hasRow(tabName)) {
       return;
     }
-    TreeRow tabRow = shuffleboardRootRow.getRow(tabName);
+    NetworkTableTreeRow tabRow = shuffleboardRootRow.getRow(tabName);
 
     if (!tabRow.hasRow(componentName)) {
       return;
     }
-    TreeRow widgetRow = tabRow.getRow(componentName);
+    NetworkTableTreeRow widgetRow = tabRow.getRow(componentName);
 
     bool isCameraStream = topic.name.endsWith('/.ShuffleboardURI');
 
@@ -375,7 +376,7 @@ class ShuffleboardNTListener {
   }
 
   Future<void> handleLayoutTopicAnnounce(
-      NT4Topic topic, TreeRow widgetRow) async {
+      NT4Topic topic, NetworkTableTreeRow widgetRow) async {
     String name = topic.name;
 
     List<String> tables = name.substring(1).split('/');
@@ -416,7 +417,7 @@ class ShuffleboardNTListener {
         if (!widgetRow.hasRow(child['title'])) {
           continue;
         }
-        TreeRow childRow = widgetRow.getRow(child['title']);
+        NetworkTableTreeRow childRow = widgetRow.getRow(child['title']);
 
         WidgetContainer? widgetContainer = await childRow.toWidgetContainer();
         NT4Widget? widget = tryCast(widgetContainer?.child);
@@ -502,7 +503,7 @@ class ShuffleboardNTListener {
     String topic = nt4Topic.name;
 
     List<String> rows = topic.substring(1).split('/');
-    TreeRow? current;
+    NetworkTableTreeRow? current;
     String currentTopic = '';
 
     for (String row in rows) {

diff --git a/...gets/network_tree/network_table_tree.dart → ...gets/network_tree/networktables_tree.dart b/...gets/network_tree/network_table_tree.dart → ...gets/network_tree/networktables_tree.dart
@@ -9,7 +9,7 @@ import 'package:elastic_dashboard/services/nt4.dart';
 import 'package:elastic_dashboard/services/nt4_connection.dart';
 import 'package:elastic_dashboard/widgets/draggable_containers/draggable_nt4_widget_container.dart';
 import 'package:elastic_dashboard/widgets/draggable_containers/draggable_widget_container.dart';
-import 'package:elastic_dashboard/widgets/network_tree/tree_row.dart';
+import 'package:elastic_dashboard/widgets/network_tree/networktables_tree_row.dart';
 
 class NetworkTableTree extends StatefulWidget {
   final Function(Offset globalPosition, DraggableNT4WidgetContainer widget)?
@@ -29,8 +29,8 @@ class NetworkTableTree extends StatefulWidget {
 }
 
 class _NetworkTableTreeState extends State<NetworkTableTree> {
-  final TreeRow root = TreeRow(topic: '/', rowName: '');
-  late final TreeController<TreeRow> treeController;
+  final NetworkTableTreeRow root = NetworkTableTreeRow(topic: '/', rowName: '');
+  late final TreeController<NetworkTableTreeRow> treeController;
 
   late final Function(
           Offset globalPosition, DraggableNT4WidgetContainer widget)?
@@ -46,7 +46,7 @@ class _NetworkTableTreeState extends State<NetworkTableTree> {
   void initState() {
     super.initState();
 
-    treeController = TreeController<TreeRow>(
+    treeController = TreeController<NetworkTableTreeRow>(
         roots: root.children, childrenProvider: (node) => node.children);
 
     nt4Connection.nt4Client
@@ -68,7 +68,7 @@ class _NetworkTableTreeState extends State<NetworkTableTree> {
     String topic = nt4Topic.name;
 
     List<String> rows = topic.substring(1).split('/');
-    TreeRow? current;
+    NetworkTableTreeRow? current;
     String currentTopic = '';
 
     for (String row in rows) {
@@ -116,9 +116,10 @@ class _NetworkTableTreeState extends State<NetworkTableTree> {
 
     root.sort();
 
-    return TreeView<TreeRow>(
+    return TreeView<NetworkTableTreeRow>(
       treeController: treeController,
-      nodeBuilder: (BuildContext context, TreeEntry<TreeRow> entry) {
+      nodeBuilder:
+          (BuildContext context, TreeEntry<NetworkTableTreeRow> entry) {
         return TreeTile(
           key: UniqueKey(),
           entry: entry,
@@ -144,7 +145,7 @@ class TreeTile extends StatelessWidget {
     this.widgetContainerBuilder,
   });
 
-  final TreeEntry<TreeRow> entry;
+  final TreeEntry<NetworkTableTreeRow> entry;
   final VoidCallback onTap;
   final Function(Offset globalPosition, DraggableNT4WidgetContainer widget)?
       onDragUpdate;

diff --git a/lib/widgets/network_tree/tree_row.dart → .../network_tree/networktables_tree_row.dart b/lib/widgets/network_tree/tree_row.dart → .../network_tree/networktables_tree_row.dart
@@ -9,18 +9,19 @@ import 'package:elastic_dashboard/widgets/nt4_widgets/nt4_widget.dart';
 import 'package:elastic_dashboard/widgets/nt4_widgets/single_topic/boolean_box.dart';
 import 'package:elastic_dashboard/widgets/nt4_widgets/single_topic/text_display.dart';
 
-class TreeRow {
+class NetworkTableTreeRow {
   final String topic;
   final String rowName;
 
   final NT4Topic? nt4Topic;
 
-  List<TreeRow> children = [];
+  List<NetworkTableTreeRow> children = [];
 
-  TreeRow({required this.topic, required this.rowName, this.nt4Topic});
+  NetworkTableTreeRow(
+      {required this.topic, required this.rowName, this.nt4Topic});
 
   bool hasRow(String name) {
-    for (TreeRow child in children) {
+    for (NetworkTableTreeRow child in children) {
       if (child.rowName == name) {
         return true;
       }
@@ -38,16 +39,16 @@ class TreeRow {
     return true;
   }
 
-  void addRow(TreeRow row) {
+  void addRow(NetworkTableTreeRow row) {
     if (hasRow(row.rowName)) {
       return;
     }
 
     children.add(row);
   }
 
-  TreeRow getRow(String name) {
-    for (TreeRow row in children) {
+  NetworkTableTreeRow getRow(String name) {
+    for (NetworkTableTreeRow row in children) {
       if (row.rowName == name) {
         return row;
       }
@@ -56,9 +57,10 @@ class TreeRow {
     throw Exception("Trying to retrieve a row that doesn't exist");
   }
 
-  TreeRow createNewRow(
+  NetworkTableTreeRow createNewRow(
       {required String topic, required String name, NT4Topic? nt4Topic}) {
-    TreeRow newRow = TreeRow(topic: topic, rowName: name, nt4Topic: nt4Topic);
+    NetworkTableTreeRow newRow =
+        NetworkTableTreeRow(topic: topic, rowName: name, nt4Topic: nt4Topic);
     addRow(newRow);
 
     return newRow;
@@ -75,7 +77,7 @@ class TreeRow {
       return a.rowName.compareTo(b.rowName);
     });
 
-    for (TreeRow child in children) {
+    for (NetworkTableTreeRow child in children) {
       child.sort();
     }
   }

diff --git a/test/pages/dashboard_page_test.dart b/test/pages/dashboard_page_test.dart
@@ -21,7 +21,7 @@ import 'package:elastic_dashboard/widgets/draggable_containers/draggable_list_la
 import 'package:elastic_dashboard/widgets/draggable_containers/draggable_widget_container.dart';
 import 'package:elastic_dashboard/widgets/draggable_dialog.dart';
 import 'package:elastic_dashboard/widgets/editable_tab_bar.dart';
-import 'package:elastic_dashboard/widgets/network_tree/network_table_tree.dart';
+import 'package:elastic_dashboard/widgets/network_tree/networktables_tree.dart';
 import 'package:elastic_dashboard/widgets/nt4_widgets/multi-topic/combo_box_chooser.dart';
 import 'package:elastic_dashboard/widgets/nt4_widgets/single_topic/boolean_box.dart';
 import 'package:elastic_dashboard/widgets/settings_dialog.dart';