From 81785221b4d822d6ced091b23b655dacfaf4064b Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Fri, 9 Sep 2022 15:53:15 -0400
Subject: [PATCH] Bug 579666: Make fields private/non-API that were previously
 marked for removal

---
 .../eclipse/cdt/ui/newui/AbstractPage.java    | 36 ++++---------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
index 453ad9cc091..a1a74109872 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
@@ -168,44 +168,22 @@ public abstract class AbstractPage extends PropertyPage implements IPreferencePa
 	 * Bookeeping variables
 	 */
 	/**
-	 * @deprecated This field was never meant to be API. This field will be made private.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
-	@Deprecated(forRemoval = true)
 	protected boolean noContentOnPage = false;
 	/**
-	 * @deprecated This field was never meant to be API. This field will be made private.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
-	@Deprecated(forRemoval = true)
 	protected boolean displayedConfig = false;
-	/**
-	 * @deprecated This field was never meant to be API. This field will be made private.
-	 */
-	@Deprecated(forRemoval = true)
-	protected IResource internalElement = null;
-	/**
-	 * @deprecated This field was never meant to be API. This field will be made private.
-	 */
-	@Deprecated(forRemoval = true)
-	protected boolean isProject = false;
-	/**
-	 * @deprecated This field was never meant to be API. This field will be made private.
-	 */
-	@Deprecated(forRemoval = true)
-	protected boolean isFolder = false;
-	/**
-	 * @deprecated This field was never meant to be API. This field will be made private.
-	 */
-	@Deprecated(forRemoval = true)
-	protected boolean isFile = false;
+	private IResource internalElement = null;
+	private boolean isProject = false;
+	private boolean isFolder = false;
+	private boolean isFile = false;
 
 	// tabs
 	private CTabFolder folder;
 	private List<InternalTab> itabs = new ArrayList<>();
-	/**
-	 * @deprecated This field was never meant to be API. This field will be made private.
-	 */
-	@Deprecated(forRemoval = true)
-	protected ICPropertyTab currentTab;
+	private ICPropertyTab currentTab;
 
 	private static boolean isNewOpening = true;