summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-03-09 05:41:26 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-03-09 05:41:26 -0500
commit1cdae92f1431cd2c22e31a3da012206c757cea5f (patch)
tree8f00b06324b83e46d5b81f675de46fe7df770a21
parent42ff123fea0f9fb8ed0c40ce2c3e21b64ff4bbf0 (diff)
move the FileSniffer class into the main package
-rw-r--r--smartdashboard/src/edu/wpi/first/smartdashboard/ExtensionFileSniffer.java (renamed from smartdashboard/src/edu/wpi/first/smartdashboard/extensions/FileSniffer.java)4
-rw-r--r--smartdashboard/src/edu/wpi/first/smartdashboard/main.java3
2 files changed, 3 insertions, 4 deletions
diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/extensions/FileSniffer.java b/smartdashboard/src/edu/wpi/first/smartdashboard/ExtensionFileSniffer.java
index 6ee5c80..932a60c 100644
--- a/smartdashboard/src/edu/wpi/first/smartdashboard/extensions/FileSniffer.java
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/ExtensionFileSniffer.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.smartdashboard.extensions;
+package edu.wpi.first.smartdashboard;
import java.io.*;
import java.lang.String;
@@ -25,7 +25,7 @@ import edu.wpi.first.smartdashboard.types.*;
*
* @author Joe Grinstead
*/
-public class FileSniffer {
+public class ExtensionFileSniffer {
private static final File EXTENSION_DIR =
new File(getUserHomeDir(), "SmartDashboard/extensions");
private static final File[] LIBRARY_DIRS = {
diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/main.java b/smartdashboard/src/edu/wpi/first/smartdashboard/main.java
index 296a417..2ef7e32 100644
--- a/smartdashboard/src/edu/wpi/first/smartdashboard/main.java
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/main.java
@@ -4,7 +4,6 @@ import java.io.*;
import javax.swing.*;
-import edu.wpi.first.smartdashboard.extensions.*;
import edu.wpi.first.smartdashboard.gui.*;
import edu.wpi.first.smartdashboard.properties.*;
import edu.wpi.first.smartdashboard.robot.*;
@@ -61,7 +60,7 @@ public class main {
final ProgressMonitor monitor = new ProgressMonitor(null, "Loading SmartDashboard", "Initializing internal code...", 0, 1000);
// Search the filesystem for extensions (49%)
- FileSniffer.findExtensions(monitor, 0, 490);
+ ExtensionFileSniffer.findExtensions(monitor, 0, 490);
// Parse arguments
ArgParser argParser = new ArgParser(args, true, true, new String[] { "ip" });