From a26bae6600dc9170746c5615dde0429ed41a7cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Tue, 11 Mar 2008 19:50:18 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@720 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../SIPRPSoft/src/leaf/LeafGradientPanel.java | 2 +- trunk/SIPRPSoft/src/leaf/LeafInputField.java | 9 ++++++++- trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java | 12 ++++++++---- trunk/SIPRPSoft/src/leaf/LeafTextDialog.java | 18 ++++++++---------- .../database/cayenne/objects/BaseObject.java | 18 ++++++++++++++++++ .../database/cayenne/objects/Empresas.java | 4 ++-- .../cayenne/objects/Estabelecimentos.java | 6 ++---- .../database/cayenne/objects/Prestadores.java | 4 ++-- .../cayenne/objects/PrtGruposProtocolo.java | 4 ++-- .../cayenne/objects/Trabalhadores.java | 4 ++-- ...TrabalhadoresConsultasDatasObservacoes.java | 4 ++-- .../TrabalhadoresEcdsDatasObservacoes.java | 4 ++-- .../processo/ui/ProcessoDadosPanel.java | 1 + 13 files changed, 58 insertions(+), 32 deletions(-) diff --git a/trunk/SIPRPSoft/src/leaf/LeafGradientPanel.java b/trunk/SIPRPSoft/src/leaf/LeafGradientPanel.java index a83131be..90f4bdbc 100644 --- a/trunk/SIPRPSoft/src/leaf/LeafGradientPanel.java +++ b/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 diff --git a/trunk/SIPRPSoft/src/leaf/LeafInputField.java b/trunk/SIPRPSoft/src/leaf/LeafInputField.java index 7772ad6e..0754195c 100644 --- a/trunk/SIPRPSoft/src/leaf/LeafInputField.java +++ b/trunk/SIPRPSoft/src/leaf/LeafInputField.java @@ -114,7 +114,7 @@ public class LeafInputField 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 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(); diff --git a/trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java b/trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java index d5cf8fb7..7f545e15 100644 --- a/trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java +++ b/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 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 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 iterator, Integer size ) diff --git a/trunk/SIPRPSoft/src/leaf/LeafTextDialog.java b/trunk/SIPRPSoft/src/leaf/LeafTextDialog.java index b40f7384..7b01fdb4 100644 --- a/trunk/SIPRPSoft/src/leaf/LeafTextDialog.java +++ b/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() diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/BaseObject.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/BaseObject.java index 7fd0769d..acb0d988 100644 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/BaseObject.java +++ b/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 ); + } + } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Empresas.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Empresas.java index 0fb6c346..449deee2 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Empresas.java +++ b/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; } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Estabelecimentos.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Estabelecimentos.java index 323ecb9b..3bd3cbe6 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Estabelecimentos.java +++ b/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 @@ -32,7 +30,7 @@ public class Estabelecimentos extends _Estabelecimentos implements Comparable