From 535c9f68383f15f01d69c0d493de7d2e26f6fefc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= <deactivated@coded.pt>
Date: Wed, 12 Mar 2008 14:06:27 +0000
Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@721
 bb69d46d-e84e-40c8-a05a-06db0d633741

---
 trunk/SIPRPSoft/src/leaf/LeafGradientPanel.java      |  1 +
 .../src/siprp/medicina/processo/mail/MailSender.java |  2 ++
 .../medicina/processo/ui/ProcessoDadosPanel.java     |  4 ++--
 .../medicina/processo/ui/ProcessoTreePanel.java      | 12 ++++++++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/trunk/SIPRPSoft/src/leaf/LeafGradientPanel.java b/trunk/SIPRPSoft/src/leaf/LeafGradientPanel.java
index 90f4bdbc..36a500d1 100644
--- a/trunk/SIPRPSoft/src/leaf/LeafGradientPanel.java
+++ b/trunk/SIPRPSoft/src/leaf/LeafGradientPanel.java
@@ -25,4 +25,5 @@ public class LeafGradientPanel extends JPanel
 //		g2d.setPaint( gradientOut );
 //		g2d.fillRect( getWidth()/2, 0, getWidth(), getHeight() );
 //	}
+	
 }
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailSender.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailSender.java
index db199b7a..16260d64 100644
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailSender.java
+++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailSender.java
@@ -3,6 +3,7 @@ package siprp.medicina.processo.mail;
 import java.util.Date;
 import java.util.Properties;
 
+import javax.mail.Address;
 import javax.mail.Authenticator;
 import javax.mail.Message;
 import javax.mail.PasswordAuthentication;
@@ -37,6 +38,7 @@ public class MailSender
 		Message msg = new MimeMessage( session );
 		
 		msg.setFrom( new InternetAddress( from ) );
+		msg.setReplyTo( new Address[]{ new InternetAddress(from)} );
 		msg.setRecipients( Message.RecipientType.TO, InternetAddress.parse( to, true ) );
 		msg.setRecipients( Message.RecipientType.BCC, InternetAddress.parse( bcc, true ) );
 		msg.setSubject( subject );
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
index aa35d393..33f428e4 100755
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
+++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
@@ -600,12 +600,12 @@ public class ProcessoDadosPanel extends JPanel
 				String subject = "";
 				String body = "";
 				
-				subject = ( String ) Singleton.getInstance( subject );
+				subject = ( String ) Singleton.getInstance( subjectName );
 				if( subject == null)
 				{
 					subject = "";
 				}
-				subject = subject.replaceAll( CompanyDataLoader.NOME, estabelecimento.getNome() );
+				subject = subject.replaceAll( CompanyDataLoader.NOME, trabalhador.getNome() );
 				
 				body = ( String ) Singleton.getInstance( letterName );
 				if( body == null)
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java
index 49e77c69..6a30fcda 100755
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java
+++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java
@@ -163,8 +163,16 @@ public class ProcessoTreePanel extends JPanel
 	{
 		if( processo != null )
 		{
-			ProcessoMutableTreeNode node = new ProcessoMutableTreeNode( processo );
-			removeNode( node );
+			for(int i = 0; i< rootNode.getChildCount(); ++i)
+			{
+				DefaultMutableTreeNode node = (DefaultMutableTreeNode) rootNode.getChildAt( i );
+				
+				if(processo.equals( node.getUserObject()))
+				{
+					removeNode( node );
+					break;
+				}
+			}
 		}
 	}