From c04f463b78aa8c234e608bdc50d4e4c292c54cfa Mon Sep 17 00:00:00 2001 From: Thad House Date: Tue, 29 May 2018 15:55:38 -0700 Subject: [PATCH] Makes FRCNetComm interfaces static final classes. (#1118) Closes #1104 --- gen/wpilibj_frcnetcomm.py | 9 +- .../edu/wpi/first/wpilibj/hal/FRCNetComm.java | 260 +++++++++--------- 2 files changed, 142 insertions(+), 127 deletions(-) diff --git a/gen/wpilibj_frcnetcomm.py b/gen/wpilibj_frcnetcomm.py index c15f5c9ac3..da8ff98848 100755 --- a/gen/wpilibj_frcnetcomm.py +++ b/gen/wpilibj_frcnetcomm.py @@ -74,7 +74,7 @@ package edu.wpi.first.wpilibj.hal; /** * JNI wrapper for library FRC_NetworkCommunication
. */ -@SuppressWarnings(\"MethodName\") +@SuppressWarnings({\"MethodName\", \"LineLength\"}) public class FRCNetComm extends JNIWrapper { """) @@ -143,7 +143,9 @@ public class FRCNetComm extends JNIWrapper { temp.write("from " + os.path.basename(fileName) + "\n" " */\n" " @SuppressWarnings(\"TypeName\")\n" - " public interface " + enumName + " {\n") + " public static final class " + enumName + + " {\n" + " private " + enumName + "() {\n }\n\n") # Write enum values count = 0 @@ -161,7 +163,8 @@ public class FRCNetComm extends JNIWrapper { if enumName != "tModuleType" and "kModuleType" in value: value = value.replace("kModuleType", "tModuleType.kModuleType") - temp.write(" int " + value[0:len(value)] + ";\n") + temp.write(" public static final int " + + value[0:len(value)] + ";\n") # Write end of enum temp.write(" }\n") diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java b/hal/src/main/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java index b70394b822..4371826881 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java +++ b/hal/src/main/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java @@ -12,160 +12,172 @@ package edu.wpi.first.wpilibj.hal; /** * JNI wrapper for library FRC_NetworkCommunication
. */ -@SuppressWarnings("MethodName") +@SuppressWarnings({"MethodName", "LineLength"}) public class FRCNetComm extends JNIWrapper { /** * Module type from LoadOut.h */ @SuppressWarnings("TypeName") - public interface tModuleType { - int kModuleType_Unknown = 0x00; - int kModuleType_Analog = 0x01; - int kModuleType_Digital = 0x02; - int kModuleType_Solenoid = 0x03; + public static final class tModuleType { + private tModuleType() { + } + + public static final int kModuleType_Unknown = 0x00; + public static final int kModuleType_Analog = 0x01; + public static final int kModuleType_Digital = 0x02; + public static final int kModuleType_Solenoid = 0x03; } /** * Target class from LoadOut.h */ @SuppressWarnings("TypeName") - public interface tTargetClass { - int kTargetClass_Unknown = 0x00; - int kTargetClass_FRC1 = 0x10; - int kTargetClass_FRC2 = 0x20; - int kTargetClass_FRC3 = 0x30; - int kTargetClass_RoboRIO = 0x40; - int kTargetClass_FRC2_Analog = kTargetClass_FRC2 | tModuleType.kModuleType_Analog; - int kTargetClass_FRC2_Digital = kTargetClass_FRC2 | tModuleType.kModuleType_Digital; - int kTargetClass_FRC2_Solenoid = kTargetClass_FRC2 | tModuleType.kModuleType_Solenoid; - int kTargetClass_FamilyMask = 0xF0; - int kTargetClass_ModuleMask = 0x0F; + public static final class tTargetClass { + private tTargetClass() { + } + + public static final int kTargetClass_Unknown = 0x00; + public static final int kTargetClass_FRC1 = 0x10; + public static final int kTargetClass_FRC2 = 0x20; + public static final int kTargetClass_FRC3 = 0x30; + public static final int kTargetClass_RoboRIO = 0x40; + public static final int kTargetClass_FRC2_Analog = kTargetClass_FRC2 | tModuleType.kModuleType_Analog; + public static final int kTargetClass_FRC2_Digital = kTargetClass_FRC2 | tModuleType.kModuleType_Digital; + public static final int kTargetClass_FRC2_Solenoid = kTargetClass_FRC2 | tModuleType.kModuleType_Solenoid; + public static final int kTargetClass_FamilyMask = 0xF0; + public static final int kTargetClass_ModuleMask = 0x0F; } /** * Resource type from UsageReporting.h */ @SuppressWarnings("TypeName") - public interface tResourceType { - int kResourceType_Controller = 0; - int kResourceType_Module = 1; - int kResourceType_Language = 2; - int kResourceType_CANPlugin = 3; - int kResourceType_Accelerometer = 4; - int kResourceType_ADXL345 = 5; - int kResourceType_AnalogChannel = 6; - int kResourceType_AnalogTrigger = 7; - int kResourceType_AnalogTriggerOutput = 8; - int kResourceType_CANJaguar = 9; - int kResourceType_Compressor = 10; - int kResourceType_Counter = 11; - int kResourceType_Dashboard = 12; - int kResourceType_DigitalInput = 13; - int kResourceType_DigitalOutput = 14; - int kResourceType_DriverStationCIO = 15; - int kResourceType_DriverStationEIO = 16; - int kResourceType_DriverStationLCD = 17; - int kResourceType_Encoder = 18; - int kResourceType_GearTooth = 19; - int kResourceType_Gyro = 20; - int kResourceType_I2C = 21; - int kResourceType_Framework = 22; - int kResourceType_Jaguar = 23; - int kResourceType_Joystick = 24; - int kResourceType_Kinect = 25; - int kResourceType_KinectStick = 26; - int kResourceType_PIDController = 27; - int kResourceType_Preferences = 28; - int kResourceType_PWM = 29; - int kResourceType_Relay = 30; - int kResourceType_RobotDrive = 31; - int kResourceType_SerialPort = 32; - int kResourceType_Servo = 33; - int kResourceType_Solenoid = 34; - int kResourceType_SPI = 35; - int kResourceType_Task = 36; - int kResourceType_Ultrasonic = 37; - int kResourceType_Victor = 38; - int kResourceType_Button = 39; - int kResourceType_Command = 40; - int kResourceType_AxisCamera = 41; - int kResourceType_PCVideoServer = 42; - int kResourceType_SmartDashboard = 43; - int kResourceType_Talon = 44; - int kResourceType_HiTechnicColorSensor = 45; - int kResourceType_HiTechnicAccel = 46; - int kResourceType_HiTechnicCompass = 47; - int kResourceType_SRF08 = 48; - int kResourceType_AnalogOutput = 49; - int kResourceType_VictorSP = 50; - int kResourceType_PWMTalonSRX = 51; - int kResourceType_CANTalonSRX = 52; - int kResourceType_ADXL362 = 53; - int kResourceType_ADXRS450 = 54; - int kResourceType_RevSPARK = 55; - int kResourceType_MindsensorsSD540 = 56; - int kResourceType_DigitalFilter = 57; - int kResourceType_ADIS16448 = 58; - int kResourceType_PDP = 59; - int kResourceType_PCM = 60; - int kResourceType_PigeonIMU = 61; - int kResourceType_NidecBrushless = 62; - int kResourceType_CANifier = 63; - int kResourceType_CTRE_future0 = 64; - int kResourceType_CTRE_future1 = 65; - int kResourceType_CTRE_future2 = 66; - int kResourceType_CTRE_future3 = 67; - int kResourceType_CTRE_future4 = 68; - int kResourceType_CTRE_future5 = 69; - int kResourceType_CTRE_future6 = 70; + public static final class tResourceType { + private tResourceType() { + } + + public static final int kResourceType_Controller = 0; + public static final int kResourceType_Module = 1; + public static final int kResourceType_Language = 2; + public static final int kResourceType_CANPlugin = 3; + public static final int kResourceType_Accelerometer = 4; + public static final int kResourceType_ADXL345 = 5; + public static final int kResourceType_AnalogChannel = 6; + public static final int kResourceType_AnalogTrigger = 7; + public static final int kResourceType_AnalogTriggerOutput = 8; + public static final int kResourceType_CANJaguar = 9; + public static final int kResourceType_Compressor = 10; + public static final int kResourceType_Counter = 11; + public static final int kResourceType_Dashboard = 12; + public static final int kResourceType_DigitalInput = 13; + public static final int kResourceType_DigitalOutput = 14; + public static final int kResourceType_DriverStationCIO = 15; + public static final int kResourceType_DriverStationEIO = 16; + public static final int kResourceType_DriverStationLCD = 17; + public static final int kResourceType_Encoder = 18; + public static final int kResourceType_GearTooth = 19; + public static final int kResourceType_Gyro = 20; + public static final int kResourceType_I2C = 21; + public static final int kResourceType_Framework = 22; + public static final int kResourceType_Jaguar = 23; + public static final int kResourceType_Joystick = 24; + public static final int kResourceType_Kinect = 25; + public static final int kResourceType_KinectStick = 26; + public static final int kResourceType_PIDController = 27; + public static final int kResourceType_Preferences = 28; + public static final int kResourceType_PWM = 29; + public static final int kResourceType_Relay = 30; + public static final int kResourceType_RobotDrive = 31; + public static final int kResourceType_SerialPort = 32; + public static final int kResourceType_Servo = 33; + public static final int kResourceType_Solenoid = 34; + public static final int kResourceType_SPI = 35; + public static final int kResourceType_Task = 36; + public static final int kResourceType_Ultrasonic = 37; + public static final int kResourceType_Victor = 38; + public static final int kResourceType_Button = 39; + public static final int kResourceType_Command = 40; + public static final int kResourceType_AxisCamera = 41; + public static final int kResourceType_PCVideoServer = 42; + public static final int kResourceType_SmartDashboard = 43; + public static final int kResourceType_Talon = 44; + public static final int kResourceType_HiTechnicColorSensor = 45; + public static final int kResourceType_HiTechnicAccel = 46; + public static final int kResourceType_HiTechnicCompass = 47; + public static final int kResourceType_SRF08 = 48; + public static final int kResourceType_AnalogOutput = 49; + public static final int kResourceType_VictorSP = 50; + public static final int kResourceType_PWMTalonSRX = 51; + public static final int kResourceType_CANTalonSRX = 52; + public static final int kResourceType_ADXL362 = 53; + public static final int kResourceType_ADXRS450 = 54; + public static final int kResourceType_RevSPARK = 55; + public static final int kResourceType_MindsensorsSD540 = 56; + public static final int kResourceType_DigitalFilter = 57; + public static final int kResourceType_ADIS16448 = 58; + public static final int kResourceType_PDP = 59; + public static final int kResourceType_PCM = 60; + public static final int kResourceType_PigeonIMU = 61; + public static final int kResourceType_NidecBrushless = 62; + public static final int kResourceType_CANifier = 63; + public static final int kResourceType_CTRE_future0 = 64; + public static final int kResourceType_CTRE_future1 = 65; + public static final int kResourceType_CTRE_future2 = 66; + public static final int kResourceType_CTRE_future3 = 67; + public static final int kResourceType_CTRE_future4 = 68; + public static final int kResourceType_CTRE_future5 = 69; + public static final int kResourceType_CTRE_future6 = 70; } /** * Instances from UsageReporting.h */ @SuppressWarnings("TypeName") - public interface tInstances { - int kLanguage_LabVIEW = 1; - int kLanguage_CPlusPlus = 2; - int kLanguage_Java = 3; - int kLanguage_Python = 4; - int kLanguage_DotNet = 5; + public static final class tInstances { + private tInstances() { + } - int kCANPlugin_BlackJagBridge = 1; - int kCANPlugin_2CAN = 2; + public static final int kLanguage_LabVIEW = 1; + public static final int kLanguage_CPlusPlus = 2; + public static final int kLanguage_Java = 3; + public static final int kLanguage_Python = 4; + public static final int kLanguage_DotNet = 5; - int kFramework_Iterative = 1; - int kFramework_Simple = 2; - int kFramework_CommandControl = 3; + public static final int kCANPlugin_BlackJagBridge = 1; + public static final int kCANPlugin_2CAN = 2; - int kRobotDrive_ArcadeStandard = 1; - int kRobotDrive_ArcadeButtonSpin = 2; - int kRobotDrive_ArcadeRatioCurve = 3; - int kRobotDrive_Tank = 4; - int kRobotDrive_MecanumPolar = 5; - int kRobotDrive_MecanumCartesian = 6; + public static final int kFramework_Iterative = 1; + public static final int kFramework_Simple = 2; + public static final int kFramework_CommandControl = 3; - int kDriverStationCIO_Analog = 1; - int kDriverStationCIO_DigitalIn = 2; - int kDriverStationCIO_DigitalOut = 3; + public static final int kRobotDrive_ArcadeStandard = 1; + public static final int kRobotDrive_ArcadeButtonSpin = 2; + public static final int kRobotDrive_ArcadeRatioCurve = 3; + public static final int kRobotDrive_Tank = 4; + public static final int kRobotDrive_MecanumPolar = 5; + public static final int kRobotDrive_MecanumCartesian = 6; - int kDriverStationEIO_Acceleration = 1; - int kDriverStationEIO_AnalogIn = 2; - int kDriverStationEIO_AnalogOut = 3; - int kDriverStationEIO_Button = 4; - int kDriverStationEIO_LED = 5; - int kDriverStationEIO_DigitalIn = 6; - int kDriverStationEIO_DigitalOut = 7; - int kDriverStationEIO_FixedDigitalOut = 8; - int kDriverStationEIO_PWM = 9; - int kDriverStationEIO_Encoder = 10; - int kDriverStationEIO_TouchSlider = 11; + public static final int kDriverStationCIO_Analog = 1; + public static final int kDriverStationCIO_DigitalIn = 2; + public static final int kDriverStationCIO_DigitalOut = 3; - int kADXL345_SPI = 1; - int kADXL345_I2C = 2; + public static final int kDriverStationEIO_Acceleration = 1; + public static final int kDriverStationEIO_AnalogIn = 2; + public static final int kDriverStationEIO_AnalogOut = 3; + public static final int kDriverStationEIO_Button = 4; + public static final int kDriverStationEIO_LED = 5; + public static final int kDriverStationEIO_DigitalIn = 6; + public static final int kDriverStationEIO_DigitalOut = 7; + public static final int kDriverStationEIO_FixedDigitalOut = 8; + public static final int kDriverStationEIO_PWM = 9; + public static final int kDriverStationEIO_Encoder = 10; + public static final int kDriverStationEIO_TouchSlider = 11; - int kCommand_Scheduler = 1; + public static final int kADXL345_SPI = 1; + public static final int kADXL345_I2C = 2; - int kSmartDashboard_Instance = 1; + public static final int kCommand_Scheduler = 1; + + public static final int kSmartDashboard_Instance = 1; } }