[Mailsomething-cvs] mailsomething/src/net/sf/mailsomething/gui/mail TreeStyleMailboxTableModel.java,

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/gui/mail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv303/net/sf/mailsomething/gui/mail

Modified Files:
	TreeStyleMailboxTableModel.java MessageViewer.java 
	MailEditor.java MailboxTableModel.java FilterConfig.java 
	MailboxTable.java 
Log Message:

Index: MessageViewer.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/gui/mail/MessageViewer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MessageViewer.java	20 Mar 2005 20:36:45 -0000	1.5
--- MessageViewer.java	21 Mar 2005 17:16:38 -0000	1.6
***************
*** 18,22 ****
  import net.sf.mailsomething.mail.*;
  import net.sf.mailsomething.mail.Message;
! import net.sf.mailsomething.mail.MessageConstants;
  import net.sf.mailsomething.mail.actions.GetMessageBodyAction;

--- 18,22 ----
  import net.sf.mailsomething.mail.*;
  import net.sf.mailsomething.mail.Message;
! import net.sf.mailsomething.mail.RFC822;
  import net.sf.mailsomething.mail.actions.GetMessageBodyAction;

***************
*** 146,150 ****
  		displayMessage(message);

! 		String name = message.getField(MessageConstants.SUBJECT);

  		if (name.equals("") == false) {
--- 146,150 ----
  		displayMessage(message);

! 		String name = message.getField(RFC822.SUBJECT);

  		if (name.equals("") == false) {
***************
*** 154,158 ****
  		} else {

! 			name = message.getField(MessageConstants.FROM);

  			if (name.equals("") == false) {
--- 154,158 ----
  		} else {

! 			name = message.getField(RFC822.FROM);

  			if (name.equals("") == false) {
***************
*** 660,664 ****
  			if (header.isDraft())
  				headerPanel.setFrom(
! 					"To: " + header.getField(MessageConstants.TO));
  			else if (header.getFrom() != null)
  				headerPanel.setFrom("From: " + header.getFrom().getAlias());
--- 660,664 ----
  			if (header.isDraft())
  				headerPanel.setFrom(
! 					"To: " + header.getField(RFC822.TO));
  			else if (header.getFrom() != null)
  				headerPanel.setFrom("From: " + header.getFrom().getAlias());
***************
*** 666,670 ****
  				headerPanel.setFrom("From: ");

! 			headerPanel.setSubject(header.getField(MessageConstants.SUBJECT));

  			//}
--- 666,670 ----
  				headerPanel.setFrom("From: ");

! 			headerPanel.setSubject(header.getField(RFC822.SUBJECT));

  			//}
***************
*** 831,835 ****

  				String contentDisposition =
! 					o.getField(MessageConstants.CONTENT_DISPOSITION);

  				if (contentDisposition != null
--- 831,835 ----

  				String contentDisposition =
! 					o.getField(RFC822.CONTENT_DISPOSITION);

  				if (contentDisposition != null
***************
*** 861,865 ****
  								String name =
  									"Message: "
! 										+ o.getField(MessageConstants.SUBJECT);
  								attachNames.add(name);
  								attachFilenames.add(o.getFilename());
--- 861,865 ----
  								String name =
  									"Message: "
! 										+ o.getField(RFC822.SUBJECT);
  								attachNames.add(name);
  								attachFilenames.add(o.getFilename());
***************
*** 925,929 ****
  			//JLabel dateLabel = new JLabel("<html>Date: " + "<font color=blue>" + b.getField(MessageConstants.DATE) + "</font>");

! 			JLabel date1Label = new JLabel(b.getField(MessageConstants.DATE));

  			datepanel.add(dateLabel);
--- 925,929 ----
  			//JLabel dateLabel = new JLabel("<html>Date: " + "<font color=blue>" + b.getField(MessageConstants.DATE) + "</font>");

! 			JLabel date1Label = new JLabel(b.getField(RFC822.DATE));

  			datepanel.add(dateLabel);
***************
*** 946,950 ****
  			if (b.isDraft())
  				fromLabel =
! 					new JLabel("To: " + b.getField(MessageConstants.TO));
  			else if (b.getFrom() != null)
  				fromLabel = new JLabel("From: " + b.getFrom().getAlias());
--- 946,950 ----
  			if (b.isDraft())
  				fromLabel =
! 					new JLabel("To: " + b.getField(RFC822.TO));
  			else if (b.getFrom() != null)
  				fromLabel = new JLabel("From: " + b.getFrom().getAlias());
***************
*** 960,964 ****

  			subjectLabel =
! 				new JLabel("Subject: " + b.getField(MessageConstants.SUBJECT));

  			subjectLabel.setForeground(new Color(40, 50, 100));
--- 960,964 ----

  			subjectLabel =
! 				new JLabel("Subject: " + b.getField(RFC822.SUBJECT));

  			subjectLabel.setForeground(new Color(40, 50, 100));

Index: MailEditor.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/gui/mail/MailEditor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MailEditor.java	20 Mar 2005 20:36:45 -0000	1.4
--- MailEditor.java	21 Mar 2005 17:16:38 -0000	1.5
***************
*** 477,481 ****

  		if (header.toField.getText().indexOf("@") != -1) {
! 			draft.setField(MessageConstants.TO, header.toField.getText());
  		} else if (header.keys != null) {

--- 477,481 ----

  		if (header.toField.getText().indexOf("@") != -1) {
! 			draft.setField(RFC822.TO, header.toField.getText());
  		} else if (header.keys != null) {

***************
*** 503,507 ****
  						emails.append(";" + addresses[++i].getEmail());
  					}
! 					draft.setField(MessageConstants.TO, emails.toString());
  				}
  			} else {
--- 503,507 ----
  						emails.append(";" + addresses[++i].getEmail());
  					}
! 					draft.setField(RFC822.TO, emails.toString());
  				}
  			} else {
***************
*** 518,522 ****
  						//m.setTo()
  						draft.setField(
! 							MessageConstants.TO,
  							addresses[0].getEmail());

--- 518,522 ----
  						//m.setTo()
  						draft.setField(
! 							RFC822.TO,
  							addresses[0].getEmail());

***************
*** 588,592 ****
  						}

! 						draft.setField(MessageConstants.TO, add.getEmail());

--- 588,592 ----
  						}

! 						draft.setField(RFC822.TO, add.getEmail());

***************
*** 690,694 ****
  					toField =
  						new AddressTextfield(
! 							message.getField(MessageConstants.TO));

  				} else {
--- 690,694 ----
  					toField =
  						new AddressTextfield(
! 							message.getField(RFC822.TO));

  				} else {
***************
*** 696,701 ****
  					String temp = "";

! 					if (message.getField(MessageConstants.REPLY_TO) != null)
! 						temp = message.getField(MessageConstants.REPLY_TO);
  					else
  						temp = message.getFrom().toString();
--- 696,701 ----
  					String temp = "";

! 					if (message.getField(RFC822.REPLY_TO) != null)
! 						temp = message.getField(RFC822.REPLY_TO);
  					else
  						temp = message.getFrom().toString();
***************
*** 773,777 ****
  					subjectField =
  						new JTextField(
! 							message.getField(MessageConstants.SUBJECT));

  				} else {
--- 773,777 ----
  					subjectField =
  						new JTextField(
! 							message.getField(RFC822.SUBJECT));

  				} else {
***************
*** 1097,1101 ****
  								.exists(
  									message.getField(
! 										MessageConstants.MESSAGE_ID)))
  								drafts.addMessage(message);

--- 1097,1101 ----
  								.exists(
  									message.getField(
! 										RFC822.MESSAGE_ID)))
  								drafts.addMessage(message);

***************
*** 1137,1141 ****

  					if (!drafts
! 						.exists(message.getField(MessageConstants.MESSAGE_ID)))
  						drafts.addMessage(message);

--- 1137,1141 ----

  					if (!drafts
! 						.exists(message.getField(RFC822.MESSAGE_ID)))
  						drafts.addMessage(message);

***************
*** 1148,1152 ****
  					if (!drafts
  						.exists(
! 							message.getField(MessageConstants.MESSAGE_ID))) {

  						drafts.addMessage(message);
--- 1148,1152 ----
  					if (!drafts
  						.exists(
! 							message.getField(RFC822.MESSAGE_ID))) {

  						drafts.addMessage(message);
***************
*** 2057,2073 ****
  		stamp += '\n';

! 		stamp += "From: " + message.getField(MessageConstants.FROM);

  		stamp += '\n';

! 		stamp += "To: " + message.getField(MessageConstants.TO);

  		stamp += '\n';

! 		stamp += "Sent: " + message.getField(MessageConstants.DATE);

  		stamp += '\n';

! 		stamp += "Subject: " + message.getField(MessageConstants.SUBJECT);

  		stamp += '\n';
--- 2057,2073 ----
  		stamp += '\n';

! 		stamp += "From: " + message.getField(RFC822.FROM);

  		stamp += '\n';

! 		stamp += "To: " + message.getField(RFC822.TO);

  		stamp += '\n';

! 		stamp += "Sent: " + message.getField(RFC822.DATE);

  		stamp += '\n';

! 		stamp += "Subject: " + message.getField(RFC822.SUBJECT);

  		stamp += '\n';
***************
*** 2095,2101 ****
  			return;

! 		if (message.getField(MessageConstants.REPLY_TO) != null) {

! 			header.toField.setText(message.getField(MessageConstants.REPLY_TO));

  		} else if (message.getFrom() != null) {
--- 2095,2101 ----
  			return;

! 		if (message.getField(RFC822.REPLY_TO) != null) {

! 			header.toField.setText(message.getField(RFC822.REPLY_TO));

  		} else if (message.getFrom() != null) {
***************
*** 2103,2109 ****
  			header.toField.setText(message.getFrom().toString());

! 		} else if (message.getField(MessageConstants.FROM) != null) {

! 			header.toField.setText(message.getField(MessageConstants.FROM));

  		}
--- 2103,2109 ----
  			header.toField.setText(message.getFrom().toString());

! 		} else if (message.getField(RFC822.FROM) != null) {

! 			header.toField.setText(message.getField(RFC822.FROM));

  		}

Index: MailboxTableModel.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/gui/mail/MailboxTableModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MailboxTableModel.java	20 Mar 2005 20:36:45 -0000	1.2
--- MailboxTableModel.java	21 Mar 2005 17:16:39 -0000	1.3
***************
*** 6,10 ****

  import net.sf.mailsomething.mail.Message;
! import net.sf.mailsomething.mail.MessageConstants;
  import net.sf.mailsomething.mail.MessageEvent;
  import net.sf.mailsomething.mail.MessageHolder;
--- 6,10 ----

  import net.sf.mailsomething.mail.Message;
! import net.sf.mailsomething.mail.RFC822;
  import net.sf.mailsomething.mail.MessageEvent;
  import net.sf.mailsomething.mail.MessageHolder;
***************
*** 87,95 ****
  			return "error";

! 		if (header[column].equals(MessageConstants.SUBJECT)) {

! 			return "  " + m.getField(MessageConstants.SUBJECT);

! 		} else if (header[column].equals(MessageConstants.FROM)) {

  			if (m.isDraft()) {
--- 87,95 ----
  			return "error";

! 		if (header[column].equals(RFC822.SUBJECT)) {

! 			return "  " + m.getField(RFC822.SUBJECT);

! 		} else if (header[column].equals(RFC822.FROM)) {

  			if (m.isDraft()) {
***************
*** 97,101 ****
  				//isDraft = true;

! 				return m.getField(MessageConstants.TO);

  			} else {
--- 97,101 ----
  				//isDraft = true;

! 				return m.getField(RFC822.TO);

  			} else {
***************
*** 109,113 ****
  			}

! 		} else if (header[column].equals(MessageConstants.DATE)) {

  			return m.getDate();
--- 109,113 ----
  			}

! 		} else if (header[column].equals(RFC822.DATE)) {

  			return m.getDate();
***************
*** 151,159 ****
  	public String getColumnName(int column) {

! 		if (header[column].equals(MessageConstants.SUBJECT)) {

  			return "Subject";

! 		} else if (header[column].equals(MessageConstants.FROM)) {

  			if (isDraft)
--- 151,159 ----
  	public String getColumnName(int column) {

! 		if (header[column].equals(RFC822.SUBJECT)) {

  			return "Subject";

! 		} else if (header[column].equals(RFC822.FROM)) {

  			if (isDraft)
***************
*** 163,167 ****
  				return "Sender";

! 		} else if (header[column].equals(MessageConstants.DATE)) {

  			return "Date";
--- 163,167 ----
  				return "Sender";

! 		} else if (header[column].equals(RFC822.DATE)) {

  			return "Date";
***************
*** 241,245 ****
  	public Class getColumnClass(int column) {

! 		if (header[column].equals(MessageConstants.DATE))
  			return Date.class;

--- 241,245 ----
  	public Class getColumnClass(int column) {

! 		if (header[column].equals(RFC822.DATE))
  			return Date.class;

Index: FilterConfig.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/gui/mail/FilterConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FilterConfig.java	3 Apr 2004 07:56:48 -0000	1.1
--- FilterConfig.java	21 Mar 2005 17:16:39 -0000	1.2
***************
*** 40,44 ****
  		//Get values from current Filter
  		Criteria[] filtercriteria = currentFilter.getCriteria();
! 		String[] criteriaTypes = {MessageConstants.FROM, MessageConstants.SUBJECT, MessageConstants.TO, MessageConstants.CC};

  		/* If adding a new filter, then currentFilter is null, else you are editing
--- 40,44 ----
  		//Get values from current Filter
  		Criteria[] filtercriteria = currentFilter.getCriteria();
! 		String[] criteriaTypes = {RFC822.FROM, RFC822.SUBJECT, RFC822.TO, RFC822.CC};

  		/* If adding a new filter, then currentFilter is null, else you are editing

Index: MailboxTable.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/gui/mail/MailboxTable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MailboxTable.java	20 Mar 2005 20:36:46 -0000	1.3
--- MailboxTable.java	21 Mar 2005 17:16:40 -0000	1.4
***************
*** 142,148 ****
  	private String[] headerTypes =
  		new String[] {
! 			MessageConstants.SUBJECT,
! 			MessageConstants.FROM,
! 			MessageConstants.DATE };

  	/**
--- 142,148 ----
  	private String[] headerTypes =
  		new String[] {
! 			RFC822.SUBJECT,
! 			RFC822.FROM,
! 			RFC822.DATE };

  	/**

Index: TreeStyleMailboxTableModel.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/gui/mail/TreeStyleMailboxTableModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreeStyleMailboxTableModel.java	3 Apr 2004 07:56:49 -0000	1.1
--- TreeStyleMailboxTableModel.java	21 Mar 2005 17:16:38 -0000	1.2
***************
*** 432,440 ****
  			return "error";

! 		if (header[column].equals(MessageConstants.SUBJECT)) {

! 			return "  " + m.getField(MessageConstants.SUBJECT);

! 		} else if (header[column].equals(MessageConstants.FROM)) {

  			if (m.isDraft()) {
--- 432,440 ----
  			return "error";

! 		if (header[column].equals(RFC822.SUBJECT)) {

! 			return "  " + m.getField(RFC822.SUBJECT);

! 		} else if (header[column].equals(RFC822.FROM)) {

  			if (m.isDraft()) {
***************
*** 442,446 ****
  				//isDraft = true;

! 				return m.getField(MessageConstants.TO);

  			} else {
--- 442,446 ----
  				//isDraft = true;

! 				return m.getField(RFC822.TO);

  			} else {
***************
*** 454,458 ****
  			}

! 		} else if (header[column].equals(MessageConstants.DATE)) {

  			return m.getDate();
--- 454,458 ----
  			}

! 		} else if (header[column].equals(RFC822.DATE)) {

  			return m.getDate();

[Mailsomething-cvs] mailsomething/src/net/sf/mailsomething/gui/mail TreeStyleMailboxTableModel.java,

[Mailsomething-cvs] mailsomething/src/net/sf/mailsomething/gui/mail TreeStyleMailboxTableModel.java,1.1,1.2 MessageViewer.java,1.5,1.6 MailEditor.java,1.4,1.5 MailboxTableModel.java,1.2,1.3 FilterConfig.java,1.1,1.2 MailboxTable.java,1.3,1.4