SAK-44192 Deprecated utils.FormattedText => api.FormattedText (sakaip…

…roject#8501) * SAK-44192Deprecated utils.FormattedText => api.FormattedText * SAK-44192 SiteEmailNotificationMail ComponentManager
ottenhoff · Sep 2, 2020 · 7e385b2 · 7e385b2
1 parent c856c3d
commit 7e385b2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/...chive-impl/impl/src/java/org/sakaiproject/mailarchive/impl/SiteEmailNotificationMail.java b/...chive-impl/impl/src/java/org/sakaiproject/mailarchive/impl/SiteEmailNotificationMail.java
@@ -38,8 +38,8 @@
 import org.sakaiproject.site.api.Site;
 import org.sakaiproject.site.api.SiteService;
 import org.sakaiproject.util.EmailNotification;
-import org.sakaiproject.util.FormattedText;
 import org.sakaiproject.util.SiteEmailNotification;
+import org.sakaiproject.util.api.FormattedText;
 
 /**
  * <p>
@@ -53,6 +53,7 @@ public class SiteEmailNotificationMail extends SiteEmailNotification
 
 	private EntityManager entityManager = ComponentManager.get(EntityManager.class);
 	private SiteService siteService = ComponentManager.get(SiteService.class);
+	private FormattedText formattedText = ComponentManager.get(FormattedText.class);
 
 	/**
 	 * Construct.
@@ -195,7 +196,7 @@ protected String plainTextContent(Event event) {
 		if ( msg.getBody() != null && msg.getBody().length() > 0 )
 			buf.append( msg.getBody() );
 		else
-			buf.append(FormattedText.convertFormattedTextToPlaintext(msg.getHtmlBody()));
+			buf.append(formattedText.convertFormattedTextToPlaintext(msg.getHtmlBody()));
 
 		// add any attachments
 		List attachments = hdr.getAttachments();

diff --git a/message/message-util/util/src/java/org/sakaiproject/message/util/BaseMessage.java b/message/message-util/util/src/java/org/sakaiproject/message/util/BaseMessage.java
@@ -97,8 +97,8 @@
 import org.sakaiproject.util.BaseResourcePropertiesEdit;
 import org.sakaiproject.util.DoubleStorageUser;
 import org.sakaiproject.util.EntityCollections;
-import org.sakaiproject.util.FormattedText;
 import org.sakaiproject.util.Validator;
+import org.sakaiproject.util.api.FormattedText;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -171,6 +171,8 @@ public abstract class BaseMessage implements MessageService, DoubleStorageUser
 
 	/** Dependency: EntityManager. */
 	@Setter protected EntityManager m_entityManager;
+
+	@Setter protected FormattedText m_formattedText;
 
 	/**
 	 * Access this service from the inner classes.
@@ -3302,7 +3304,7 @@ public BaseMessageEdit(MessageChannel channel, Element el)
 		{
 			this(channel, "");
 
-			m_body = FormattedText.decodeFormattedTextAttribute(el, "body");
+			m_body = m_formattedText.decodeFormattedTextAttribute(el, "body");
 
 			// the children (header, body)
 			NodeList children = el.getChildNodes();
@@ -3328,7 +3330,7 @@ else if (element.getTagName().equals("body"))
 						{
 							// convert from plaintext messages to formatted text messages
 							m_body = element.getChildNodes().item(0).getNodeValue();
-							if (m_body != null) m_body = FormattedText.convertPlaintextToFormattedText(m_body);
+							if (m_body != null) m_body = m_formattedText.convertPlaintextToFormattedText(m_body);
 						}
 						if (m_body == null)
 						{
@@ -3491,7 +3493,7 @@ public Element toXml(Document doc, Stack stack)
 
 			m_header.toXml(doc, stack);
 
-			FormattedText.encodeFormattedTextAttribute(message, "body", getBody());
+			m_formattedText.encodeFormattedTextAttribute(message, "body", getBody());
 
 			/*
 			 * // Note: the old way to set the body - CDATA is too sensitive to the characters within -ggolden Element body = doc.createElement("body"); message.appendChild(body); body.appendChild(doc.createCDATASection(getBody()));

diff --git a/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java b/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java
@@ -64,9 +64,8 @@
 import org.sakaiproject.user.api.UserNotificationPreferencesRegistration;
 import org.sakaiproject.user.api.UserNotificationPreferencesRegistrationService;
 import org.sakaiproject.user.cover.UserDirectoryService;
-import org.sakaiproject.util.FormattedText;
 import org.sakaiproject.util.ResourceLoader;
-import org.sakaiproject.util.Web;
+import org.sakaiproject.util.api.FormattedText;
 
 /**
  * UserPrefsTool is the Sakai end-user tool to view and edit one's preferences.
@@ -575,14 +574,15 @@ public String getTabTitle()
 	 */
 	public static String getUserSpecificSiteTitle( Site site, boolean truncate )
 	{
+		FormattedText formattedText = ComponentManager.get(FormattedText.class);
 		String retVal = SiteService.getUserSpecificSiteTitle( site, UserDirectoryService.getCurrentUser().getId() );
 		if (truncate)
 		{
-			return Web.escapeHtml( FormattedText.makeShortenedText( retVal, null, null, null ) );
+			return formattedText.escapeHtml( formattedText.makeShortenedText( retVal, null, null, null ) );
 		}
 		else
 		{
-			return Web.escapeHtml( retVal );
+			return formattedText.escapeHtml( retVal );
 		}
 	}