From 93a9145d4519fa17facfdf1090ab4ae00fe2a129 Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Mon, 26 Mar 2018 12:44:31 -0400
Subject: [PATCH] Replace some @deprecated with Formerly deprecated:, because
 beehive as a whole is deprecated and will never have any more updates

---
 .../org/apache/beehive/netui/pageflow/ActionResolver.java     | 2 +-
 .../org/apache/beehive/netui/pageflow/FlowController.java     | 4 ++--
 .../java/org/apache/beehive/netui/pageflow/GlobalApp.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/ActionResolver.java b/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/ActionResolver.java
index 107af20..ae81c89 100644
--- a/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/ActionResolver.java
+++ b/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/ActionResolver.java
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * Interface for controller classes that resolve actions to URIs.
  * 
- * @deprecated This is a legacy interface that is implemented by {@link PageFlowController}, but unused in the framework.
+ * Formerly deprecated: This is a legacy interface that is implemented by {@link PageFlowController}, but unused in the framework.
  */ 
 public interface ActionResolver
 {
diff --git a/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/FlowController.java b/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/FlowController.java
index 99e3438..fa23a77 100644
--- a/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/FlowController.java
+++ b/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/FlowController.java
@@ -87,7 +87,7 @@ public abstract class FlowController extends PageFlowManagedObject
     /**
      * The system default Locale.
      * 
-     * @deprecated Use {@link #getDefaultLocale}.
+     * Formerly deprecated: Use {@link #getDefaultLocale}.
      */
     protected static Locale defaultLocale = DEFAULT_LOCALE;
 
@@ -1872,7 +1872,7 @@ public abstract class FlowController extends PageFlowManagedObject
      * attribute for use by the Struts &lt;html:messages&gt; tag (if
      * messages="true" is set), if any messages are required.  Otherwise,
      * ensure that the request attribute is not created.
-     * @deprecated This method will be removed without replacement in a future release.
+     * Formerly deprecated: This method will be removed without replacement in a future release.
      *
      * @param request  The servlet request we are processing
      * @param messages Messages object
diff --git a/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/GlobalApp.java b/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/GlobalApp.java
index 8dffae8..36a462c 100644
--- a/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/GlobalApp.java
+++ b/beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/GlobalApp.java
@@ -37,7 +37,7 @@ import org.apache.struts.action.ActionMapping;
  * <p>
  * Data in the current GlobalApp instance can be accessed by databinding tags using the <code>globalApp</code> scope.
  * 
- * @deprecated Use a {@link SharedFlowController} instead.
+ * Formerly deprecated: Use a {@link SharedFlowController} instead.
  * @see PageFlowController
  */
 public class GlobalApp