From 1137582a7a31367cbd637df3dbd6f35198865e73 Mon Sep 17 00:00:00 2001 From: Thad House Date: Fri, 21 Sep 2018 11:32:11 -0700 Subject: [PATCH] Revert "Move deprecated ntcore classes to wpilibj jar (#1322)" (#1326) This reverts commit 12c92a822d58df14603615b057b1503d6bb7000d. --- .../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 {wpilibj => ntcore}/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java (99%) rename {wpilibj => ntcore}/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java (100%) rename {wpilibj => ntcore}/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java (100%) rename {wpilibj => ntcore}/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java (99%) rename {wpilibj => ntcore}/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java (100%) diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java b/ntcore/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java similarity index 99% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java rename to ntcore/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java index cf394847fb..f360a19cac 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java +++ b/ntcore/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", "PMD"}) +@SuppressWarnings("checkstyle:all") public class NetworkTable implements ITable, IRemote { /** * The path separator for sub-tables and keys diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java b/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java rename to ntcore/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java b/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java rename to ntcore/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java b/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java similarity index 99% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java rename to ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java index 2e21571777..2d0d5d6a40 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java +++ b/ntcore/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", "PMD"}) +@SuppressWarnings("checkstyle:all") public interface ITable { /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java b/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java rename to ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java