diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData b/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData
index 7560b1b0..0c47e50b 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData
@@ -6,17 +6,17 @@
         <Node id="RecuperarPassword.jsp" x="900" y="300" zoom="true"/>
         <Node id="FormDirGerRh.jsp" x="150" y="150" zoom="true"/>
         <Node id="FormGestor.jsp" x="1150" y="150" zoom="true"/>
-        <Node id="Acesso.jsp" x="400" y="750" zoom="true"/>
         <Node id="Erro.jsp" x="650" y="450" zoom="true"/>
+        <Node id="Acesso.jsp" x="400" y="750" zoom="true"/>
         <Node id="FormRH.jsp" x="400" y="150" zoom="true"/>
         <Node id="EstatisticasProcesso.jsp" x="150" y="900" zoom="true"/>
-        <Node id="FormSeguranca.jsp" x="1150" y="300" zoom="true"/>
         <Node id="AnaliseAcidenteTrabalho.jsp" x="150" y="300" zoom="true"/>
+        <Node id="FormSeguranca.jsp" x="1150" y="300" zoom="true"/>
         <Node id="NovoUtilizador.jsp" x="150" y="450" zoom="true"/>
         <Node id="FormDirSiprp.jsp" x="650" y="150" zoom="true"/>
         <Node id="FichaUtilizador.jsp" x="1400" y="150" zoom="true"/>
-        <Node id="FormHS.jsp" x="900" y="450" zoom="true"/>
         <Node id="FormMedico.jsp" x="650" y="600" zoom="true"/>
+        <Node id="FormHS.jsp" x="900" y="450" zoom="true"/>
         <Node id="EnviarCorrecao.jsp" x="400" y="450" zoom="true"/>
         <Node id="UtilizadorFields.jsp" x="150" y="600" zoom="true"/>
         <Node id="ConfirmarDesactivar.jsp" x="1650" y="150" zoom="true"/>
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java
index 2e9da20c..37b87362 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java
@@ -13,6 +13,7 @@ import com.sun.data.provider.RowKey;
 import com.sun.rave.web.ui.appbase.AbstractPageBean;
 import com.sun.rave.web.ui.component.Body;
 import com.sun.rave.web.ui.component.Button;
+import com.sun.rave.web.ui.component.Calendar;
 import com.sun.rave.web.ui.component.DropDown;
 import com.sun.rave.web.ui.component.Form;
 import com.sun.rave.web.ui.component.Head;
@@ -36,10 +37,7 @@ import global.Global;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
 import java.util.ListIterator;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
@@ -1224,14 +1222,14 @@ public class FormHS extends AbstractPageBean
 	{
 		this.textFilterEstabelecimentoActual = textFilterEstabelecimentoActual;
 	}
-	private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar();
+	private Calendar calFilterDateActual = new Calendar();
 
-	public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual()
+	public Calendar getCalFilterDateActual()
 	{
 		return this.calFilterDateActual;
 	}
 
-	public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c )
+	public void setCalFilterDateActual( Calendar c )
 	{
 		this.calFilterDateActual = c;
 	}
@@ -1323,14 +1321,14 @@ public class FormHS extends AbstractPageBean
 	{
 		this.textFilterEstabelecimentoSeg = textFilterEstabelecimentoSeg;
 	}
-	private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar();
+	private Calendar calFilterDateSeg = new Calendar();
 
-	public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
+	public Calendar getCalFilterDateSeg()
 	{
 		return this.calFilterDateSeg;
 	}
 
-	public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
+	public void setCalFilterDateSeg( Calendar c )
 	{
 		this.calFilterDateSeg = c;
 	}