Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 340606 Spell things properly: fix all but file renames.

Browse Source
This commit is contained in:
kieran%eternal.undonet.com 2007-01-24 09:08:35 +00:00
parent 2a3ffbed75
commit 37406b774a
31 changed files with 250 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grendel/sources/grendel/addressbook/AddressBookManager.java
View File

@ -45,7 +45,7 @@ public final class AddressBookManager
* Get the addressbooks branch from preferances.
* Done here incase any other initation requires it.
*/
books = Preferences.getPreferances().getAddressbooks();
books = Preferences.getPreferences().getAddressbooks();
}
/**

4
grendel/sources/grendel/javamail/Gnu.java
View File

@ -107,10 +107,10 @@ public final class Gnu {
//XXX This refers to the HEAD CVS of GNU JavaMail
String host = nntp.getHost();
if (host!=null) {
props.put("mail.nntp.newsrc.file", Preferences.getPreferances().getProfilePath()+host+".newsrc");
props.put("mail.nntp.newsrc.file", Preferences.getPreferences().getProfilePath()+host+".newsrc");
props.put("mail.nntp.host", host);
} else {
props.put("mail.nntp.newsrc.file", Preferences.getPreferances().getProfilePath()+"news.rc");
props.put("mail.nntp.newsrc.file", Preferences.getPreferences().getProfilePath()+"news.rc");
}
props.put("mail.nntp.listall", "true"); //XXX Mozilla.org Bug

2
grendel/sources/grendel/javamail/JMProviders.java
View File

@ -61,7 +61,7 @@ public final class JMProviders {
public static Session getSession() {
if (sess==null) {
options_mail=Preferences.getPreferances().getPropertyPrefs("options").getPropertyPrefs("mail");
options_mail=Preferences.getPreferences().getPropertyPrefs("options").getPropertyPrefs("mail");
Properties props = new Properties();
sess=Session.getDefaultInstance(props, null);
//fSession.setDebug(options_mail.getPropertyBoolean("debug"));

2
grendel/sources/grendel/prefs/Preferences.java
View File

@ -131,7 +131,7 @@ public final class Preferences extends XMLPreferences
return base_path;
}
public static Preferences getPreferances()
public static Preferences getPreferences()
{
if (preferences == null)
{

2
grendel/sources/grendel/prefs/accounts/Accounts.java
View File

@ -103,7 +103,7 @@ public class Accounts extends XMLPreferences {
}
}
public List<Account__Receive> getReciveAccounts() {
public List<Account__Receive> getReceiveAccounts() {
List<Account__Receive> l = new ArrayList<Account__Receive>(size());
Collection c = values();
for (Object o: c) {

4
grendel/sources/grendel/prefs/accounts/util/SimpleNewAccount.java
View File

@ -196,7 +196,7 @@ public class SimpleNewAccount {
private Account_SMTP getSMTPServer() {
if (acc_name != null) throw new NullPointerException("acc_name");
List<Account__Send> send_accounts = Preferences.getPreferances().getAccounts().getSendAccounts();
List<Account__Send> send_accounts = Preferences.getPreferences().getAccounts().getSendAccounts();
for (Account__Send account: send_accounts) {
if (account instanceof Account_SMTP) {
Account_SMTP smtp = (Account_SMTP) account;
@ -211,7 +211,7 @@ public class SimpleNewAccount {
Account_SMTP smtp = new Account_SMTP(acc_name+"_SMTP");
smtp.setHost(out_host);
smtp.setPort(out_port);
Preferences.getPreferances().getAccounts().addAccount(smtp);
Preferences.getPreferences().getAccounts().addAccount(smtp);
return smtp;
}
}

2
grendel/sources/grendel/prefs/addressbook/Addressbook__Native.java
View File

@ -88,7 +88,7 @@ public abstract class Addressbook__Native extends AbstractAddressbook implements
public static String getBaseDirectory()
{
return Preferences.getPreferances().getProfilePath().concat("/addressbook/");
return Preferences.getPreferences().getProfilePath().concat("/addressbook/");
}
public String getDirectory()

4
grendel/sources/grendel/prefs/base/GeneralPrefs.java
View File

@ -66,12 +66,12 @@ public class GeneralPrefs {
}
public String getSMTPServer() {
Account_SMTP a = (Account_SMTP) Preferences.getPreferances().getAccounts().getAccount(0);
Account_SMTP a = (Account_SMTP) Preferences.getPreferences().getAccounts().getAccount(0);
return a.getHost();
}
public void setSMTPServer(String aSMTPServer) {
Account_SMTP a = (Account_SMTP) Preferences.getPreferances().getAccounts().getAccount(0);
Account_SMTP a = (Account_SMTP) Preferences.getPreferences().getAccounts().getAccount(0);
a.setHost(aSMTPServer);
}

12
grendel/sources/grendel/prefs/base/IdentityArray.java
View File

@ -104,9 +104,9 @@ public class IdentityArray {
}
public IdentityStructure get(int Index) {
Identity id = Preferences.getPreferances().getAccounts().getAccount(0).getIdentity(Index);
Identity id = Preferences.getPreferences().getAccounts().getAccount(0).getIdentity(Index);
if (Index<0) Index=0;
if (Index>Preferences.getPreferances().getAccounts().getAccount(0).getIdentities().size()) Index=0;
if (Index>Preferences.getPreferences().getAccounts().getAccount(0).getIdentities().size()) Index=0;
if (id == null) {
return get(Index +1);
}
@ -115,18 +115,18 @@ public class IdentityArray {
}
public void add(IdentityStructure aIdentity) {
Preferences.getPreferances().getAccounts().getAccount(0).addIdentity(aIdentity.getID());
Preferences.getPreferences().getAccounts().getAccount(0).addIdentity(aIdentity.getID());
/*if (aIdentity.getParent() == null) {
aIdentity.setParent(XMLPreferences.getPreferances().getAccounts().getAccount(0).getIdentities());
aIdentity.setParent(XMLPreferences.getPreferences().getAccounts().getAccount(0).getIdentities());
}*/
}
public void remove(int Index) {
Preferences.getPreferances().getAccounts().getAccount(0).removeIdentity(Index);
Preferences.getPreferences().getAccounts().getAccount(0).removeIdentity(Index);
}
public int size() {
int i =Preferences.getPreferances().getAccounts().getAccount(0).getIdentities().size();
int i =Preferences.getPreferences().getAccounts().getAccount(0).getIdentities().size();
return i;
}

10
grendel/sources/grendel/prefs/base/ServerArray.java
View File

@ -86,9 +86,9 @@ public class ServerArray {
}
public ServerStructure get(int Index) {
Account a = Preferences.getPreferances().getAccounts().getReciveAccounts().get(Index);
Account a = Preferences.getPreferences().getAccounts().getReceiveAccounts().get(Index);
if (Index<0) Index=0;
if (Index>Preferences.getPreferances().getAccounts().getReciveAccounts().size()) Index=0;
if (Index>Preferences.getPreferences().getAccounts().getReceiveAccounts().size()) Index=0;
if (a == null) {
return get(Index +1);
}
@ -97,15 +97,15 @@ public class ServerArray {
}
public void add(ServerStructure aServer) {
Preferences.getPreferances().getAccounts().addAccount(aServer.getAccount());
Preferences.getPreferences().getAccounts().addAccount(aServer.getAccount());
}
public void remove(int Index) {
Preferences.getPreferances().getAccounts().removeAccount(Index);
Preferences.getPreferences().getAccounts().removeAccount(Index);
}
public int size() {
return Preferences.getPreferances().getAccounts().getReciveAccounts().size();
return Preferences.getPreferences().getAccounts().getReceiveAccounts().size();
}
}

12
grendel/sources/grendel/prefs/xml/Test.java
View File

@ -67,7 +67,7 @@ public final class Test {
p.setProperty("ui",p_1);
p.storeToXML(new FileWriter("C:\\test_1.xml"));
System.out.println(p.toString());*/
/*Accounts accounts = XMLPreferences.getPreferances().getAccounts();
/*Accounts accounts = XMLPreferences.getPreferences().getAccounts();
accounts.addAccount(new Account_SMTP("Main_SMTP"));
accounts.addAccount(new Account_IMAP("Main_IMAP"));
accounts.getAccount(1).addIdentity(new Identity("Hash9","hash9@localhost","Main"));
@ -105,8 +105,8 @@ public final class Test {
wired.setDefaultIdentity(0);
wired.setPassword("tri3i9");
wired.setUsername("hash9");*/
//XMLPreferences.getPreferances().getAccounts().getAccount(5);
//Preferences.getPreferances().getAccounts().removeAccount(5);
//XMLPreferences.getPreferences().getAccounts().getAccount(5);
//Preferences.getPreferences().getAccounts().removeAccount(5);
/*Account_IMAP Server_2 = new Account_IMAP();
Server_2.setName("Server");
Server_2.setHost("192.168.0.100");
@ -114,7 +114,7 @@ public final class Test {
Server_2.setDefaultIdentity(0);
Server_2.setPassword("Sig27ma");
Server_2.setUsername("hash9");
Preferences.getPreferances().getAccounts().addAccount(Server_2);*/
Preferences.getPreferences().getAccounts().addAccount(Server_2);*/
/*Account_NNTP a = new Account_NNTP("Mozilla Mail/News");
Identity id = new Identity();
id.setEMail("grendel@eternal.undonet.com");
@ -122,7 +122,7 @@ public final class Test {
a.addIdentity(id);
a.setHost("news.mozilla.org");
a.setPort(-1);
Preferences.getPreferances().getAccounts().addAccount(a);*/
Preferences.getPreferences().getAccounts().addAccount(a);*/
Account_IMAP Server_2 = new Account_IMAP();
Server_2.setName("Alt Server");
Server_2.setHost("192.168.0.100");
@ -130,7 +130,7 @@ public final class Test {
Server_2.setDefaultIdentity(0);
Server_2.setPassword("Sig27ma");
Server_2.setUsername("hash9");
Preferences.getPreferances().getAccounts().addAccount(Server_2);
Preferences.getPreferences().getAccounts().addAccount(Server_2);
Preferences.save();
}
}

8
grendel/sources/grendel/renderer/Renderer.java
View File

@ -134,9 +134,9 @@ public class Renderer implements Runnable {
putBar(buf);
Attachment a=makeAttachment(index, p);
buf.append("<table border=\"1\" cellspacing=\"0\">");
buf.append("<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">");
buf.append("<tr><td>");
buf.append(HTMLUtils.genHRef("<img src=\"image.jpg\">", a.getURL()));
buf.append(HTMLUtils.genHRef("<img src=\"image.jpg\" />", a.getURL()));
buf.append("</td><td><table border=\"0\">\n");
if (p.getFileName()!=null) {
@ -231,6 +231,7 @@ public class Renderer implements Runnable {
ps.println("<head>");
ps.println("</head>");
ps.println("<body>");
ps.println("<div>");
try {
ps.println(objectRenderer(message, null, message).toString());
@ -240,6 +241,7 @@ public class Renderer implements Runnable {
e.printStackTrace(ps);
}
ps.println("</div>");
ps.println("</body>");
ps.println("</html>");
ps.close();
@ -314,7 +316,7 @@ public class Renderer implements Runnable {
public void putBar(StringBuilder buf) {
if (putbar) {
buf.append("<br>\n<hr>\n<br>\n");
buf.append("<br />\n<hr />\n<br />\n");
} else {
putbar = true;
}

10
grendel/sources/grendel/renderer/html/BriefHeaderFormatter.java
View File

@ -56,22 +56,22 @@ public class BriefHeaderFormatter extends HeaderFormatter {
/** Called when beginning to output a header block. This opens the table. */
void startHeaderOutput(StringBuilder output) {
super.startHeaderOutput(output);
output.append("<TR>");
output.append("<tr>");
}
/** Called when done filling a header block. This closes the table. */
void finishHeaderOutput(StringBuilder output) {
output.append("</TR>");
output.append("</tr>");
super.finishHeaderOutput(output);
}
boolean writeRandomHeader(String header, StringBuilder value, StringBuilder output) {
output.append("<TH VALIGN=BASELINE ALIGN=RIGHT NOWRAP><FONT FACE=" + HEADER_FONT_NAME + ">");
output.append("<th valign=\"baseline\" align=\"right\" =\"nowrap\"><font face=\"" + HEADER_FONT_NAME + "\">");
output.append(localizeHeaderName(header));
output.append(": </FONT></TH><TD><FONT FACE=" + HEADER_FONT_NAME + ">");
output.append(": </font></th><td><font face=\"" + HEADER_FONT_NAME + "\">");
quoteHTML(value);
output.append(value);
output.append("</FONT></TD>");
output.append("</font></td>");
return true;
}

2
grendel/sources/grendel/renderer/html/HTMLUtils.java
View File

@ -142,7 +142,7 @@ public final class HTMLUtils {
String strData=buffer.toString();
//strData = strData.replace(" ", "&nbsp;");
strData=strData.replace("\n", "<br>");
strData=strData.replace("\n", "<br />");
return strData;
}

10
grendel/sources/grendel/renderer/html/HeaderFormatter.java
View File

@ -54,12 +54,12 @@ abstract class HeaderFormatter {
/** Called when beginning to output a header block. This opens the table. */
void startHeaderOutput(StringBuilder output) {
output.append("<TABLE CELLPADDING=2 CELLSPACING=0 BORDER=0>");
output.append("<table cellpadding=\"2\" cellspacing=\"0\" width=\"100%\">");
}
/** Called when done filling a header block. This closes the table. */
void finishHeaderOutput(StringBuilder output) {
output.append("</TABLE>");
output.append("</table>");
}
/*************************************************************************/
@ -208,12 +208,12 @@ abstract class HeaderFormatter {
}
boolean writeRandomHeader(String header, StringBuilder value, StringBuilder output) {
output.append("<TR><TH VALIGN=BASELINE ALIGN=RIGHT NOWRAP><FONT FACE=" + HEADER_FONT_NAME + ">");
output.append("<tr><th valign=\"baseline\" align=\"right\" nowrap=\"nowrap\"><font face=\"" + HEADER_FONT_NAME + "\">");
output.append(localizeHeaderName(header));
output.append(": </FONT></TH><TD><FONT FACE=" + HEADER_FONT_NAME + ">");
output.append(": </font></th><td><font face=\"" + HEADER_FONT_NAME + "\">");
quoteHTML(value);
output.append(value);
output.append("</FONT></TD></TR>");
output.append("</font></td></tr>");
return true;
}
}

8
grendel/sources/grendel/renderer/html/TextHTMLConverter.java
View File

@ -109,7 +109,7 @@ public class TextHTMLConverter {
char url[] = new char[url_length];
text.getChars(i, end, url, 0);
text.insert(i, "<A HREF=\"");
text.insert(i, "<a href=\"");
i += 9;
end += 9;
in_length += 9;
@ -145,7 +145,7 @@ public class TextHTMLConverter {
i++;
}
text.insert(i, "</A>");
text.insert(i, "</a>");
i += 4;
in_length += 4;
@ -184,9 +184,9 @@ public class TextHTMLConverter {
if (i < in_length &&
(text.charAt(i) == '>' || text.charAt(i) == ']') &&
!sendmailFuckage(text, i, in_length)) {
text.insert(i, "<CITE>");
text.insert(i, "<cite>");
in_length += 6;
text.insert(in_length, "</CITE><br>");
text.insert(in_length, "</cite><br />");
}
}
}

4
grendel/sources/grendel/renderer/tools/RenderInputStream.java
View File

@ -100,7 +100,7 @@ public class RenderInputStream implements ObjectRender
if (p.getContentType().contains("text/")) {
//buf.append("<br>\n<hr>\n<br>\n");
buf.append("<table border=\"1\" cellspacing=\"0\">");
buf.append("<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">");
Enumeration enumm=p.getAllHeaders();
@ -116,7 +116,7 @@ public class RenderInputStream implements ObjectRender
}
buf.append("</table>");
buf.append("<br>");
buf.append("<br />");
buf.append("<blockquote>");
buf.append("<pre>");
buf.append(HTMLUtils.quoteToHTML(sw.toString()));

4
grendel/sources/grendel/renderer/tools/RenderMessage.java
View File

@ -94,7 +94,7 @@ public class RenderMessage implements ObjectRender {
if (indent) {
buf.append("<blockquote>");
buf.append("<table border=\"1\" cellspacing=\"0\">");
buf.append("<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">");
buf.append("<tr><td>");
}
@ -111,7 +111,7 @@ public class RenderMessage implements ObjectRender {
/*new BriefHeaderFormatter().formatHeaders(ih, buf);
buf.append("<hr>");*/
new NormalHeaderFormatter().formatHeaders(ih, buf);
buf.append("<hr>");
buf.append("<hr />");
/*new FullHeaderFormatter().formatHeaders(ih, buf);
buf.append("<hr>");*/
}

8
grendel/sources/grendel/renderer/tools/RenderString.java
View File

@ -44,6 +44,7 @@ package grendel.renderer.tools;
import grendel.renderer.html.HTMLUtils;
import grendel.renderer.ObjectRender;
import grendel.renderer.Renderer;
import grendel.renderer.html.TextHTMLConverter;
import java.util.Enumeration;
@ -91,7 +92,12 @@ public class RenderString implements ObjectRender
buf.append(HTMLUtils.cleanHTML((String) o));
} else if (p.getContentType().contains("text/plain")) {
master.putBar(buf);
buf.append(HTMLUtils.quoteToHTML((String) o));
buf.append("<pre class=\"message-plain-text\">");
StringBuilder buffer=new StringBuilder((String) o);
TextHTMLConverter.quoteForHTML(buffer, true, true);
buf.append(buffer);
buf.append("</pre>");
//buf.append(HTMLUtils.quoteToHTML((String) o));
} else {
try {
String s=(String) o;

238
grendel/sources/grendel/start.html
View File

@ -1,119 +1,119 @@
<html>
<head>
<!--
** Mozilla Thunderbird Start Page
**
** Contributor:
** David Tenser <tenser gmail com>
** Kieran Maclean <kieran eternal undonet com>
-->
<title>Welcome to Mozilla Grendel!</title>
<style type="text/css" media="screen,projection">
body {
margin: 0px;
background: url(startpage-back.png) repeat-y #EEF1F4;
width: 100%;
}
h1 {
font-size: 130%;
color: white;
background: url(startpage-h1.png) /*no-repeat*/ transparent;
height: 40px;
padding: 5px 0.3ex 15px 25px;
margin-top: 0px;
width: 100%;
}
h2 {
color: black;
background: url(h2.png) repeat-y bottom left;
width: 30ex;
font-size: 100%;
padding: 2px 0px 2px 10px;
}
#indent {
margin-left: 25px;
margin-right: 25px;
background: url(thunderbird-watermark.png) no-repeat top right;
}
ul {
margin-left: 30px;
padding-left: 0px;
}
li {
list-style-image: url(startpage-li.png)
}
a:link, a:visited {
background: transparent;
text-decoration: none;
color: #006;
}
a:active, a:hover {
background: #f2f2f8;
color: #009;
}
#powered {
font-size: 90%;
margin: 0%;
color: #fff;
background: url(startpage-h2.png) no-repeat;
padding-left: 25px;
width: 100%;
height: 30px;
margin-top: 20px;
}
#powered a:link, #gecko a:visited {
color: black;
background: transparent;
padding-right: 5px;
}
</style>
</head>
<body>
<h1>Welcome to Mozilla Grendel</h1>
<div id="indent">
<p>Mozilla Grendel is a open-source Java mail and news client.</p>
<h2>Features</h2>
<ul>
<li><a href="http://wiki.mozilla.org/Grendel:Outstanding_Issues">Outstanding Issues</a></li>
<li><a href="#">Reads Mail...</a></li>
<!--
<ul>
<li><a href="http://www.mozilla.org/products/thunderbird/junkmail.html">Adaptive Junk Mail Controls</a></li>
<li><a href="http://www.mozilla.org/products/thunderbird/rss.html">RSS Reader</a></li>
<li><a href="http://www.mozilla.org/products/thunderbird/global-inbox.html">Global Inbox Support</a></li>
<li><a href="http://www.mozilla.org/products/thunderbird/search-folders.html">Saved Search Folders</a></li>
<li><a href="http://www.mozilla.org/products/thunderbird/message-grouping.html">Message Grouping</a></li>
<li><a href="http://www.mozilla.org/products/thunderbird/privacy-protection.html">Privacy Protection</a></li>
-->
</ul>
<h2>More Information</h2>
<!--
<p>For frequently asked questions, tips and general help, visit <a href="http://www.mozilla.org/support/thunderbird/">Thunderbird Help</a>.</p>
-->
<p>For product information, visit the <a href="http://wiki.mozilla.org/Grendel">Grendel Home Page</a>.</p>
<div id="powered"><a href="http://java.sun.com/">Powered by Java.</a></div>
</div>
</body>
</html>
<html>
<head>
<!--
** Mozilla Thunderbird Start Page
**
** Contributor:
** David Tenser <tenser gmail com>
** Kieran Maclean <kieran eternal undonet com>
-->
<title>Welcome to Mozilla Grendel!</title>
<style type="text/css" media="screen,projection">
body {
margin: 0px;
background: url(startpage-back.png) repeat-y #EEF1F4;
width: 100%;
}
h1 {
font-size: 130%;
color: white;
background: url(startpage-h1.png) no-repeat transparent;
height: 40px;
padding: 5px 0.3ex 15px 25px;
margin-top: 0px;
/*width: 100%;*/
}
h2 {
color: black;
background: url(h2.png) repeat-y bottom left;
width: 30ex;
font-size: 100%;
padding: 2px 0px 2px 10px;
}
#indent {
margin-left: 25px;
margin-right: 25px;
background: url(thunderbird-watermark.png) no-repeat top right;
}
ul {
margin-left: 30px;
padding-left: 0px;
}
li {
list-style-image: url(startpage-li.png)
}
a:link, a:visited {
background: transparent;
text-decoration: none;
color: #006;
}
a:active, a:hover {
background: #f2f2f8;
color: #009;
}
#powered {
font-size: 90%;
margin: 0%;
color: #fff;
background: url(startpage-h2.png) no-repeat;
padding-left: 25px;
width: 100%;
height: 30px;
margin-top: 20px;
}
#powered a:link, #gecko a:visited {
color: black;
background: transparent;
padding-right: 5px;
}
</style>
</head>
<body>
<h1>Welcome to Mozilla Grendel</h1>
<div id="indent">
<p>Mozilla Grendel is a open-source Java mail and news client.</p>
<h2>Features</h2>
<ul>
<li><a href="http://wiki.mozilla.org/Grendel:Outstanding_Issues">Outstanding Issues</a></li>
<li><a href="#">Reads Mail...</a></li>
<!--
<ul>
<li><a href="http://www.mozilla.org/products/thunderbird/junkmail.html">Adaptive Junk Mail Controls</a></li>
<li><a href="http://www.mozilla.org/products/thunderbird/rss.html">RSS Reader</a></li>
<li><a href="http://www.mozilla.org/products/thunderbird/global-inbox.html">Global Inbox Support</a></li>
<li><a href="http://www.mozilla.org/products/thunderbird/search-folders.html">Saved Search Folders</a></li>
<li><a href="http://www.mozilla.org/products/thunderbird/message-grouping.html">Message Grouping</a></li>
<li><a href="http://www.mozilla.org/products/thunderbird/privacy-protection.html">Privacy Protection</a></li>
-->
</ul>
<h2>More Information</h2>
<!--
<p>For frequently asked questions, tips and general help, visit <a href="http://www.mozilla.org/support/thunderbird/">Thunderbird Help</a>.</p>
-->
<p>For product information, visit the <a href="http://wiki.mozilla.org/Grendel">Grendel Home Page</a>.</p>
<div id="powered"><a href="http://java.sun.com/">Powered by Java.</a></div>
</div>
</body>
</html>

14
grendel/sources/grendel/structure/Folder.java
View File

@ -338,6 +338,18 @@ public class Folder {
return name_this.equals(name_that);
}
/*
* Tests if this folder physically exists on the Server.
*/
public boolean exists() {
getServer().ensureConnection();
try {
return folder.exists();
} catch (MessagingException ex) {
NoticeBoard.publish(new ExceptionNotice(ex));
return false;
}
}
/**
* Get the number of unread messages
@ -695,7 +707,7 @@ public class Folder {
boolean found = false;
for (int j = 0; j < messages_a.length; j++) {
if (m.equals(messages_a[i])) {
if (m.equals(messages_a[j])) {
found = true;
j = messages_a.length;
}

6
grendel/sources/grendel/structure/Message.java
View File

@ -467,6 +467,9 @@ public class Message
String message_id_that = list[0];
if (message_id_this==null) {
return false;
}
return message_id_this.equals(message_id_that);
}
@ -475,6 +478,9 @@ public class Message
String message_id_this = this.getMessageID();
String message_id_that = message.getMessageID();
if (message_id_this==null) {
return false;
}
return message_id_this.equals(message_id_that);
}

12
grendel/sources/grendel/structure/Server.java
View File

@ -71,18 +71,26 @@ public class Server {
NoticeBoard.publish(new ExceptionNotice(e));
JOptionPane.showMessageDialog(null,"Login failed", "Grendel Error", JOptionPane.ERROR_MESSAGE); // TODO REDO THIS!!!!!
try {
store.close();
if (store.isConnected()) {
store.close();
}
} catch (MessagingException ex) {
ex.printStackTrace();
} catch (Exception ex) {
ex.printStackTrace();
}
return false;
} catch (MessagingException e) {
NoticeBoard.publish(new ExceptionNotice(e.getNextException()));
try {
store.close();
if (store.isConnected()) {
store.close();
}
} catch (MessagingException ex) {
ex.printStackTrace();
} catch (Exception ex) {
ex.printStackTrace();
}
return false;
}

10
grendel/sources/grendel/structure/Servers.java
View File

@ -37,7 +37,7 @@ public final class Servers {
/** Creates a new instance of Servers */
static {
options_mail=Preferences.getPreferances().getPropertyPrefs("options").getPropertyPrefs("mail");
options_mail=Preferences.getPreferences().getPropertyPrefs("options").getPropertyPrefs("mail");
}
public static synchronized List<Server> getServers() {
@ -52,17 +52,17 @@ public final class Servers {
}
}
private static synchronized void updateServers() {
List<Account__Receive> recive_accounts_list= new ArrayList<Account__Receive>(Preferences.getPreferances().getAccounts().getReciveAccounts());
private static synchronized void updateServers() {
List<Account__Receive> receive_accounts_list= new ArrayList<Account__Receive>(Preferences.getPreferences().getAccounts().getReceiveAccounts());
//servers=new Vector<Server>(recive_accounts_list.size());
for (Server s: servers) {
boolean contains = recive_accounts_list.remove(s.getAccount());
boolean contains = receive_accounts_list.remove(s.getAccount());
if (! contains) {
servers.remove(s);
}
}
for (Account__Receive account : recive_accounts_list) {
for (Account__Receive account : receive_accounts_list) {
try {
servers.add(new Server(account));
} catch (NoSuchProviderException e) {

2
grendel/sources/grendel/structure/test/Main.java
View File

@ -111,7 +111,7 @@ public class Main {
Message m = test.getMessage(1);
System.out.println("Message 1: " + m.toString());*/
//echoSigs(netscape);*/
//Account__Receive ar = Preferences.getPreferances().getAccounts().getReciveAccounts().get(0);
//Account__Receive ar = Preferences.getPreferances().getAccounts().getReceiveAccounts().get(0);
/*System.out.println("Servers: "+Servers.getServers());
Server s = Servers.getServers().get(2);
FolderList fl =s.getRoot().getFolders();

2
grendel/sources/grendel/structure/utill/IdentityUtills.java
View File

@ -31,7 +31,7 @@ public final class IdentityUtills {
public static ArrayList<AccountIdentity> getAllAccountIdentitys() {
ArrayList<AccountIdentity> ai_a = new ArrayList<AccountIdentity>();
List<Account__Receive> recieve_accounts = Preferences.getPreferances().getAccounts().getReciveAccounts();
List<Account__Receive> recieve_accounts = Preferences.getPreferences().getAccounts().getReceiveAccounts();
for (Account__Receive account: recieve_accounts) {
Collection<Identity> identities = account.getCollectionIdentities();
Account__Send send_account = account.getSendAccount();

33
grendel/sources/grendel/ui/ActionFactory.java
View File

@ -29,13 +29,8 @@
package grendel.ui;
import grendel.ui.addressbook2.Addressbook;
import java.awt.Component;
import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.Enumeration;
import java.util.ResourceBundle;
import javax.swing.JFrame;
import javax.swing.ToolTipManager;
@ -45,15 +40,9 @@ import grendel.ui.prefs.Identities;
import grendel.ui.prefs.Servers;
import grendel.ui.prefs.General;
import grendel.ui.prefs.UI;
import grendel.storage.MailDrop;
import grendel.search.SearchFrame;
/* Temporarily removed because FilterMaster is broken (edwin)
import grendel.filters.FilterMaster;
*/
import grendel.composition.Composition;
import com.trfenv.parsers.Event;
import grendel.ui.prefs2.PrefsUI;
/**
*Generates a list of common Grendel events for use across the application.
@ -78,6 +67,8 @@ public class ActionFactory {
static Runnable fComposeMessageThread = new DummyComposeMessageThread();
static RunPrefEditor fRunPrefEditor = new RunPrefEditor();
public static ExitAction GetExitAction() {
return fExitAction;
}
@ -140,6 +131,10 @@ public class ActionFactory {
return fShowAddressBookAction;
}
public static RunPrefEditor GetRunPrefEditor() {
return fRunPrefEditor;
}
/**
*Returns an array of all the preferences events. Used in windows that
*don't automatically have the preferences events supplied to them.
@ -155,6 +150,20 @@ public class ActionFactory {
}
}
class RunPrefEditor extends Event {
public RunPrefEditor() {
super("prefEditor");
setEnabled(true);
}
public void actionPerformed(ActionEvent aEvent) {
new PrefsUI().setVisible(true);
}
}
class ExitAction extends Event {
public ExitAction() {

4
grendel/sources/grendel/ui/MenuLabels.dtd
View File

@ -191,6 +191,10 @@
<!ENTITY multiPrefsLabel "Tools" >
<!ENTITY multiPrefsAccel "T" >
<!ENTITY prefEditorLabel "Preferences..." >
<!ENTITY prefEditorAccel "P" >
<!ENTITY prefIdsLabel "Identities" >
<!ENTITY prefIdsAccel "I" >
<!ENTITY prefSrvsLabel "Servers" >

15
grendel/sources/grendel/ui/UnifiedMessageDisplayManager.java
View File

@ -24,6 +24,7 @@
package grendel.ui;
import grendel.ui2.FolderView;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
@ -138,7 +139,7 @@ public class UnifiedMessageDisplayManager extends MessageDisplayManager {
class UnifiedMessageFrame extends GeneralFrame {
private final boolean DEBUG = false;
MasterPanel fFolders = null;
FolderView fFolders = null;
FolderPanel fThreads = null;
MessagePanel fMessage = null;
JSplitPane splitter1 = null, splitter2 = null;
@ -160,7 +161,7 @@ class UnifiedMessageFrame extends GeneralFrame {
PrefsDialog.CheckPrefs(this);
fFolders = new MasterPanel();
fFolders = new FolderView();
fThreads = new FolderPanel();
fMessage = new MessagePanel();
@ -182,19 +183,19 @@ class UnifiedMessageFrame extends GeneralFrame {
layoutPanels(layout);
XMLMenuBuilder builder = new XMLMenuBuilder(Util.MergeActions(actions, Util.MergeActions(fFolders.getActions(), Util.MergeActions(fThreads.getActions(), fMessage.getActions()))));
XMLMenuBuilder builder = new XMLMenuBuilder(Util.MergeActions(actions, /*Util.MergeActions(fFolders.getActions(),*/ Util.MergeActions(fThreads.getActions(), fMessage.getActions())/*)*/));
fMenu = builder.buildFrom("ui/grendel.xml", this);
getRootPane().setJMenuBar(fMenu);
JToolBar masterToolBar = fFolders.getToolBar();
//JToolBar masterToolBar = fFolders.getToolBar();
JToolBar folderToolBar = fThreads.getToolBar();
JToolBar messageToolBar = fMessage.getToolBar();
fToolBar = Util.MergeToolBars(masterToolBar,
fToolBar = /*Util.MergeToolBars(masterToolBar,*/
Util.MergeToolBars(folderToolBar,
messageToolBar));
messageToolBar)/*)*/;
fToolBarPanelConstraints.fill = GridBagConstraints.HORIZONTAL;
fToolBarPanelConstraints.anchor = GridBagConstraints.WEST;
@ -228,7 +229,7 @@ class UnifiedMessageFrame extends GeneralFrame {
UIPrefs.GetMaster().setMultiPaneLayout(fLayout);
UIPrefs.GetMaster().writePrefs();
fFolders.dispose();
//fFolders.dispose();
fThreads.dispose();
fMessage.dispose();

2
grendel/sources/grendel/ui/grendel.xml
View File

@ -131,6 +131,8 @@
<menupopup>
<menuitem onclick="openAddressBook" label="&addressBookLabel;" accesskey="&addressBookAccel;"/>
<menuseparator/>
<menuitem id="prefEditor" onclick="prefEditor" label="Preferences Editor" accesskey="p"/>
<menuseparator/>
<menuitem id="prefGeneral" onclick="prefGeneral" label="&prefGeneralLabel;" accesskey="&prefGeneralAccel;"/>
<menuitem id="prefIds" onclick="prefIds" label="&prefIdsLabel;" accesskey="&prefIdsAccel;"/>
<menuitem id="prefSrvs" onclick="prefSrvs" label="&prefSrvsLabel;" accesskey="&prefSrvsAccel;"/>

2
grendel/sources/grendel/ui/prefs2/PrefsTreeTableModel.java
View File

@ -33,7 +33,7 @@ public class PrefsTreeTableModel extends DefaultTreeTableModel
* Creates a new instance of PrefsTreeTableModel
*/
public PrefsTreeTableModel() {
this(Preferences.getPreferances());
this(Preferences.getPreferences());
}
public PrefsTreeTableModel(XMLPreferences prefs) {