From e2336db7d780c4679d4eb1a6af588dfe1a0eb99f Mon Sep 17 00:00:00 2001 From: Frederico Palma Date: Mon, 28 Oct 2013 22:03:31 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1804 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../db/providers/AnalisesDataProvider.java | 14 +- .../src/utils/Utils.java | 123 +++++++++--------- 2 files changed, 71 insertions(+), 66 deletions(-) diff --git a/trunk/AnaliseAcidentesTrabalho/src/db/providers/AnalisesDataProvider.java b/trunk/AnaliseAcidentesTrabalho/src/db/providers/AnalisesDataProvider.java index 8af44d6d..c8c896b1 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/db/providers/AnalisesDataProvider.java +++ b/trunk/AnaliseAcidentesTrabalho/src/db/providers/AnalisesDataProvider.java @@ -3210,11 +3210,11 @@ public class AnalisesDataProvider extends GenericDataProvider } else if ( estado == Global.ESTADO_HS ) { - return "FASE 3 - SIPRP - RECOMENDAÇÕES"; + return "FASE 3 - SIPRP - RECOMENDA\u00c7\u00d5ES"; } else if ( estado == Global.ESTADO_RH2 ) { - return "FASE 4 - RH - MEDIDAS + LESÃO"; + return "FASE 4 - RH - MEDIDAS + LES\u00c3O"; } // else if(estado == Global.ESTADO_MEDICINA) // { @@ -3222,7 +3222,7 @@ public class AnalisesDataProvider extends GenericDataProvider // } else if ( estado == Global.ESTADO_CONSOLIDACAO ) { - return "FASE 5 - SIPRP - CONSOLIDAÇÃO"; + return "FASE 5 - SIPRP - CONSOLIDA\u00c7\u00c3O"; } // else if(estado == Global.ESTADO_ASSINATURAS) // { @@ -3234,19 +3234,19 @@ public class AnalisesDataProvider extends GenericDataProvider // } else if ( estado == Global.ESTADO_ASSINATURA_SEG ) { - return "FASE 6 - SEG - VERIFICAÇÃO SEG."; + return "FASE 6 - SEG - VERIFICA\u00c7\u00c3O SEG."; } else if ( estado == Global.ESTADO_ASSINATURA_RH ) { - return "FASE 7 - RH - VERIFICAÇÃO RH"; + return "FASE 7 - RH - VERIFICA\u00c7\u00c3O RH"; } else if ( estado == Global.ESTADO_FECHAR ) { - return "FASE 8 - SIPRP - CONCLUSÃO"; + return "FASE 8 - SIPRP - CONCLUS\u00c3O"; } else if ( estado == Global.ESTADO_CONCLUIDO ) { - return "FASE 9 - CONCLUÍDO"; + return "FASE 9 - CONCLU\u00cdDO"; } return null; } diff --git a/trunk/AnaliseAcidentesTrabalho/src/utils/Utils.java b/trunk/AnaliseAcidentesTrabalho/src/utils/Utils.java index 365aed89..3121d4fb 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/utils/Utils.java +++ b/trunk/AnaliseAcidentesTrabalho/src/utils/Utils.java @@ -10,12 +10,16 @@ package utils; import beans.Utilizador; + import com.evolute.utils.Singleton; import com.evolute.utils.error.ErrorLogger; +import com.evolute.utils.strings.UnicodeChecker; import com.sun.rave.web.ui.component.DropDown; import com.sun.rave.web.ui.model.Option; + import db.providers.AnalisesDataProvider; import db.providers.EstatisticasDataProvider; + import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -25,6 +29,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; + import javax.faces.context.ExternalContext; import javax.servlet.ServletContext; import javax.servlet.http.HttpSession; @@ -47,65 +52,65 @@ public class Utils { } String output = text; - output = output.replaceAll( "\\\\u0009", " " ); - output = output.replaceAll( "\\\\u000a", "
" ); - - output = output.replaceAll( "\\\\u00a0", " " ); - output = output.replaceAll( "\\\\u00aa", "ª" ); - output = output.replaceAll( "\\\\u00ba", "º" ); - - output = output.replaceAll( "\\\\u00c0", "À" ); - output = output.replaceAll( "\\\\u00c1", "Á" ); - output = output.replaceAll( "\\\\u00c2", "Â" ); - output = output.replaceAll( "\\\\u00c3", "Ã" ); - output = output.replaceAll( "\\\\u00c7", "Ç" ); - output = output.replaceAll( "\\\\u00c8", "È" ); - output = output.replaceAll( "\\\\u00c9", "É" ); - output = output.replaceAll( "\\\\u00d3", "Ó" ); - output = output.replaceAll( "\\\\u00d2", "Ò" ); - - output = output.replaceAll( "\\\\u00ca", "Ê" ); - output = output.replaceAll( "\\\\u00cc", "Ì" ); - output = output.replaceAll( "\\\\u00cd", "Í" ); - output = output.replaceAll( "\\\\u00ce", "Î" ); - output = output.replaceAll( "\\\\u00d2", "ò" ); - output = output.replaceAll( "\\\\u00d3", "ó" ); - output = output.replaceAll( "\\\\u00d4", "ô" ); - output = output.replaceAll( "\\\\u00d5", "õ" ); - output = output.replaceAll( "\\\\u00d9", "Ù" ); - output = output.replaceAll( "\\\\u00da", "Ú" ); - output = output.replaceAll( "\\\\u00db", "Û" ); - - output = output.replaceAll( "\\\\u00e0", "à" ); - output = output.replaceAll( "\\\\u00e1", "á" ); - output = output.replaceAll( "\\\\u00e2", "â" ); - output = output.replaceAll( "\\\\u00e3", "ã" ); - output = output.replaceAll( "\\\\u00e7", "ç" ); - output = output.replaceAll( "\\\\u00e8", "è" ); - output = output.replaceAll( "\\\\u00e9", "é" ); - output = output.replaceAll( "\\\\u00ea", "ê" ); - output = output.replaceAll( "\\\\u00ec", "ì" ); - output = output.replaceAll( "\\\\u00ed", "í" ); - output = output.replaceAll( "\\\\u00ee", "î" ); - output = output.replaceAll( "\\\\u00f2", "ò" ); - output = output.replaceAll( "\\\\u00f3", "ó" ); - output = output.replaceAll( "\\\\u00f4", "ô" ); - output = output.replaceAll( "\\\\u00f5", "õ" ); - output = output.replaceAll( "\\\\u00f9", "ù" ); - output = output.replaceAll( "\\\\u00fa", "ú" ); - output = output.replaceAll( "\\\\u00fb", "û" ); - - output = output.replaceAll( "\\\\u0153", "œ" ); - - output = output.replaceAll( "\\\\u2013", "-" ); - output = output.replaceAll( "\\\\u2014", "-" ); - output = output.replaceAll( "\\\\u2018|\\\\u2019", "'" ); - output = output.replaceAll( "\\\\u201c|\\\\u201d", "\"" ); - - output = output.replaceAll( "\\\\u2022", "*" ); - output = output.replaceAll( "\\\\u2026", "..." ); - - return output; +// output = output.replaceAll( "\\\\u0009", " " ); +// output = output.replaceAll( "\\\\u000a", "
" ); +// +// output = output.replaceAll( "\\\\u00a0", " " ); +// output = output.replaceAll( "\\\\u00aa", "ª" ); +// output = output.replaceAll( "\\\\u00ba", "º" ); +// +// output = output.replaceAll( "\\\\u00c0", "À" ); +// output = output.replaceAll( "\\\\u00c1", "Á" ); +// output = output.replaceAll( "\\\\u00c2", "Â" ); +// output = output.replaceAll( "\\\\u00c3", "Ã" ); +// output = output.replaceAll( "\\\\u00c7", "Ç" ); +// output = output.replaceAll( "\\\\u00c8", "È" ); +// output = output.replaceAll( "\\\\u00c9", "É" ); +// output = output.replaceAll( "\\\\u00d3", "Ó" ); +// output = output.replaceAll( "\\\\u00d2", "Ò" ); +// +// output = output.replaceAll( "\\\\u00ca", "Ê" ); +// output = output.replaceAll( "\\\\u00cc", "Ì" ); +// output = output.replaceAll( "\\\\u00cd", "Í" ); +// output = output.replaceAll( "\\\\u00ce", "Î" ); +// output = output.replaceAll( "\\\\u00d2", "ò" ); +// output = output.replaceAll( "\\\\u00d3", "ó" ); +// output = output.replaceAll( "\\\\u00d4", "ô" ); +// output = output.replaceAll( "\\\\u00d5", "õ" ); +// output = output.replaceAll( "\\\\u00d9", "Ù" ); +// output = output.replaceAll( "\\\\u00da", "Ú" ); +// output = output.replaceAll( "\\\\u00db", "Û" ); +// +// output = output.replaceAll( "\\\\u00e0", "à" ); +// output = output.replaceAll( "\\\\u00e1", "á" ); +// output = output.replaceAll( "\\\\u00e2", "â" ); +// output = output.replaceAll( "\\\\u00e3", "ã" ); +// output = output.replaceAll( "\\\\u00e7", "ç" ); +// output = output.replaceAll( "\\\\u00e8", "è" ); +// output = output.replaceAll( "\\\\u00e9", "é" ); +// output = output.replaceAll( "\\\\u00ea", "ê" ); +// output = output.replaceAll( "\\\\u00ec", "ì" ); +// output = output.replaceAll( "\\\\u00ed", "í" ); +// output = output.replaceAll( "\\\\u00ee", "î" ); +// output = output.replaceAll( "\\\\u00f2", "ò" ); +// output = output.replaceAll( "\\\\u00f3", "ó" ); +// output = output.replaceAll( "\\\\u00f4", "ô" ); +// output = output.replaceAll( "\\\\u00f5", "õ" ); +// output = output.replaceAll( "\\\\u00f9", "ù" ); +// output = output.replaceAll( "\\\\u00fa", "ú" ); +// output = output.replaceAll( "\\\\u00fb", "û" ); +// +// output = output.replaceAll( "\\\\u0153", "œ" ); +// +// output = output.replaceAll( "\\\\u2013", "-" ); +// output = output.replaceAll( "\\\\u2014", "-" ); +// output = output.replaceAll( "\\\\u2018|\\\\u2019", "'" ); +// output = output.replaceAll( "\\\\u201c|\\\\u201d", "\"" ); +// +// output = output.replaceAll( "\\\\u2022", "*" ); +// output = output.replaceAll( "\\\\u2026", "..." ); +// + return UnicodeChecker.parseFromUnicode( output ); } public static String textToUnicode( String text )