From a2d7631c0d861b8da2e9ded97c907f48de6173b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Tue, 20 Apr 2010 19:21:26 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1238 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../TratarMarcacaoEstabelecimentoAction.java | 7 ++- .../TratarMarcacaoTrabalhadorAction.java | 13 +++-- .../MarcacaoConsultaExtendedPanel.java | 3 +- .../siprp/medicina/MarcacaoConsultaPanel.java | 41 +++++++++----- .../siprp/medicina/MarcacaoExamePanel.java | 42 +++++++++----- .../medicina/MarcacoesMedicinaHandler.java | 10 ++-- .../siprp/medicina/MedicinaDataProvider.java | 30 ++++++---- .../siprp/medicina/MedicinaUpperPanel.java | 24 +++++--- .../src/siprp/medicina/MedicinaWindow.java | 53 ++++++++++++------ trunk/SIPRPSoft/src/siprp/medicina/Test.java | 3 +- .../exames/ui/RecepcaoExamesWindow.java | 1 - .../locais_analise/EnviarAnalisesWindow.java | 2 - .../locais_realizacao/FaxPrinter.java | 11 ++-- .../LocaisRealizacaoWindow.java | 2 - .../presencas/DetalhesRealizacaoDialog.java | 13 +++-- .../presencas/ImpressaoAuxiliaresWindow.java | 8 +-- .../siprp/medicina/presencas/Presenca.java | 1 - .../presencas/PresencasActionFactory.java | 5 +- .../actions/DesmarcadoSHSTAction.java | 5 +- .../actions/DesmarcadoTrabalhadorAction.java | 5 +- .../presencas/actions/FaltouAction.java | 5 +- .../presencas/actions/RealizouAction.java | 7 ++- .../actions/RealizouParcialmenteAction.java | 8 ++- .../prestadores/PrestadoresDataProvider.java | 5 +- .../prestadores/data/Prestadores.java | 2 +- .../prestadores/data/PrestadoresData.java | 3 +- .../prestadores/data/PrestadoresID.java | 4 +- .../processo/data/TrabalhadoresConsultas.java | 3 +- .../data/TrabalhadoresConsultasData.java | 3 +- .../data/TrabalhadoresConsultasDatas.java | 3 +- .../data/TrabalhadoresConsultasDatasData.java | 3 +- .../TrabalhadoresConsultasDatasEmails.java | 3 +- ...TrabalhadoresConsultasDatasEmailsData.java | 3 +- .../TrabalhadoresConsultasDatasEmailsID.java | 4 +- .../data/TrabalhadoresConsultasDatasID.java | 4 +- ...rabalhadoresConsultasDatasObservacoes.java | 2 +- ...lhadoresConsultasDatasObservacoesData.java | 3 +- ...balhadoresConsultasDatasObservacoesID.java | 4 +- .../data/TrabalhadoresConsultasID.java | 4 +- .../processo/data/TrabalhadoresEcd.java | 2 +- .../processo/data/TrabalhadoresEcdData.java | 3 +- .../processo/data/TrabalhadoresEcdID.java | 4 +- .../processo/data/TrabalhadoresEcds.java | 3 +- .../data/TrabalhadoresEcdsAnalise.java | 3 +- .../data/TrabalhadoresEcdsAnaliseData.java | 3 +- .../data/TrabalhadoresEcdsAnaliseID.java | 4 +- .../processo/data/TrabalhadoresEcdsData.java | 3 +- .../processo/data/TrabalhadoresEcdsDatas.java | 3 +- .../data/TrabalhadoresEcdsDatasData.java | 3 +- .../data/TrabalhadoresEcdsDatasEmails.java | 3 +- .../TrabalhadoresEcdsDatasEmailsData.java | 3 +- .../data/TrabalhadoresEcdsDatasEmailsID.java | 4 +- .../data/TrabalhadoresEcdsDatasID.java | 4 +- .../TrabalhadoresEcdsDatasObservacoes.java | 2 +- ...TrabalhadoresEcdsDatasObservacoesData.java | 3 +- .../TrabalhadoresEcdsDatasObservacoesID.java | 4 +- .../processo/data/TrabalhadoresEcdsID.java | 4 +- .../data/TrabalhadoresFichasAptidao.java | 2 +- .../data/TrabalhadoresFichasAptidaoData.java | 3 +- .../data/TrabalhadoresFichasAptidaoID.java | 4 +- .../processo/data/TrabalhadoresProcesso.java | 3 +- .../data/TrabalhadoresProcessoData.java | 3 +- .../data/TrabalhadoresProcessoID.java | 4 +- .../processo/ui/MedicinaProcessoWindow.java | 4 +- .../src/siprp/pesquisas/PesquisasWindow.java | 56 ++++++++++++++----- .../print/PlanoActuacaoPDFCreator.java | 1 - .../src/siprp/update/UpdateWindow.java | 25 +++++---- .../siprp/update/updates/V11_1_To_V11_2.java | 17 ------ .../siprp/update/updates/V6_1_To_V7_0.java | 7 +-- .../siprp/update/updates/V7_0_To_V7_2.java | 7 +-- .../siprp/update/updates/V7_2_To_V7_4.java | 7 +-- .../siprp/update/updates/V7_4_To_V7_5.java | 7 +-- .../siprp/update/updates/V7_5_To_V7_6.java | 7 +-- .../siprp/update/updates/V7_7_To_V7_8.java | 2 - .../siprp/update/updates/V7_8_To_V7_9.java | 2 - .../siprp/update/updates/V7_9_To_V8_0.java | 2 - .../siprp/update/updates/V8_0_To_V8_1.java | 2 - trunk/SIPRPSoft/src/siprp/web/WebUpdater.java | 36 +++++++++--- .../database/cayenne/objects/HsRisco.java | 2 - .../cayenne/objects/PrtGruposProtocolo.java | 2 - ...rabalhadoresConsultasDatasObservacoes.java | 2 - .../cayenne/objects/TrabalhadoresEcds.java | 4 +- .../objects/TrabalhadoresEcdsDatas.java | 4 +- .../TrabalhadoresEcdsDatasObservacoes.java | 2 - .../cayenne/providers/PlanoActuacaoDAO.java | 2 - 85 files changed, 369 insertions(+), 260 deletions(-) diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/actions/TratarMarcacaoEstabelecimentoAction.java b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/actions/TratarMarcacaoEstabelecimentoAction.java index 8f4b8ef0..81122929 100644 --- a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/actions/TratarMarcacaoEstabelecimentoAction.java +++ b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/actions/TratarMarcacaoEstabelecimentoAction.java @@ -9,13 +9,14 @@ package siprp.lembretes.remarcacoes.actions; -import com.evolute.utils.data.IDObject; -import com.evolute.utils.ui.DialogException; - import java.awt.Component; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.ui.DialogException; + /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/actions/TratarMarcacaoTrabalhadorAction.java b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/actions/TratarMarcacaoTrabalhadorAction.java index 17706673..ba2a445a 100644 --- a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/actions/TratarMarcacaoTrabalhadorAction.java +++ b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/actions/TratarMarcacaoTrabalhadorAction.java @@ -9,15 +9,12 @@ package siprp.lembretes.remarcacoes.actions; -import com.evolute.utils.Singleton; -import com.evolute.utils.data.IDObject; -import com.evolute.utils.jdo.JDOProvider; -import com.evolute.utils.ui.DialogException; - import java.awt.Component; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JOptionPane; + import siprp.SIPRPTracker; import siprp.SingletonConstants; import siprp.data.EmpresaData; @@ -35,10 +32,14 @@ import siprp.database.cayenne.objects.TrabalhadoresProcesso; import siprp.database.cayenne.providers.MedicinaDAO; import siprp.lembretes.Lembrete; import siprp.lembretes.LembretesDataProvider; -import siprp.medicina.processo.data.TrabalhadoresConsultasData; import siprp.medicina.processo.logic.MedicinaProcessoLogic; import siprp.medicina.processo.ui.MedicinaProcessoWindow; +import com.evolute.utils.Singleton; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.ui.DialogException; + /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaExtendedPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaExtendedPanel.java index b1cfe077..f92a2213 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaExtendedPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaExtendedPanel.java @@ -9,8 +9,7 @@ package siprp.medicina; -import java.awt.*; -import javax.swing.*; +import javax.swing.JPanel; /** * diff --git a/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.java index 5404688a..73a30584 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.java @@ -1,20 +1,31 @@ package siprp.medicina; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.data.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.db.*; -import com.evolute.utils.documents.*; -import com.evolute.utils.sql.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.calendar.*; -import com.evolute.utils.ui.panel.*; -import com.evolute.utils.ui.text.*; -import java.awt.*; -import java.util.*; -import javax.swing.*; -import siprp.data.*; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.util.Hashtable; + +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; + +import com.evolute.utils.Singleton; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.data.MappableObject; +import com.evolute.utils.data.PropertyObject; +import com.evolute.utils.dataui.ComponentController; +import com.evolute.utils.dataui.ComponentsHashtable; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.dataui.DataClassAware; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.SQLExecuter; +import com.evolute.utils.ui.calendar.JCalendarPanel; +import com.evolute.utils.ui.panel.RadioButtonFixedPanel; +import com.evolute.utils.ui.text.StateTextArea; public class MarcacaoConsultaPanel extends JPanel diff --git a/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.java b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.java index d1f4fd75..2c4bb581 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.java @@ -1,20 +1,32 @@ package siprp.medicina; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.data.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.db.*; -import com.evolute.utils.documents.*; -import com.evolute.utils.sql.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.calendar.*; -import com.evolute.utils.ui.panel.*; -import com.evolute.utils.ui.text.*; -import java.awt.*; -import java.util.*; -import javax.swing.*; -import siprp.data.*; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.util.Hashtable; + +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; + +import com.evolute.utils.Singleton; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.data.MappableObject; +import com.evolute.utils.data.PropertyObject; +import com.evolute.utils.dataui.ComponentController; +import com.evolute.utils.dataui.ComponentsHashtable; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.dataui.DataClassAware; +import com.evolute.utils.dataui.JPanelControllable; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.SQLExecuter; +import com.evolute.utils.ui.calendar.JCalendarPanel; +import com.evolute.utils.ui.panel.RadioButtonFixedPanel; +import com.evolute.utils.ui.text.StateTextArea; public class MarcacaoExamePanel extends JPanel diff --git a/trunk/SIPRPSoft/src/siprp/medicina/MarcacoesMedicinaHandler.java b/trunk/SIPRPSoft/src/siprp/medicina/MarcacoesMedicinaHandler.java index 2ccce75a..057a77f5 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/MarcacoesMedicinaHandler.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/MarcacoesMedicinaHandler.java @@ -9,12 +9,14 @@ package siprp.medicina; -import java.util.*; +import java.util.Date; -import com.evolute.utils.*; -import com.evolute.utils.jdo.*; +import siprp.data.Marcacao; +import siprp.data.MarcacaoTrabalhadorData; +import siprp.data.TrabalhadorData; -import siprp.data.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.jdo.JDOProvider; /** * Classe auxiliar para tratamento de marcações de Medicina. diff --git a/trunk/SIPRPSoft/src/siprp/medicina/MedicinaDataProvider.java b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaDataProvider.java index 6a1c6a9f..755be6a7 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/MedicinaDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaDataProvider.java @@ -9,18 +9,28 @@ package siprp.medicina; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.Vector; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.data.*; -import com.evolute.utils.db.*; -import com.evolute.utils.metadb.*; -import com.evolute.utils.sql.*; -import com.evolute.utils.tables.*; +import siprp.MedicinaConstants; +import siprp.data.Marcacao; -import siprp.*; -import siprp.data.*; +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.DBManager; +import com.evolute.utils.db.Executer; +import com.evolute.utils.metadb.MetaProvider; +import com.evolute.utils.sql.Assignment; +import com.evolute.utils.sql.Delete; +import com.evolute.utils.sql.Expression; +import com.evolute.utils.sql.Field; +import com.evolute.utils.sql.Insert; +import com.evolute.utils.sql.Select; +import com.evolute.utils.sql.Select2; +import com.evolute.utils.tables.ColumnizedMappable; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/medicina/MedicinaUpperPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaUpperPanel.java index dbdd786d..855c8fc0 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/MedicinaUpperPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaUpperPanel.java @@ -9,15 +9,23 @@ package siprp.medicina; -import java.awt.*; -import javax.swing.*; -import javax.swing.event.*; -import java.util.*; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.util.Arrays; +import java.util.Vector; -import com.evolute.utils.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.tables.*; -import com.evolute.utils.ui.*; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.ListSelectionModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; + +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.tables.BaseTable; +import com.evolute.utils.tables.ColumnizedMappable; +import com.evolute.utils.tables.VectorTableModel; +import com.evolute.utils.ui.DialogException; /** * diff --git a/trunk/SIPRPSoft/src/siprp/medicina/MedicinaWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaWindow.java index fa827ed4..56c24078 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/MedicinaWindow.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaWindow.java @@ -10,26 +10,43 @@ package siprp.medicina; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; -import java.text.*; -import java.util.*; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.text.DateFormat; +import java.util.Date; +import java.util.Locale; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.data.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.panel.*; -import com.evolute.utils.ui.search.*; -import com.evolute.utils.ui.text.*; -import com.evolute.utils.ui.window.*; +import javax.swing.BorderFactory; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; -import siprp.*; -import siprp.clientes.*; -import siprp.data.*; +import siprp.CompanyDataLoader; +import siprp.FichaDataProvider; +import siprp.SIPRPTracker; +import siprp.SingletonConstants; +import siprp.data.AvisoConstants; +import siprp.data.ContactoData; +import siprp.data.EstabelecimentoData; +import siprp.data.Marcacao; +import siprp.data.MarcacaoTrabalhadorData; +import siprp.data.TrabalhadorData; + +import com.evolute.utils.Singleton; +import com.evolute.utils.arrays.Object2DArray; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.panel.CheckBoxPanel; +import com.evolute.utils.ui.panel.TableEditorPanel; +import com.evolute.utils.ui.text.CopyPasteHandler; +import com.evolute.utils.ui.window.TabbedWindow; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/medicina/Test.java b/trunk/SIPRPSoft/src/siprp/medicina/Test.java index 8305609e..1c4c128d 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/Test.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/Test.java @@ -10,8 +10,7 @@ package siprp.medicina; -import java.awt.*; -import javax.swing.*; +import javax.swing.JFrame; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/medicina/exames/ui/RecepcaoExamesWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/exames/ui/RecepcaoExamesWindow.java index 5ddc29a6..c3a6df9a 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/exames/ui/RecepcaoExamesWindow.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/exames/ui/RecepcaoExamesWindow.java @@ -9,7 +9,6 @@ import java.awt.Dimension; import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import java.util.HashMap; import java.util.List; import javax.swing.JLabel; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindow.java index 670548f9..10c7aab2 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindow.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindow.java @@ -22,8 +22,6 @@ import javax.swing.WindowConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import siprp.medicina.locais_realizacao.LocaisRealizacaoConstants; - import com.evolute.utils.data.IDObject; import com.evolute.utils.dataui.ControllableComponent; import com.evolute.utils.tracker.TrackableWindow; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/FaxPrinter.java b/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/FaxPrinter.java index 392f8f25..e6ba4b5c 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/FaxPrinter.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/FaxPrinter.java @@ -9,15 +9,13 @@ package siprp.medicina.locais_realizacao; -import com.evolute.utils.data.IDObject; -import com.evolute.utils.data.MappableObject; -import com.evolute.utils.ui.CustomJDialog; -import com.evolute.utils.ui.panel.CheckBoxPanel; import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; + import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; + import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JLabel; @@ -26,6 +24,11 @@ import javax.swing.JTextField; import javax.swing.JToggleButton; import javax.swing.SwingUtilities; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.data.MappableObject; +import com.evolute.utils.ui.CustomJDialog; +import com.evolute.utils.ui.panel.CheckBoxPanel; + /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/LocaisRealizacaoWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/LocaisRealizacaoWindow.java index af9acce9..c557839e 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/LocaisRealizacaoWindow.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/LocaisRealizacaoWindow.java @@ -37,11 +37,9 @@ import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import siprp.data.Marcacao; import siprp.medicina.prestadores.PrestadoresDataProvider; import com.evolute.utils.data.IDObject; -import com.evolute.utils.data.MappableObject; import com.evolute.utils.tables.BaseTable; import com.evolute.utils.tables.ColumnizedMappable; import com.evolute.utils.tables.VectorTableModel; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/presencas/DetalhesRealizacaoDialog.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/DetalhesRealizacaoDialog.java index 6b939411..416d4ece 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/presencas/DetalhesRealizacaoDialog.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/presencas/DetalhesRealizacaoDialog.java @@ -9,14 +9,19 @@ package siprp.medicina.presencas; -import com.evolute.utils.data.IDObject; -import com.evolute.utils.ui.CustomJDialog; -import com.evolute.utils.ui.panel.CheckBoxPanel; import java.awt.BorderLayout; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import javax.swing.*; + +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; + +import com.evolute.utils.data.IDObject; +import com.evolute.utils.ui.CustomJDialog; +import com.evolute.utils.ui.panel.CheckBoxPanel; /** * diff --git a/trunk/SIPRPSoft/src/siprp/medicina/presencas/ImpressaoAuxiliaresWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/ImpressaoAuxiliaresWindow.java index 022449ce..e6167b76 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/presencas/ImpressaoAuxiliaresWindow.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/presencas/ImpressaoAuxiliaresWindow.java @@ -9,11 +9,11 @@ package siprp.medicina.presencas; -import java.awt.*; -import javax.swing.*; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.calendar.*; +import com.evolute.utils.ui.calendar.JCalendarPanel; /** * diff --git a/trunk/SIPRPSoft/src/siprp/medicina/presencas/Presenca.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/Presenca.java index 8398bcf9..42ef6e57 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/presencas/Presenca.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/presencas/Presenca.java @@ -10,7 +10,6 @@ package siprp.medicina.presencas; import com.evolute.utils.data.IDObject; -import siprp.data.Marcacao; /** * diff --git a/trunk/SIPRPSoft/src/siprp/medicina/presencas/PresencasActionFactory.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/PresencasActionFactory.java index a9faca2e..056eed36 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/presencas/PresencasActionFactory.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/presencas/PresencasActionFactory.java @@ -9,15 +9,16 @@ package siprp.medicina.presencas; -import com.evolute.utils.data.IDObject; -import com.evolute.utils.ui.panel.multipleactionlist.ActionFactory; import javax.swing.Action; + import siprp.medicina.presencas.actions.DesmarcadoSHSTAction; import siprp.medicina.presencas.actions.DesmarcadoTrabalhadorAction; import siprp.medicina.presencas.actions.FaltouAction; import siprp.medicina.presencas.actions.RealizouAction; import siprp.medicina.presencas.actions.RealizouParcialmenteAction; +import com.evolute.utils.ui.panel.multipleactionlist.ActionFactory; + /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/DesmarcadoSHSTAction.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/DesmarcadoSHSTAction.java index 7cf7717a..6df37359 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/DesmarcadoSHSTAction.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/DesmarcadoSHSTAction.java @@ -9,12 +9,15 @@ package siprp.medicina.presencas.actions; -import com.evolute.utils.ui.DialogException; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; + import siprp.medicina.presencas.Presenca; import siprp.medicina.presencas.PresencasDataProvider; +import com.evolute.utils.ui.DialogException; + /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/DesmarcadoTrabalhadorAction.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/DesmarcadoTrabalhadorAction.java index 93085547..76dba664 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/DesmarcadoTrabalhadorAction.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/DesmarcadoTrabalhadorAction.java @@ -9,12 +9,15 @@ package siprp.medicina.presencas.actions; -import com.evolute.utils.ui.DialogException; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; + import siprp.medicina.presencas.Presenca; import siprp.medicina.presencas.PresencasDataProvider; +import com.evolute.utils.ui.DialogException; + /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/FaltouAction.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/FaltouAction.java index 035c8dd5..707250fe 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/FaltouAction.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/FaltouAction.java @@ -9,12 +9,15 @@ package siprp.medicina.presencas.actions; -import com.evolute.utils.ui.DialogException; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; + import siprp.medicina.presencas.Presenca; import siprp.medicina.presencas.PresencasDataProvider; +import com.evolute.utils.ui.DialogException; + /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/RealizouAction.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/RealizouAction.java index 105b4ac0..971cec4e 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/RealizouAction.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/RealizouAction.java @@ -9,18 +9,21 @@ package siprp.medicina.presencas.actions; -import com.evolute.utils.data.IDObject; -import com.evolute.utils.ui.DialogException; import java.awt.event.ActionEvent; import java.util.Arrays; import java.util.Vector; + import javax.swing.AbstractAction; + import siprp.clientes.ClientesDataProvider; import siprp.medicina.MedicinaDataProvider; import siprp.medicina.presencas.DetalhesRealizacaoDialog; import siprp.medicina.presencas.Presenca; import siprp.medicina.presencas.PresencasDataProvider; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.ui.DialogException; + /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/RealizouParcialmenteAction.java b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/RealizouParcialmenteAction.java index 5384d787..3c669f3c 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/RealizouParcialmenteAction.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/presencas/actions/RealizouParcialmenteAction.java @@ -9,13 +9,12 @@ package siprp.medicina.presencas.actions; -import com.evolute.utils.data.IDObject; -import com.evolute.utils.ui.DialogException; import java.awt.event.ActionEvent; import java.util.Arrays; import java.util.Vector; + import javax.swing.AbstractAction; -import javax.swing.JOptionPane; + import siprp.clientes.ClientesDataProvider; import siprp.data.Marcacao; import siprp.medicina.MedicinaDataProvider; @@ -23,6 +22,9 @@ import siprp.medicina.presencas.DetalhesRealizacaoDialog; import siprp.medicina.presencas.Presenca; import siprp.medicina.presencas.PresencasDataProvider; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.ui.DialogException; + /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/medicina/prestadores/PrestadoresDataProvider.java b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/PrestadoresDataProvider.java index 2538eeab..6cb7b3ae 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/prestadores/PrestadoresDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/PrestadoresDataProvider.java @@ -9,6 +9,9 @@ package siprp.medicina.prestadores; +import siprp.data.ContactoData; +import siprp.medicina.prestadores.data.PrestadoresData; + import com.evolute.utils.Singleton; import com.evolute.utils.arrays.Object2DArray; import com.evolute.utils.arrays.Virtual2DArray; @@ -27,8 +30,6 @@ import com.evolute.utils.sql.Rollback; import com.evolute.utils.sql.Select; import com.evolute.utils.ui.search.SearchDialog; import com.evolute.utils.ui.search.SearchExecuter; -import siprp.data.ContactoData; -import siprp.medicina.prestadores.data.PrestadoresData; /** * diff --git a/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/Prestadores.java b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/Prestadores.java index 2be96bc6..234b5225 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/Prestadores.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/Prestadores.java @@ -7,7 +7,7 @@ */ package siprp.medicina.prestadores.data; -import com.evolute.utils.jdo.*; +import com.evolute.utils.jdo.JDOInnerObject; public final class Prestadores implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/PrestadoresData.java b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/PrestadoresData.java index 76b0c90c..c1393c5a 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/PrestadoresData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/PrestadoresData.java @@ -8,7 +8,8 @@ package siprp.medicina.prestadores.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class PrestadoresData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/PrestadoresID.java b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/PrestadoresID.java index 0c5e0dfe..6d755bde 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/PrestadoresID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/prestadores/data/PrestadoresID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.prestadores.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class PrestadoresID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultas.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultas.java index 751d454b..a95e96f3 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultas.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultas.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class TrabalhadoresConsultas implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasData.java index 63d5e7f4..fb96b27f 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasData.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadoresConsultasData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatas.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatas.java index 4d3f6ae2..f73e9722 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatas.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatas.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class TrabalhadoresConsultasDatas implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasData.java index 9065f440..536abfce 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasData.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadoresConsultasDatasData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmails.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmails.java index 3b6ffaa5..00bc91c3 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmails.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmails.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class TrabalhadoresConsultasDatasEmails implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsData.java index 4b468049..9225b356 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsData.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadoresConsultasDatasEmailsData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsID.java index 2ce5ade1..a9e15659 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasEmailsID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.processo.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadoresConsultasDatasEmailsID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasID.java index 32fbe2a2..ab628d6f 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.processo.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadoresConsultasDatasID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoes.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoes.java index 0d0f4f1d..7b4793c4 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoes.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoes.java @@ -7,7 +7,7 @@ */ package siprp.medicina.processo.data; -import com.evolute.utils.jdo.*; +import com.evolute.utils.jdo.JDOInnerObject; public final class TrabalhadoresConsultasDatasObservacoes implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesData.java index 1e922027..398752ba 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesData.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadoresConsultasDatasObservacoesData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesID.java index b94b6ccd..c8db4f34 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasDatasObservacoesID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.processo.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadoresConsultasDatasObservacoesID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasID.java index c68ef867..2347b21b 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresConsultasID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.processo.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadoresConsultasID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcd.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcd.java index 2ddfcc3a..cc8e3184 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcd.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcd.java @@ -7,7 +7,7 @@ */ package siprp.medicina.processo.data; -import com.evolute.utils.jdo.*; +import com.evolute.utils.jdo.JDOInnerObject; public final class TrabalhadoresEcd implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdData.java index 1dee1e3e..0154d4c5 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdData.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadoresEcdData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdID.java index 02db54c7..24d39509 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.processo.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadoresEcdID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcds.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcds.java index c6630bb6..5305b0d4 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcds.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcds.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class TrabalhadoresEcds implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsAnalise.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsAnalise.java index 51c237ff..a5d36be2 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsAnalise.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsAnalise.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class TrabalhadoresEcdsAnalise implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsAnaliseData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsAnaliseData.java index 3a2d06f2..d3f0ce07 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsAnaliseData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsAnaliseData.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadoresEcdsAnaliseData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsAnaliseID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsAnaliseID.java index 8ea6c5c4..1bd2d4b5 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsAnaliseID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsAnaliseID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.processo.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadoresEcdsAnaliseID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsData.java index c0a70e3d..b4a70a07 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsData.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadoresEcdsData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatas.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatas.java index f2f27ef9..51705429 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatas.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatas.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class TrabalhadoresEcdsDatas implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasData.java index 6337944a..ef21d535 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasData.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadoresEcdsDatasData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmails.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmails.java index fa6067ce..7fc88394 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmails.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmails.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class TrabalhadoresEcdsDatasEmails implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsData.java index 83bab785..b20862d7 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsData.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadoresEcdsDatasEmailsData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsID.java index 4f922a8f..b32cda9f 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasEmailsID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.processo.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadoresEcdsDatasEmailsID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasID.java index 56cab791..7526071c 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.processo.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadoresEcdsDatasID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoes.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoes.java index 1b9507c6..be5ee16e 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoes.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoes.java @@ -7,7 +7,7 @@ */ package siprp.medicina.processo.data; -import com.evolute.utils.jdo.*; +import com.evolute.utils.jdo.JDOInnerObject; public final class TrabalhadoresEcdsDatasObservacoes implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesData.java index 27a92a29..66f869b0 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesData.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadoresEcdsDatasObservacoesData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesID.java index 69a38d55..ae9fed15 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsDatasObservacoesID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.processo.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadoresEcdsDatasObservacoesID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsID.java index 53b5956f..85030225 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresEcdsID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.processo.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadoresEcdsID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidao.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidao.java index 08eea8e2..ef967eba 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidao.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidao.java @@ -7,7 +7,7 @@ */ package siprp.medicina.processo.data; -import com.evolute.utils.jdo.*; +import com.evolute.utils.jdo.JDOInnerObject; public final class TrabalhadoresFichasAptidao implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoData.java index ef732bfb..d7866eb2 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoData.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadoresFichasAptidaoData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoID.java index 9dba0804..8fe72ebf 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresFichasAptidaoID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.processo.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadoresFichasAptidaoID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcesso.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcesso.java index aa30278b..a5508aa4 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcesso.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcesso.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class TrabalhadoresProcesso implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcessoData.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcessoData.java index 25b68e51..176007ab 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcessoData.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcessoData.java @@ -8,7 +8,8 @@ package siprp.medicina.processo.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadoresProcessoData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcessoID.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcessoID.java index 3937e1df..17ab385e 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcessoID.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/data/TrabalhadoresProcessoID.java @@ -7,9 +7,9 @@ */ package siprp.medicina.processo.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadoresProcessoID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java index d997d0e3..e72abc63 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java @@ -12,8 +12,6 @@ import java.util.List; import javax.swing.JSeparator; -import com.evolute.adt.OrderedMap; - import leaf.ui.LeafCalendarDialog; import leaf.ui.LeafOptionDialog; import leaf.ui.LeafTextDialog; @@ -27,6 +25,8 @@ import siprp.database.cayenne.objects.TrabalhadoresEcd; import siprp.database.cayenne.objects.TrabalhadoresEcdsDatas; import siprp.medicina.processo.logic.MedicinaProcessoLogic; +import com.evolute.adt.OrderedMap; + public class MedicinaProcessoWindow extends LeafWindow { private static final long serialVersionUID = 1L; diff --git a/trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java b/trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java index 4c258ed5..c4f497b6 100644 --- a/trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java +++ b/trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java @@ -6,23 +6,49 @@ package siprp.pesquisas; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import javax.swing.*; -import javax.swing.event.*; -import java.util.*; +import java.awt.Dimension; +import java.awt.FileDialog; +import java.awt.FlowLayout; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Vector; -import com.evolute.utils.*; -import com.evolute.utils.data.*; -import com.evolute.utils.documents.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.tables.*; -import com.evolute.utils.tracker.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.text.*; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JEditorPane; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextField; +import javax.swing.ListSelectionModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; -import siprp.data.*; +import siprp.data.ContactoData; +import siprp.data.EmpresaData; +import siprp.data.EstabelecimentoData; + +import com.evolute.utils.Singleton; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.data.MappableObject; +import com.evolute.utils.documents.YearDocument; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.tables.BaseTable; +import com.evolute.utils.tables.VectorTableModel; +import com.evolute.utils.tracker.TrackableWindow; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * diff --git a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPDFCreator.java b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPDFCreator.java index 6e4aba09..9b3e0a29 100644 --- a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPDFCreator.java +++ b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPDFCreator.java @@ -2,7 +2,6 @@ package siprp.planoactuacao.print; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.FileOutputStream; import java.io.InputStream; import org.jdom.Document; diff --git a/trunk/SIPRPSoft/src/siprp/update/UpdateWindow.java b/trunk/SIPRPSoft/src/siprp/update/UpdateWindow.java index 256a2571..1dcacb8b 100644 --- a/trunk/SIPRPSoft/src/siprp/update/UpdateWindow.java +++ b/trunk/SIPRPSoft/src/siprp/update/UpdateWindow.java @@ -9,19 +9,22 @@ package siprp.update; -import java.awt.*; -import java.awt.event.*; -import java.io.BufferedOutputStream; -import java.io.ByteArrayOutputStream; +import java.awt.BorderLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; -import javax.swing.*; -import java.util.*; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; -import com.evolute.utils.*; -import com.evolute.utils.date.*; -import com.evolute.utils.db.*; -import com.evolute.utils.sql.*; -import com.evolute.utils.ui.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; +import com.evolute.utils.sql.Assignment; +import com.evolute.utils.sql.Field; /** diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_1_To_V11_2.java b/trunk/SIPRPSoft/src/siprp/update/updates/V11_1_To_V11_2.java index 8dbe418e..e4f57870 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V11_1_To_V11_2.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V11_1_To_V11_2.java @@ -1,27 +1,10 @@ package siprp.update.updates; -import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; -import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; -import static com.evolute.utils.strings.UnicodeLatin1Map.oacute; -import static com.evolute.utils.strings.UnicodeLatin1Map.uacute; - -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; - -import javax.imageio.ImageIO; - import siprp.higiene.gestao.importacao.Importador; import com.evolute.utils.Singleton; -import com.evolute.utils.arrays.Virtual2DArray; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Assignment; -import com.evolute.utils.sql.BlobUpdate; -import com.evolute.utils.sql.Field; -import com.evolute.utils.sql.Insert; -import com.evolute.utils.sql.Select2; -import com.evolute.utils.sql.Update; public class V11_1_To_V11_2 implements siprp.update.Update { diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V6_1_To_V7_0.java b/trunk/SIPRPSoft/src/siprp/update/updates/V6_1_To_V7_0.java index b6a7d176..0fa15d9e 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V6_1_To_V7_0.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V6_1_To_V7_0.java @@ -9,10 +9,9 @@ package siprp.update.updates; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.db.*; -import com.evolute.utils.sql.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; /** diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_0_To_V7_2.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_0_To_V7_2.java index 19f7986a..2bcb004c 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_0_To_V7_2.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V7_0_To_V7_2.java @@ -9,10 +9,9 @@ package siprp.update.updates; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.db.*; -import com.evolute.utils.sql.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; /** diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_2_To_V7_4.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_2_To_V7_4.java index 02dcc720..bf21eb40 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_2_To_V7_4.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V7_2_To_V7_4.java @@ -9,10 +9,9 @@ package siprp.update.updates; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.db.*; -import com.evolute.utils.sql.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; /** diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_4_To_V7_5.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_4_To_V7_5.java index 792157d0..56902912 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_4_To_V7_5.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V7_4_To_V7_5.java @@ -9,10 +9,9 @@ package siprp.update.updates; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.db.*; -import com.evolute.utils.sql.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; /** diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_5_To_V7_6.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_5_To_V7_6.java index af850998..497f3783 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_5_To_V7_6.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V7_5_To_V7_6.java @@ -9,10 +9,9 @@ package siprp.update.updates; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.db.*; -import com.evolute.utils.sql.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; /** diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_7_To_V7_8.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_7_To_V7_8.java index 648a1182..72c7893a 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_7_To_V7_8.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V7_7_To_V7_8.java @@ -12,8 +12,6 @@ package siprp.update.updates; import com.evolute.utils.Singleton; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Assignment; -import com.evolute.utils.sql.Field; /** * diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_8_To_V7_9.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_8_To_V7_9.java index f5946acf..c98b022e 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_8_To_V7_9.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V7_8_To_V7_9.java @@ -12,8 +12,6 @@ package siprp.update.updates; import com.evolute.utils.Singleton; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Assignment; -import com.evolute.utils.sql.Field; /** * diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_9_To_V8_0.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_9_To_V8_0.java index 45c4d103..8423db84 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_9_To_V8_0.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V7_9_To_V8_0.java @@ -12,8 +12,6 @@ package siprp.update.updates; import com.evolute.utils.Singleton; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Assignment; -import com.evolute.utils.sql.Field; /** * diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_0_To_V8_1.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_0_To_V8_1.java index 99b2d931..177c3baa 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_0_To_V8_1.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V8_0_To_V8_1.java @@ -12,8 +12,6 @@ package siprp.update.updates; import com.evolute.utils.Singleton; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Assignment; -import com.evolute.utils.sql.Field; /** * diff --git a/trunk/SIPRPSoft/src/siprp/web/WebUpdater.java b/trunk/SIPRPSoft/src/siprp/web/WebUpdater.java index d34a5bae..36109d56 100644 --- a/trunk/SIPRPSoft/src/siprp/web/WebUpdater.java +++ b/trunk/SIPRPSoft/src/siprp/web/WebUpdater.java @@ -6,13 +6,35 @@ package siprp.web; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.sql.*; -import javax.swing.*; -import javax.swing.event.*; -import java.util.*; +import java.awt.Color; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionListener; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.OutputStream; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.Statement; +import java.util.Calendar; +import java.util.Properties; +import java.util.Vector; + +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.event.DocumentListener; //import siprp.*; //import siprp.clientes.*; diff --git a/trunk/common/src/siprp/database/cayenne/objects/HsRisco.java b/trunk/common/src/siprp/database/cayenne/objects/HsRisco.java index a34d18ad..f8579dcd 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/HsRisco.java +++ b/trunk/common/src/siprp/database/cayenne/objects/HsRisco.java @@ -1,7 +1,5 @@ package siprp.database.cayenne.objects; -import java.util.Date; - import siprp.database.cayenne.objects.auto._HsRisco; public class HsRisco extends _HsRisco { diff --git a/trunk/common/src/siprp/database/cayenne/objects/PrtGruposProtocolo.java b/trunk/common/src/siprp/database/cayenne/objects/PrtGruposProtocolo.java index 88b6a712..04645e4e 100755 --- a/trunk/common/src/siprp/database/cayenne/objects/PrtGruposProtocolo.java +++ b/trunk/common/src/siprp/database/cayenne/objects/PrtGruposProtocolo.java @@ -1,7 +1,5 @@ package siprp.database.cayenne.objects; -import com.evolute.utils.strings.UnicodeChecker; - import siprp.database.cayenne.objects.auto._PrtGruposProtocolo; public class PrtGruposProtocolo extends _PrtGruposProtocolo { diff --git a/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatasObservacoes.java b/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatasObservacoes.java index 0308bbfe..a3383eb7 100755 --- a/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatasObservacoes.java +++ b/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatasObservacoes.java @@ -1,7 +1,5 @@ package siprp.database.cayenne.objects; -import com.evolute.utils.strings.UnicodeChecker; - import siprp.database.cayenne.objects.auto._TrabalhadoresConsultasDatasObservacoes; public class TrabalhadoresConsultasDatasObservacoes extends _TrabalhadoresConsultasDatasObservacoes { diff --git a/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java b/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java index b4fd8b6b..164af20e 100755 --- a/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java +++ b/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import com.evolute.adt.OrderedMap; - import siprp.MedicinaConstants; import siprp.database.cayenne.objects.auto._TrabalhadoresEcds; +import com.evolute.adt.OrderedMap; + public class TrabalhadoresEcds extends _TrabalhadoresEcds implements MedicinaConstants { private static final long serialVersionUID = 1L; diff --git a/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java b/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java index 2706c1f8..2091117d 100755 --- a/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java +++ b/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java @@ -5,11 +5,11 @@ import java.util.Date; import java.util.HashMap; import java.util.List; -import com.evolute.adt.OrderedMap; - import siprp.MedicinaConstants; import siprp.database.cayenne.objects.auto._TrabalhadoresEcdsDatas; +import com.evolute.adt.OrderedMap; + public class TrabalhadoresEcdsDatas extends _TrabalhadoresEcdsDatas implements MedicinaConstants { private static final long serialVersionUID = 1L; diff --git a/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatasObservacoes.java b/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatasObservacoes.java index ff0ac0af..aa91c677 100755 --- a/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatasObservacoes.java +++ b/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatasObservacoes.java @@ -1,7 +1,5 @@ package siprp.database.cayenne.objects; -import com.evolute.utils.strings.UnicodeChecker; - import siprp.database.cayenne.objects.auto._TrabalhadoresEcdsDatasObservacoes; public class TrabalhadoresEcdsDatasObservacoes extends _TrabalhadoresEcdsDatasObservacoes { diff --git a/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java b/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java index 280780a2..94f5d7d7 100644 --- a/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java +++ b/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java @@ -5,9 +5,7 @@ import java.util.LinkedList; import java.util.List; import org.apache.cayenne.DataObjectUtils; -import org.apache.cayenne.cache.QueryCache; import org.apache.cayenne.exp.ExpressionFactory; -import org.apache.cayenne.query.QueryCacheStrategy; import org.apache.cayenne.query.SelectQuery; import siprp.database.cayenne.objects.EmailPlanoDeActuacao;