diff --git a/trunk/SIPRPSoft/src/leaf/ui/LeafScrollBar.java b/trunk/SIPRPSoft/src/leaf/ui/LeafScrollBar.java index 4df163d3..f3e5d4f7 100644 --- a/trunk/SIPRPSoft/src/leaf/ui/LeafScrollBar.java +++ b/trunk/SIPRPSoft/src/leaf/ui/LeafScrollBar.java @@ -1,6 +1,5 @@ package leaf.ui; -import javax.swing.JScrollBar; import javax.swing.JScrollPane; public class LeafScrollBar extends JScrollPane diff --git a/trunk/SIPRPSoft/src/leaf/ui/LeafTableModel.java b/trunk/SIPRPSoft/src/leaf/ui/LeafTableModel.java index 5b93a11a..66d22449 100644 --- a/trunk/SIPRPSoft/src/leaf/ui/LeafTableModel.java +++ b/trunk/SIPRPSoft/src/leaf/ui/LeafTableModel.java @@ -4,13 +4,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; - -import siprp.database.cayenne.objects.TrabalhadoresEcd; - - import com.evolute.adt.OrderedMap; import com.evolute.utils.tables.BaseTableModel; -import com.evolute.utils.tables.models.SortableModel; public class LeafTableModel extends BaseTableModel { diff --git a/trunk/SIPRPSoft/src/leaf/ui/LeafTextArea.java b/trunk/SIPRPSoft/src/leaf/ui/LeafTextArea.java index e4656459..41d69586 100644 --- a/trunk/SIPRPSoft/src/leaf/ui/LeafTextArea.java +++ b/trunk/SIPRPSoft/src/leaf/ui/LeafTextArea.java @@ -2,7 +2,6 @@ package leaf.ui; import java.beans.PropertyChangeListener; -import javax.swing.JComponent; import javax.swing.JTextArea; import javax.swing.event.CaretEvent; import javax.swing.event.CaretListener; diff --git a/trunk/SIPRPSoft/src/leaf/ui/TreeInserterDialog.java b/trunk/SIPRPSoft/src/leaf/ui/TreeInserterDialog.java index a36db6f6..aaaf3ce9 100644 --- a/trunk/SIPRPSoft/src/leaf/ui/TreeInserterDialog.java +++ b/trunk/SIPRPSoft/src/leaf/ui/TreeInserterDialog.java @@ -3,7 +3,6 @@ package leaf.ui; import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; -import java.awt.Component; import java.awt.Dimension; import java.awt.Insets; import java.awt.Toolkit; diff --git a/trunk/SIPRPSoft/src/siprp/SHSTLogger.java b/trunk/SIPRPSoft/src/siprp/SHSTLogger.java index 9330e900..cdcf37f8 100644 --- a/trunk/SIPRPSoft/src/siprp/SHSTLogger.java +++ b/trunk/SIPRPSoft/src/siprp/SHSTLogger.java @@ -6,10 +6,14 @@ package siprp; -import com.evolute.utils.*; -import com.evolute.utils.db.*; -import com.evolute.utils.error.*; -import com.evolute.utils.sql.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; +import com.evolute.utils.db.SQLRetriever; +import com.evolute.utils.error.Logger; +import com.evolute.utils.sql.Assignment; +import com.evolute.utils.sql.Field; +import com.evolute.utils.sql.Insert; /** * diff --git a/trunk/SIPRPSoft/src/siprp/clientes/AvisosPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/AvisosPanel.java index fa73c5d2..a9472388 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/AvisosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/AvisosPanel.java @@ -6,20 +6,38 @@ package siprp.clientes; -import java.awt.*; -import java.awt.event.*; -import java.text.*; -import java.util.*; -import javax.swing.*; -import java.util.*; +import java.awt.Color; +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.Calendar; +import java.util.Date; +import java.util.Hashtable; +import java.util.Set; -import com.evolute.utils.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.ui.*; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; -import siprp.*; -import siprp.data.*; +import siprp.FichaDataProvider; +import siprp.SIPRPTracker; +import siprp.data.AvisoConstants; +import siprp.data.AvisoData; +import siprp.data.EmpresaData; +import siprp.data.EstabelecimentoData; +import siprp.data.TrabalhadorData; + +import com.evolute.utils.Singleton; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.ui.DialogException; /** * diff --git a/trunk/SIPRPSoft/src/siprp/clientes/ClientesDataProvider.java b/trunk/SIPRPSoft/src/siprp/clientes/ClientesDataProvider.java index 1ecb612a..5ab25639 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/ClientesDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/ClientesDataProvider.java @@ -9,15 +9,21 @@ package siprp.clientes; -import java.util.*; +import java.util.Hashtable; +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.strings.*; +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.Field; +import com.evolute.utils.sql.Insert; +import com.evolute.utils.sql.Select; /** * diff --git a/trunk/SIPRPSoft/src/siprp/clientes/ContactoPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/ContactoPanel.java index 71c5dae3..b1f6d1cd 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/ContactoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/ContactoPanel.java @@ -6,14 +6,21 @@ package siprp.clientes; -import java.awt.*; -import javax.swing.*; -import java.util.*; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.util.Hashtable; -import com.evolute.utils.dataui.*; -import com.evolute.utils.ui.text.*; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; -import siprp.data.*; +import siprp.data.ContactoData; + +import com.evolute.utils.dataui.ComponentController; +import com.evolute.utils.dataui.ComponentsHashtable; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/clientes/EtiquetaChooserDialog.java b/trunk/SIPRPSoft/src/siprp/clientes/EtiquetaChooserDialog.java index d6324e91..34c90851 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/EtiquetaChooserDialog.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/EtiquetaChooserDialog.java @@ -9,12 +9,16 @@ package siprp.clientes; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import java.util.*; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.Hashtable; -import com.evolute.utils.ui.*; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.SwingUtilities; + +import com.evolute.utils.ui.CustomJDialog; /** * diff --git a/trunk/SIPRPSoft/src/siprp/clientes/HistoricoEstabelecimentoPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/HistoricoEstabelecimentoPanel.java index 275e7a71..beb96e7f 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/HistoricoEstabelecimentoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/HistoricoEstabelecimentoPanel.java @@ -6,19 +6,36 @@ package siprp.clientes; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; -import java.util.*; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.Hashtable; -import com.evolute.utils.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.calendar.*; -import com.evolute.utils.ui.text.*; +import javax.swing.Icon; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.event.DocumentListener; -import siprp.data.*; +import siprp.data.EstabelecimentoData; +import siprp.data.HistoricoEstabelecimentoData; + +import com.evolute.utils.EVUtilsImageLib; +import com.evolute.utils.dataui.ComponentController; +import com.evolute.utils.dataui.ComponentsHashtable; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.calendar.JCalendarPanel; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * diff --git a/trunk/SIPRPSoft/src/siprp/clientes/MarcacaoEmpresaPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/MarcacaoEmpresaPanel.java index 4a271a73..281cb79b 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/MarcacaoEmpresaPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/MarcacaoEmpresaPanel.java @@ -6,21 +6,36 @@ package siprp.clientes; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; -import java.util.*; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.Hashtable; -import com.evolute.utils.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.toolbar.*; -import com.evolute.utils.tables.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.calendar.*; -import com.evolute.utils.ui.text.*; +import javax.swing.Icon; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.event.ChangeListener; +import javax.swing.event.DocumentListener; -import siprp.data.*; +import siprp.data.EmpresaData; +import siprp.data.MarcacaoEmpresaData; + +import com.evolute.utils.EVUtilsImageLib; +import com.evolute.utils.dataui.ComponentController; +import com.evolute.utils.dataui.ComponentsHashtable; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.calendar.JCalendarPanel; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * diff --git a/trunk/SIPRPSoft/src/siprp/clientes/NoticiasDataProvider.java b/trunk/SIPRPSoft/src/siprp/clientes/NoticiasDataProvider.java index a678cd7c..e4f23ccc 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/NoticiasDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/NoticiasDataProvider.java @@ -6,15 +6,18 @@ package siprp.clientes; -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.ui.search.*; -import com.evolute.utils.sql.*; +import siprp.SingletonConstants; -import siprp.*; +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.db.JDBCManager; +import com.evolute.utils.metadb.MetaProvider; +import com.evolute.utils.sql.Assignment; +import com.evolute.utils.sql.Field; +import com.evolute.utils.sql.Insert; +import com.evolute.utils.sql.Select; /** * diff --git a/trunk/SIPRPSoft/src/siprp/clientes/NoticiasDialog.java b/trunk/SIPRPSoft/src/siprp/clientes/NoticiasDialog.java index 5e432c05..6db2c3b7 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/NoticiasDialog.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/NoticiasDialog.java @@ -6,12 +6,19 @@ package siprp.clientes; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.panel.*; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; + +import com.evolute.utils.ui.CustomJDialog; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.panel.HTMLEditorPanel; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/clientes/PerfilProtocoloPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/PerfilProtocoloPanel.java index bfe2a4e8..04ef1c6e 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/PerfilProtocoloPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/PerfilProtocoloPanel.java @@ -9,14 +9,21 @@ package siprp.clientes; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import java.util.*; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.Arrays; +import java.util.Vector; -import com.evolute.utils.data.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.ui.panel.*; +import javax.swing.BorderFactory; +import javax.swing.JCheckBox; +import javax.swing.JPanel; + +import com.evolute.utils.data.IDObject; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.ui.panel.CheckBoxPanel; /** * diff --git a/trunk/SIPRPSoft/src/siprp/clientes/ProtocoloPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/ProtocoloPanel.java index af0e2ae0..53544e40 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/ProtocoloPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/ProtocoloPanel.java @@ -9,12 +9,18 @@ package siprp.clientes; -import java.awt.*; -import javax.swing.*; -import java.util.*; +import java.awt.GridLayout; +import java.util.Arrays; +import java.util.Hashtable; +import java.util.Vector; -import com.evolute.utils.data.*; -import com.evolute.utils.dataui.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.JScrollPane; + +import com.evolute.utils.data.IDObject; +import com.evolute.utils.data.MappableObject; +import com.evolute.utils.dataui.ControllableComponent; /** * diff --git a/trunk/SIPRPSoft/src/siprp/clientes/TrabalhadorPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/TrabalhadorPanel.java index 5a21baea..88ab5274 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/TrabalhadorPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/TrabalhadorPanel.java @@ -9,28 +9,44 @@ package siprp.clientes; import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; -import javax.swing.*; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.Arrays; +import java.util.Hashtable; +import java.util.Vector; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; -import java.util.*; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.ListSelectionModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; -import com.evolute.utils.data.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.date.*; -import com.evolute.utils.error.ErrorLogger; -import com.evolute.utils.metadb.*; -import com.evolute.utils.tables.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.calendar.*; -import com.evolute.utils.ui.panel.*; -import com.evolute.utils.ui.text.*; +import siprp.FichaDataProvider; +import siprp.SIPRPTracker; +import siprp.data.EmpresaData; +import siprp.data.EstabelecimentoData; +import siprp.data.TrabalhadorData; -import siprp.*; -import siprp.data.*; -import siprp.importer.*; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.data.MappableObject; +import com.evolute.utils.dataui.ComponentController; +import com.evolute.utils.dataui.ComponentsHashtable; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.error.ErrorLogger; +import com.evolute.utils.tables.BaseTable; +import com.evolute.utils.tables.VectorTableModel; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.calendar.JCalendarPanel; +import com.evolute.utils.ui.panel.RadioButtonFixedPanel; +import com.evolute.utils.ui.panel.RadioButtonPanel; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * diff --git a/trunk/SIPRPSoft/src/siprp/clientes/UserDataProvider.java b/trunk/SIPRPSoft/src/siprp/clientes/UserDataProvider.java index 1d89bc93..ee5a373a 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/UserDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/UserDataProvider.java @@ -6,17 +6,20 @@ package siprp.clientes; -import java.util.*; +import siprp.SingletonConstants; -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.ui.search.*; -import com.evolute.utils.sql.*; - -import siprp.*; +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.db.JDBCManager; +import com.evolute.utils.metadb.MetaProvider; +import com.evolute.utils.sql.Assignment; +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.Update; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/clientes/UserPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/UserPanel.java index d9a8bf2f..f518b16e 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/UserPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/UserPanel.java @@ -6,13 +6,23 @@ package siprp.clientes; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; +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.awt.event.FocusListener; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.text.*; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.event.DocumentListener; + +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/clientes/UserWindow.java b/trunk/SIPRPSoft/src/siprp/clientes/UserWindow.java index 8ba90d39..b2cba2b1 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/UserWindow.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/UserWindow.java @@ -6,14 +6,15 @@ package siprp.clientes; -import java.awt.*; -import javax.swing.*; +import java.awt.BorderLayout; -import com.evolute.utils.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.ui.*; +import javax.swing.JFrame; -import siprp.data.*; +import siprp.data.EmpresaData; + +import com.evolute.utils.Singleton; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.ui.CustomJDialog; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/data/ActualizacaoSaveHandler.java b/trunk/SIPRPSoft/src/siprp/data/ActualizacaoSaveHandler.java index a951e86a..dbd36fc9 100644 --- a/trunk/SIPRPSoft/src/siprp/data/ActualizacaoSaveHandler.java +++ b/trunk/SIPRPSoft/src/siprp/data/ActualizacaoSaveHandler.java @@ -6,9 +6,10 @@ package siprp.data; -import java.util.*; +import java.util.Date; -import com.evolute.utils.jdo.*; +import com.evolute.utils.jdo.JDOObject; +import com.evolute.utils.jdo.JDOOperationHandlerInterface; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/data/Aviso.java b/trunk/SIPRPSoft/src/siprp/data/Aviso.java index 791fad87..3d22b137 100644 --- a/trunk/SIPRPSoft/src/siprp/data/Aviso.java +++ b/trunk/SIPRPSoft/src/siprp/data/Aviso.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class Aviso implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/AvisoData.java b/trunk/SIPRPSoft/src/siprp/data/AvisoData.java index dace2057..75121ad5 100644 --- a/trunk/SIPRPSoft/src/siprp/data/AvisoData.java +++ b/trunk/SIPRPSoft/src/siprp/data/AvisoData.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class AvisoData extends JDOObject implements AvisoConstants diff --git a/trunk/SIPRPSoft/src/siprp/data/AvisoID.java b/trunk/SIPRPSoft/src/siprp/data/AvisoID.java index 9a7cfb3f..c7f0b9d4 100644 --- a/trunk/SIPRPSoft/src/siprp/data/AvisoID.java +++ b/trunk/SIPRPSoft/src/siprp/data/AvisoID.java @@ -7,7 +7,7 @@ */ package siprp.data; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class AvisoID extends IntegerID { diff --git a/trunk/SIPRPSoft/src/siprp/data/Contacto.java b/trunk/SIPRPSoft/src/siprp/data/Contacto.java index 38941701..4fa841b0 100644 --- a/trunk/SIPRPSoft/src/siprp/data/Contacto.java +++ b/trunk/SIPRPSoft/src/siprp/data/Contacto.java @@ -7,8 +7,7 @@ */ package siprp.data; -import java.util.Date; -import com.evolute.utils.jdo.*; +import com.evolute.utils.jdo.JDOInnerObject; public final class Contacto implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/ContactoData.java b/trunk/SIPRPSoft/src/siprp/data/ContactoData.java index a3fd1829..5e06d014 100644 --- a/trunk/SIPRPSoft/src/siprp/data/ContactoData.java +++ b/trunk/SIPRPSoft/src/siprp/data/ContactoData.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class ContactoData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/ContactoID.java b/trunk/SIPRPSoft/src/siprp/data/ContactoID.java index a142d5ef..52eb7936 100644 --- a/trunk/SIPRPSoft/src/siprp/data/ContactoID.java +++ b/trunk/SIPRPSoft/src/siprp/data/ContactoID.java @@ -7,7 +7,7 @@ */ package siprp.data; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class ContactoID extends IntegerID { diff --git a/trunk/SIPRPSoft/src/siprp/data/DisableDeleteHandler.java b/trunk/SIPRPSoft/src/siprp/data/DisableDeleteHandler.java index d6f2650e..5663cd4b 100644 --- a/trunk/SIPRPSoft/src/siprp/data/DisableDeleteHandler.java +++ b/trunk/SIPRPSoft/src/siprp/data/DisableDeleteHandler.java @@ -6,7 +6,8 @@ package siprp.data; -import com.evolute.utils.jdo.*; +import com.evolute.utils.jdo.JDOObject; +import com.evolute.utils.jdo.JDOOperationHandlerInterface; /** * diff --git a/trunk/SIPRPSoft/src/siprp/data/Empresa.java b/trunk/SIPRPSoft/src/siprp/data/Empresa.java index 7a64f2dc..3f99524e 100644 --- a/trunk/SIPRPSoft/src/siprp/data/Empresa.java +++ b/trunk/SIPRPSoft/src/siprp/data/Empresa.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class Empresa implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/EmpresaData.java b/trunk/SIPRPSoft/src/siprp/data/EmpresaData.java index 437a7f72..6a21a31e 100644 --- a/trunk/SIPRPSoft/src/siprp/data/EmpresaData.java +++ b/trunk/SIPRPSoft/src/siprp/data/EmpresaData.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class EmpresaData extends JDOObject implements DisableDeleteable, ActualizacaoSaveable diff --git a/trunk/SIPRPSoft/src/siprp/data/EmpresaID.java b/trunk/SIPRPSoft/src/siprp/data/EmpresaID.java index ddee27c0..03737a85 100644 --- a/trunk/SIPRPSoft/src/siprp/data/EmpresaID.java +++ b/trunk/SIPRPSoft/src/siprp/data/EmpresaID.java @@ -7,9 +7,9 @@ */ package siprp.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class EmpresaID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/data/Estabelecimento.java b/trunk/SIPRPSoft/src/siprp/data/Estabelecimento.java index e5a6877d..1c526df3 100644 --- a/trunk/SIPRPSoft/src/siprp/data/Estabelecimento.java +++ b/trunk/SIPRPSoft/src/siprp/data/Estabelecimento.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class Estabelecimento implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/EstabelecimentoData.java b/trunk/SIPRPSoft/src/siprp/data/EstabelecimentoData.java index 59d8742e..6df56420 100644 --- a/trunk/SIPRPSoft/src/siprp/data/EstabelecimentoData.java +++ b/trunk/SIPRPSoft/src/siprp/data/EstabelecimentoData.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class EstabelecimentoData extends JDOObject implements DisableDeleteable, ActualizacaoSaveable diff --git a/trunk/SIPRPSoft/src/siprp/data/EstabelecimentoID.java b/trunk/SIPRPSoft/src/siprp/data/EstabelecimentoID.java index 3824759b..fb87c386 100644 --- a/trunk/SIPRPSoft/src/siprp/data/EstabelecimentoID.java +++ b/trunk/SIPRPSoft/src/siprp/data/EstabelecimentoID.java @@ -7,9 +7,9 @@ */ package siprp.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class EstabelecimentoID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/data/Etiqueta.java b/trunk/SIPRPSoft/src/siprp/data/Etiqueta.java index 7a35bb38..86592fbd 100644 --- a/trunk/SIPRPSoft/src/siprp/data/Etiqueta.java +++ b/trunk/SIPRPSoft/src/siprp/data/Etiqueta.java @@ -7,7 +7,7 @@ */ package siprp.data; -import com.evolute.utils.jdo.*; +import com.evolute.utils.jdo.JDOInnerObject; public final class Etiqueta implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/EtiquetaData.java b/trunk/SIPRPSoft/src/siprp/data/EtiquetaData.java index 8d244d95..72f27f05 100644 --- a/trunk/SIPRPSoft/src/siprp/data/EtiquetaData.java +++ b/trunk/SIPRPSoft/src/siprp/data/EtiquetaData.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class EtiquetaData extends JDOObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/EtiquetaID.java b/trunk/SIPRPSoft/src/siprp/data/EtiquetaID.java index d014ef55..1b2b80c6 100644 --- a/trunk/SIPRPSoft/src/siprp/data/EtiquetaID.java +++ b/trunk/SIPRPSoft/src/siprp/data/EtiquetaID.java @@ -7,9 +7,9 @@ */ package siprp.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class EtiquetaID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/data/Exame.java b/trunk/SIPRPSoft/src/siprp/data/Exame.java index 58ade49b..95b49286 100644 --- a/trunk/SIPRPSoft/src/siprp/data/Exame.java +++ b/trunk/SIPRPSoft/src/siprp/data/Exame.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class Exame implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/ExameData.java b/trunk/SIPRPSoft/src/siprp/data/ExameData.java index ffc17877..41277465 100644 --- a/trunk/SIPRPSoft/src/siprp/data/ExameData.java +++ b/trunk/SIPRPSoft/src/siprp/data/ExameData.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class ExameData extends JDOObject implements DisableDeleteable diff --git a/trunk/SIPRPSoft/src/siprp/data/ExameID.java b/trunk/SIPRPSoft/src/siprp/data/ExameID.java index 3fc144de..c5a85ba6 100644 --- a/trunk/SIPRPSoft/src/siprp/data/ExameID.java +++ b/trunk/SIPRPSoft/src/siprp/data/ExameID.java @@ -7,7 +7,7 @@ */ package siprp.data; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class ExameID extends IntegerID { diff --git a/trunk/SIPRPSoft/src/siprp/data/Historico.java b/trunk/SIPRPSoft/src/siprp/data/Historico.java index 3a641ee1..fee34bd7 100644 --- a/trunk/SIPRPSoft/src/siprp/data/Historico.java +++ b/trunk/SIPRPSoft/src/siprp/data/Historico.java @@ -6,13 +6,11 @@ package siprp.data; -import java.text.*; -import java.util.*; +import java.text.DateFormat; +import java.util.Date; -import com.evolute.utils.jdo.*; -import com.evolute.utils.tables.*; - -import siprp.*; +import com.evolute.utils.jdo.JDOObject; +import com.evolute.utils.tables.ColumnizedObject; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimento.java b/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimento.java index 0bd186b8..627cfb58 100644 --- a/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimento.java +++ b/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimento.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class HistoricoEstabelecimento implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimentoData.java b/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimentoData.java index 38f82221..fbadf75d 100644 --- a/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimentoData.java +++ b/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimentoData.java @@ -8,7 +8,6 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; public final class HistoricoEstabelecimentoData extends Historico { diff --git a/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimentoID.java b/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimentoID.java index 1513d1bc..393db911 100644 --- a/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimentoID.java +++ b/trunk/SIPRPSoft/src/siprp/data/HistoricoEstabelecimentoID.java @@ -7,7 +7,7 @@ */ package siprp.data; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class HistoricoEstabelecimentoID extends IntegerID { diff --git a/trunk/SIPRPSoft/src/siprp/data/Marcacao.java b/trunk/SIPRPSoft/src/siprp/data/Marcacao.java index 5302e965..ed260f6d 100644 --- a/trunk/SIPRPSoft/src/siprp/data/Marcacao.java +++ b/trunk/SIPRPSoft/src/siprp/data/Marcacao.java @@ -6,14 +6,15 @@ package siprp.data; -import java.text.*; -import java.util.*; +import java.text.DateFormat; +import java.util.Date; -import com.evolute.utils.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.tables.*; +import siprp.FichaDataProvider; -import siprp.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.jdo.JDOObject; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.tables.ColumnizedObject; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresa.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresa.java index 1f32cac8..9288e111 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresa.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresa.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class MarcacaoEmpresa implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresaData.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresaData.java index 54921f1f..95d12903 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresaData.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresaData.java @@ -8,7 +8,6 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; public final class MarcacaoEmpresaData extends Marcacao { diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresaID.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresaID.java index 8b074d13..cc7f8c1e 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresaID.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEmpresaID.java @@ -7,7 +7,7 @@ */ package siprp.data; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class MarcacaoEmpresaID extends IntegerID { diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimento.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimento.java index 0081b6c4..4ed9c9cf 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimento.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimento.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class MarcacaoEstabelecimento implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoData.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoData.java index 1f490d33..059aa94a 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoData.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoData.java @@ -8,7 +8,6 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; public final class MarcacaoEstabelecimentoData extends Marcacao { diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoID.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoID.java index 36240581..5fc5f25d 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoID.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoID.java @@ -7,9 +7,9 @@ */ package siprp.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class MarcacaoEstabelecimentoID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoListLoader.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoListLoader.java index c966c222..ee594e50 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoListLoader.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoListLoader.java @@ -6,13 +6,13 @@ package siprp.data; -import javax.jdo.*; -import java.util.*; +import java.util.Collection; -import com.evolute.utils.*; -import com.evolute.utils.jdo.*; +import javax.jdo.Query; -import siprp.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.jdo.JDOInnerObject; +import com.evolute.utils.jdo.JDOProvider; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoSaveAndDeleteHandler.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoSaveAndDeleteHandler.java index c8df3dc6..6bc6a08b 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoSaveAndDeleteHandler.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoSaveAndDeleteHandler.java @@ -6,12 +6,15 @@ package siprp.data; -import java.util.*; +import java.util.Calendar; +import java.util.Date; -import com.evolute.utils.*; -import com.evolute.utils.jdo.*; +import siprp.medicina.MedicinaDataProvider; -import siprp.medicina.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.jdo.JDOObject; +import com.evolute.utils.jdo.JDOOperationHandlerInterface; +import com.evolute.utils.jdo.JDOProvider; /** * diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhador.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhador.java index a4af4d07..8835ae31 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhador.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhador.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class MarcacaoTrabalhador implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorData.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorData.java index 67273b67..0919c0ae 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorData.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorData.java @@ -8,7 +8,6 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; public final class MarcacaoTrabalhadorData extends Marcacao implements MarcacaoTrabalhadorConstants diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorID.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorID.java index 7dc15955..abd9163c 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorID.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoTrabalhadorID.java @@ -7,9 +7,9 @@ */ package siprp.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class MarcacaoTrabalhadorID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/data/Medico.java b/trunk/SIPRPSoft/src/siprp/data/Medico.java index a9c4785e..178429b1 100644 --- a/trunk/SIPRPSoft/src/siprp/data/Medico.java +++ b/trunk/SIPRPSoft/src/siprp/data/Medico.java @@ -7,7 +7,7 @@ */ package siprp.data; -import com.evolute.utils.jdo.*; +import com.evolute.utils.jdo.JDOInnerObject; public final class Medico implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/MedicoData.java b/trunk/SIPRPSoft/src/siprp/data/MedicoData.java index 6e385ce8..9c18e5f9 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MedicoData.java +++ b/trunk/SIPRPSoft/src/siprp/data/MedicoData.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class MedicoData extends JDOObject implements DisableDeleteable diff --git a/trunk/SIPRPSoft/src/siprp/data/MedicoID.java b/trunk/SIPRPSoft/src/siprp/data/MedicoID.java index 8c13efb7..3b34b83d 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MedicoID.java +++ b/trunk/SIPRPSoft/src/siprp/data/MedicoID.java @@ -7,7 +7,7 @@ */ package siprp.data; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class MedicoID extends IntegerID { diff --git a/trunk/SIPRPSoft/src/siprp/data/SearchExecuterFactory.java b/trunk/SIPRPSoft/src/siprp/data/SearchExecuterFactory.java index e011144d..6080dd16 100644 --- a/trunk/SIPRPSoft/src/siprp/data/SearchExecuterFactory.java +++ b/trunk/SIPRPSoft/src/siprp/data/SearchExecuterFactory.java @@ -6,11 +6,14 @@ package siprp.data; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.db.*; -import com.evolute.utils.sql.*; -import com.evolute.utils.ui.search.*; +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.Field; +import com.evolute.utils.sql.Select; +import com.evolute.utils.ui.search.SearchDialog; +import com.evolute.utils.ui.search.SearchExecuter; /** * diff --git a/trunk/SIPRPSoft/src/siprp/data/TecnicoHST.java b/trunk/SIPRPSoft/src/siprp/data/TecnicoHST.java index 6ed0a97c..578302f0 100644 --- a/trunk/SIPRPSoft/src/siprp/data/TecnicoHST.java +++ b/trunk/SIPRPSoft/src/siprp/data/TecnicoHST.java @@ -7,7 +7,7 @@ */ package siprp.data; -import com.evolute.utils.jdo.*; +import com.evolute.utils.jdo.JDOInnerObject; public final class TecnicoHST implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTData.java b/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTData.java index 28f3cb19..52cfd269 100644 --- a/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTData.java +++ b/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTData.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TecnicoHSTData extends JDOObject implements DisableDeleteable diff --git a/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTID.java b/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTID.java index f7f90bd4..c578ee65 100644 --- a/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTID.java +++ b/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTID.java @@ -7,9 +7,9 @@ */ package siprp.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TecnicoHSTID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/data/Trabalhador.java b/trunk/SIPRPSoft/src/siprp/data/Trabalhador.java index d4a289bc..a60fda4c 100644 --- a/trunk/SIPRPSoft/src/siprp/data/Trabalhador.java +++ b/trunk/SIPRPSoft/src/siprp/data/Trabalhador.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.Date; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOInnerObject; public final class Trabalhador implements JDOInnerObject { diff --git a/trunk/SIPRPSoft/src/siprp/data/TrabalhadorData.java b/trunk/SIPRPSoft/src/siprp/data/TrabalhadorData.java index a90dfe34..e907b82a 100644 --- a/trunk/SIPRPSoft/src/siprp/data/TrabalhadorData.java +++ b/trunk/SIPRPSoft/src/siprp/data/TrabalhadorData.java @@ -8,7 +8,8 @@ package siprp.data; import java.util.HashMap; -import com.evolute.utils.jdo.*; + +import com.evolute.utils.jdo.JDOObject; public final class TrabalhadorData extends JDOObject implements DisableDeleteable, ActualizacaoSaveable diff --git a/trunk/SIPRPSoft/src/siprp/data/TrabalhadorID.java b/trunk/SIPRPSoft/src/siprp/data/TrabalhadorID.java index 6f37784d..9560a787 100644 --- a/trunk/SIPRPSoft/src/siprp/data/TrabalhadorID.java +++ b/trunk/SIPRPSoft/src/siprp/data/TrabalhadorID.java @@ -7,9 +7,9 @@ */ package siprp.data; -import java.io.*; +import java.io.Serializable; -import com.evolute.utils.jdo.jpox.*; +import com.evolute.utils.jdo.jpox.IntegerID; public final class TrabalhadorID extends IntegerID implements Serializable diff --git a/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaDataProvider.java b/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaDataProvider.java index 935afc49..dcfbdd70 100644 --- a/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaDataProvider.java @@ -6,19 +6,19 @@ package siprp.estatistica; -import java.text.*; -import java.util.*; +import java.text.DateFormat; +import java.util.Date; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.data.*; -import com.evolute.utils.db.*; -import com.evolute.utils.db.keyretrievers.*; -import com.evolute.utils.metadb.*; -import com.evolute.utils.sql.*; -import com.evolute.utils.sql.expression.*; +import siprp.data.Marcacao; +import siprp.data.MarcacaoTrabalhadorData; -import siprp.data.*; +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.metadb.MetaProvider; +import com.evolute.utils.sql.Field; +import com.evolute.utils.sql.Select; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaWindow.java b/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaWindow.java index eb4fed2f..20cbd873 100644 --- a/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaWindow.java +++ b/trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaWindow.java @@ -6,26 +6,51 @@ package siprp.estatistica; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import javax.swing.*; -import javax.swing.event.*; -import java.text.*; -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.ActionListener; +import java.awt.event.ItemListener; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.text.DateFormat; +import java.util.Arrays; +import java.util.Date; +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.calendar.*; -import com.evolute.utils.ui.text.*; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JComboBox; +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.ListSelectionListener; -import siprp.data.*; -import siprp.pesquisas.*; +import siprp.data.EmpresaData; +import siprp.data.EstabelecimentoData; +import siprp.pesquisas.PesquisasProvider; + +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.calendar.JCalendarPanel; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/estatisticas/EstatisticasWindow.java b/trunk/SIPRPSoft/src/siprp/estatisticas/EstatisticasWindow.java index 71e4e844..cc54322d 100644 --- a/trunk/SIPRPSoft/src/siprp/estatisticas/EstatisticasWindow.java +++ b/trunk/SIPRPSoft/src/siprp/estatisticas/EstatisticasWindow.java @@ -6,9 +6,10 @@ package siprp.estatisticas; -import javax.swing.*; +import javax.swing.JComboBox; +import javax.swing.JPanel; -import com.evolute.utils.ui.window.*; +import com.evolute.utils.ui.window.CustomJFrame; /** * diff --git a/trunk/SIPRPSoft/src/siprp/ficha/EmpresaPanel.java b/trunk/SIPRPSoft/src/siprp/ficha/EmpresaPanel.java index e7669c40..ab55ba67 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/EmpresaPanel.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/EmpresaPanel.java @@ -6,23 +6,35 @@ package siprp.ficha; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import java.util.*; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.Hashtable; -import com.evolute.utils.*; -import com.evolute.utils.data.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.metadb.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.button.*; -import com.evolute.utils.ui.panel.*; -import com.evolute.utils.ui.text.*; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; -import siprp.*; -import siprp.data.*; +import siprp.FichaDataProvider; +import siprp.SingletonConstants; +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.dataui.ComponentController; +import com.evolute.utils.dataui.ComponentsHashtable; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.panel.RadioButtonFixedPanel; +import com.evolute.utils.ui.panel.RadioButtonPanel; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * diff --git a/trunk/SIPRPSoft/src/siprp/ficha/ExamePDF.java b/trunk/SIPRPSoft/src/siprp/ficha/ExamePDF.java index 5e8ae171..61f934fb 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/ExamePDF.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/ExamePDF.java @@ -3,7 +3,6 @@ package siprp.ficha; import java.awt.Color; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.HashMap; diff --git a/trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoEditorManager.java b/trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoEditorManager.java index ce664623..ba56bd15 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoEditorManager.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoEditorManager.java @@ -6,7 +6,10 @@ package siprp.ficha; -import com.evolute.utils.editormanager.*; +import com.evolute.utils.editormanager.Editor; +import com.evolute.utils.editormanager.EditorManager; +import com.evolute.utils.editormanager.EditorManagerFactory; +import com.evolute.utils.editormanager.EditorManagerInterface; /** * diff --git a/trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoEditorManagerFactory.java b/trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoEditorManagerFactory.java index e7d4196f..f6ec1512 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoEditorManagerFactory.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoEditorManagerFactory.java @@ -6,7 +6,9 @@ package siprp.ficha; -import com.evolute.utils.editormanager.*; +import com.evolute.utils.editormanager.Editor; +import com.evolute.utils.editormanager.EditorManagerFactory; +import com.evolute.utils.editormanager.EditorManagerInterface; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java b/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java index fffc4e94..d25bba32 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.Hashtable; import java.util.Vector; -import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.JPanel; diff --git a/trunk/SIPRPSoft/src/siprp/ficha/MedicoColumnizedObject.java b/trunk/SIPRPSoft/src/siprp/ficha/MedicoColumnizedObject.java index 4253604d..f8d64bbd 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/MedicoColumnizedObject.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/MedicoColumnizedObject.java @@ -6,7 +6,7 @@ package siprp.ficha; -import com.evolute.utils.tables.*; +import com.evolute.utils.tables.ColumnizedObject; /** * diff --git a/trunk/SIPRPSoft/src/siprp/ficha/MedicoEditor.java b/trunk/SIPRPSoft/src/siprp/ficha/MedicoEditor.java index a6268c29..6aa8555e 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/MedicoEditor.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/MedicoEditor.java @@ -6,21 +6,36 @@ package siprp.ficha; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; -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.util.Vector; -import com.evolute.utils.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.metadb.*; -import com.evolute.utils.tables.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.text.*; +import javax.swing.JButton; +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.ListSelectionListener; -import siprp.*; -import siprp.data.*; +import siprp.FichaDataProvider; +import siprp.data.DisableDeleteHandler; +import siprp.data.MedicoData; + +import com.evolute.utils.Singleton; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.tables.BaseTable; +import com.evolute.utils.tables.VectorTableModel; +import com.evolute.utils.ui.CustomJDialog; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * diff --git a/trunk/SIPRPSoft/src/siprp/ficha/ObservacoesPanel.java b/trunk/SIPRPSoft/src/siprp/ficha/ObservacoesPanel.java index 68edd548..f433f176 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/ObservacoesPanel.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/ObservacoesPanel.java @@ -6,18 +6,20 @@ package siprp.ficha; -import java.awt.*; -import javax.swing.*; +import java.awt.GridLayout; -import com.evolute.utils.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.documents.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.metadb.*; -import com.evolute.utils.ui.text.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.JTextField; -import siprp.*; -import siprp.data.*; +import siprp.FichaDataProvider; +import siprp.data.TrabalhadorData; + +import com.evolute.utils.Singleton; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.documents.MaximumLengthDocument; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/ficha/PDFFilePrinter.java b/trunk/SIPRPSoft/src/siprp/ficha/PDFFilePrinter.java index 01068e9e..a3e0b5ea 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/PDFFilePrinter.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/PDFFilePrinter.java @@ -5,10 +5,7 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.print.PageFormat; -import java.io.File; -import java.io.RandomAccessFile; import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; import com.evolute.utils.print.A4ContinuoPage; import com.evolute.utils.print.AbstractPrintHandler; diff --git a/trunk/SIPRPSoft/src/siprp/ficha/RecomendacoesPanel.java b/trunk/SIPRPSoft/src/siprp/ficha/RecomendacoesPanel.java index 7d74be41..2e387342 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/RecomendacoesPanel.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/RecomendacoesPanel.java @@ -6,13 +6,18 @@ package siprp.ficha; -import java.awt.*; -import javax.swing.*; +import java.awt.BorderLayout; +import java.awt.GridLayout; -import com.evolute.utils.documents.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.calendar.*; -import com.evolute.utils.ui.text.*; +import javax.swing.BorderFactory; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; + +import com.evolute.utils.documents.MaximumLengthDocument; +import com.evolute.utils.ui.calendar.JCalendarPanel; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * diff --git a/trunk/SIPRPSoft/src/siprp/ficha/TrabalhadorPanel.java b/trunk/SIPRPSoft/src/siprp/ficha/TrabalhadorPanel.java index 25c2d670..8753bb84 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/TrabalhadorPanel.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/TrabalhadorPanel.java @@ -6,24 +6,33 @@ package siprp.ficha; -import java.awt.*; -import javax.swing.*; -import java.util.*; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.util.Hashtable; -import com.evolute.utils.*; -import com.evolute.utils.data.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.date.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.metadb.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.calendar.*; -import com.evolute.utils.ui.panel.*; -import com.evolute.utils.ui.text.*; +import javax.swing.BorderFactory; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; -import siprp.*; -import siprp.data.*; -import siprp.importer.*; +import siprp.FichaDataProvider; +import siprp.data.TrabalhadorData; +import siprp.importer.Importer; + +import com.evolute.utils.Singleton; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.data.MappableObject; +import com.evolute.utils.dataui.ComponentController; +import com.evolute.utils.dataui.ComponentsHashtable; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.date.DateUtils; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.calendar.JCalendarPanel; +import com.evolute.utils.ui.panel.RadioButtonFixedPanel; +import com.evolute.utils.ui.panel.RadioButtonPanel; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * * @author fpalma diff --git a/trunk/SIPRPSoft/src/siprp/ficha/UpperPanel.java b/trunk/SIPRPSoft/src/siprp/ficha/UpperPanel.java index 8b0ec1fa..6210c6a1 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/UpperPanel.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/UpperPanel.java @@ -6,21 +6,32 @@ package siprp.ficha; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import java.util.*; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ItemListener; +import java.util.Hashtable; -import com.evolute.utils.*; -import com.evolute.utils.data.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.metadb.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.text.*; +import javax.swing.JComboBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTextField; -import siprp.*; -import siprp.data.*; +import siprp.FichaDataProvider; +import siprp.data.EmpresaData; +import siprp.data.EstabelecimentoData; +import siprp.data.MedicoData; +import siprp.data.TrabalhadorData; + +import com.evolute.utils.Singleton; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.data.MappableObject; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/EmpresaPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/EmpresaPanel.java index 55e0b0fc..d3bd1465 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/EmpresaPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/EmpresaPanel.java @@ -14,7 +14,6 @@ import javax.swing.JPanel; import javax.swing.JTabbedPane; import leaf.ui.LeafDialog; - import siprp.database.cayenne.objects.Empresas; import siprp.database.cayenne.providers.MedicinaDAO; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/GerirEmpresaPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/GerirEmpresaPanel.java index 7ad642ab..43e7a8e2 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/GerirEmpresaPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/GerirEmpresaPanel.java @@ -1,10 +1,13 @@ package siprp.higiene.gestao; -import java.awt.Dimension; - +import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; +import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; +import static com.evolute.utils.strings.UnicodeLatin1Map.otilde; import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; +import java.awt.Dimension; + import javax.swing.BorderFactory; import javax.swing.JPanel; @@ -15,8 +18,6 @@ import siprp.higiene.gestao.normalizacao.AdicionarNormalizacaoPanel; import siprp.higiene.gestao.postos.GerirAreasPanel; import siprp.higiene.gestao.riscos.AdicionarRiscosPanel; -import static com.evolute.utils.strings.UnicodeLatin1Map.*; - public class GerirEmpresaPanel extends JPanel { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java index 795cf802..ab48d55f 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java @@ -1,5 +1,9 @@ package siprp.higiene.gestao; +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 java.awt.Dimension; import javax.swing.JFrame; @@ -8,8 +12,6 @@ import javax.swing.SwingUtilities; import com.evolute.utils.tracker.TrackableWindow; -import static com.evolute.utils.strings.UnicodeLatin1Map.*; - public class GestaoRelatorioWindow extends JFrame implements TrackableWindow { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/GlobalPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/GlobalPanel.java index de5ca494..cc77c4d8 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/GlobalPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/GlobalPanel.java @@ -1,5 +1,8 @@ package siprp.higiene.gestao; +import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; +import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; + import javax.swing.JTabbedPane; import siprp.higiene.gestao.equipamentos.GerirEquipamentosPanel; @@ -7,8 +10,6 @@ import siprp.higiene.gestao.legislacao.GerirLegislacaoPanel; import siprp.higiene.gestao.normalizacao.GerirNormalizacaoPanel; import siprp.higiene.gestao.riscos.GerirRiscosPanel; -import static com.evolute.utils.strings.UnicodeLatin1Map.*; - public class GlobalPanel extends JTabbedPane { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java index 031fc84c..3097cbb4 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java @@ -7,8 +7,6 @@ import javax.swing.JOptionPane; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; -import com.evolute.adt.TreeTools; - import leaf.ui.LeafDialog; import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.objects.HsEmail; @@ -16,6 +14,8 @@ import siprp.database.cayenne.objects.HsEmailEstabelecimento; import siprp.higiene.gestao.AdicionarPanel; import siprp.logic.HigieneSegurancaLogic; +import com.evolute.adt.TreeTools; + public class AdicionarEmailsPanel extends AdicionarPanel { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java index b042fa19..1cf251f8 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java @@ -11,7 +11,6 @@ import java.awt.event.ActionListener; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JTree; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; @@ -19,8 +18,6 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import com.evolute.adt.TreeTools; - import leaf.ui.LeafButton; import leaf.ui.LeafDialog; import leaf.ui.LeafIconButton; @@ -32,6 +29,8 @@ import siprp.database.cayenne.objects.HsRelatorioEquipamento; import siprp.logic.HigieneSegurancaLogic; import siprp.logic.node.EquipamentoNode; +import com.evolute.adt.TreeTools; + public class AdicionarEquipamentosPanel extends JPanel { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java index 07c05901..372508b6 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java @@ -16,7 +16,6 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextField; -import javax.swing.JTree; import javax.swing.event.CaretEvent; import javax.swing.event.CaretListener; import javax.swing.event.TreeSelectionEvent; @@ -26,8 +25,6 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import com.evolute.adt.TreeTools; - import leaf.ui.LeafButton; import leaf.ui.LeafDialog; import leaf.ui.LeafIconButton; @@ -36,6 +33,8 @@ import leaf.ui.LeafUIConstants; import siprp.database.cayenne.objects.HsEquipamento; import siprp.logic.HigieneSegurancaLogic; +import com.evolute.adt.TreeTools; + public class GerirEquipamentosPanel extends JPanel implements CaretListener, LeafUIConstants { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/importacao/Importador.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/importacao/Importador.java index 2ae33364..90352986 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/importacao/Importador.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/importacao/Importador.java @@ -8,8 +8,6 @@ import org.jdom.Document; import org.jdom.Element; import org.jdom.input.SAXBuilder; -import siprp.planoactuacao.db.DBConstants; - import com.evolute.utils.arrays.Virtual2DArray; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java index 38479b61..6e991074 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java @@ -6,8 +6,6 @@ import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; -import com.evolute.adt.TreeTools; - import leaf.ui.LeafDialog; import leaf.ui.TreeInserterDialog; import siprp.database.cayenne.objects.Empresas; @@ -18,6 +16,8 @@ import siprp.database.cayenne.objects.HsLegislacaoEstabelecimento; import siprp.higiene.gestao.AdicionarPanel; import siprp.logic.HigieneSegurancaLogic; +import com.evolute.adt.TreeTools; + public class AdicionarLegislacaoPanel extends AdicionarPanel { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java index be5896a2..3794c1ed 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java @@ -18,7 +18,6 @@ import javax.swing.BorderFactory; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JTree; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; @@ -26,9 +25,6 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import com.evolute.adt.TreeTools; -import com.evolute.adt.Validator; - import leaf.ui.LeafButton; import leaf.ui.LeafDialog; import leaf.ui.LeafIconButton; @@ -39,6 +35,9 @@ import siprp.database.cayenne.objects.HsLegislacao; import siprp.database.cayenne.objects.HsLegislacaoCategoria; import siprp.logic.HigieneSegurancaLogic; +import com.evolute.adt.TreeTools; +import com.evolute.adt.Validator; + public class GerirLegislacaoPanel extends JPanel implements LeafUIConstants { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java index 59b92d38..b3b48641 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java @@ -6,8 +6,6 @@ import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; -import com.evolute.adt.TreeTools; - import leaf.ui.LeafDialog; import leaf.ui.TreeInserterDialog; import siprp.database.cayenne.objects.Empresas; @@ -18,6 +16,8 @@ import siprp.database.cayenne.objects.HsNormalizacaoEstabelecimento; import siprp.higiene.gestao.AdicionarPanel; import siprp.logic.HigieneSegurancaLogic; +import com.evolute.adt.TreeTools; + public class AdicionarNormalizacaoPanel extends AdicionarPanel { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java index 39d1cd73..8f4202df 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java @@ -10,8 +10,6 @@ import java.awt.GridLayout; import java.awt.LayoutManager; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.Date; import javax.swing.BorderFactory; @@ -21,30 +19,26 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JTextField; -import javax.swing.JTree; import javax.swing.event.CaretEvent; import javax.swing.event.CaretListener; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; -import javax.swing.text.AbstractDocument.LeafElement; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import com.evolute.adt.TreeTools; -import com.evolute.adt.Validator; - import leaf.ui.LeafButton; import leaf.ui.LeafDialog; import leaf.ui.LeafIconButton; -import leaf.ui.LeafTextAreaEditor; import leaf.ui.LeafTree; import leaf.ui.LeafUIConstants; import siprp.SIPRPSpellChecker; import siprp.database.cayenne.objects.HsNormalizacao; import siprp.logic.HigieneSegurancaLogic; +import com.evolute.adt.TreeTools; + public class GerirNormalizacaoPanel extends JPanel implements LeafUIConstants, CaretListener { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java index 09258183..d91b26fe 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java @@ -9,7 +9,6 @@ import java.awt.event.ActionListener; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JTree; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; @@ -17,8 +16,6 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import com.evolute.adt.TreeTools; - import leaf.ui.LeafButton; import leaf.ui.LeafDialog; import leaf.ui.LeafIconButton; @@ -31,6 +28,8 @@ import siprp.logic.HigieneSegurancaLogic; import siprp.logic.node.AreaNode; import siprp.logic.node.PostoNode; +import com.evolute.adt.TreeTools; + public class AdicionarAreasPanel extends JPanel { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java index cd96174b..5f6c0bfe 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java @@ -22,7 +22,6 @@ import javax.swing.JCheckBox; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JTree; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; @@ -31,8 +30,6 @@ import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import com.evolute.adt.TreeTools; - import leaf.ui.LeafButton; import leaf.ui.LeafDialog; import leaf.ui.LeafIconButton; @@ -44,6 +41,8 @@ import siprp.database.cayenne.objects.HsPosto; import siprp.logic.node.AreaNode; import siprp.logic.node.PostoNode; +import com.evolute.adt.TreeTools; + public class GerirAreasPanel extends JPanel implements LeafUIConstants { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java index d6774e20..9d955856 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java @@ -10,7 +10,6 @@ import java.util.List; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JTree; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; @@ -18,8 +17,6 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import com.evolute.adt.TreeTools; - import leaf.ui.LeafButton; import leaf.ui.LeafDialog; import leaf.ui.LeafIconButton; @@ -34,6 +31,8 @@ import siprp.database.cayenne.objects.HsRiscoEmpresa; import siprp.logic.HigieneSegurancaLogic; import siprp.logic.node.NodeRisco; +import com.evolute.adt.TreeTools; + public class AdicionarRiscosPanel extends JPanel { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirMedidaPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirMedidaPanel.java index ffda367b..51393615 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirMedidaPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirMedidaPanel.java @@ -21,7 +21,6 @@ import siprp.database.cayenne.objects.HsMedida; import com.evolute.utils.images.ImageException; import com.evolute.utils.images.ImageIconLoader; -import com.evolute.utils.ui.text.CopyPasteHandler; public class GerirMedidaPanel extends JPanel { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java index 80b3e7b8..7b0089f2 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java @@ -1,6 +1,7 @@ package siprp.higiene.gestao.riscos; -import static com.evolute.utils.strings.UnicodeLatin1Map.*; +import static com.evolute.utils.strings.UnicodeLatin1Map.aacute; +import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; @@ -17,7 +18,6 @@ import javax.swing.BorderFactory; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JTree; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; @@ -25,8 +25,6 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import com.evolute.adt.TreeTools; - import leaf.ui.LeafButton; import leaf.ui.LeafDialog; import leaf.ui.LeafIconButton; @@ -38,6 +36,8 @@ import siprp.database.cayenne.objects.HsRiscoMedida; import siprp.database.cayenne.objects.HsRiscoTema; import siprp.logic.HigieneSegurancaLogic; +import com.evolute.adt.TreeTools; + public class GerirRiscosPanel extends JPanel implements LeafUIConstants { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/legislacoes/GestaoLegislacoesWindow.java b/trunk/SIPRPSoft/src/siprp/higiene/legislacoes/GestaoLegislacoesWindow.java index fe791aa7..7e4178c9 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/legislacoes/GestaoLegislacoesWindow.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/legislacoes/GestaoLegislacoesWindow.java @@ -1,12 +1,14 @@ package siprp.higiene.legislacoes; +import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; +import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; +import static com.evolute.utils.strings.UnicodeLatin1Map.otilde; + import javax.swing.JFrame; import javax.swing.SwingUtilities; import com.evolute.utils.tracker.TrackableWindow; -import static com.evolute.utils.strings.UnicodeLatin1Map.*; - public class GestaoLegislacoesWindow extends JFrame implements TrackableWindow { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/CorTecnicoCellRenderer.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/CorTecnicoCellRenderer.java index 13d07aff..ad536467 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/CorTecnicoCellRenderer.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/CorTecnicoCellRenderer.java @@ -9,10 +9,14 @@ package siprp.higiene.marcacoes; -import java.awt.*; -import javax.swing.*; +import java.awt.Color; +import java.awt.Component; -import siprp.higiene.*; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.ListCellRenderer; + +import siprp.higiene.HigieneDataProvider; /** * diff --git a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java index 20158384..85e90fe9 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java @@ -3,10 +3,6 @@ package siprp.higiene.marcacoes; import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; -import java.awt.Dimension; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; import java.util.Hashtable; import javax.swing.BorderFactory; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneUpperPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneUpperPanel.java index 1efa12af..64c9c2d1 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneUpperPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneUpperPanel.java @@ -9,17 +9,25 @@ package siprp.higiene.marcacoes; -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 siprp.higiene.*; +import siprp.higiene.HigieneDataProvider; + +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/higiene/marcacoes/TecnicoRenderer.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoRenderer.java index 6fad3170..5510e309 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoRenderer.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoRenderer.java @@ -9,11 +9,14 @@ package siprp.higiene.marcacoes; -import java.awt.*; -import javax.swing.*; -import javax.swing.table.*; +import java.awt.Color; +import java.awt.Component; -import siprp.higiene.*; +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.table.TableCellRenderer; + +import siprp.higiene.HigieneDataProvider; /** * diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java index 64d7459c..c8991ae2 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java @@ -26,8 +26,6 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import com.evolute.adt.TreeTools; - import leaf.ui.LeafButton; import leaf.ui.LeafDialog; import leaf.ui.LeafIconButton; @@ -45,6 +43,8 @@ import siprp.logic.node.MedidaRelatorioNode; import siprp.logic.node.NodeRisco; import siprp.logic.node.RiscoRelatorioNode; +import com.evolute.adt.TreeTools; + public class GerirMedidasRelatorioPanel extends JPanel { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioHigieneSegurancaWindow.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioHigieneSegurancaWindow.java index 0a4c65a2..e84bf102 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioHigieneSegurancaWindow.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioHigieneSegurancaWindow.java @@ -7,6 +7,7 @@ import info.clearthought.layout.TableLayoutConstraints; import java.awt.Color; import java.awt.Container; +import java.awt.Cursor; import java.awt.Dimension; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -26,8 +27,6 @@ import siprp.database.cayenne.objects.HsRelatorio; import siprp.database.cayenne.objects.MarcacoesEstabelecimento; import siprp.logic.HigieneSegurancaLogic; -import java.awt.Cursor; - import com.evolute.utils.tracker.TrackableWindow; public class RelatorioHigieneSegurancaWindow extends JFrame implements TrackableWindow diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioNormalizacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioNormalizacaoPanel.java index bb21a9b8..dedcf0e4 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioNormalizacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioNormalizacaoPanel.java @@ -3,7 +3,6 @@ package siprp.higiene.relatorio; 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 info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; @@ -17,7 +16,6 @@ import javax.swing.JButton; import javax.swing.JPanel; import leaf.ui.SimpleTable; -import siprp.data.Estabelecimento; import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.objects.HsRelatorio; import siprp.database.cayenne.objects.HsRelatorioNormalizacao; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java index c1bf9dc6..4e8434fe 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java @@ -17,8 +17,6 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import com.evolute.adt.TreeTools; - import leaf.ui.LeafTree; import siprp.database.cayenne.objects.HsRelatorio; import siprp.database.cayenne.objects.HsRelatorioPosto; @@ -26,6 +24,8 @@ import siprp.database.cayenne.objects.HsRelatorioPostoRisco; import siprp.logic.HigieneSegurancaLogic; import siprp.logic.node.PostoRelatorioNode; +import com.evolute.adt.TreeTools; + public class VerAreasRelatorioPanel extends JPanel { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioDBInit.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioDBInit.java index caac22c3..b06320cd 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioDBInit.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioDBInit.java @@ -1,10 +1,6 @@ package siprp.higiene.relatorio.print; -import siprp.SingletonConstants; - import com.evolute.utils.Singleton; -import com.evolute.utils.db.DBManager; -import com.evolute.utils.db.JDBCManager; import com.evolute.utils.db.keyretrievers.PostgresqlAutoKeyRetriever; import com.evolute.utils.sql.Insert; import com.evolute.utils.strings.UnicodeChecker; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioPDFCreator.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioPDFCreator.java index 9582332e..231a382e 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioPDFCreator.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioPDFCreator.java @@ -2,7 +2,6 @@ package siprp.higiene.relatorio.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/higiene/relatorio/print/RelatorioToPrint.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioToPrint.java index 066c5fad..0c36facb 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioToPrint.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioToPrint.java @@ -2,8 +2,6 @@ package siprp.higiene.relatorio.print; import java.util.Vector; -import javax.swing.JOptionPane; - import org.jdom.Element; public class RelatorioToPrint diff --git a/trunk/SIPRPSoft/src/siprp/importer/DataChooserWindow.java b/trunk/SIPRPSoft/src/siprp/importer/DataChooserWindow.java index a341e0b5..00d9a541 100644 --- a/trunk/SIPRPSoft/src/siprp/importer/DataChooserWindow.java +++ b/trunk/SIPRPSoft/src/siprp/importer/DataChooserWindow.java @@ -6,12 +6,21 @@ package siprp.importer; -import java.awt.*; -import java.awt.event.*; -import java.util.*; -import javax.swing.*; +import java.awt.Container; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.Hashtable; -import com.evolute.utils.ui.*; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; + +import com.evolute.utils.ui.CustomJDialog; /** * * @author lflores diff --git a/trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasDataProvider.java b/trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasDataProvider.java index 773b4979..8d999540 100644 --- a/trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasDataProvider.java @@ -9,20 +9,22 @@ package siprp.impressaofichas; -import java.text.*; -import java.util.*; +import java.text.DateFormat; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Date; +import java.util.Locale; +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.strings.*; -import com.evolute.utils.tables.*; - -import siprp.*; -import siprp.data.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.arrays.Virtual2DArray; +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.Field; +import com.evolute.utils.sql.Select; +import com.evolute.utils.tables.ColumnizedMappable; /** * diff --git a/trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasWindow.java b/trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasWindow.java index 3b29b698..ccf982b2 100644 --- a/trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasWindow.java +++ b/trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasWindow.java @@ -9,19 +9,41 @@ package siprp.impressaofichas; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import javax.print.*; -import javax.swing.*; -import javax.swing.event.*; -import java.util.*; +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.IOException; +import java.util.Arrays; +import java.util.Date; +import java.util.Properties; +import java.util.Vector; -import com.evolute.utils.properties.*; -import com.evolute.utils.tables.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.calendar.*; -import com.evolute.utils.ui.window.*; +import javax.print.PrintService; +import javax.print.PrintServiceLookup; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JFileChooser; +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 com.evolute.utils.properties.PropertyHandler; +import com.evolute.utils.tables.BaseTable; +import com.evolute.utils.tables.ColumnizedMappable; +import com.evolute.utils.tables.ColumnizedObjectArray; +import com.evolute.utils.tables.VectorTableModel; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.calendar.JCalendarPanel; +import com.evolute.utils.ui.window.EditorWindow; /** * diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/LembretesWindow.java b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesWindow.java index 734c21a0..0bbf2a6b 100644 --- a/trunk/SIPRPSoft/src/siprp/lembretes/LembretesWindow.java +++ b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesWindow.java @@ -12,14 +12,9 @@ package siprp.lembretes; import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; -import java.awt.*; +import java.awt.Dimension; +import java.awt.GridLayout; import java.awt.event.ActionEvent; -import javax.swing.*; - -import com.evolute.utils.tables.*; -import com.evolute.utils.tables.special.ComboBoxData; -import com.evolute.utils.tracker.TrackableWindow; -import com.evolute.utils.ui.DialogException; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -28,6 +23,16 @@ import java.awt.event.WindowEvent; import java.util.List; import java.util.Vector; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.ListSelectionModel; +import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionEvent; @@ -40,6 +45,12 @@ import siprp.lembretes.externos.LembretesExternosPanel; import siprp.lembretes.marcacoes.LembretesMarcacaoPanel; import siprp.lembretes.remarcacoes.LembretesRemarcacaoPanel; +import com.evolute.utils.tables.BaseTable; +import com.evolute.utils.tables.ColumnizedObjectArray; +import com.evolute.utils.tables.VectorTableModel; +import com.evolute.utils.tracker.TrackableWindow; +import com.evolute.utils.ui.DialogException; + /** * * @author Frederico diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/actions/TratarCriacaoProcessoTrabalhadorAction.java b/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/actions/TratarCriacaoProcessoTrabalhadorAction.java index a38122bb..130ca7ef 100644 --- a/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/actions/TratarCriacaoProcessoTrabalhadorAction.java +++ b/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/actions/TratarCriacaoProcessoTrabalhadorAction.java @@ -9,36 +9,28 @@ package siprp.lembretes.marcacoes.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; -import siprp.data.EstabelecimentoData; -import siprp.data.MarcacaoTrabalhadorData; -import siprp.data.TrabalhadorData; import siprp.database.cayenne.objects.Empresas; import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.objects.Trabalhadores; -import siprp.database.cayenne.objects.TrabalhadoresConsultas; -import siprp.database.cayenne.objects.TrabalhadoresConsultasDatas; -import siprp.database.cayenne.objects.TrabalhadoresEcds; -import siprp.database.cayenne.objects.TrabalhadoresEcdsDatas; -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/lembretes/remarcacoes/LembretesRemarcacaoPanel.java b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/LembretesRemarcacaoPanel.java index 4dfcfe90..6c90800a 100644 --- a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/LembretesRemarcacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/LembretesRemarcacaoPanel.java @@ -9,18 +9,17 @@ package siprp.lembretes.remarcacoes; -import com.evolute.utils.data.IDObject; -import com.evolute.utils.data.MappableObject; -import com.evolute.utils.jdo.JDOProvider; -import com.evolute.utils.ui.panel.multipleactionlist.MultipleActionListPanel; import java.awt.BorderLayout; import java.awt.GridLayout; -import java.util.List; -import java.util.Vector; -import javax.swing.*; -import siprp.lembretes.Lembrete; + +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; + import siprp.lembretes.LembretesConstants; -import siprp.lembretes.LembretesDataProvider; + +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.ui.panel.multipleactionlist.MultipleActionListPanel; /** * diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesActionFactory.java b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesActionFactory.java index 25b84227..8b538b5f 100644 --- a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesActionFactory.java +++ b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesActionFactory.java @@ -9,12 +9,14 @@ package siprp.lembretes.remarcacoes; -import com.evolute.utils.data.IDObject; -import com.evolute.utils.ui.panel.multipleactionlist.ActionFactory; import javax.swing.Action; + import siprp.lembretes.remarcacoes.actions.TratarMarcacaoEstabelecimentoAction; import siprp.lembretes.remarcacoes.actions.TratarMarcacaoTrabalhadorAction; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.ui.panel.multipleactionlist.ActionFactory; + /** * * @author fpalma