Clean up code

RaiderRobotix · Mar 6, 2019 · c559c5d · c559c5d
1 parent b5976b7
commit c559c5d
Show file tree

Hide file tree

Showing 16 changed files with 682 additions and 674 deletions.
diff --git a/.idea/dictionaries/FRC.xml b/.idea/dictionaries/FRC.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-MainTest-Class: org.usfirst.frc.team25.scouting.client.ui.MainTest
+Main-Class: org.usfirst.frc.team25.scouting.client.ui.MainTest
 
diff --git a/src/main/java/org/usfirst/frc/team25/scouting/client/ui/MainController.java b/src/main/java/org/usfirst/frc/team25/scouting/client/ui/MainController.java
@@ -12,7 +12,6 @@
 import org.usfirst.frc.team25.scouting.data.models.ScoutEntry;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 
@@ -32,14 +31,14 @@ public class MainController {
     private TextField analysisTeamOne, analysisTeamTwo, analysisTeamThree, teamNumEventCode, analysisOppTeamOne,
             analysisOppTeamTwo, analysisOppTeamThree, analysisMatchNum;
 
-    TextField[] allianceBasedGroup;
-    TextField[] matchBasedGroup;
+    private TextField[] allianceBasedGroup;
+    private TextField[] matchBasedGroup;
 
     private EventReport eventReport;
     private ArrayList<File> jsonFileList;
     private String eventName;
 
-    private File currentDataDirectory, teamNameList;
+    private File currentDataDirectory;
 
     public void initialize() {
 
@@ -100,9 +99,7 @@ public void initialize() {
             enableTextFieldGroup(matchBasedGroup, matchBasedReport.isSelected());
         });
 
-        generateFilesButton.setOnAction(event -> {
-            processData();
-        });
+        generateFilesButton.setOnAction(event -> processData());
 
         downloadDataButton.setOnAction(event -> {
             String response;
@@ -123,9 +120,7 @@ public void initialize() {
             addStatus(response);
         });
 
-        displayReportButton.setOnAction(event -> {
-            displayAggregateReport();
-        });
+        displayReportButton.setOnAction(event -> displayAggregateReport());
     }
 
     private void enableTextFieldGroup(TextField[] textFields, boolean enable) {
@@ -252,10 +247,9 @@ private void processData() {
         retrieveEventReport();
 
         if (backupJson.isSelected()) {
-            try {
-                FileManager.createBackup(jsonFileList, currentDataDirectory);
+            if (FileManager.createBackup(jsonFileList, currentDataDirectory)) {
                 status += "\nBackup JSON files created";
-            } catch (FileNotFoundException e) {
+            } else {
                 status += "\nJSON file backup failed";
             }
 
@@ -331,7 +325,7 @@ private void retrieveEventReport() {
 
         ArrayList<ScoutEntry> scoutEntries = FileManager.deserializeData(jsonFileList);
 
-        this.teamNameList = FileManager.getTeamNameList(currentDataDirectory);
+        File teamNameList = FileManager.getTeamNameList(currentDataDirectory);
 
         this.eventReport = new EventReport(scoutEntries, eventName, currentDataDirectory);
 

diff --git a/src/main/java/org/usfirst/frc/team25/scouting/client/ui/MatchPredictionController.java b/src/main/java/org/usfirst/frc/team25/scouting/client/ui/MatchPredictionController.java
@@ -11,7 +11,7 @@ public class MatchPredictionController {
 
     @FXML
     Text redTeamOneNum, eventKey, matchNumText;
-    Scene scene;
+    private Scene scene;
 
     public void initialize(AllianceReport redAlliance, AllianceReport blueAlliance) {