Author: norman
Date: Wed Aug 5 18:55:10 2009
New Revision: 801359
URL: http://svn.apache.org/viewvc?rev=801359&view=rev
Log:
Handle text 2 html converting on the client side
Added:
labs/hupa/src/main/java/org/apache/hupa/shared/data/Util.java
Modified:
labs/hupa/pom.xml
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/ExposeMessageHandler.java
Modified: labs/hupa/pom.xml
URL:
http://svn.apache.org/viewvc/labs/hupa/pom.xml?rev=801359&r1=801358&r2=801359&view=diff
==============================================================================
--- labs/hupa/pom.xml (original)
+++ labs/hupa/pom.xml Wed Aug 5 18:55:10 2009
@@ -273,11 +273,6 @@
<version>1.2.13</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.1</version>
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java?rev=801359&r1=801358&r2=801359&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
Wed Aug 5 18:55:10 2009
@@ -34,6 +34,7 @@
import org.apache.hupa.shared.data.IMAPMessage;
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.data.Util;
import org.apache.hupa.shared.events.ForwardMessageEvent;
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.ReplyMessageEvent;
@@ -94,7 +95,11 @@
display.getCc().setText(arrayToString(message.getHeader().getCc()));
display.getTo().setText(arrayToString(message.getHeader().getTo()));
display.getSubject().setText(message.getHeader().getSubject());
-
display.getContent().setHTML(message.getMessageContent().getText());
+ String con = message.getMessageContent().getText();
+ if (message.getMessageContent().isHTML() == false) {
+ con = Util.toHtml(con);
+ }
+ display.getContent().setHTML(con);
display.setAttachments(message.getMessageContent().getMessageAttachments(),user.getSessionId(),
folder.getFullName(),message.getUid());
}
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java?rev=801359&r1=801358&r2=801359&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
Wed Aug 5 18:55:10 2009
@@ -280,8 +280,7 @@
} else if (type.equals(Type.REPLY) ||
type.equals(Type.REPLY_ALL)) {
display.getSubjectText().setText("Re: " +
oldmessage.getHeader().getSubject());
- // TODO: Set original message content
- display.getMessageText().setText("\n\n-------- Message
-------\n" );
+ display.getMessageText().setText("\n\n-------- Message
-------\n" + oldmessage.getMessageContent().getText());
if (type.equals(Type.REPLY)) {
display.getToText().setText(oldmessage.getHeader().getFrom());
Modified:
labs/hupa/src/main/java/org/apache/hupa/server/handler/ExposeMessageHandler.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/ExposeMessageHandler.java?rev=801359&r1=801358&r2=801359&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/server/handler/ExposeMessageHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/ExposeMessageHandler.java
Wed Aug 5 18:55:10 2009
@@ -33,7 +33,6 @@
import net.customware.gwt.dispatch.server.ExecutionContext;
import net.customware.gwt.dispatch.shared.ActionException;
-import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.data.IMAPFolder;
@@ -88,7 +87,7 @@
Object con = message.getContent();
if (con instanceof String) {
- content.setText(StringEscapeUtils.escapeHtml((String)
con).replaceAll("\n", "<br>"));
+ //content.setText(StringEscapeUtils.escapeHtml((String)
con).replaceAll("\n", "<br>"));
content.setIsHTML(isHTML);
bodyFound = true;
@@ -104,8 +103,9 @@
System.out.println("c: " + contentType);
if ( bodyFound == false &&
contentType.startsWith("text/plain") && isHTML == false) {
- sbPlain.append(StringEscapeUtils.escapeHtml((String)
part.getContent()).replaceAll("\n", "<br>"));
- bodyFound = true;
+ //sbPlain.append(StringEscapeUtils.escapeHtml((String)
part.getContent()).replaceAll("\n", "<br>"));
+ sbPlain.append((String) part.getContent());
+ bodyFound = true;
} else if (bodyFound == false &&
contentType.startsWith("text/html")) {
isHTML = true;
if (sbHTML.length() > 0) {
Added: labs/hupa/src/main/java/org/apache/hupa/shared/data/Util.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/data/Util.java?rev=801359&view=auto
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/data/Util.java (added)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/data/Util.java Wed Aug 5
18:55:10 2009
@@ -0,0 +1,44 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.hupa.shared.data;
+
+public class Util {
+
+ public final static String HTML_LT = "<";
+ public final static String STRING_LT = "<";
+ public final static String HTML_GT = ">";
+ public final static String STRING_GT = ">";
+ public final static String HTML_CR = "<br>";
+ public final static String STRING_CR = "\n";
+ public static String toString(String string) {
+ string = string.replaceAll(HTML_LT, STRING_LT);
+ string = string.replaceAll(HTML_GT, STRING_GT);
+ string = string.replaceAll(HTML_CR, STRING_CR);
+
+ return string;
+ }
+
+ public static String toHtml(String string) {
+ string = string.replaceAll(STRING_LT, HTML_LT);
+ string = string.replaceAll(STRING_GT, HTML_GT);
+ string = string.replaceAll(STRING_CR, HTML_CR);
+ return string;
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
