git-svn-id: https://svn.coded.pt/svn/SIPRP@635 bb69d46d-e84e-40c8-a05a-06db0d633741

18 years ago · 374b197ccc
parent 675f614510
commit 374b197ccc
2 changed files with 8 additions and 2 deletions
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java
+++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java
@ -53,6 +53,7 @@ public class LeafOptionDialog<KeyClass extends Object> extends JDialog
 	public LeafOptionDialog(Map<KeyClass, ? extends Object> map)
 	{
 		super();
+		cancelActive = false;
 		startup( map, null );
 	}

@ -60,6 +61,11 @@ public class LeafOptionDialog<KeyClass extends Object> extends JDialog
 	{
 		super();
 		this.message = message;
+		cancelActive = false;
+		for(KeyClass key : map.keySet())
+		{
+			mapEnabledForKey.put( key, true );
+		}
 		startup( map, null );
 	}

@ -68,7 +74,7 @@ public class LeafOptionDialog<KeyClass extends Object> extends JDialog
 		super();
 		ordered = true;
 		this.message = message;
-		this.okLabel = okButton;
+		okLabel = okButton;
 		this.mapChosenForKey = chosen;
 		this.mapEnabledForKey = enabled;
 		if( chosen != null )
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
+++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
@ -488,7 +488,7 @@ public class ProcessoDadosPanel extends JPanel
 				}
 			}
 		}
-		LeafOptionDialog<PrtGruposProtocolo> gruposChosen = new LeafOptionDialog<PrtGruposProtocolo>( grupos, gruposSelected, gruposEnabled, "Escolha os ECDs para esta marca" +ccedil + atilde + "o" , "<html><font size=\"4\"><b>Marcar »</b></font></html>" );
+		LeafOptionDialog<PrtGruposProtocolo> gruposChosen = new LeafOptionDialog<PrtGruposProtocolo>( grupos, gruposSelected, gruposEnabled, "Escolha os ECDs para esta marca" +ccedil + atilde + "o" , "Marcar »" );
 		for( PrtGruposProtocolo grupo : gruposChosen.getSelected() )
 		{
 			marcacao.marcarGrupoExames( grupo );