diff --git a/ntcore/src/generate/main/java/NetworkTableEntry.java.jinja b/ntcore/src/generate/main/java/NetworkTableEntry.java.jinja index d0bbb3fff0..8f4b887b30 100644 --- a/ntcore/src/generate/main/java/NetworkTableEntry.java.jinja +++ b/ntcore/src/generate/main/java/NetworkTableEntry.java.jinja @@ -15,14 +15,6 @@ import java.nio.ByteBuffer; */ @SuppressWarnings("UnnecessaryParentheses") public final class NetworkTableEntry implements Publisher, Subscriber { - /** - * Flag values (as returned by {@link #getFlags()}). - * - * @deprecated Use isPersistent() instead. - */ - @Deprecated(since = "2022", forRemoval = true) - public static final int kPersistent = 0x01; - /** * Construct from native handle. * @@ -114,17 +106,6 @@ public final class NetworkTableEntry implements Publisher, Subscriber { return NetworkTableType.getFromInt(NetworkTablesJNI.getType(m_handle)); } - /** - * Returns the flags. - * - * @return the flags (bitmask) - * @deprecated Use isPersistent() or topic properties instead - */ - @Deprecated(since = "2022", forRemoval = true) - public int getFlags() { - return NetworkTablesJNI.getEntryFlags(m_handle); - } - /** * Gets the last time the entry's value was changed. * @@ -534,28 +515,6 @@ public final class NetworkTableEntry implements Publisher, Subscriber { return setDoubleArray(NetworkTableValue.toNativeDoubleArray(value)); } - /** - * Sets flags. - * - * @param flags the flags to set (bitmask) - * @deprecated Use setPersistent() or topic properties instead - */ - @Deprecated(since = "2022", forRemoval = true) - public void setFlags(int flags) { - NetworkTablesJNI.setEntryFlags(m_handle, getFlags() | flags); - } - - /** - * Clears flags. - * - * @param flags the flags to clear (bitmask) - * @deprecated Use setPersistent() or topic properties instead - */ - @Deprecated(since = "2022", forRemoval = true) - public void clearFlags(int flags) { - NetworkTablesJNI.setEntryFlags(m_handle, getFlags() & ~flags); - } - /** Make value persistent through program restarts. */ public void setPersistent() { NetworkTablesJNI.setTopicPersistent(m_topic.getHandle(), true); diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableEntry.java b/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableEntry.java index e9ba91699b..09926bff6c 100644 --- a/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableEntry.java +++ b/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableEntry.java @@ -15,14 +15,6 @@ import java.nio.ByteBuffer; */ @SuppressWarnings("UnnecessaryParentheses") public final class NetworkTableEntry implements Publisher, Subscriber { - /** - * Flag values (as returned by {@link #getFlags()}). - * - * @deprecated Use isPersistent() instead. - */ - @Deprecated(since = "2022", forRemoval = true) - public static final int kPersistent = 0x01; - /** * Construct from native handle. * @@ -114,17 +106,6 @@ public final class NetworkTableEntry implements Publisher, Subscriber { return NetworkTableType.getFromInt(NetworkTablesJNI.getType(m_handle)); } - /** - * Returns the flags. - * - * @return the flags (bitmask) - * @deprecated Use isPersistent() or topic properties instead - */ - @Deprecated(since = "2022", forRemoval = true) - public int getFlags() { - return NetworkTablesJNI.getEntryFlags(m_handle); - } - /** * Gets the last time the entry's value was changed. * @@ -935,28 +916,6 @@ public final class NetworkTableEntry implements Publisher, Subscriber { return setDoubleArray(NetworkTableValue.toNativeDoubleArray(value)); } - /** - * Sets flags. - * - * @param flags the flags to set (bitmask) - * @deprecated Use setPersistent() or topic properties instead - */ - @Deprecated(since = "2022", forRemoval = true) - public void setFlags(int flags) { - NetworkTablesJNI.setEntryFlags(m_handle, getFlags() | flags); - } - - /** - * Clears flags. - * - * @param flags the flags to clear (bitmask) - * @deprecated Use setPersistent() or topic properties instead - */ - @Deprecated(since = "2022", forRemoval = true) - public void clearFlags(int flags) { - NetworkTablesJNI.setEntryFlags(m_handle, getFlags() & ~flags); - } - /** Make value persistent through program restarts. */ public void setPersistent() { NetworkTablesJNI.setTopicPersistent(m_topic.getHandle(), true); diff --git a/ntcore/src/main/native/include/networktables/NetworkTableEntry.h b/ntcore/src/main/native/include/networktables/NetworkTableEntry.h index 74825c4958..6eec8964f3 100644 --- a/ntcore/src/main/native/include/networktables/NetworkTableEntry.h +++ b/ntcore/src/main/native/include/networktables/NetworkTableEntry.h @@ -33,12 +33,6 @@ class Topic; */ class NetworkTableEntry final { public: - /** - * Flag values (as returned by GetFlags()). - * @deprecated Use IsPersistent() instead. - */ - enum Flags { kPersistent = NT_PERSISTENT }; - /** * Construct invalid instance. */ @@ -93,15 +87,6 @@ class NetworkTableEntry final { */ NetworkTableType GetType() const; - /** - * Returns the flags. - * - * @return the flags (bitmask) - * @deprecated Use IsPersistent() or topic properties instead - */ - [[deprecated("Use IsPersistent() or topic properties instead")]] - unsigned int GetFlags() const; - /** * Gets the last time the entry's value was changed. * @@ -460,24 +445,6 @@ class NetworkTableEntry final { */ bool SetStringArray(std::span value, int64_t time = 0); - /** - * Sets flags. - * - * @param flags the flags to set (bitmask) - * @deprecated Use SetPersistent() or topic properties instead - */ - [[deprecated("Use SetPersistent() or topic properties instead")]] - void SetFlags(unsigned int flags); - - /** - * Clears flags. - * - * @param flags the flags to clear (bitmask) - * @deprecated Use SetPersistent() or topic properties instead - */ - [[deprecated("Use SetPersistent() or topic properties instead")]] - void ClearFlags(unsigned int flags); - /** * Make value persistent through program restarts. */ diff --git a/ntcore/src/main/native/include/networktables/NetworkTableEntry.inc b/ntcore/src/main/native/include/networktables/NetworkTableEntry.inc index c025156d71..0f18e2d445 100644 --- a/ntcore/src/main/native/include/networktables/NetworkTableEntry.inc +++ b/ntcore/src/main/native/include/networktables/NetworkTableEntry.inc @@ -36,10 +36,6 @@ inline NetworkTableType NetworkTableEntry::GetType() const { return static_cast(GetEntryType(m_handle)); } -inline unsigned int NetworkTableEntry::GetFlags() const { - return GetEntryFlags(m_handle); -} - inline int64_t NetworkTableEntry::GetLastChange() const { return GetEntryLastChange(m_handle); } @@ -216,14 +212,6 @@ inline bool NetworkTableEntry::SetStringArray( return nt::SetStringArray(m_handle, value, time); } -inline void NetworkTableEntry::SetFlags(unsigned int flags) { - SetEntryFlags(m_handle, GetEntryFlags(m_handle) | flags); -} - -inline void NetworkTableEntry::ClearFlags(unsigned int flags) { - SetEntryFlags(m_handle, GetEntryFlags(m_handle) & ~flags); -} - inline void NetworkTableEntry::SetPersistent() { nt::SetTopicPersistent(nt::GetTopicFromHandle(m_handle), true); }