From dc796fd689344bcd486f88f11e0a1db0861c1c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Flores?= Date: Mon, 9 Aug 2010 18:18:43 +0000 Subject: [PATCH] devel cursos git-svn-id: https://svn.coded.pt/svn/SIPRP@1360 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/SIPRPSoft/lib/cursos.jar | Bin 355838 -> 355838 bytes .../properties/1-development/app.properties | 11 +- .../src/siprp/FichaDataProvider.java | 27 ++--- trunk/SIPRPSoft/src/siprp/SIPRPTracker.java | 25 +++- .../src/siprp/SingletonConstants.java | 1 + .../siprp/clientes/ClientesDataProvider.java | 24 ++-- .../src/siprp/clientes/EmpresaPanel.java | 50 ++++---- .../siprp/clientes/PerfilProtocoloPanel.java | 21 ++-- .../src/siprp/clientes/ProtocoloPanel.java | 37 +++--- .../src/siprp/cursos/CursosInit.java | 31 +++++ .../src/siprp/cursos/CursosWindowAdapter.java | 21 ++++ .../siprp/cursos/logic/AutorizacaoLogic.java | 28 +++++ .../cursos/provider/AutorizacaoProvider.java | 30 +++++ .../cursos/provider/EntidadesProvider.java | 33 +++++ .../cursos/provider/PessoasProvider.java | 114 ++++++++++++++++++ 15 files changed, 368 insertions(+), 85 deletions(-) create mode 100644 trunk/SIPRPSoft/src/siprp/cursos/CursosInit.java create mode 100644 trunk/SIPRPSoft/src/siprp/cursos/CursosWindowAdapter.java create mode 100644 trunk/SIPRPSoft/src/siprp/cursos/logic/AutorizacaoLogic.java create mode 100644 trunk/SIPRPSoft/src/siprp/cursos/provider/AutorizacaoProvider.java create mode 100644 trunk/SIPRPSoft/src/siprp/cursos/provider/EntidadesProvider.java create mode 100644 trunk/SIPRPSoft/src/siprp/cursos/provider/PessoasProvider.java diff --git a/trunk/SIPRPSoft/lib/cursos.jar b/trunk/SIPRPSoft/lib/cursos.jar index 5ebfa1fd64859dadc2351b27c577c9a0cdba13eb..47958ddc2fc86da7252ddcebfd2aea24379cb0f7 100644 GIT binary patch delta 4991 zcmY*cd3?>s7Qb_6Ci_D6L}ZmjA}d)ei6l*=A`v&XB(f*g#*)(4P)nn(xY(&UGTh_xCN2&_fmsths{gy9_X;FWTjCe`#C*36&NVJ57Bn&wZ<4J1snzO2VMEXiyh`t{H4Hm6V z+}ffeysFyvm#WhF@2U`*D80&Q0z$Ab+@uzNPf$*Sjb6;5BYJ!qvocO*=8~Vm;yV2H zx^gSyLuS^&cXH!auNM)^`%Bd;Sc|O|Yy2eVf%BiN<1^-=ulAZ3BoMJI4TK*bM=!vL6Fz;+QML8%v!JNb~M4bs)at zI#q8Yv#gHTwBoUqPUq3ZSRLjsQoXoMt-7g7^qP|0?`h*-od4-R2-YXw7vCo^E)}9S(f@)Sqff9ob7%O6Ae)dk~~Pcbv0K;yI0Dkp1h=9NBF&%#5iW z{f`!?BccNH#?7$Mo5>D!u}WKJd~~RX(J;-rcEQYJ1f(99^LD6ZlqEUjfHYQy z<&rAL0b+YkZlln( zWG6T_R*{F8cGaV4QRSvO-7;HIm`nVH=cmL(xm8Wnv-fr<^KNwSg6GPWjbx#0hcaO^ zc?|xATgY4r)0TMn=7V~1e}}qo_wD2eXm9Kwda%D!LyCb&uOsJy@ZU))tYxUGL*!3r z&YBj|Vj?BuPZLid7M&;EAx`a&BowPWe{^l&U7b$1n22SUsFzrGjhHFU7l}34`ClR- zK#cew2?Ap7Ws-oN*==*2Zm6EqiD|EC)qvCZOW{Z?C@uEt+HI?KG2PEq<3VA7hb z544fCmc#Tvf#g|wH#e~{cc zuD1vG_EvqSqjb-FqBn=gd7PHPh8(q|j<9>J))X#U<*6;r#=EcSQEEkwrA~LqMO3a+ zcP89}S}Tj~=)0D%kjjLV+jZ&`22osysy+wZGWVk8Fy1qLX)R1dcm%bFECYH`2Ox5z z=rAC5#L#HGO#|FpeUFJwDYTzxO68_XL^Ay^#!I0dU>i7)QV1NHMjI{Vf*y>d1*Vc1 zT%cxv??T0eyVZ?qS);_V9n4$oGg2<*6i`PIpRNYoUPN(_rE2gx(OP#Pcy6>kx+oxtJqM~}XTJebtZYmm@sf`jp zgYJQ{U%W?Gg8PcuGy%@TxesVVC+OYHxFf$WP(LfPy28*aYLzwEg`A?ktM-Vc>uG;w z*E)I}A}w4`J42*38|YlvHjgdT8zhO_s1Fchw$r;nWY*B#&>QQ$vu_0Vg4px=m@p) z)K?q!iz~aCpD4=WZX$l940VaZWv;BdOx>WGJ*~6?h^TAy0R|6E^*NPnqtoSkip*Zr zOHtnulVI+f9#gpbmG7R=)lm7^KWPbc?z@-N7w*TODf=gMV5S920pdU>HXm$KotO=z z%5h=Xli6+>QSHt`A>b)bb{)=!63lLbq$->}g}q(fmrVqTS$}pM;+#uh2SM^#GIIsV z&J>ozphH`uOb69<*6AJx!`V>Ox6Tzf@m~21R~}o)1Wu&qqI(tx)mbUfCbCrR{FFjw zFD4hOJ@YAHC-815=YC0E>c=;biMC?aSLr>PML^oJu?)UVN?938hb+5hu}`41v`Y4k zw;WBfUVUgu!fFG951rz&kySy5c5P)XVEoYzW`%q3)5{5)`l?@~A5Cx%_SLXbF!8Hr zs~}9%PKNiv`P~dY%*tJIvANDMH-mUq~aEkX`W6?^|ZFU;sI^Si<^0Tev zQ$7PE=NZp{Wp=mZ4zPy)Hr(Ds@4s9ObKrecTd~A}%U7#7>A=G!>K%D+iLs76MdEx% z9GZ!BDiW&76 zV|W#--38sET>0Qvmg`(!bNfYOy1VfVX))c6%NM-(#*ND-k$B+7OC=8N!pBJ5)rF6h z=dTX*Z>ldZlDI`f z>u$(T(eRXpz5GzV!jBg~tSJ$3vRh7Ym^J--5dC?lcox~3v zqLbgYok3A#fMz8ht0-Ebiey0-0(hase%%p2)$oOe1%cS$#z5421R=h!VXKCTJy5=0 zLmG^JCBZyP#%~DbBP7~|XbaOdH+HKL(C8&0*ys}>*vOzzo-J+Xhw=i6*F!NzTo})h z{3;E9)i5I*<(pN62IZ{v{iKRVRH6QHa~3(8nwqS2140Z==L#!I}WelFk^xo*ZwKtBfMIRjdclz)W@QGcK8hRUj9``|?#J;>( z*0DiD(|&w{);qZ~jH)`mgh5XViT<()BEVCdR{SRjIDYA^H9Nhit96VPqa&T%2 zMrrrQD75#@#bp>Zq8oQqHW34ac17w~% zr8pMpqj7!PM&lUSjltM6$6&0h8lN^6<=<%7bsX{^Y54Ovv>!PhZ=C;($MLn8fTwh_ thNm@*ehcNRHEh?gqzvVUH4K`Fr*!c|tnn8Dn{{wthJuCnK delta 4991 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 diff --git a/trunk/SIPRPSoft/properties/1-development/app.properties b/trunk/SIPRPSoft/properties/1-development/app.properties index df3ae563..57e9f9ca 100644 --- a/trunk/SIPRPSoft/properties/1-development/app.properties +++ b/trunk/SIPRPSoft/properties/1-development/app.properties @@ -4,14 +4,13 @@ app.main-class = siprp.Main app.main = siprp.Main db.url.prefix = jdbc:postgresql:// -db.user = postgres -db.password = Typein -#rg2h-opksiprp -db.name = siprp_local_3_20100713 +db.user = siprp +db.password = rg2h-opksiprp +db.name = siprp_local_3 db.connection.driver = org.postgresql.Driver -jnlp.resources.property.server.address = evoserver -jnlp.resources.property.server.port = 5432 +jnlp.resources.property.server.address = www.evolute.pt +jnlp.resources.property.server.port = 5436 app.resources.j2se.max-heap-size=512m app.resources.j2se.initial-heap-size=256m diff --git a/trunk/SIPRPSoft/src/siprp/FichaDataProvider.java b/trunk/SIPRPSoft/src/siprp/FichaDataProvider.java index 2f117e83..1227313a 100644 --- a/trunk/SIPRPSoft/src/siprp/FichaDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/FichaDataProvider.java @@ -8,7 +8,6 @@ package siprp; import java.text.DateFormat; import java.util.Date; -import java.util.Hashtable; import siprp.data.AvisoConstants; import siprp.data.Marcacao; @@ -18,7 +17,6 @@ import com.evolute.utils.Singleton; import com.evolute.utils.arrays.Virtual2DArray; import com.evolute.utils.data.IDObject; import com.evolute.utils.data.MappableObject; -import com.evolute.utils.db.DBException; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; import com.evolute.utils.sql.Assignment; @@ -30,6 +28,8 @@ import com.evolute.utils.sql.Update; import com.evolute.utils.strings.StringPlainer; import com.evolute.utils.ui.search.SearchDialog; import com.evolute.utils.ui.search.SearchExecuter; +import java.util.HashMap; +import java.util.Map; /** * @@ -180,10 +180,10 @@ public class FichaDataProvider private int SEARCH_TRABALHADORES_ID = -1; private int SEARCH_EXAMES_ID = -1; - protected final Hashtable medicosEstabelecimentosHash = new Hashtable(); + protected final Map medicosEstabelecimentosHash = new HashMap(); /** Creates a new instance of FichaDataProvider */ - public FichaDataProvider() + private FichaDataProvider() throws Exception { DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER /*SingletonConstants.DBMANAGER*/ ); @@ -687,7 +687,7 @@ public class FichaDataProvider public void setMedicoForEstabelecimento( Integer estabelecimentoID, Integer medicoID ) throws Exception { - Integer medicoAntigo = ( Integer ) medicosEstabelecimentosHash.get( estabelecimentoID ); + Integer medicoAntigo = medicosEstabelecimentosHash.get( estabelecimentoID ); if( !medicoID.equals( medicoAntigo ) ) { Update update = @@ -721,11 +721,10 @@ public class FichaDataProvider } public Long countTrabalhadoresActivosForEmpresa( Integer empresaID ) + throws Exception { Long result = 0L; - try - { - Select2 query = new Select2( new String[]{ "trabalhadores", "estabelecimentos", "empresas" }, + Select2 query = new Select2( new String[]{ "trabalhadores", "estabelecimentos", "empresas" }, new Integer[]{ Select2.JOIN_INNER, Select2.JOIN_INNER }, new Expression[]{ new Field("estabelecimentos.id").isEqual(new Field("trabalhadores.estabelecimento_id")), @@ -736,14 +735,10 @@ public class FichaDataProvider and( new Field("trabalhadores.data_demissao").isEqual( null ) ). and( new Field("estabelecimentos.inactivo").isEqual( "n" ) ), null, null, null, null ); - Virtual2DArray returned = executer.executeQuery( query ); - if( returned.columnLength() > 0 ) - { - result = (Long) returned.get( 0, 0 ); - } - } - catch (DBException e) { - e.printStackTrace(); + Virtual2DArray returned = executer.executeQuery( query ); + if( returned.columnLength() > 0 ) + { + result = (Long) returned.get( 0, 0 ); } return result; } diff --git a/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java index 49ee014d..30413c94 100644 --- a/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java +++ b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java @@ -6,8 +6,8 @@ package siprp; -import java.util.Hashtable; +import com.evolute.module.cursos.CursosWindow; import javax.swing.tree.DefaultMutableTreeNode; import shst.SHSTTrackerInterface; @@ -32,10 +32,15 @@ import siprp.medicina.prestadores.PrestadoresWindow; import siprp.pesquisas.RelatorioAnualWindow; import com.evolute.utils.Singleton; +import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.tracker.TrackableWindow; import com.evolute.utils.tracker.WindowCreator; import com.evolute.utils.tracker.WindowTracker; import com.evolute.utils.ui.window.LoginWindow; +import java.util.HashMap; +import java.util.Map; +import siprp.cursos.CursosInit; +import siprp.cursos.CursosWindowAdapter; /** * * @author fpalma @@ -69,7 +74,7 @@ public class SIPRPTracker extends WindowTracker implements SHSTTrackerInterface Singleton.setInstance( Singleton.TRACKER, this ); this.avisos = avisosP; avisos.setTracker( this ); - Hashtable creators = new Hashtable(); + Map creators = new HashMap(); DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode( Singleton.getInstance( SingletonConstants.COMPANY_ACRONYM ) ); @@ -77,6 +82,8 @@ public class SIPRPTracker extends WindowTracker implements SHSTTrackerInterface boolean hasGestao = ( (Boolean)Singleton.getInstance( SingletonConstants.MODULE_CLIENTES ) ).booleanValue(); boolean hasRelatorio = ( (Boolean)Singleton.getInstance( SingletonConstants.MODULE_RELATORIO ) ).booleanValue(); boolean hasListagens = ( (Boolean)Singleton.getInstance( SingletonConstants.MODULE_LISTAGENS ) ).booleanValue(); + // TODO use property !!!! + boolean hasCursos = false;//true; //( (Boolean)Singleton.getInstance( SingletonConstants.MODULE_CURSOS ) ).booleanValue(); if( hasGestao ) { @@ -94,7 +101,7 @@ public class SIPRPTracker extends WindowTracker implements SHSTTrackerInterface clientesWindow = null; medicinaWindow = null; higieneWindow = null; - ex.printStackTrace(); + ErrorLogger.logException(ex); } } else @@ -289,6 +296,18 @@ public class SIPRPTracker extends WindowTracker implements SHSTTrackerInterface } } ); } + if( hasCursos ) + { + rootNode.add( new DefaultMutableTreeNode( CursosWindow.TITLE ) ); + creators.put( CursosWindow.TITLE, new WindowCreator() { + public TrackableWindow create() + throws Exception + { + CursosInit.initFactory(); + return new CursosWindowAdapter(); + } + } ); + } setRoot( rootNode ); setCreators( creators ); } diff --git a/trunk/SIPRPSoft/src/siprp/SingletonConstants.java b/trunk/SIPRPSoft/src/siprp/SingletonConstants.java index 6d2170fc..a58da2c9 100644 --- a/trunk/SIPRPSoft/src/siprp/SingletonConstants.java +++ b/trunk/SIPRPSoft/src/siprp/SingletonConstants.java @@ -36,6 +36,7 @@ public class SingletonConstants public static final String WEB_AWARE = "web_aware"; public static final String MODULE_RELATORIO = "module_relatorio"; public static final String MODULE_LISTAGENS = "module_listagens"; + public static final String MODULE_CURSOS = "module_cursos"; public static final String WEB_USER = "web_user"; public static final String WEB_PASSWORD = "web_password"; diff --git a/trunk/SIPRPSoft/src/siprp/clientes/ClientesDataProvider.java b/trunk/SIPRPSoft/src/siprp/clientes/ClientesDataProvider.java index 5ab25639..da178858 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/ClientesDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/ClientesDataProvider.java @@ -9,8 +9,6 @@ package siprp.clientes; -import java.util.Hashtable; -import java.util.Vector; import com.evolute.utils.Singleton; import com.evolute.utils.arrays.Virtual2DArray; @@ -24,6 +22,10 @@ import com.evolute.utils.sql.Delete; import com.evolute.utils.sql.Field; import com.evolute.utils.sql.Insert; import com.evolute.utils.sql.Select; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @@ -38,14 +40,14 @@ public class ClientesDataProvider extends MetaProvider private Integer etiquetaID; /** Creates a new instance of ClientesDataProvider */ - public ClientesDataProvider() + private ClientesDataProvider() throws Exception { DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER /*SingletonConstants.DBMANAGER*/ ); executer = dbm.getSharedExecuter( this ); } - public static MetaProvider getProvider() + public static ClientesDataProvider getProvider() throws Exception { synchronized( LOCK ) @@ -88,7 +90,7 @@ public class ClientesDataProvider extends MetaProvider return grupos; } - public Hashtable getAllTiposElementosProtocoloByGrupo() + public Map> getAllTiposElementosProtocoloByGrupo() throws Exception { Select select = @@ -98,16 +100,16 @@ public class ClientesDataProvider extends MetaProvider new String[]{ "grupo_protocolo_id", "ordem" }, null ); Virtual2DArray array = executer.executeQuery( select ); - Hashtable tipos = new Hashtable(); + Map> tipos = new HashMap>(); for( int n = 0; n < array.columnLength(); n++ ) { IDObject tipo = new MappableObject( ( Integer ) array.get( n, 0 ), ( String ) array.get( n, 1 ) ); Integer grupoID = ( Integer ) array.get( n, 3 ); if( !tipos.containsKey( grupoID ) ) { - tipos.put( grupoID, new Vector() ); + tipos.put( grupoID, new ArrayList() ); } - Vector tiposGrupo = ( Vector ) tipos.get( grupoID ); + List tiposGrupo = tipos.get( grupoID ); tiposGrupo.add( tipo ); } return tipos; @@ -156,14 +158,14 @@ public class ClientesDataProvider extends MetaProvider new String[]{ "numero_perfil" }, null ); Virtual2DArray array = executer.executeQuery( select ); - Vector data[] = new Vector[ numeroPerfis ]; + List data[] = new List[ numeroPerfis ]; for( int n = 0; n < array.columnLength(); n++ ) { int perfil = ( ( Integer ) array.get( n, 1 ) ).intValue() - 1; Integer tipo = ( Integer ) array.get( n, 0 ); if( data[ perfil ] == null ) { - data[ perfil ] = new Vector(); + data[ perfil ] = new ArrayList(); } data[ perfil ].add( tipo ); } @@ -176,7 +178,7 @@ public class ClientesDataProvider extends MetaProvider } else { - elementos[ n ] = ( Integer [] ) data[ n ].toArray( new Integer[ data[ n ].size() ] ); + elementos[ n ] = data[ n ].toArray( new Integer[ data[ n ].size() ] ); } } return elementos; diff --git a/trunk/SIPRPSoft/src/siprp/clientes/EmpresaPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/EmpresaPanel.java index 75aa853d..e60c1e35 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/EmpresaPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/EmpresaPanel.java @@ -19,7 +19,6 @@ import java.awt.Insets; import java.util.Arrays; import java.util.Collection; import java.util.Map; -import java.util.Vector; import javax.swing.BorderFactory; import javax.swing.JComboBox; @@ -58,6 +57,8 @@ import com.evolute.utils.ui.DialogException; import com.evolute.utils.ui.calendar.JCalendarPanel; import com.evolute.utils.ui.text.CopyPasteHandler; import com.evolute.utils.ui.text.StateTextField; +import java.util.ArrayList; +import java.util.List; /** * @@ -125,7 +126,7 @@ public class EmpresaPanel extends JPanel private boolean webAware; - private Vector listSelectionListeners; + private final List listSelectionListeners = new ArrayList(); /** Creates a new instance of EmpresaPanel */ public EmpresaPanel() @@ -133,7 +134,6 @@ public class EmpresaPanel extends JPanel { webAware = ( ( Boolean ) Singleton.getInstance( SingletonConstants.WEB_AWARE ) ).booleanValue(); provider = (FichaDataProvider)FichaDataProvider.getProvider(); - listSelectionListeners = new Vector(); objectProvider = ( ProviderInterface ) Singleton.getInstance( Singleton.DEFAULT_EVO_DATA_PROVIDER ); setupComponents(); setupComponentsHashtable(); @@ -800,25 +800,32 @@ public class EmpresaPanel extends JPanel estabelecimentos = new IDObject[0]; } reloadMarcacoes(); - Vector v = new Vector( Arrays.asList( estabelecimentos ) ); - estabelecimentosModel.setValues( v ); + estabelecimentosModel.setValues( Arrays.asList( estabelecimentos ) ); - Vector dadosProtocolo[] = new Vector[]{ new Vector(), new Vector() }; + List dadosProtocolo[] = new List[]{ new ArrayList(), new ArrayList() }; boolean analisesExamesA[] = new boolean[2]; - analisesExamesA[ 0 ] = "y".equals( empresa.get( EmpresasData.A_CONSULTAS ) ); - analisesExamesA[ 1 ] = "y".equals( empresa.get( EmpresasData.A_EXAMES ) ); + analisesExamesA[ 0 ] = "y".equals( empresa.getA_consultas() ); + analisesExamesA[ 1 ] = "y".equals( empresa.getA_exames() ); dadosProtocolo[ 0 ].add( analisesExamesA ); dadosProtocolo[ 0 ].add( elementosProtocolo[ 0 ] ); boolean analisesExamesB[] = new boolean[2]; - analisesExamesB[ 0 ] = "y".equals( empresa.get( EmpresasData.B_CONSULTAS ) ); - analisesExamesB[ 1 ] = "y".equals( empresa.get( EmpresasData.B_EXAMES ) ); + analisesExamesB[ 0 ] = "y".equals( empresa.getB_consultas() ); + analisesExamesB[ 1 ] = "y".equals( empresa.getB_exames() ); dadosProtocolo[ 1 ].add( analisesExamesB ); dadosProtocolo[ 1 ].add( elementosProtocolo[ 1 ] ); protocoloPanel.fill( dadosProtocolo ); - Integer empresaID = empresa == null ? null : (Integer) empresa.get( EmpresasData.ID ); + Integer empresaID = empresa == null ? null : empresa.getId(); if( empresaID != null ) { - Long numTrabalhadoresActivos = provider.countTrabalhadoresActivosForEmpresa( empresaID ); + Long numTrabalhadoresActivos = null; + try + { + numTrabalhadoresActivos = provider.countTrabalhadoresActivosForEmpresa(empresaID); + } + catch( Exception ex ) + { + ErrorLogger.logException(ex); + } labelTrabalhadoresActivos.setText( getTextForTrabalhadoresActivos( numTrabalhadoresActivos ) ); ImageData logo = empresa.toEmpresa_logo_id(); logotipo.fill( logo == null ? null : logo.getImage_data() ); @@ -838,20 +845,20 @@ public class EmpresaPanel extends JPanel empresa = new EmpresasData(); } - String names[] = ( String[] ) components.keySet().toArray( new String[ components.size() ] ); + String names[] = components.keySet().toArray( new String[ components.size() ] ); Map hash = empresa.getHashData(); ComponentController.save( names, hash, components ); empresa.setHashData( hash ); - Vector dadosProtocolo[] = ( Vector[] ) protocoloPanel.save(); - boolean analisesExamesA[] = ( boolean [] ) dadosProtocolo[ 0 ].elementAt( 0 ); + List dadosProtocolo[] = protocoloPanel.save(); + boolean analisesExamesA[] = ( boolean [] ) dadosProtocolo[ 0 ].get( 0 ); empresa.set( EmpresasData.A_CONSULTAS, analisesExamesA[ 0 ] ? "y" : "n" ); empresa.set( EmpresasData.A_EXAMES, analisesExamesA[ 1 ] ? "y" : "n" ); - boolean analisesExamesB[] = ( boolean [] ) dadosProtocolo[ 1 ].elementAt( 0 ); + boolean analisesExamesB[] = ( boolean [] ) dadosProtocolo[ 1 ].get( 0 ); empresa.set( EmpresasData.B_CONSULTAS, analisesExamesB[ 0 ] ? "y" : "n" ); empresa.set( EmpresasData.B_EXAMES, analisesExamesB[ 1 ] ? "y" : "n" ); Integer elementosProtocolo[][] = - new Integer[][]{ ( Integer [] ) dadosProtocolo[ 0 ].elementAt( 1 ), - ( Integer [] ) dadosProtocolo[ 1 ].elementAt( 1 ) }; + new Integer[][]{ ( Integer [] ) dadosProtocolo[ 0 ].get( 1 ), + ( Integer [] ) dadosProtocolo[ 1 ].get( 1 ) }; ImageData logo = empresa.toEmpresa_logo_id(); try { @@ -872,6 +879,7 @@ public class EmpresaPanel extends JPanel return new Object[] { empresa, elementosProtocolo }; } + @Override public void setEnabled( boolean enable ) { super.setEnabled( enable ); @@ -898,7 +906,7 @@ public class EmpresaPanel extends JPanel { ListSelectionEvent newEvent = new ListSelectionEvent( this, e.getFirstIndex(), e.getLastIndex(), e.getValueIsAdjusting() ); - ( (ListSelectionListener) listSelectionListeners.elementAt( n ) ).valueChanged( newEvent ); + listSelectionListeners.get( n ).valueChanged( newEvent ); } } @@ -930,7 +938,7 @@ public class EmpresaPanel extends JPanel public void setSelectedEstabelecimento( EstabelecimentosData estab ) { IDObject lista[] = (IDObject [])estabelecimentosModel.getValues().toArray( new IDObject[ 0 ] ); - Integer id = (Integer)estab.get( EstabelecimentosData.ID ); + Integer id = estab.getId(); for( int n = 0; n < lista.length; n++ ) { if( lista[ n ].getID().equals( id ) ) @@ -949,7 +957,7 @@ public class EmpresaPanel extends JPanel Collection marcacoesCollection = objectProvider.listLoad( MarcacoesEmpresaData.class, new Object[]{ empresa.getId() }, new String []{ MarcacoesEmpresaData.EMPRESA_ID }, new String[]{ "data desc" } ); - Vector marcacoes = new Vector(); + List marcacoes = new ArrayList(); marcacoes.add( new ColumnizedObject(){ public Object getValue( int col ) { diff --git a/trunk/SIPRPSoft/src/siprp/clientes/PerfilProtocoloPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/PerfilProtocoloPanel.java index 04ef1c6e..89366c26 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/PerfilProtocoloPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/PerfilProtocoloPanel.java @@ -15,7 +15,6 @@ import java.awt.Insets; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.Arrays; -import java.util.Vector; import javax.swing.BorderFactory; import javax.swing.JCheckBox; @@ -24,13 +23,15 @@ import javax.swing.JPanel; import com.evolute.utils.data.IDObject; import com.evolute.utils.dataui.ControllableComponent; import com.evolute.utils.ui.panel.CheckBoxPanel; +import java.util.ArrayList; +import java.util.List; /** * * @author fpalma */ public class PerfilProtocoloPanel extends JPanel - implements ControllableComponent, ItemListener + implements ControllableComponent, ItemListener { protected JCheckBox consultasCheck; protected JCheckBox examesCheck; @@ -90,14 +91,13 @@ public class PerfilProtocoloPanel extends JPanel return panel; } - public void fill( Object data ) + public void fill( List list ) { clear(); - if( data != null ) + if( list != null ) { - Vector list = ( Vector ) data; - boolean consultasExames[] = (boolean[]) list.elementAt( 0 ); - Integer tiposEscolhidos[] = ( Integer [] ) list.elementAt( 1 ); + boolean consultasExames[] = ( boolean[] )list.get( 0 ); + Integer tiposEscolhidos[] = ( Integer [] ) list.get( 1 ); consultasCheck.setSelected( consultasExames[ 0 ] ); examesCheck.setSelected( consultasExames[ 1 ] ); for( int n = 0; n < tiposCheck.length; n++ ) @@ -107,12 +107,12 @@ public class PerfilProtocoloPanel extends JPanel } } - public Object save() + public List save() { boolean consultasExames[] = new boolean[ 2 ]; consultasExames[ 0 ] = consultasCheck.isSelected(); consultasExames[ 1 ] = examesCheck.isSelected(); - Vector tiposEscolhidos = new Vector(); + List tiposEscolhidos = new ArrayList(); if( consultasExames[ 1 ] ) { for( int n = 0; n < tiposCheck.length; n++ ) @@ -120,12 +120,13 @@ public class PerfilProtocoloPanel extends JPanel tiposEscolhidos.addAll( Arrays.asList( tiposCheck[ n ].getSelected() ) ); } } - Vector list = new Vector(); + List list = new ArrayList(); list.add( consultasExames ); list.add( tiposEscolhidos.toArray( new Integer[ tiposEscolhidos.size() ] ) ); return list; } + @Override public void setEnabled( boolean enable ) { consultasCheck.setEnabled( enable ); diff --git a/trunk/SIPRPSoft/src/siprp/clientes/ProtocoloPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/ProtocoloPanel.java index 53544e40..8b7284d0 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/ProtocoloPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/ProtocoloPanel.java @@ -11,7 +11,6 @@ package siprp.clientes; import java.awt.GridLayout; import java.util.Arrays; -import java.util.Hashtable; import java.util.Vector; import javax.swing.BorderFactory; @@ -21,15 +20,18 @@ import javax.swing.JScrollPane; import com.evolute.utils.data.IDObject; import com.evolute.utils.data.MappableObject; import com.evolute.utils.dataui.ControllableComponent; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * * @author fpalma */ public class ProtocoloPanel extends JPanel - implements ControllableComponent + implements ControllableComponent { - protected ClientesDataProvider provider; + protected final ClientesDataProvider provider; protected IDObject grupos[]; protected IDObject tipos[][]; @@ -40,28 +42,28 @@ public class ProtocoloPanel extends JPanel public ProtocoloPanel() throws Exception { - provider = ( ClientesDataProvider ) ClientesDataProvider.getProvider(); + provider = ClientesDataProvider.getProvider(); IDObject gruposReais[] = provider.getAllGruposProtocoloReais(); - Vector gruposAux = new Vector( Arrays.asList( gruposReais ) ); + List gruposAux = new ArrayList( Arrays.asList( gruposReais ) ); gruposAux.add( new MappableObject( new Integer( 0 ), "Outros" ) ); - grupos = ( IDObject[] ) gruposAux.toArray( new IDObject[ gruposReais.length + 1 ] ); + grupos = gruposAux.toArray( new IDObject[ gruposReais.length + 1 ] ); IDObject gruposFalsos[] = provider.getAllGruposProtocoloFalsos(); - Hashtable tiposHash = provider.getAllTiposElementosProtocoloByGrupo(); + Map> tiposHash = provider.getAllTiposElementosProtocoloByGrupo(); tipos = new IDObject[ grupos.length ][]; for( int n = 0; n < gruposReais.length; n++ ) { - Vector tiposGrupo = ( Vector ) tiposHash.get( gruposReais[ n ].getID() ); - tipos[ n ] = ( IDObject[] ) tiposGrupo.toArray( new IDObject[ tiposGrupo.size() ] ); + List tiposGrupo = tiposHash.get( gruposReais[ n ].getID() ); + tipos[ n ] = tiposGrupo.toArray( new IDObject[ tiposGrupo.size() ] ); } - Vector outros = new Vector(); + List outros = new ArrayList(); for( int n = 0; n < gruposFalsos.length; n++ ) { - Vector tiposGrupo = ( Vector ) tiposHash.get( gruposFalsos[ n ].getID() ); + List tiposGrupo = tiposHash.get( gruposFalsos[ n ].getID() ); outros.addAll( tiposGrupo ); } - tipos[ gruposReais.length ] = ( IDObject[] ) outros.toArray( new IDObject[ outros.size() ] ); + tipos[ gruposReais.length ] = outros.toArray( new IDObject[ outros.size() ] ); setupComponents(); } @@ -88,18 +90,17 @@ public class ProtocoloPanel extends JPanel add( perfilBScp ); } - public void fill( Object data ) + public void fill( List lists[] ) { - Vector lists[] = ( Vector [] ) data; perfisPanels[ 0 ].fill( lists[ 0 ] ); perfisPanels[ 1 ].fill( lists[ 1 ] ); } - public Object save() + public List[] save() { - Vector lists[] = new Vector[ 2 ]; - lists[ 0 ] = ( Vector ) perfisPanels[ 0 ].save(); - lists[ 1 ] = ( Vector ) perfisPanels[ 1 ].save(); + List lists[] = new List[ 2 ]; + lists[ 0 ] = perfisPanels[ 0 ].save(); + lists[ 1 ] = perfisPanels[ 1 ].save(); return lists; } diff --git a/trunk/SIPRPSoft/src/siprp/cursos/CursosInit.java b/trunk/SIPRPSoft/src/siprp/cursos/CursosInit.java new file mode 100644 index 00000000..ef0e4ad2 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/cursos/CursosInit.java @@ -0,0 +1,31 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package siprp.cursos; + +import com.evolute.genericpeople.AutorizacaoLogicFactory; +import com.evolute.genericpeople.AutorizacaoProviderFactory; +import com.evolute.genericpeople.EntidadesProviderFactory; +import com.evolute.genericpeople.PessoasProviderFactory; +import siprp.cursos.logic.AutorizacaoLogic; +import siprp.cursos.provider.AutorizacaoProvider; +import siprp.cursos.provider.EntidadesProvider; +import siprp.cursos.provider.PessoasProvider; + +/** + * + * @author lflores + */ +public class CursosInit +{ + public static void initFactory() + throws Exception + { + AutorizacaoProviderFactory.setProvider( AutorizacaoProvider.getProvider() ); + AutorizacaoLogicFactory.setLogic( AutorizacaoLogic.getLogic() ); + EntidadesProviderFactory.setProvider( EntidadesProvider.getProvider() ); + PessoasProviderFactory.setProvider( PessoasProvider.getProvider() ); + } +} diff --git a/trunk/SIPRPSoft/src/siprp/cursos/CursosWindowAdapter.java b/trunk/SIPRPSoft/src/siprp/cursos/CursosWindowAdapter.java new file mode 100644 index 00000000..63d1daa9 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/cursos/CursosWindowAdapter.java @@ -0,0 +1,21 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package siprp.cursos; + +import com.evolute.utils.tracker.TrackableWindow; + +/** + * + * @author lflores + */ +public class CursosWindowAdapter extends com.evolute.module.cursos.CursosWindow + implements TrackableWindow +{ + public CursosWindowAdapter() + throws Exception + { + } +} diff --git a/trunk/SIPRPSoft/src/siprp/cursos/logic/AutorizacaoLogic.java b/trunk/SIPRPSoft/src/siprp/cursos/logic/AutorizacaoLogic.java new file mode 100644 index 00000000..30f3f56a --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/cursos/logic/AutorizacaoLogic.java @@ -0,0 +1,28 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package siprp.cursos.logic; + +import com.evolute.genericpeople.AutorizacaoLogicInterface; +import com.evolute.swing.frame.EvoFrame; + +/** + * + * @author lflores + */ +public class AutorizacaoLogic implements AutorizacaoLogicInterface +{ + public static AutorizacaoLogic getLogic() + { + return null; + } + + public boolean insertPedido(EvoFrame ef, Integer intgr, String string, String string1, byte[] bytes, Integer intgr1) throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + +} diff --git a/trunk/SIPRPSoft/src/siprp/cursos/provider/AutorizacaoProvider.java b/trunk/SIPRPSoft/src/siprp/cursos/provider/AutorizacaoProvider.java new file mode 100644 index 00000000..736f7872 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/cursos/provider/AutorizacaoProvider.java @@ -0,0 +1,30 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package siprp.cursos.provider; + +import com.evolute.genericpeople.AutorizacaoProviderInterface; + +/** + * + * @author lflores + */ +public class AutorizacaoProvider implements AutorizacaoProviderInterface +{ + public static AutorizacaoProvider getProvider() + { + return null; + } + + public Integer getAutorizadorCursos() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public Integer getSubTipoIDForDescricao(String string) throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } +} diff --git a/trunk/SIPRPSoft/src/siprp/cursos/provider/EntidadesProvider.java b/trunk/SIPRPSoft/src/siprp/cursos/provider/EntidadesProvider.java new file mode 100644 index 00000000..4d040a05 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/cursos/provider/EntidadesProvider.java @@ -0,0 +1,33 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package siprp.cursos.provider; + +import com.evolute.genericpeople.EntidadeInterface; +import com.evolute.genericpeople.EntidadesProviderInterface; +import com.evolute.utils.data.IDObject; + +/** + * + * @author lflores + */ +public class EntidadesProvider implements EntidadesProviderInterface +{ + public static EntidadesProvider getProvider() + { + return null; + } + + public EntidadeInterface loadEntidade(Integer intgr) throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public IDObject[] getEntidades() throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + +} diff --git a/trunk/SIPRPSoft/src/siprp/cursos/provider/PessoasProvider.java b/trunk/SIPRPSoft/src/siprp/cursos/provider/PessoasProvider.java new file mode 100644 index 00000000..d0d3ab06 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/cursos/provider/PessoasProvider.java @@ -0,0 +1,114 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package siprp.cursos.provider; + +import com.evolute.genericpeople.PessoaDocumentoInterface; +import com.evolute.genericpeople.PessoaInterface; +import com.evolute.genericpeople.PessoasProviderInterface; +import com.evolute.module.cursos.data.CurFormadoresData; +import com.evolute.module.cursos.data.CurFormandosData; +import com.evolute.utils.arrays.Virtual2DArray; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.data.Mappable; +import com.evolute.utils.ui.search.SearchDialog; +import java.util.List; + +/** + * + * @author lflores + */ +public class PessoasProvider implements PessoasProviderInterface +{ + public static PessoasProvider getProvider() + { + return null; + } + + public void setDocumentosForPessoa(Integer intgr, PessoaDocumentoInterface[] pdis) throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public PessoaInterface getPessoaFromFormador(CurFormadoresData cfd) throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public PessoaInterface getPessoaFromFormando(CurFormandosData cfd) throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public boolean biAlreadyExists(Integer intgr, String string) throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public PessoaInterface loadPessoa(Integer intgr) throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public List getAllPessoasIDObjects() throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public Mappable[] getPaises() throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public String getNacionalidadeByPaisID(Integer intgr) throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public List getTiposDocumento() throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public PessoaDocumentoInterface[] getDocumentosForPessoa(Integer intgr) throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public PessoaInterface newPessoa() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public PessoaDocumentoInterface newPessoaDocumento() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public Virtual2DArray search(String string) throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public boolean hasDetails() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public void showDetails(SearchDialog sd, Object o) throws Exception + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public String getSearchTitle() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public String[] getColumnNames() + { + throw new UnsupportedOperationException("Not supported yet."); + } +}