From ecffce6f447c254affef33688b9f8d4a43ddce50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Tue, 13 Jul 2010 20:58:20 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1292 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/SIPRPSoft/lib/shst.jar | Bin 1287680 -> 1287759 bytes trunk/SIPRPSoft/src/siprp/SIPRPTracker.java | 4 +-- .../siprp/estatistica/EstatisticaWindow.java | 30 ++++++++++++------ .../SIPRPSoft/src/siprp/ficha/ExamePanel.java | 8 +++-- .../src/siprp/ficha/FichaWindow.java | 8 +++-- .../marcacoes/MarcacaoVisitaHSTPanel.java | 7 ++-- .../siprp/initializer/SIPRPUIInitializer.java | 26 +++++++-------- .../remarcacoes/RemarcacoesDataProvider.java | 2 +- .../siprp/medicina/MarcacaoConsultaPanel.java | 16 ++++++---- .../siprp/medicina/MarcacaoExamePanel.java | 12 ++++--- ...sWindow.java => RelatorioAnualWindow.java} | 25 +++++++++------ 11 files changed, 84 insertions(+), 54 deletions(-) rename trunk/SIPRPSoft/src/siprp/pesquisas/{PesquisasWindow.java => RelatorioAnualWindow.java} (97%) diff --git a/trunk/SIPRPSoft/lib/shst.jar b/trunk/SIPRPSoft/lib/shst.jar index 8669a80805bc8e65ba11d187d953de2d21eb3af9..71b6076f97032c99683b85e43571c336be6fff1e 100644 GIT binary patch delta 31818 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 uU)K2Dp9eMDiv+~r7x!4ik8xHB^AmlSy7RM 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

-^+4|TXesvG+ z`9OQ{lk2}fXJfno{If84zuACvIN%f1K|#xj!N?Bf6W~`qH0&$Ji+3ZWk}iQnF}Aic zDl2-&|G!7ljLSfU#%6=tm*FvlzqPcH)H(PZ_)4=SNbqa`jctq> z-~{>mb2erj2&1v_oy`dv?AF0+Ae_dQ0HN0j8KA_N?4YrQ^4`1-B1r=#9WIbCej7TB zR1$d6**drv1L-T?yx@732Dx-NFH!tb@2^z6hW`G4VT_6hkX1zJVmHX3J_8zD4i+-l z_--Q_Hp!vIV1xk&;B^LD2^V_T!aryKcRkX;FoSJ~45=`oW_}4zQ|AuB1dHY1WJBTL z;|nmHaM(|Vf6IWbku`UC@|T%x4J^9dccWA-6w!d9Q)k$>QZT|~<2x7y7VN~ay9C&E z9~KOrcM!o78%41Zv6%NUO9w}Q6If#uuUg!Mi&p{Z_C#z-`UY6Vn!!U;7OkJ(Js*pS$&l6Ce^cggW!|vLk zB1i?ZB;X2;ijGfcKy@#uu016inOdGZcxFQx#c)Le#xU~{k68AIU;sK?CJ~1u2|3=6 zd7RG2@TEOkKyk{M5#%mBP09P~c>F_>Z2WZSGE&NU@|VaDrqxf{#DU?1AOAD3n)-h! z!Sf(=a7t>@9X=GIA_glw2vnqCvWKO3-U_6kH<2cuB0MX?4|FZzGrdtM-m*!ThV_{R z^rU&+=Lws{?56~{{FG3`!vm#x9tnAYN@=zco<3G`Uq>7MXXV3M3DD6>DF3sj>5k8) zKY+4KSZ1jyWsU}`W!UJ^5jY?Ny+%GKK-Y7)Qbw!sirWaOq%bfb11|`0?<6M+g|@W8 zr=e|dP~X;qLXf%|QF}jODjTdFfQ3ZYJH)z%SVAL{toRXV8eb)$Ln=J7LXbWa;Mz}k zft)GFRzP9+AgcVAN$O!awg%3&FL6kq2Sy$QGnjf|p7(W9_M;qI6Hk%CxI=4iL%BY9 z5uCaM4+n)6`6nJZEsRA4t4J6R6z?&<=im>1gKvR)z zi>-`Zh<}4FNB@6@L{ccAi$c)>R}^`DRf<%Pfi^|9Im&~f1TAv~fPoSlKaUE5ZQ`vU z1-J@Prtz|c9aIjfBo)x9#J0e@hYh}pmIvTQayHzfPQCp7WMNemuuPeaZ&ZSnp}`s{ zOjQOKmDw!h_8z2?2W3HrGMo1(O$D}v<-s*|whZs2Pn8Ipg(q3luhpMWZvVfeh6;b> zY2dQT(r~ppSW($JNlbl4vIjn&= zDxg-4SBzJPSfGiBsz5<~a@D(6sh`pb1KR>aH2NDLy3{mj@kCcmgNK;Vl^drd^7_V5 zH+^ceMITbr-|~ZrxBMDF z+XzzOU_A|~R-Us#gPwE@7 zsURdkKosmj*(3Atp#=GQ*k3jtjRT07wVOv&GG?Q5PGGt*B+8}mhyG5M~aSTvQ%&XsgBl z9~KQX!tTL6v8g-t;6*rA^%k2B!80?n;-1A6>n(TT0vGw$3HA|iVq}1DmkYQj99@N7^RPbLjSBjBRedP zjKQ&a08YlKyQ)=S*ot?3lAjKjZXvtD4|6vFy3Gy&s)m$CF{lPn}(Zr-i_Z z93e$4i;C4a14g^$su1YDDx~_Cs$>JH;g2v?9;~oocpelQXM@f@AxW%&{OZ|4TVuZ_S*vV$wNFG;WifczUQAdM zG}!X${0dPGWQ74^i?AY)oyi+A1~Vbm&K6U(K;$Gf0Z}d7FjWuKy9o<`9Wy6md|tWZ zV+x#GEchJBa>`O%5iqH+B2ZWq%$&vZ>og16Iva^uwxG^#(u{C6cu#^iLb*2oJvT1I zVp&D-Wfpwo3bPcM4J`~FpQJ9B&AUeWB5M7mNov+?-tu(^QD5Jgq=u-&r3xj5tDBp& zJtz@Iz6}li=xL$X;;LbpM!&a5nPC;rfc`+A0=UM$Bq|3yB!Q* z#>gZKZvVu<)_7j6t>!?MET0Ik2e!C`5GJ0IG1Dxo9#5+vY04tuujG-zAQ7`misx+W2fF*xmKiTI;gl){; z!9D(3__TfMgf|`jM?n*>^qULY*IUDfyyCD#u($vIpyzN)7EC_MzSY?uDh&;ug}+ma z(GCAhwKJ2d4BFv2A#5-=YQ9T5j33t*)ZHc#Hx zA>vm_9`P$A;x3FD8KY@Ja|iyPId>VJ=%B--XhQ4;c z&`Y@@Qk4eFm+%JZaY!V@S5m>AmDFjV%aJ#U2O*WT08kggr+-k>b|GwrfE5dQou3Gs z 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 WG#;d>eTvd2Qp<0YR*lMjWca^rL3acI diff --git a/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java index 5fceef21..65bf2d9f 100644 --- a/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java +++ b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java @@ -29,7 +29,7 @@ import siprp.medicina.locais_analise.EnviarAnalisesWindow; import siprp.medicina.locais_realizacao.LocaisRealizacaoWindow; import siprp.medicina.presencas.RegistarPresencasWindow; import siprp.medicina.prestadores.PrestadoresWindow; -import siprp.pesquisas.PesquisasWindow; +import siprp.pesquisas.RelatorioAnualWindow; import com.evolute.utils.Singleton; import com.evolute.utils.tracker.TrackableWindow; @@ -271,7 +271,7 @@ public class SIPRPTracker extends WindowTracker implements SHSTTrackerInterface public TrackableWindow create() throws Exception { - return new PesquisasWindow(); + return new RelatorioAnualWindow(); } } ); } diff --git a/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaWindow.java b/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaWindow.java index d40a924f..4d14936c 100644 --- a/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaWindow.java +++ b/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaWindow.java @@ -6,6 +6,7 @@ package siprp.estatistica; +import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FileDialog; import java.awt.FlowLayout; @@ -170,8 +171,6 @@ public class EstatisticaWindow extends SIPRPFrame empresasTable.setNonResizableNorReordable(); empresasTable.getSelectionModel().addListSelectionListener( this ); JScrollPane empresasScroll = new JScrollPane(); - empresasScroll.setBorder( BorderFactory.createTitledBorder( - BorderFactory.createEtchedBorder(), "Empresa" ) ); empresasScroll.setViewportView( empresasTable ); empresasScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ); empresasScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS ); @@ -183,8 +182,6 @@ public class EstatisticaWindow extends SIPRPFrame estabelecimentosTable.setNonResizableNorReordable(); estabelecimentosTable.getSelectionModel().addListSelectionListener( this ); JScrollPane estabelecimentosScroll = new JScrollPane(); - estabelecimentosScroll.setBorder( BorderFactory.createTitledBorder( - BorderFactory.createEtchedBorder(), "Estabelecimento" ) ); estabelecimentosScroll.setViewportView( estabelecimentosTable ); estabelecimentosScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ); estabelecimentosScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS ); @@ -245,11 +242,20 @@ public class EstatisticaWindow extends SIPRPFrame constraints.gridheight = 2; constraints.weightx = 0.3; constraints.gridwidth = 3; - gridbag.setConstraints( empresasScroll, constraints ); - getContentPane().add( empresasScroll ); - gridbag.setConstraints( estabelecimentosScroll, constraints ); - getContentPane().add( estabelecimentosScroll ); + JPanel empresasPanel = new JPanel( new BorderLayout() ); + empresasPanel.add( empresasScroll ); + empresasPanel.setBorder( BorderFactory.createTitledBorder( "Empresa" ) ); + + gridbag.setConstraints( empresasPanel, constraints ); + getContentPane().add( empresasPanel ); + + JPanel panel = new JPanel( new BorderLayout() ); + panel.setBorder( BorderFactory.createTitledBorder( "Estabelecimento" ) ); + panel.add( estabelecimentosScroll ); + + gridbag.setConstraints( panel, constraints ); + getContentPane().add( panel ); constraints.weighty = 0; constraints.gridheight = 1; @@ -284,8 +290,12 @@ public class EstatisticaWindow extends SIPRPFrame constraints.gridheight = GridBagConstraints.REMAINDER; constraints.weightx = 1; constraints.gridwidth = GridBagConstraints.REMAINDER; - gridbag.setConstraints( resultadoScroll, constraints ); - getContentPane().add( resultadoScroll ); + + JPanel resultadoPanel = new JPanel( new BorderLayout() ); + resultadoPanel.add( resultadoScroll ); + + gridbag.setConstraints( resultadoPanel, constraints ); + getContentPane().add( resultadoPanel ); processarEscolha(); } diff --git a/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java b/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java index 7399cb45..0a22afd9 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java @@ -51,9 +51,11 @@ import com.evolute.utils.ui.text.CopyPasteHandler; * @author fpalma */ public class ExamePanel extends JPanel - implements ChangeListener, ControllableComponent, ListSelectionListener + implements ChangeListener, ControllableComponent, ListSelectionListener { + private static final long serialVersionUID = 1L; + private ProviderInterface JDO; private JCalendarPanel dataExamePanel; @@ -240,9 +242,9 @@ public class ExamePanel extends JPanel // JPanel recomendacoesOuterPanel = new JPanel(); // recomendacoesOuterPanel.setLayout( new GridLayout( 1, 1 ) ); // recomendacoesOuterPanel.add( recomendacoesScp ); - JPanel recomendacoesPanel = new JPanel(); + JPanel recomendacoesPanel = new JPanel( new BorderLayout() ); gridbag.setConstraints( recomendacoesPanel, constraints ); - recomendacoesPanel.add( recomendacoesScp ); + recomendacoesPanel.add( recomendacoesScp, BorderLayout.CENTER ); recomendacoesPanel.setBorder( BorderFactory.createTitledBorder( "Outras recomenda\u00e7\u00f5es" ) ); rightPanel.add( recomendacoesPanel ); diff --git a/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java b/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java index a9b651e2..64b1b8c3 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java @@ -57,9 +57,11 @@ import com.evolute.utils.ui.window.ProgressDialog; * * @author fpalma */ -public class FichaWindow extends SIPRPTabbedWindow - implements ListAction, FichaAptidaoConstants +public class FichaWindow extends SIPRPTabbedWindow implements ListAction, FichaAptidaoConstants { + + private static final long serialVersionUID = 1L; + private ProviderInterface JDO; private UpperPanel upperPanel; @@ -116,7 +118,7 @@ public class FichaWindow extends SIPRPTabbedWindow private void setupComponents() throws Exception { - setSize( 700, 640 ); + setSize( 800, 700 ); setResizable( false ); setTitle( "Ficha de Aptid\u00e3o" ); diff --git a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java index a5dfdbe8..99a3c8c1 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java @@ -3,6 +3,7 @@ package siprp.higiene.marcacoes; import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; +import java.awt.BorderLayout; import java.util.Hashtable; import java.util.Map; @@ -95,7 +96,6 @@ public class MarcacaoVisitaHSTPanel observacoesText.setWrapStyleWord( true ); observacoesText.setRows( 5 ); - observacoesTextScroll.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Observa\u00e7\u00f5es" ) ); observacoesTextScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ); observacoesTextScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED ); observacoesTextScroll.setViewportView( observacoesText ); @@ -123,7 +123,10 @@ public class MarcacaoVisitaHSTPanel this.add( tecnicoSuperiorLabel, new TableLayoutConstraints(1,4) ); this.add( tecnicoSuperiorList, new TableLayoutConstraints(2,4) ); this.add( estadoList, new TableLayoutConstraints(1,5,2,5) ); - this.add( observacoesTextScroll, new TableLayoutConstraints(1,6,2,6) ); + JPanel panel = new JPanel( new BorderLayout() ); + panel.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Observa\u00e7\u00f5es" ) ); + panel.add( observacoesTextScroll ); + this.add( panel, new TableLayoutConstraints(1,6,2,6) ); // // JPanel MarcacaoVisitaHSTPanel = this; // GridBagConstraints MarcacaoVisitaHSTPanelGBC = new GridBagConstraints(); diff --git a/trunk/SIPRPSoft/src/siprp/initializer/SIPRPUIInitializer.java b/trunk/SIPRPSoft/src/siprp/initializer/SIPRPUIInitializer.java index 7bc03910..b9bd8830 100644 --- a/trunk/SIPRPSoft/src/siprp/initializer/SIPRPUIInitializer.java +++ b/trunk/SIPRPSoft/src/siprp/initializer/SIPRPUIInitializer.java @@ -19,19 +19,19 @@ public class SIPRPUIInitializer extends EvoAbstractAppInitializer @Override public boolean doInit() throws Exception { -// NimRODTheme nt = new NimRODTheme(); -// nt.setPrimary1( new Color( 185,211,238 ) ); -// nt.setPrimary2( new Color( 159,182,205 ) ); -// nt.setPrimary3( new Color( 108,123,139 ) ); -// -// nt.setSecondary( new Color( 230, 230, 230 ) ); -//// nt.setSecondary1( new Color( 210, 210, 210 ) ); -//// nt.setSecondary2( Color.pink ); -//// nt.setSecondary3( Color.pink ); -// -// NimRODLookAndFeel NimRODLF = new NimRODLookAndFeel(); -// NimRODLookAndFeel.setCurrentTheme( nt); -// UIManager.setLookAndFeel( NimRODLF ); + NimRODTheme nt = new NimRODTheme(); + nt.setPrimary1( new Color( 185,211,238 ) ); + nt.setPrimary2( new Color( 159,182,205 ) ); + nt.setPrimary3( new Color( 108,123,139 ) ); + + nt.setSecondary( new Color( 230, 230, 230 ) ); +// nt.setSecondary1( new Color( 210, 210, 210 ) ); +// nt.setSecondary2( Color.pink ); +// nt.setSecondary3( Color.pink ); + + NimRODLookAndFeel NimRODLF = new NimRODLookAndFeel(); + NimRODLookAndFeel.setCurrentTheme( nt ); + UIManager.setLookAndFeel( NimRODLF ); return true; } diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java index 1bc1896d..431a01e5 100644 --- a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java @@ -158,7 +158,7 @@ public class RemarcacoesDataProvider String estabelecimento = ( String ) array.get( n, 5 ); String empresa = ( String ) array.get( n, 6 ); String str = "" + trabalhador + "" - + "
   " + tipoMarcacaoStr + " de " + D_F.format( data ) + + "
   " + tipoMarcacaoStr + " de " + (data == null ? "(data desconhecida)" : D_F.format( data )) + "
   " + descricao + "" + "
   " + empresa.substring( 0, empresa.length() > 20 ? 20 : empresa.length() ) + " / " + estabelecimento.substring( 0, estabelecimento.length() > 10 ? 10 : estabelecimento.length() ) diff --git a/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.java index f4985f4d..7669b8a8 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.java @@ -1,5 +1,6 @@ package siprp.medicina; +import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -9,7 +10,6 @@ import java.util.Map; import javax.swing.BorderFactory; import javax.swing.JButton; -import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -34,6 +34,8 @@ public class MarcacaoConsultaPanel extends JPanel implements ControllableComponent, DataClassAware { + + private static final long serialVersionUID = 1L; private MarcacoesTrabalhadorData marcacaoTrabalhadoresData; private final ComponentsHashtable components = new ComponentsHashtable(); @@ -69,7 +71,6 @@ public class MarcacaoConsultaPanel public void setupComponents() throws Exception { - JComponent MarcacaoConsultaPanel = this; dataPanel.setMinimumSize( new Dimension( 300, 20 ) ); dataPanel.setPreferredSize( new Dimension( 100, 20 ) ); @@ -97,8 +98,7 @@ public class MarcacaoConsultaPanel }; estadoList = new RadioButtonFixedPanel( estadoListOptions, 6, 1, RadioButtonFixedPanel.ORIENTATION_VERTICAL, false, null ); estadoList.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Estado" ) ); - - observacoesTextScroll.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Observa\u00e7\u00f5es" ) ); + observacoesText.setLineWrap( true ); observacoesText.setWrapStyleWord( true ); observacoesText.setRows( 5 ); @@ -192,8 +192,12 @@ public class MarcacaoConsultaPanel observacoesTextScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED ); observacoesTextScroll.setViewportView( observacoesText ); MarcacaoConsultaPanelGBC.fill = GridBagConstraints.BOTH; - MarcacaoConsultaPanelLayout.setConstraints( observacoesTextScroll, MarcacaoConsultaPanelGBC ); - MarcacaoConsultaPanel.add( observacoesTextScroll ); + + JPanel obsPanel = new JPanel( new BorderLayout() ); + obsPanel.setBorder( BorderFactory.createTitledBorder( "Observa\u00e7\u00f5es" ) ); + obsPanel.add( observacoesTextScroll, BorderLayout.CENTER ); + MarcacaoConsultaPanelLayout.setConstraints( obsPanel, MarcacaoConsultaPanelGBC ); + MarcacaoConsultaPanel.add( obsPanel ); } diff --git a/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.java b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.java index 3c0222b5..d43ecdcc 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.java @@ -1,5 +1,6 @@ package siprp.medicina; +import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -84,8 +85,7 @@ public class MarcacaoExamePanel }; estadoList = new RadioButtonFixedPanel( estadoListOptions, 6, 1, RadioButtonFixedPanel.ORIENTATION_VERTICAL, false, null ); estadoList.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Estado" ) ); - - observacoesTextScroll.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Observa\u00e7\u00f5es" ) ); + observacoesText.setLineWrap( true ); observacoesText.setWrapStyleWord( true ); observacoesText.setRows( 5 ); @@ -163,8 +163,12 @@ public class MarcacaoExamePanel observacoesTextScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED ); observacoesTextScroll.setViewportView( observacoesText ); MarcacaoExamePanelGBC.fill = GridBagConstraints.BOTH; - MarcacaoExamePanelLayout.setConstraints( observacoesTextScroll, MarcacaoExamePanelGBC ); - MarcacaoExamePanel.add( observacoesTextScroll ); + JPanel obsPanel = new JPanel( new BorderLayout() ); + obsPanel.add( observacoesTextScroll, BorderLayout.CENTER ); + obsPanel.setBorder( BorderFactory.createTitledBorder( "Observa\u00e7\u00f5es" ) ); + + MarcacaoExamePanelLayout.setConstraints( obsPanel, MarcacaoExamePanelGBC ); + MarcacaoExamePanel.add( obsPanel ); } diff --git a/trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java b/trunk/SIPRPSoft/src/siprp/pesquisas/RelatorioAnualWindow.java similarity index 97% rename from trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java rename to trunk/SIPRPSoft/src/siprp/pesquisas/RelatorioAnualWindow.java index b113d13b..8fe9c268 100644 --- a/trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java +++ b/trunk/SIPRPSoft/src/siprp/pesquisas/RelatorioAnualWindow.java @@ -6,6 +6,7 @@ package siprp.pesquisas; +import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FileDialog; import java.awt.FlowLayout; @@ -54,7 +55,7 @@ import com.evolute.utils.ui.text.CopyPasteHandler; * * @author fpalma */ -public class PesquisasWindow extends SIPRPFrame +public class RelatorioAnualWindow extends SIPRPFrame implements TrackableWindow, ListSelectionListener, ActionListener { private ProviderInterface JDO; @@ -76,7 +77,7 @@ public class PesquisasWindow extends SIPRPFrame // } /** Creates a new instance of PesquisasWindow */ - public PesquisasWindow() + public RelatorioAnualWindow() throws Exception { provider = (PesquisasProvider)PesquisasProvider.getProvider(); @@ -101,8 +102,6 @@ public class PesquisasWindow extends SIPRPFrame empresasTable.setNonResizableNorReordable(); empresasTable.getSelectionModel().addListSelectionListener( this ); JScrollPane empresasScroll = new JScrollPane(); - empresasScroll.setBorder( BorderFactory.createTitledBorder( - BorderFactory.createEtchedBorder(), "Empresa" ) ); empresasScroll.setViewportView( empresasTable ); empresasScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ); empresasScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS ); @@ -114,8 +113,6 @@ public class PesquisasWindow extends SIPRPFrame estabelecimentosTable.setNonResizableNorReordable(); estabelecimentosTable.getSelectionModel().addListSelectionListener( this ); JScrollPane estabelecimentosScroll = new JScrollPane(); - estabelecimentosScroll.setBorder( BorderFactory.createTitledBorder( - BorderFactory.createEtchedBorder(), "Estabelecimento" ) ); estabelecimentosScroll.setViewportView( estabelecimentosTable ); estabelecimentosScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ); estabelecimentosScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS ); @@ -159,11 +156,19 @@ public class PesquisasWindow extends SIPRPFrame constraints.gridheight = 2; constraints.weightx = 0.3; constraints.gridwidth = 3; - gridbag.setConstraints( empresasScroll, constraints ); - getContentPane().add( empresasScroll ); - gridbag.setConstraints( estabelecimentosScroll, constraints ); - getContentPane().add( estabelecimentosScroll ); + JPanel empresasPanel = new JPanel( new BorderLayout() ); + JPanel estabelecimentosPanel = new JPanel( new BorderLayout() ); + empresasPanel.setBorder( BorderFactory.createTitledBorder( "Empresa" ) ); + estabelecimentosPanel.setBorder( BorderFactory.createTitledBorder( "Estabelecimento" ) ); + empresasPanel.add( empresasScroll, BorderLayout.CENTER ); + estabelecimentosPanel.add( estabelecimentosScroll, BorderLayout.CENTER ); + + gridbag.setConstraints( empresasPanel, constraints ); + getContentPane().add( empresasPanel ); + + gridbag.setConstraints( estabelecimentosPanel, constraints ); + getContentPane().add( estabelecimentosPanel ); constraints.weighty = 0; constraints.gridheight = 1;