refactor packages

CoolSpy3 · CoolSpy3 · commit c10373771335 · 2022-08-01T18:51:59.000-07:00
diff --git a/src/main/java/org/carlmontrobotics/lib199/CachedSparkMax.java b/src/main/java/org/carlmontrobotics/lib199/CachedSparkMax.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import com.revrobotics.CANSparkMax;
 import com.revrobotics.RelativeEncoder;
diff --git a/src/main/java/org/carlmontrobotics/lib199/ConvertPaths.py b/src/main/java/org/carlmontrobotics/lib199/ConvertPaths.py
diff --git a/src/main/java/org/carlmontrobotics/lib199/DummySparkMaxAnswer.java b/src/main/java/org/carlmontrobotics/lib199/DummySparkMaxAnswer.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import com.revrobotics.CANSparkMax;
 import com.revrobotics.RelativeEncoder;
diff --git a/src/main/java/org/carlmontrobotics/lib199/ErrorCodeAnswer.java b/src/main/java/org/carlmontrobotics/lib199/ErrorCodeAnswer.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import com.ctre.phoenix.ErrorCode;
 
diff --git a/src/main/java/org/carlmontrobotics/lib199/Lib199Subsystem.java b/src/main/java/org/carlmontrobotics/lib199/Lib199Subsystem.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
diff --git a/src/main/java/org/carlmontrobotics/lib199/Limelight.java b/src/main/java/org/carlmontrobotics/lib199/Limelight.java
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import edu.wpi.first.networktables.NetworkTableInstance;
 import edu.wpi.first.math.controller.PIDController;
diff --git a/src/main/java/org/carlmontrobotics/lib199/LinearInterpolation.java b/src/main/java/org/carlmontrobotics/lib199/LinearInterpolation.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import java.io.FileNotFoundException;
 import java.io.FileReader;
diff --git a/src/main/java/org/carlmontrobotics/lib199/Mocks.java b/src/main/java/org/carlmontrobotics/lib199/Mocks.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/src/main/java/org/carlmontrobotics/lib199/MotorControllerFactory.java b/src/main/java/org/carlmontrobotics/lib199/MotorControllerFactory.java
@@ -5,21 +5,23 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import com.ctre.phoenix.motorcontrol.NeutralMode;
 import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX;
 import com.ctre.phoenix.motorcontrol.can.WPI_VictorSPX;
 import com.revrobotics.CANSparkMax;
 import com.revrobotics.CANSparkMax.ExternalFollower;
 import com.revrobotics.CANSparkMax.IdleMode;
+
+import org.carlmontrobotics.lib199.sim.MockSparkMax;
+import org.carlmontrobotics.lib199.sim.MockTalonSRX;
+import org.carlmontrobotics.lib199.sim.MockVictorSPX;
+
 import com.revrobotics.CANSparkMaxLowLevel;
 import com.revrobotics.SparkMaxPIDController;
 
 import edu.wpi.first.wpilibj.RobotBase;
-import frc.robot.lib.sim.MockSparkMax;
-import frc.robot.lib.sim.MockTalonSRX;
-import frc.robot.lib.sim.MockVictorSPX;
 
 /**
  * Add your docs here.
diff --git a/src/main/java/org/carlmontrobotics/lib199/MotorErrors.java b/src/main/java/org/carlmontrobotics/lib199/MotorErrors.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/org/carlmontrobotics/lib199/OmniDrive.java b/src/main/java/org/carlmontrobotics/lib199/OmniDrive.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import java.util.StringJoiner;
 
diff --git a/src/main/java/org/carlmontrobotics/lib199/REVLibErrorAnswer.java b/src/main/java/org/carlmontrobotics/lib199/REVLibErrorAnswer.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import com.revrobotics.REVLibError;
 
diff --git a/src/main/java/org/carlmontrobotics/lib199/SparkVelocityPIDController.java b/src/main/java/org/carlmontrobotics/lib199/SparkVelocityPIDController.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import com.revrobotics.CANSparkMax;
 import com.revrobotics.RelativeEncoder;
diff --git a/src/main/java/org/carlmontrobotics/lib199/SwerveConfig.java b/src/main/java/org/carlmontrobotics/lib199/SwerveConfig.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 public final class SwerveConfig {
 
diff --git a/src/main/java/org/carlmontrobotics/lib199/SwerveModule.java b/src/main/java/org/carlmontrobotics/lib199/SwerveModule.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import java.util.function.Supplier;
 
diff --git a/src/main/java/org/carlmontrobotics/lib199/logging/DataLog.java b/src/main/java/org/carlmontrobotics/lib199/logging/DataLog.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.logging;
+package org.carlmontrobotics.lib199.logging;
 
 import java.io.IOException;
 import java.time.LocalDateTime;
diff --git a/src/main/java/org/carlmontrobotics/lib199/logging/EventLog.java b/src/main/java/org/carlmontrobotics/lib199/logging/EventLog.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.logging;
+package org.carlmontrobotics.lib199.logging;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/src/main/java/org/carlmontrobotics/lib199/logging/GlobalLogInfo.java b/src/main/java/org/carlmontrobotics/lib199/logging/GlobalLogInfo.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.logging;
+package org.carlmontrobotics.lib199.logging;
 
 import java.io.File;
 import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/org/carlmontrobotics/lib199/logging/Log.java b/src/main/java/org/carlmontrobotics/lib199/logging/Log.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.logging;
+package org.carlmontrobotics.lib199.logging;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
diff --git a/src/main/java/org/carlmontrobotics/lib199/logging/LogFiles.java b/src/main/java/org/carlmontrobotics/lib199/logging/LogFiles.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.logging;
+package org.carlmontrobotics.lib199.logging;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/src/main/java/org/carlmontrobotics/lib199/logging/LogUtils.java b/src/main/java/org/carlmontrobotics/lib199/logging/LogUtils.java
@@ -1,6 +1,6 @@
-package frc.robot.lib.logging;
+package org.carlmontrobotics.lib199.logging;
 
-import static frc.robot.lib.logging.GlobalLogInfo.*;
+import static org.carlmontrobotics.lib199.logging.GlobalLogInfo.*;
 
 /**
  * Various utility methods utilized by the logging code
diff --git a/src/main/java/org/carlmontrobotics/lib199/logging/TimeLog.java b/src/main/java/org/carlmontrobotics/lib199/logging/TimeLog.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.logging;
+package org.carlmontrobotics.lib199.logging;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/org/carlmontrobotics/lib199/logging/VarType.java b/src/main/java/org/carlmontrobotics/lib199/logging/VarType.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.logging;
+package org.carlmontrobotics.lib199.logging;
 
 /**
  * Represents the type of a variable in the logging code
diff --git a/src/main/java/org/carlmontrobotics/lib199/path/DifferentialDriveInterface.java b/src/main/java/org/carlmontrobotics/lib199/path/DifferentialDriveInterface.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.path;
+package org.carlmontrobotics.lib199.path;
 
 import java.util.function.Supplier;
 import java.util.stream.DoubleStream;
diff --git a/src/main/java/org/carlmontrobotics/lib199/path/DrivetrainInterface.java b/src/main/java/org/carlmontrobotics/lib199/path/DrivetrainInterface.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.path;
+package org.carlmontrobotics.lib199.path;
 
 import java.util.function.Supplier;
 
diff --git a/src/main/java/org/carlmontrobotics/lib199/path/RobotPath.java b/src/main/java/org/carlmontrobotics/lib199/path/RobotPath.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.path;
+package org.carlmontrobotics.lib199.path;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/main/java/org/carlmontrobotics/lib199/path/SwerveDriveInterface.java b/src/main/java/org/carlmontrobotics/lib199/path/SwerveDriveInterface.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.path;
+package org.carlmontrobotics.lib199.path;
 
 import java.util.function.Supplier;
 
diff --git a/src/main/java/org/carlmontrobotics/lib199/sim/MockPhoenixController.java b/src/main/java/org/carlmontrobotics/lib199/sim/MockPhoenixController.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.sim;
+package org.carlmontrobotics.lib199.sim;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/org/carlmontrobotics/lib199/sim/MockSparkMax.java b/src/main/java/org/carlmontrobotics/lib199/sim/MockSparkMax.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.sim;
+package org.carlmontrobotics.lib199.sim;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,12 +11,13 @@
 import com.revrobotics.CANSparkMax.IdleMode;
 import com.revrobotics.CANSparkMaxLowLevel.MotorType;
 
+import org.carlmontrobotics.lib199.DummySparkMaxAnswer;
+import org.carlmontrobotics.lib199.Mocks;
+import org.carlmontrobotics.lib199.REVLibErrorAnswer;
+
 import edu.wpi.first.hal.SimDevice;
 import edu.wpi.first.hal.SimDouble;
 import edu.wpi.first.hal.SimDevice.Direction;
-import frc.robot.lib.REVLibErrorAnswer;
-import frc.robot.lib.DummySparkMaxAnswer;
-import frc.robot.lib.Mocks;
 
 public class MockSparkMax {
     // Assign the CAN port to a PWM port so it works with the simulator. Not a fan
diff --git a/src/main/java/org/carlmontrobotics/lib199/sim/MockTalonSRX.java b/src/main/java/org/carlmontrobotics/lib199/sim/MockTalonSRX.java
@@ -1,10 +1,11 @@
-package frc.robot.lib.sim;
+package org.carlmontrobotics.lib199.sim;
 
 import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX;
 
+import org.carlmontrobotics.lib199.ErrorCodeAnswer;
+import org.carlmontrobotics.lib199.Mocks;
+
 import edu.wpi.first.wpilibj.motorcontrol.Talon;
-import frc.robot.lib.ErrorCodeAnswer;
-import frc.robot.lib.Mocks;
 
 public class MockTalonSRX extends MockPhoenixController {
 
diff --git a/src/main/java/org/carlmontrobotics/lib199/sim/MockVictorSPX.java b/src/main/java/org/carlmontrobotics/lib199/sim/MockVictorSPX.java
@@ -1,10 +1,11 @@
-package frc.robot.lib.sim;
+package org.carlmontrobotics.lib199.sim;
 
 import com.ctre.phoenix.motorcontrol.can.WPI_VictorSPX;
 
+import org.carlmontrobotics.lib199.ErrorCodeAnswer;
+import org.carlmontrobotics.lib199.Mocks;
+
 import edu.wpi.first.wpilibj.motorcontrol.VictorSP;
-import frc.robot.lib.ErrorCodeAnswer;
-import frc.robot.lib.Mocks;
 
 public class MockVictorSPX extends MockPhoenixController {
     public MockVictorSPX(int portPWM) {
diff --git a/src/main/java/org/carlmontrobotics/lib199/sim/MockedSparkEncoder.java b/src/main/java/org/carlmontrobotics/lib199/sim/MockedSparkEncoder.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.sim;
+package org.carlmontrobotics.lib199.sim;
 
 import com.revrobotics.REVLibError;
 
diff --git a/src/main/java/org/carlmontrobotics/lib199/sim/MockedSparkMaxPIDController.java b/src/main/java/org/carlmontrobotics/lib199/sim/MockedSparkMaxPIDController.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.sim;
+package org.carlmontrobotics.lib199.sim;
 
 import com.revrobotics.REVLibError;
 
diff --git a/src/main/java/org/carlmontrobotics/lib199/swerve/SwerveDriveVoltageConstraint.java b/src/main/java/org/carlmontrobotics/lib199/swerve/SwerveDriveVoltageConstraint.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.swerve;
+package org.carlmontrobotics.lib199.swerve;
 
 import static edu.wpi.first.util.ErrorMessages.requireNonNullParam;
 
diff --git a/src/main/java/org/carlmontrobotics/lib199/swerve/SwerveMath.java b/src/main/java/org/carlmontrobotics/lib199/swerve/SwerveMath.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.swerve;
+package org.carlmontrobotics.lib199.swerve;
 
 import edu.wpi.first.math.geometry.Rotation2d;
 import edu.wpi.first.math.kinematics.SwerveModuleState;
diff --git a/src/test/java/org/carlmontrobotics/lib199/DummySparkMaxAnswerTest.java b/src/test/java/org/carlmontrobotics/lib199/DummySparkMaxAnswerTest.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/org/carlmontrobotics/lib199/ErrorCodeAnswerTest.java b/src/test/java/org/carlmontrobotics/lib199/ErrorCodeAnswerTest.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/org/carlmontrobotics/lib199/Lib199SubsystemTest.java b/src/test/java/org/carlmontrobotics/lib199/Lib199SubsystemTest.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeTrue;
diff --git a/src/test/java/org/carlmontrobotics/lib199/LimelightTest.java b/src/test/java/org/carlmontrobotics/lib199/LimelightTest.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/carlmontrobotics/lib199/LinearInterpolationTest.java b/src/test/java/org/carlmontrobotics/lib199/LinearInterpolationTest.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/org/carlmontrobotics/lib199/MocksTest.java b/src/test/java/org/carlmontrobotics/lib199/MocksTest.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/org/carlmontrobotics/lib199/MotorControllerFactoryTest.java b/src/test/java/org/carlmontrobotics/lib199/MotorControllerFactoryTest.java
@@ -1,14 +1,13 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import static org.junit.Assert.assertEquals;
 
+import org.carlmontrobotics.lib199.testUtils.ErrStreamTest;
+import org.carlmontrobotics.lib199.testUtils.SimDeviceTestRule;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 
-import frc.robot.lib.testUtils.ErrStreamTest;
-import frc.robot.lib.testUtils.SimDeviceTestRule;
-
 public class MotorControllerFactoryTest extends ErrStreamTest {
 
     @ClassRule
diff --git a/src/test/java/org/carlmontrobotics/lib199/MotorErrorsTest.java b/src/test/java/org/carlmontrobotics/lib199/MotorErrorsTest.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -8,11 +8,11 @@
 import com.revrobotics.CANSparkMax;
 import com.revrobotics.CANSparkMax.FaultID;
 
+import org.carlmontrobotics.lib199.testUtils.ErrStreamTest;
 import org.junit.Test;
 
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import edu.wpi.first.wpilibj2.command.CommandScheduler;
-import frc.robot.lib.testUtils.ErrStreamTest;
 
 public class MotorErrorsTest extends ErrStreamTest {
 
diff --git a/src/test/java/org/carlmontrobotics/lib199/REVLibErrorAnswerTest.java b/src/test/java/org/carlmontrobotics/lib199/REVLibErrorAnswerTest.java
@@ -1,4 +1,4 @@
-package frc.robot.lib;
+package org.carlmontrobotics.lib199;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/org/carlmontrobotics/lib199/sim/MockPheonixControllerTest.java b/src/test/java/org/carlmontrobotics/lib199/sim/MockPheonixControllerTest.java
@@ -1,21 +1,21 @@
-package frc.robot.lib.sim;
+package org.carlmontrobotics.lib199.sim;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import com.ctre.phoenix.motorcontrol.can.BaseMotorController;
 
+import org.carlmontrobotics.lib199.Mocks;
+import org.carlmontrobotics.lib199.testUtils.SafelyClosable;
+import org.carlmontrobotics.lib199.testUtils.SimDeviceTestRule;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mockito;
 
 import edu.wpi.first.wpilibj.motorcontrol.MotorController;
 import edu.wpi.first.wpilibj.simulation.PWMSim;
-import frc.robot.lib.Mocks;
-import frc.robot.lib.testUtils.SafelyClosable;
-import frc.robot.lib.testUtils.SimDeviceTestRule;
 
 public abstract class MockPheonixControllerTest {
     
diff --git a/src/test/java/org/carlmontrobotics/lib199/sim/MockTalonSRXTest.java b/src/test/java/org/carlmontrobotics/lib199/sim/MockTalonSRXTest.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.sim;
+package org.carlmontrobotics.lib199.sim;
 
 import com.ctre.phoenix.motorcontrol.can.BaseMotorController;
 
@@ -8,5 +8,5 @@ public class MockTalonSRXTest extends MockPheonixControllerTest {
     protected BaseMotorController createController(int portPWM) {
         return MockTalonSRX.createMockTalonSRX(portPWM);
     }
-    
+
 }
diff --git a/src/test/java/org/carlmontrobotics/lib199/sim/MockVictorSPXTest.java b/src/test/java/org/carlmontrobotics/lib199/sim/MockVictorSPXTest.java
@@ -1,4 +1,4 @@
-package frc.robot.lib.sim;
+package org.carlmontrobotics.lib199.sim;
 
 import com.ctre.phoenix.motorcontrol.can.BaseMotorController;
 
diff --git a/src/test/java/org/carlmontrobotics/lib199/sim/MockedSparkEncoderTest.java b/src/test/java/org/carlmontrobotics/lib199/sim/MockedSparkEncoderTest.java
diff --git a/src/test/java/org/carlmontrobotics/lib199/sim/MockedSparkMaxPIDControllerTest.java b/src/test/java/org/carlmontrobotics/lib199/sim/MockedSparkMaxPIDControllerTest.java
diff --git a/src/test/java/org/carlmontrobotics/lib199/swerve/SwerveDriveVoltageConstraintTest.java b/src/test/java/org/carlmontrobotics/lib199/swerve/SwerveDriveVoltageConstraintTest.java
diff --git a/src/test/java/org/carlmontrobotics/lib199/swerve/SwerveMathTest.java b/src/test/java/org/carlmontrobotics/lib199/swerve/SwerveMathTest.java
diff --git a/src/test/java/org/carlmontrobotics/lib199/testUtils/ErrStreamTest.java b/src/test/java/org/carlmontrobotics/lib199/testUtils/ErrStreamTest.java
diff --git a/src/test/java/org/carlmontrobotics/lib199/testUtils/SafelyClosable.java b/src/test/java/org/carlmontrobotics/lib199/testUtils/SafelyClosable.java
diff --git a/src/test/java/org/carlmontrobotics/lib199/testUtils/SimDeviceTestRule.java b/src/test/java/org/carlmontrobotics/lib199/testUtils/SimDeviceTestRule.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package frc.robot.lib;`
	`1`	`+package org.carlmontrobotics.lib199;`
`2`	`2`
`3`	`3`	`import com.revrobotics.CANSparkMax;`
`4`	`4`	`import com.revrobotics.RelativeEncoder;`