From f882fb81a3d35f82cfbd15f2d4efa9557d35eea4 Mon Sep 17 00:00:00 2001 From: nathanrsxtn Date: Tue, 1 Mar 2022 16:30:25 -0700 Subject: [PATCH] Revert partial logging with message resource files --- src/main/java/frc4388/robot/RobotContainer.java | 10 ++++------ src/main/java/frc4388/utility/Logging.properties | 4 ---- 2 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 src/main/java/frc4388/utility/Logging.properties diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 9f03798..4f44b21 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -4,8 +4,6 @@ package frc4388.robot; -import static frc4388.utility.AnsiLogging.RESOURCE_BUNDLE; - import java.io.File; import java.io.IOException; import java.nio.file.FileSystems; @@ -235,16 +233,16 @@ public class RobotContainer { String watchEventFileName = watchEventFile.getName(); if (watchEventFileName.endsWith(".path")) { if (pathWatchEvent.kind().equals(StandardWatchEventKinds.ENTRY_CREATE)) { - LOGGER.logrb(Level.WARNING, RESOURCE_BUNDLE, "RobotContainer.updateAutoChooser.entryCreate", watchEventFileName); + LOGGER.log(Level.WARNING, "PathPlanner file {0} created. Options added to SendableChooser.", watchEventFileName); autoChooser.addOption(watchEventFile.getName(), watchEventFile); } else if (pathWatchEvent.kind().equals(StandardWatchEventKinds.ENTRY_MODIFY)) { - LOGGER.logrb(Level.WARNING, RESOURCE_BUNDLE, "RobotContainer.updateAutoChooser.entryModify", watchEventFileName); + LOGGER.log(Level.WARNING, "PathPlanner file {0} modified.", watchEventFileName); if (watchEventFileName.equals(autoChooser.getSelected().getName())) { - LOGGER.logrb(Level.SEVERE, RESOURCE_BUNDLE, "RobotContainer.updateAutoChooser.entryModify.selected", watchEventFileName); + LOGGER.log(Level.SEVERE, "PathPlanner file {0} already selected. Reloading path.", watchEventFileName); loadPath(watchEventFileName); } } else if (pathWatchEvent.kind().equals(StandardWatchEventKinds.ENTRY_DELETE)) { - LOGGER.logrb(Level.SEVERE, RESOURCE_BUNDLE, "RobotContainer.updateAutoChooser.entryDelete", watchEventFileName); + LOGGER.log(Level.SEVERE, "PathPlanner file {0} deleted. Removing options from SendableChooser not yet implemented.", watchEventFileName); } } } diff --git a/src/main/java/frc4388/utility/Logging.properties b/src/main/java/frc4388/utility/Logging.properties deleted file mode 100644 index b93bbb6..0000000 --- a/src/main/java/frc4388/utility/Logging.properties +++ /dev/null @@ -1,4 +0,0 @@ -RobotContainer.updateAutoChooser.entryCreate = PathPlanner file {0} created. Options added to SendableChooser. -RobotContainer.updateAutoChooser.entryModify = PathPlanner file {0} modified. -RobotContainer.updateAutoChooser.entryModify.selected = PathPlanner file {0} already selected. Reloading path. -RobotContainer.updateAutoChooser.entryDelete = PathPlanner file {0} deleted. Removing options from SendableChooser not yet implemented. \ No newline at end of file