From 12c92a822d58df14603615b057b1503d6bb7000d Mon Sep 17 00:00:00 2001 From: Thad House Date: Thu, 20 Sep 2018 21:50:30 -0700 Subject: [PATCH] Move deprecated ntcore classes to wpilibj jar (#1322) Will allow for modularization --- .../java/edu/wpi/first/wpilibj/networktables/NetworkTable.java | 2 +- .../src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java | 0 .../edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java | 0 .../src/main/java/edu/wpi/first/wpilibj/tables/ITable.java | 2 +- .../main/java/edu/wpi/first/wpilibj/tables/ITableListener.java | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename {ntcore => wpilibj}/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java (99%) rename {ntcore => wpilibj}/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java (100%) rename {ntcore => wpilibj}/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java (100%) rename {ntcore => wpilibj}/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java (99%) rename {ntcore => wpilibj}/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java (100%) diff --git a/ntcore/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java similarity index 99% rename from ntcore/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java index f360a19cac..cf394847fb 100644 --- a/ntcore/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java @@ -38,7 +38,7 @@ import edu.wpi.first.wpilibj.tables.ITableListener; * @deprecated Use {@link edu.wpi.first.networktables.NetworkTable} instead. */ @Deprecated -@SuppressWarnings("checkstyle:all") +@SuppressWarnings({"checkstyle:all", "PMD"}) public class NetworkTable implements ITable, IRemote { /** * The path separator for sub-tables and keys diff --git a/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java similarity index 100% rename from ntcore/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java diff --git a/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java similarity index 100% rename from ntcore/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java diff --git a/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java similarity index 99% rename from ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java index 2d0d5d6a40..2e21571777 100644 --- a/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java @@ -16,7 +16,7 @@ import java.util.Set; * @deprecated Use {@link edu.wpi.first.networktables.NetworkTable}. */ @Deprecated -@SuppressWarnings("checkstyle:all") +@SuppressWarnings({"checkstyle:all", "PMD"}) public interface ITable { /** diff --git a/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java similarity index 100% rename from ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java