mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Adding HTML message support back to Grendel and wrapping plain-text messages around a <pre> tag for proper rendering for plain people.

This commit is contained in:
rj.keller%beonex.com 2005-05-06 23:07:33 +00:00
Родитель d1c2a725ff
Коммит f0b98803bc
4 изменённых файлов: 60 добавлений и 82 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
grendel/sources/grendel/mime/html/HeaderFormatter.java
Просмотреть файл

@ -17,7 +17,7 @@
* Copyright (C) 1997 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Contributor(s):
*
* Created: Jamie Zawinski <jwz@netscape.com>, 31 Aug 1997.
*/
@ -36,6 +36,10 @@ abstract class HeaderFormatter {
abstract public void formatHeaders(InternetHeaders headers,
StringBuffer output);
/** The name of the default font to be used in the headers box at the top
*of every Grendel email message */
private static final String HEADER_FONT_NAME = "Sans-Serif";
/** Translates an RFC-mandated message header name (like "Subject")
into a localized string which should be presented to the user.
*/
@ -50,12 +54,12 @@ abstract class HeaderFormatter {
/** Called when beginning to output a header block. This opens the table. */
void startHeaderOutput(StringBuffer output) {
// output.append("<TABLE CELLPADDING=0 CELLSPACING=0 BORDER=0>");
output.append("<TABLE CELLPADDING=2 CELLSPACING=0 BORDER=0>");
}
/** Called when done filling a header block. This closes the table. */
void finishHeaderOutput(StringBuffer output) {
// output.append("</TABLE>");
output.append("</TABLE>");
}
/*************************************************************************/
@ -206,12 +210,12 @@ abstract class HeaderFormatter {
boolean writeRandomHeader(String header, StringBuffer value,
StringBuffer output) {
// output.append("<TR><TH VALIGN=BASELINE ALIGN=RIGHT NOWRAP>");
output.append("<TR><TH VALIGN=BASELINE ALIGN=RIGHT NOWRAP><FONT FACE=" + HEADER_FONT_NAME + ">");
output.append(localizeHeaderName(header));
// output.append(": </TH><TD>");
output.append(": </FONT></TH><TD><FONT FACE=" + HEADER_FONT_NAME + ">");
// quoteHTML(value);
output.append(value);
// output.append("</TD></TR>");
output.append("</FONT></TD></TR>");
return true;
}
}

4
grendel/sources/grendel/mime/html/MimeMessageOperator.java
Просмотреть файл

@ -45,6 +45,10 @@ class MimeMessageOperator extends MimeContainerOperator {
StringBuffer output = new StringBuffer(200);
formatter.formatHeaders(object.headers(), output);
// output.append("<P>");
if (object.contentType().equals("text/plain")) {
output.append("<pre>");
}
getOut().print(output.toString());
return super.createChild(object);

17
grendel/sources/grendel/prefs/ui/UI.java
Просмотреть файл

@ -102,26 +102,21 @@ public class UI extends JFrame {
label.setBounds(12,294,label.getPreferredSize().width,label.getPreferredSize().height);
getContentPane().add(label);
JLabel icon; URL iconUrl;
JLabel icon;
iconUrl = getClass().getResource("images/multi.gif");
icon = new JLabel(new ImageIcon(iconUrl));
icon = new JLabel(new ImageIcon("prefs/ui/images/multi.gif"));
icon.setBounds(48,44,icon.getPreferredSize().width,icon.getPreferredSize().height);
getContentPane().add(icon);
iconUrl = getClass().getResource("images/right.gif");
icon = new JLabel(new ImageIcon(iconUrl));
icon = new JLabel(new ImageIcon("prefs/ui/images/right.gif"));
icon.setBounds(138,44,icon.getPreferredSize().width,icon.getPreferredSize().height);
getContentPane().add(icon);
iconUrl = getClass().getResource("images/top.gif");
icon = new JLabel(new ImageIcon(iconUrl));
icon = new JLabel(new ImageIcon("prefs/ui/images/top.gif"));
icon.setBounds(228,44,icon.getPreferredSize().width,icon.getPreferredSize().height);
getContentPane().add(icon);
iconUrl = getClass().getResource("images/left.gif");
icon = new JLabel(new ImageIcon(iconUrl));
icon = new JLabel(new ImageIcon("prefs/ui/images/left.gif"));
icon.setBounds(318,44,icon.getPreferredSize().width,icon.getPreferredSize().height);
getContentPane().add(icon);
iconUrl = getClass().getResource("images/stacked.gif");
icon = new JLabel(new ImageIcon(iconUrl));
icon = new JLabel(new ImageIcon("prefs/ui/images/stacked.gif"));
icon.setBounds(408,44,icon.getPreferredSize().width,icon.getPreferredSize().height);
getContentPane().add(icon);

105
grendel/sources/grendel/ui/MessagePanel.java
Просмотреть файл

@ -83,6 +83,9 @@ import calypso.net.URLSource;
import calypso.util.ByteBuf;
import java.util.logging.Logger;
import java.util.logging.Level;
//import netscape.orion.uimanager.IUICmd;
//import lego.document.HTMLDocument;
@ -91,6 +94,9 @@ import calypso.util.ByteBuf;
//import mg.edge.embed.jfc.URLComponentFactory;
//import mg.magellan.document.IDocument;
/**
*This is the box where a Grendel email message will be displayed.
*/
public class MessagePanel extends GeneralPanel {
// JTextArea fTextArea;
JEditorPane fTextArea;
@ -98,13 +104,19 @@ public class MessagePanel extends GeneralPanel {
Thread fMessageLoadThread;
Message fMessage;
MessagePanel fPanel;
boolean useMagellan;
boolean makeRealHTML;
EventListenerList fListeners = new EventListenerList();
Event fActions[] = {ActionFactory.GetNewMailAction(),
ActionFactory.GetComposeMessageAction()};
private static Logger mLogger = Logger.getLogger("grendel.ui.MessagePanel");
static {
mLogger.setLevel(Level.OFF);
}
/**
* Constructs a new message panel.
*/
@ -112,21 +124,14 @@ public class MessagePanel extends GeneralPanel {
public MessagePanel() {
fPanel = this;
useMagellan = false;
makeRealHTML = true;
if (useMagellan) {
// fViewer = (URLComponent) URLComponentFactory.NewURLComponent(null);
// Component viewComponent = fViewer.getComponent();
// add(viewComponent);
} else {
fTextArea = new JEditorPane();
fTextArea.setEditable(false);
// fTextArea.setContentType("text/html");
fTextArea.setFont(new Font("Helvetica", Font.PLAIN, 12));
fTextArea.setBorder(BorderFactory.createLoweredBevelBorder());
add(new JScrollPane(fTextArea));
}
fTextArea = new JEditorPane();
fTextArea.setEditable(false);
fTextArea.setContentType("text/html");
fTextArea.setFont(new Font("Helvetica", Font.PLAIN, 12));
fTextArea.setBorder(BorderFactory.createLoweredBevelBorder());
add(new JScrollPane(fTextArea));
}
/**
@ -138,7 +143,7 @@ public class MessagePanel extends GeneralPanel {
public void dispose() {
synchronized (fPanel) {
if (fMessageLoadThread != null) {
// System.out.println("Killing msg thread");
mLogger.info("Killing msg thread");
fMessageLoadThread.interrupt();
try {
fMessageLoadThread.join();
@ -166,7 +171,7 @@ public class MessagePanel extends GeneralPanel {
public synchronized void setMessage(Message aMessage) {
if (fMessageLoadThread != null) {
// System.out.println("Killing msg thread");
mLogger.info("Killing msg thread");
fMessageLoadThread.interrupt();
try {
fMessageLoadThread.join();
@ -178,7 +183,7 @@ public class MessagePanel extends GeneralPanel {
}
fMessageLoadThread =
new Thread(new LoadMessageThread(aMessage), "msgLoad");
System.out.println("Starting msg thread");
mLogger.info("Starting msg thread");
fMessageLoadThread.start();
}
@ -262,64 +267,34 @@ public class MessagePanel extends GeneralPanel {
notifyStatus(fLabels.getString("messageLoadingStatus"));
try {
if (!useMagellan) {
synchronized (fTextArea) {
if (fMessage != null) {
fTextArea.setText("");
try {
InputStream stream = mextra.getInputStreamWithHeaders();
if (makeRealHTML) {
stream = new MakeItHTML(stream).getHTMLInputStream();
}
// Okay, let's try to read from the stream and set the
// text from the InputStream. We may need to put this
// stuff back later. (talisman)
//InputStreamReader reader = new InputStreamReader(stream);
// char buff[] = new char[4096];
// int count;
// while ((count = reader.read(buff, 0, 4096)) != -1) {
// fTextArea.append(new String(buff, 0, count));
fTextArea.read(stream, "Message");
// }
} catch (MessagingException me) {
fTextArea.setText(me.toString());
me.printStackTrace();
} catch (IOException e) {
fTextArea.setText(e.toString());
e.printStackTrace();
}
} else {
fTextArea.setText("This space intentionally left blank");
}
}
} else {
InputStream in = null;
synchronized (fTextArea) {
if (fMessage != null) {
InputStream rawin;
fTextArea.setText("");
try {
rawin = mextra.getInputStreamWithHeaders();
InputStream stream = mextra.getInputStreamWithHeaders();
if (makeRealHTML) {
in = (new MakeItHTML(rawin)).getHTMLInputStream();
} else {
in = new StupidHackToMakeHTML(rawin);
stream = new MakeItHTML(stream).getHTMLInputStream();
}
// Okay, let's try to read from the stream and set the
// text from the InputStream. We may need to put this
// stuff back later. (talisman)
//InputStreamReader reader = new InputStreamReader(stream);
// char buff[] = new char[4096];
// int count;
// while ((count = reader.read(buff, 0, 4096)) != -1) {
// fTextArea.append(new String(buff, 0, count));
fTextArea.read(stream, "Message");
// }
} catch (MessagingException me) {
throw new Error("Can't get the input stream??? " + me);
fTextArea.setText(me.toString());
me.printStackTrace();
} catch (IOException e) {
throw new Error("Can't get the input stream??? " + e);
fTextArea.setText(e.toString());
e.printStackTrace();
}
} else {
fTextArea.setText("This space intentionally left blank");
}
// synchronized (fViewer) {
/* ####
URL url = new URL("http://home.netscape.com/");
URLSource source = new URLSource(url, null, in);
IDocument doc = new HTMLDocument(source);
fViewer.goTo(doc);
*/
// }
}
} catch (Exception e) {
notifyStatus(e.toString());