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

trunk/SIPRPSoft/src/leaf/LeafGradientPanel.java

@@ -10,7 +10,7 @@ public class LeafGradientPanel extends JPanel
 	
 	public LeafGradientPanel()
 	{
-		setBackground( new Color(200,200,200) );
+		setBackground( new Color(220,220,220) );
 	}
 
 //	@Override

trunk/SIPRPSoft/src/leaf/LeafInputField.java

@@ -114,7 +114,7 @@ public class LeafInputField<ObjClass extends Object> extends JPanel implements F
 
 	private String getStringFromUser()
 	{
-		LeafTextDialog textDialog = new LeafTextDialog( getParentFrame(), this, (String) object, false );
+		LeafTextDialog textDialog = new LeafTextDialog( getParentFrame(), this, (String) object, true );
 		return textDialog.getText();
 	}
 
@@ -438,6 +438,13 @@ public class LeafInputField<ObjClass extends Object> extends JPanel implements F
 			{
 				setObject( (ObjClass) ((LeafInputField) object).getObject(), ((LeafInputField) object).getSelectedObject() );
 			}
+			else if( object instanceof String )
+			{
+				JTextArea textArea =  new JTextArea();
+				textArea.setEditable( false );
+				textArea.setText( object == null ? "" : object.toString() );
+				thiz = textArea;
+			}
 			else
 			{
 				String toString = object.toString();

trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java

@@ -4,6 +4,7 @@ import info.clearthought.layout.TableLayout;
 import info.clearthought.layout.TableLayoutConstraints;
 
 import java.awt.Dimension;
+import java.awt.LayoutManager;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
@@ -16,8 +17,10 @@ import java.util.Set;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
+import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JRootPane;
 import javax.swing.JScrollBar;
 import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
@@ -119,8 +122,12 @@ public class LeafOptionDialog<KeyClass extends Object> extends JDialog
 			this.orderedMap = orderedMap;
 		}
 		setupComponents( map == null ? orderedMap.iterator() : map.keySet().iterator(), map == null ? orderedMap.rows() : map.keySet().size(), map == null ? true : false );
-		setModal( true );
 		setUndecorated( true );
+		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+		getRootPane().setWindowDecorationStyle(JRootPane.PLAIN_DIALOG);
+		setSize( getLayout().minimumLayoutSize( getRootPane() ) );
+		setLocationRelativeTo( getParent() );
+		setModal( true );
 		setVisible( true );
 	}
 
@@ -158,9 +165,6 @@ public class LeafOptionDialog<KeyClass extends Object> extends JDialog
 			addListenerToComponent( submitButton );
 		}
 		((JComponent) getContentPane()).setBorder( BorderFactory.createRaisedBevelBorder() );
-		setSize( layout.preferredLayoutSize( this.getContentPane() ) );
-//		setSize( optionsScrollPane.getPreferredSize().width, getSize().height );
-		setLocationRelativeTo( getParent() );
 	}
 
 	private void setupOptionsComponents( Iterator<KeyClass> iterator, Integer size )

trunk/SIPRPSoft/src/leaf/LeafTextDialog.java

@@ -4,21 +4,15 @@ import info.clearthought.layout.TableLayout;
 import info.clearthought.layout.TableLayoutConstraints;
 
 import java.awt.Dimension;
-import java.awt.GradientPaint;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
+import javax.swing.JRootPane;
 import javax.swing.JTextArea;
 
 public class LeafTextDialog extends JDialog
@@ -35,7 +29,7 @@ public class LeafTextDialog extends JDialog
 
 	private String defaultText = null;
 
-	private boolean expanded = false;
+	private boolean expanded = true;
 
 	private final JTextArea textArea = new JTextArea();
 	private final LeafButton expandButton = new LeafButton( "+" );
@@ -59,7 +53,9 @@ public class LeafTextDialog extends JDialog
 		okButton.setPreferredSize( buttonSize );
 		setupLayout();
 		setUndecorated( true );
-		setLocationRelativeTo( parent );
+		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+		getRootPane().setWindowDecorationStyle(JRootPane.PLAIN_DIALOG);
+		setLocationRelativeTo( null );
 		this.expanded = expanded;
 		expand( expanded );
 		addListeners();
@@ -106,7 +102,8 @@ public class LeafTextDialog extends JDialog
 		
 		((JComponent) getContentPane()).setBorder( BorderFactory.createRaisedBevelBorder() );
 		
-		setSize( expand ? expandedLayout.preferredLayoutSize( this.getContentPane() ) : layout.preferredLayoutSize( this.getContentPane() ) );
+//		setSize( expand ? expandedLayout.preferredLayoutSize( this.getContentPane() ) : layout.preferredLayoutSize( this.getContentPane() ) );
+		setSize( getLayout().preferredLayoutSize( getRootPane() ) );
 	}
 
 	private void setupComponents(boolean expand)
@@ -120,6 +117,7 @@ public class LeafTextDialog extends JDialog
 	private void expand( boolean expand )
 	{
 		setupComponents(expand);
+		setResizable( expand );
 	}
 
 	private void addListeners()

trunk/SIPRPSoft/src/siprp/database/cayenne/objects/BaseObject.java

@@ -10,11 +10,18 @@ import java.util.Locale;
 import org.apache.cayenne.CayenneDataObject;
 import org.apache.cayenne.PersistenceState;
 
+import com.evolute.utils.strings.UnicodeChecker;
+
 import siprp.database.cayenne.providers.MedicinaDAO;
 import siprp.medicina.MedicinaConstants;
 
 public class BaseObject extends CayenneDataObject
 {
+
+	static {
+		UnicodeChecker.setUseDoubleSlash( true );
+	}
+	
 	private static final long serialVersionUID = 1L;
 	
 	protected static MedicinaDAO medicinaProvider = new MedicinaDAO();
@@ -51,4 +58,15 @@ public class BaseObject extends CayenneDataObject
 		return result;
 	}
 	
+	protected String parseToUnicode( String string )
+	{
+		String result = UnicodeChecker.parseToUnicode( string );
+		return result.replaceAll( "\\\\\\\\", "\\\\" );
+	}
+	
+	protected String parseFromUnicode( String string )
+	{
+		return UnicodeChecker.parseFromUnicode( string );
+	}
+	
 }

trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Empresas.java

@@ -29,7 +29,7 @@ public class Empresas extends _Empresas {
 	@Override
 	public void setDesignacaoSocial( String nome )
 	{
-		super.setDesignacaoSocial( UnicodeChecker.parseToUnicode( name ) );
+		super.setDesignacaoSocial( parseToUnicode( name ) );
 		getDesignacaoSocial();
 	}
 
@@ -41,7 +41,7 @@ public class Empresas extends _Empresas {
 		}
 		else
 		{
-			convertedName = UnicodeChecker.parseFromUnicode( name );
+			convertedName = parseFromUnicode( name );
 		}
 		return convertedName;
 	}

trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Estabelecimentos.java

@@ -4,8 +4,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import com.evolute.utils.strings.UnicodeChecker;
-
 import siprp.database.cayenne.objects.auto._Estabelecimentos;
 
 public class Estabelecimentos extends _Estabelecimentos implements Comparable<Estabelecimentos>
@@ -32,7 +30,7 @@ public class Estabelecimentos extends _Estabelecimentos implements Comparable<Es
 	@Override
 	public void setNome( String nome )
 	{
-		super.setNome( UnicodeChecker.parseToUnicode( name ) );
+		super.setNome( parseToUnicode( name ) );
 		getNome();
 	}
 
@@ -44,7 +42,7 @@ public class Estabelecimentos extends _Estabelecimentos implements Comparable<Es
 		}
 		else
 		{
-			convertedName = UnicodeChecker.parseFromUnicode( name );
+			convertedName = parseFromUnicode( name );
 		}
 		return convertedName;
 	}

trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Prestadores.java

@@ -35,7 +35,7 @@ public class Prestadores extends _Prestadores {
 	@Override
 	public void setNome( String nome )
 	{
-		super.setNome( UnicodeChecker.parseToUnicode( nome ) );
+		super.setNome( parseToUnicode( nome ) );
 		getNome();
 	}
 
@@ -47,7 +47,7 @@ public class Prestadores extends _Prestadores {
 		}
 		else
 		{
-			convertedName = UnicodeChecker.parseFromUnicode( name );
+			convertedName = parseFromUnicode( name );
 		}
 		return convertedName;
 	}

trunk/SIPRPSoft/src/siprp/database/cayenne/objects/PrtGruposProtocolo.java

@@ -27,7 +27,7 @@ public class PrtGruposProtocolo extends _PrtGruposProtocolo {
 	@Override
 	public void setDescricao( String nome )
 	{
-		super.setDescricao( UnicodeChecker.parseToUnicode( name ) );
+		super.setDescricao( parseToUnicode( name ) );
 		getDescricao();
 	}
 
@@ -39,7 +39,7 @@ public class PrtGruposProtocolo extends _PrtGruposProtocolo {
 		}
 		else
 		{
-			convertedName = UnicodeChecker.parseFromUnicode( name );
+			convertedName = parseFromUnicode( name );
 		}
 		return convertedName;
 	}

trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java

@@ -51,7 +51,7 @@ public class Trabalhadores extends _Trabalhadores implements Comparable<Trabalha
 	@Override
 	public void setNome( String nome )
 	{
-		super.setNome( UnicodeChecker.parseToUnicode( name ) );
+		super.setNome( parseToUnicode( name ) );
 		getNome();
 	}
 
@@ -63,7 +63,7 @@ public class Trabalhadores extends _Trabalhadores implements Comparable<Trabalha
 		}
 		else
 		{
-			convertedName = UnicodeChecker.parseFromUnicode( name );
+			convertedName = parseFromUnicode( name );
 		}
 		return convertedName;
 	}

trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatasObservacoes.java

@@ -32,7 +32,7 @@ public class TrabalhadoresConsultasDatasObservacoes extends _TrabalhadoresConsul
 	@Override
 	public void setObservacao( String nome )
 	{
-		super.setObservacao( nome != null ? UnicodeChecker.parseToUnicode( nome ) : null );
+		super.setObservacao( nome != null ? parseToUnicode( nome ) : null );
 		getObservacao();
 	}
 
@@ -44,7 +44,7 @@ public class TrabalhadoresConsultasDatasObservacoes extends _TrabalhadoresConsul
 		}
 		else
 		{
-			convertedName = UnicodeChecker.parseFromUnicode( name );
+			convertedName = parseFromUnicode( name );
 		}
 		return convertedName;
 	}

trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatasObservacoes.java

@@ -33,7 +33,7 @@ public class TrabalhadoresEcdsDatasObservacoes extends _TrabalhadoresEcdsDatasOb
 	@Override
 	public void setObservacao( String nome )
 	{
-		super.setObservacao( nome != null ? UnicodeChecker.parseToUnicode( nome ) : null );
+		super.setObservacao( nome != null ? parseToUnicode( nome ) : null );
 		getObservacao();
 	}
 
@@ -45,7 +45,7 @@ public class TrabalhadoresEcdsDatasObservacoes extends _TrabalhadoresEcdsDatasOb
 		}
 		else
 		{
-			convertedName = UnicodeChecker.parseFromUnicode( name );
+			convertedName = parseFromUnicode( name );
 		}
 		return convertedName;
 	}

trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java

@@ -528,6 +528,7 @@ public class ProcessoDadosPanel extends JPanel
 		if( obs != null )
 		{
 			inputExameMarcacaoObsMensagem.setObject( obs.getObservacao() == null ? "" : obs.getObservacao() );
+			inputExameMarcacaoObsMensagem.setEditable( true );
 			cardLayout.show( this, PANEL_EXAME_MARCACAO_OBSERVACAO_NAME );
 		}
 		else