diff --git a/trunk/common/src/leaf/ui/LeafButton.java b/trunk/SIPRPSoft/src/leaf/ui/LeafButton.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafButton.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafButton.java diff --git a/trunk/common/src/leaf/ui/LeafCalendarDialog.java b/trunk/SIPRPSoft/src/leaf/ui/LeafCalendarDialog.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafCalendarDialog.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafCalendarDialog.java diff --git a/trunk/common/src/leaf/ui/LeafDialog.java b/trunk/SIPRPSoft/src/leaf/ui/LeafDialog.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafDialog.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafDialog.java diff --git a/trunk/common/src/leaf/ui/LeafGradientPanel.java b/trunk/SIPRPSoft/src/leaf/ui/LeafGradientPanel.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafGradientPanel.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafGradientPanel.java diff --git a/trunk/common/src/leaf/ui/LeafIconButton.java b/trunk/SIPRPSoft/src/leaf/ui/LeafIconButton.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafIconButton.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafIconButton.java diff --git a/trunk/common/src/leaf/ui/LeafInputField.java b/trunk/SIPRPSoft/src/leaf/ui/LeafInputField.java similarity index 99% rename from trunk/common/src/leaf/ui/LeafInputField.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafInputField.java index af191a28..dc77b29a 100644 --- a/trunk/common/src/leaf/ui/LeafInputField.java +++ b/trunk/SIPRPSoft/src/leaf/ui/LeafInputField.java @@ -31,7 +31,8 @@ import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.SwingUtilities; -import leaf.data.OrderedMap; +import com.evolute.adt.OrderedMap; + public class LeafInputField extends JPanel implements FocusListener, MouseListener, PropertyChangeListener diff --git a/trunk/common/src/leaf/ui/LeafLogic.java b/trunk/SIPRPSoft/src/leaf/ui/LeafLogic.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafLogic.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafLogic.java diff --git a/trunk/common/src/leaf/ui/LeafLookAndFeel.java b/trunk/SIPRPSoft/src/leaf/ui/LeafLookAndFeel.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafLookAndFeel.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafLookAndFeel.java diff --git a/trunk/common/src/leaf/ui/LeafOptionDialog.java b/trunk/SIPRPSoft/src/leaf/ui/LeafOptionDialog.java similarity index 99% rename from trunk/common/src/leaf/ui/LeafOptionDialog.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafOptionDialog.java index 1b7e72ba..99da214c 100644 --- a/trunk/common/src/leaf/ui/LeafOptionDialog.java +++ b/trunk/SIPRPSoft/src/leaf/ui/LeafOptionDialog.java @@ -24,7 +24,8 @@ import javax.swing.JScrollPane; import javax.swing.JSeparator; import javax.swing.ScrollPaneConstants; -import leaf.data.OrderedMap; +import com.evolute.adt.OrderedMap; + public class LeafOptionDialog extends JDialog diff --git a/trunk/common/src/leaf/ui/LeafRuntimeException.java b/trunk/SIPRPSoft/src/leaf/ui/LeafRuntimeException.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafRuntimeException.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafRuntimeException.java diff --git a/trunk/common/src/leaf/ui/LeafScrollBar.java b/trunk/SIPRPSoft/src/leaf/ui/LeafScrollBar.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafScrollBar.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafScrollBar.java diff --git a/trunk/common/src/leaf/ui/LeafTableModel.java b/trunk/SIPRPSoft/src/leaf/ui/LeafTableModel.java similarity index 98% rename from trunk/common/src/leaf/ui/LeafTableModel.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafTableModel.java index 36adb121..5b93a11a 100644 --- a/trunk/common/src/leaf/ui/LeafTableModel.java +++ b/trunk/SIPRPSoft/src/leaf/ui/LeafTableModel.java @@ -4,11 +4,11 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import leaf.data.OrderedMap; import siprp.database.cayenne.objects.TrabalhadoresEcd; +import com.evolute.adt.OrderedMap; import com.evolute.utils.tables.BaseTableModel; import com.evolute.utils.tables.models.SortableModel; diff --git a/trunk/common/src/leaf/ui/LeafTextArea.java b/trunk/SIPRPSoft/src/leaf/ui/LeafTextArea.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafTextArea.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafTextArea.java diff --git a/trunk/common/src/leaf/ui/LeafTextAreaEditor.java b/trunk/SIPRPSoft/src/leaf/ui/LeafTextAreaEditor.java similarity index 99% rename from trunk/common/src/leaf/ui/LeafTextAreaEditor.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafTextAreaEditor.java index 2b809e8f..ed0db935 100644 --- a/trunk/common/src/leaf/ui/LeafTextAreaEditor.java +++ b/trunk/SIPRPSoft/src/leaf/ui/LeafTextAreaEditor.java @@ -17,9 +17,9 @@ import javax.swing.text.JTextComponent; import siprp.SIPRPSpellChecker; +import com.evolute.adt.Validator; import com.evolute.utils.ui.text.CopyPasteHandler; -import leaf.data.Validator; public class LeafTextAreaEditor extends JPanel { diff --git a/trunk/common/src/leaf/ui/LeafTextDialog.java b/trunk/SIPRPSoft/src/leaf/ui/LeafTextDialog.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafTextDialog.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafTextDialog.java diff --git a/trunk/common/src/leaf/ui/LeafTransparentPanel.java b/trunk/SIPRPSoft/src/leaf/ui/LeafTransparentPanel.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafTransparentPanel.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafTransparentPanel.java diff --git a/trunk/common/src/leaf/ui/LeafUIConstants.java b/trunk/SIPRPSoft/src/leaf/ui/LeafUIConstants.java similarity index 100% rename from trunk/common/src/leaf/ui/LeafUIConstants.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafUIConstants.java diff --git a/trunk/common/src/leaf/ui/LeafWindow.java b/trunk/SIPRPSoft/src/leaf/ui/LeafWindow.java similarity index 99% rename from trunk/common/src/leaf/ui/LeafWindow.java rename to trunk/SIPRPSoft/src/leaf/ui/LeafWindow.java index 86f7d972..3e30df5e 100755 --- a/trunk/common/src/leaf/ui/LeafWindow.java +++ b/trunk/SIPRPSoft/src/leaf/ui/LeafWindow.java @@ -38,11 +38,11 @@ import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.table.TableModel; -import leaf.data.Pair; import leaf.ui.LeafLogic.Action; import leaf.ui.LeafLogic.LeafLogicActionBinding; import leaf.ui.LeafLogic.LeafUIActionBinding; +import com.evolute.adt.Pair; import com.evolute.utils.tables.BaseTable; import com.evolute.utils.tables.ColumnizedMappable; import com.evolute.utils.tables.VectorTableModel; diff --git a/trunk/common/src/leaf/ui/SimpleTable.java b/trunk/SIPRPSoft/src/leaf/ui/SimpleTable.java similarity index 100% rename from trunk/common/src/leaf/ui/SimpleTable.java rename to trunk/SIPRPSoft/src/leaf/ui/SimpleTable.java diff --git a/trunk/common/src/leaf/ui/TreeInserterDialog.java b/trunk/SIPRPSoft/src/leaf/ui/TreeInserterDialog.java similarity index 99% rename from trunk/common/src/leaf/ui/TreeInserterDialog.java rename to trunk/SIPRPSoft/src/leaf/ui/TreeInserterDialog.java index a65fce8d..a36db6f6 100644 --- a/trunk/common/src/leaf/ui/TreeInserterDialog.java +++ b/trunk/SIPRPSoft/src/leaf/ui/TreeInserterDialog.java @@ -21,6 +21,7 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; +import com.evolute.adt.TreeTools; import com.evolute.utils.images.ImageException; import com.evolute.utils.images.ImageIconLoader; diff --git a/trunk/common/src/leaf/ui/icons/add.png b/trunk/SIPRPSoft/src/leaf/ui/icons/add.png similarity index 100% rename from trunk/common/src/leaf/ui/icons/add.png rename to trunk/SIPRPSoft/src/leaf/ui/icons/add.png diff --git a/trunk/common/src/leaf/ui/icons/create.png b/trunk/SIPRPSoft/src/leaf/ui/icons/create.png similarity index 100% rename from trunk/common/src/leaf/ui/icons/create.png rename to trunk/SIPRPSoft/src/leaf/ui/icons/create.png diff --git a/trunk/common/src/leaf/ui/icons/delete.png b/trunk/SIPRPSoft/src/leaf/ui/icons/delete.png similarity index 100% rename from trunk/common/src/leaf/ui/icons/delete.png rename to trunk/SIPRPSoft/src/leaf/ui/icons/delete.png diff --git a/trunk/common/src/leaf/ui/icons/edit.png b/trunk/SIPRPSoft/src/leaf/ui/icons/edit.png similarity index 100% rename from trunk/common/src/leaf/ui/icons/edit.png rename to trunk/SIPRPSoft/src/leaf/ui/icons/edit.png diff --git a/trunk/common/src/leaf/ui/icons/rem.png b/trunk/SIPRPSoft/src/leaf/ui/icons/rem.png similarity index 100% rename from trunk/common/src/leaf/ui/icons/rem.png rename to trunk/SIPRPSoft/src/leaf/ui/icons/rem.png diff --git a/trunk/common/src/leaf/ui/icons/revert.png b/trunk/SIPRPSoft/src/leaf/ui/icons/revert.png similarity index 100% rename from trunk/common/src/leaf/ui/icons/revert.png rename to trunk/SIPRPSoft/src/leaf/ui/icons/revert.png diff --git a/trunk/common/src/leaf/ui/icons/save.png b/trunk/SIPRPSoft/src/leaf/ui/icons/save.png similarity index 100% rename from trunk/common/src/leaf/ui/icons/save.png rename to trunk/SIPRPSoft/src/leaf/ui/icons/save.png diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java index 2564d64c..031fc84c 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java @@ -7,8 +7,9 @@ import javax.swing.JOptionPane; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; +import com.evolute.adt.TreeTools; + import leaf.ui.LeafDialog; -import leaf.ui.TreeTools; import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.objects.HsEmail; import siprp.database.cayenne.objects.HsEmailEstabelecimento; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java index ae667cb3..b042fa19 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java @@ -19,12 +19,13 @@ 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; import leaf.ui.LeafTree; import leaf.ui.TreeInserterDialog; -import leaf.ui.TreeTools; import siprp.database.cayenne.objects.HsEquipamento; import siprp.database.cayenne.objects.HsRelatorio; import siprp.database.cayenne.objects.HsRelatorioEquipamento; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java index fb7c6ee8..07c05901 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java @@ -26,12 +26,13 @@ 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; import leaf.ui.LeafTree; import leaf.ui.LeafUIConstants; -import leaf.ui.TreeTools; import siprp.database.cayenne.objects.HsEquipamento; import siprp.logic.HigieneSegurancaLogic; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java index e003a23f..38479b61 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java @@ -6,9 +6,10 @@ 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 leaf.ui.TreeTools; import siprp.database.cayenne.objects.Empresas; import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.objects.HsLegislacao; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java index 0e966ccc..be5896a2 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java @@ -26,14 +26,15 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import leaf.data.Validator; +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 leaf.ui.TreeTools; import siprp.database.cayenne.objects.HsLegislacao; import siprp.database.cayenne.objects.HsLegislacaoCategoria; import siprp.logic.HigieneSegurancaLogic; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java index d726a7a1..59b92d38 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java @@ -6,9 +6,10 @@ 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 leaf.ui.TreeTools; import siprp.database.cayenne.objects.Empresas; import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.objects.HsNormalizacao; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java index 57aa3dcd..39d1cd73 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java @@ -32,14 +32,15 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import leaf.data.Validator; +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 leaf.ui.TreeTools; import siprp.SIPRPSpellChecker; import siprp.database.cayenne.objects.HsNormalizacao; import siprp.logic.HigieneSegurancaLogic; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java index a02804ec..09258183 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java @@ -17,12 +17,13 @@ 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; import leaf.ui.LeafTree; import leaf.ui.TreeInserterDialog; -import leaf.ui.TreeTools; import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.objects.HsPosto; import siprp.database.cayenne.objects.HsPostoEstabelecimento; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java index fd3189bb..cd96174b 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java @@ -31,12 +31,13 @@ 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; import leaf.ui.LeafTree; import leaf.ui.LeafUIConstants; -import leaf.ui.TreeTools; import siprp.database.cayenne.objects.Empresas; import siprp.database.cayenne.objects.HsArea; import siprp.database.cayenne.objects.HsPosto; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java index 901616e3..d6774e20 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java @@ -18,12 +18,13 @@ 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; import leaf.ui.LeafTree; import leaf.ui.TreeInserterDialog; -import leaf.ui.TreeTools; import siprp.database.cayenne.objects.BaseObject; import siprp.database.cayenne.objects.Empresas; import siprp.database.cayenne.objects.HsPosto; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java index 322aefeb..80b3e7b8 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java @@ -25,12 +25,13 @@ 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; import leaf.ui.LeafTree; import leaf.ui.LeafUIConstants; -import leaf.ui.TreeTools; import siprp.database.cayenne.objects.HsMedida; import siprp.database.cayenne.objects.HsRisco; import siprp.database.cayenne.objects.HsRiscoMedida; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java index 14974f46..64d7459c 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java @@ -26,12 +26,13 @@ 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; import leaf.ui.LeafTree; import leaf.ui.TreeInserterDialog; -import leaf.ui.TreeTools; import siprp.database.cayenne.objects.HsPostoRisco; import siprp.database.cayenne.objects.HsRelatorioMedida; import siprp.database.cayenne.objects.HsRelatorioPosto; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java index d5a14ff4..724e7217 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java @@ -41,7 +41,6 @@ import javax.swing.event.CaretListener; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import leaf.data.Validator; import leaf.ui.LeafButton; import leaf.ui.LeafDialog; import leaf.ui.LeafIconButton; @@ -58,6 +57,7 @@ import siprp.medicina.processo.mail.MailDialog; import siprp.medicina.processo.mail.MailSender; import siprp.planoactuacao.print.PlanoActuacaoPDFCreator; +import com.evolute.adt.Validator; import com.evolute.utils.ui.calendar.JCalendarPanel; public class PanelRelatorio extends JPanel implements CaretListener, ChangeListener, ActionListener diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java index eefdd45b..c1bf9dc6 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java @@ -17,8 +17,9 @@ 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 leaf.ui.TreeTools; import siprp.database.cayenne.objects.HsRelatorio; import siprp.database.cayenne.objects.HsRelatorioPosto; import siprp.database.cayenne.objects.HsRelatorioPostoRisco; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/exames/ui/RecepcaoExamesWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/exames/ui/RecepcaoExamesWindow.java index d349a0d8..5ddc29a6 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/exames/ui/RecepcaoExamesWindow.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/exames/ui/RecepcaoExamesWindow.java @@ -17,7 +17,6 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.ListSelectionModel; -import leaf.data.OrderedMap; import leaf.ui.LeafButton; import leaf.ui.LeafInputField; import leaf.ui.LeafTableModel; @@ -32,6 +31,7 @@ import siprp.database.cayenne.objects.TrabalhadoresEcds; import siprp.database.cayenne.objects.TrabalhadoresEcdsDatas; import siprp.medicina.exames.logic.RecepcaoExamesLogic; +import com.evolute.adt.OrderedMap; import com.evolute.utils.tables.BaseTable; public class RecepcaoExamesWindow extends LeafWindow diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java index dda40d4b..d997d0e3 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java @@ -12,7 +12,8 @@ import java.util.List; import javax.swing.JSeparator; -import leaf.data.OrderedMap; +import com.evolute.adt.OrderedMap; + import leaf.ui.LeafCalendarDialog; import leaf.ui.LeafOptionDialog; import leaf.ui.LeafTextDialog; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java index 8b4e2d95..8f70736c 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java @@ -47,7 +47,6 @@ import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; -import leaf.data.OrderedMap; import leaf.ui.LeafCalendarDialog; import leaf.ui.LeafInputField; import leaf.ui.LeafOptionDialog; @@ -78,6 +77,7 @@ import siprp.database.cayenne.objects.TrabalhadoresProcesso; import siprp.medicina.MedicinaDataProvider; import siprp.medicina.processo.mail.MailDialog; +import com.evolute.adt.OrderedMap; import com.evolute.utils.Singleton; public class ProcessoDadosPanel extends JPanel diff --git a/trunk/common/src/leaf/data/OrderedMap.java b/trunk/common/src/com/evolute/adt/OrderedMap.java similarity index 99% rename from trunk/common/src/leaf/data/OrderedMap.java rename to trunk/common/src/com/evolute/adt/OrderedMap.java index 96b6f4d6..f16e4425 100644 --- a/trunk/common/src/leaf/data/OrderedMap.java +++ b/trunk/common/src/com/evolute/adt/OrderedMap.java @@ -1,4 +1,4 @@ -package leaf.data; +package com.evolute.adt; import java.util.ArrayList; import java.util.Collection; diff --git a/trunk/common/src/com/evolute/adt/Pair.java b/trunk/common/src/com/evolute/adt/Pair.java index ce01de8a..28f28b40 100644 --- a/trunk/common/src/com/evolute/adt/Pair.java +++ b/trunk/common/src/com/evolute/adt/Pair.java @@ -1,100 +1,48 @@ package com.evolute.adt; -public class Pair implements Comparable> +public class Pair, CdrClass> implements Comparable> { - - private final CARCLASS left; - - private final CDRCLASS right; - - public Pair( CARCLASS leftValue, CDRCLASS rightValue ) - { - this.left = leftValue; - this.right = rightValue; - } - public CARCLASS getLeft() + private final CarClass car; + private final CdrClass cdr; + + public Pair(CarClass car, CdrClass cdr) { - return left; + this.car = car; + this.cdr = cdr; } - public CDRCLASS getRight() + public CarClass getCar() { - return right; + return car; } - - @SuppressWarnings("unchecked") - @Override - public boolean equals(Object obj) + + public CdrClass getCdr() { - boolean result = obj != null; - if( result ) - { - if( obj instanceof Pair ) - { - result = ( left == null ? (((Pair) obj).left == null ) : (left.equals(((Pair) obj).left)) ); - result &= ( right == null ? (((Pair) obj).right == null ) : (right.equals(((Pair) obj).right)) ); - } - else - { - result = false; - } - } - return result; + return cdr; } @Override - public int compareTo(Pair pair) + public int compareTo( Pair toPair ) { - int result = compare( left, pair == null ? null : pair.left ); - if( result == 0 ) + if(toPair == null) { - result = compare( right, pair == null ? null : pair.right ); + return 1; } - return result; - } - - @SuppressWarnings("unchecked") - private int compare( Object a, Object b ) - { - int result = a == null ? (b == null ? 0 : -1 ) : ( b == null ? 1 : 0 ); - if( a != null && b != null ) + else if(car == null && toPair.getCar() == null) { - if( a.getClass().equals( b.getClass() ) && (a instanceof Comparable) ) - { - ((Comparable)a).compareTo(b); - } - else - { - result = compare(a.toString(),b.toString()); - } + return 0; } - return result; - } - - @Override - public int hashCode() - { - int result = super.hashCode(); - if( left != null ) - { - result = left.hashCode(); - if( right != null ) - { - result ^= right.hashCode(); - } - } - else if( right != null ) + else { - result = right.hashCode(); + return getCar().compareTo( toPair.getCar() ); } - return result; } @Override public String toString() { - return "<"+left+","+right+">"; + return "(" + (car == null ? "" : car.toString()) + ", "+ (cdr == null ? "" : cdr.toString()) + ")"; } - + } diff --git a/trunk/common/src/leaf/ui/TreeTools.java b/trunk/common/src/com/evolute/adt/TreeTools.java similarity index 99% rename from trunk/common/src/leaf/ui/TreeTools.java rename to trunk/common/src/com/evolute/adt/TreeTools.java index b9af3f6a..35aaae1f 100644 --- a/trunk/common/src/leaf/ui/TreeTools.java +++ b/trunk/common/src/com/evolute/adt/TreeTools.java @@ -1,4 +1,4 @@ -package leaf.ui; +package com.evolute.adt; import java.util.ArrayList; import java.util.Collections; @@ -11,6 +11,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; +import leaf.ui.LeafTree; + import com.evolute.utils.strings.StringPlainer; public class TreeTools diff --git a/trunk/common/src/leaf/data/Validator.java b/trunk/common/src/com/evolute/adt/Validator.java similarity index 88% rename from trunk/common/src/leaf/data/Validator.java rename to trunk/common/src/com/evolute/adt/Validator.java index 158e062a..1cbc5218 100644 --- a/trunk/common/src/leaf/data/Validator.java +++ b/trunk/common/src/com/evolute/adt/Validator.java @@ -1,4 +1,4 @@ -package leaf.data; +package com.evolute.adt; public interface Validator { diff --git a/trunk/common/src/leaf/data/Pair.java b/trunk/common/src/leaf/data/Pair.java deleted file mode 100644 index f1353217..00000000 --- a/trunk/common/src/leaf/data/Pair.java +++ /dev/null @@ -1,48 +0,0 @@ -package leaf.data; - -public class Pair, CdrClass> implements Comparable> -{ - - private final CarClass car; - private final CdrClass cdr; - - public Pair(CarClass car, CdrClass cdr) - { - this.car = car; - this.cdr = cdr; - } - - public CarClass getCar() - { - return car; - } - - public CdrClass getCdr() - { - return cdr; - } - - @Override - public int compareTo( Pair toPair ) - { - if(toPair == null) - { - return 1; - } - else if(car == null && toPair.getCar() == null) - { - return 0; - } - else - { - return getCar().compareTo( toPair.getCar() ); - } - } - - @Override - public String toString() - { - return "(" + (car == null ? "" : car.toString()) + ", "+ (cdr == null ? "" : cdr.toString()) + ")"; - } - -} diff --git a/trunk/common/src/leaf/ui/LeafTree.java b/trunk/common/src/leaf/ui/LeafTree.java index 4c96e8cf..b85d87a0 100644 --- a/trunk/common/src/leaf/ui/LeafTree.java +++ b/trunk/common/src/leaf/ui/LeafTree.java @@ -9,6 +9,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; +import com.evolute.adt.TreeTools; + public class LeafTree extends JTree { diff --git a/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java b/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java index f345f72f..b4fd8b6b 100755 --- a/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java +++ b/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java @@ -4,7 +4,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import leaf.data.OrderedMap; +import com.evolute.adt.OrderedMap; + import siprp.MedicinaConstants; import siprp.database.cayenne.objects.auto._TrabalhadoresEcds; diff --git a/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java b/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java index c63124c0..2706c1f8 100755 --- a/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java +++ b/trunk/common/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java @@ -5,7 +5,8 @@ import java.util.Date; import java.util.HashMap; import java.util.List; -import leaf.data.OrderedMap; +import com.evolute.adt.OrderedMap; + import siprp.MedicinaConstants; import siprp.database.cayenne.objects.auto._TrabalhadoresEcdsDatas; diff --git a/trunk/common/src/siprp/logic/HigieneSegurancaLogic.java b/trunk/common/src/siprp/logic/HigieneSegurancaLogic.java index 74f02026..29265093 100644 --- a/trunk/common/src/siprp/logic/HigieneSegurancaLogic.java +++ b/trunk/common/src/siprp/logic/HigieneSegurancaLogic.java @@ -10,8 +10,9 @@ import java.util.List; import javax.swing.tree.DefaultMutableTreeNode; -import leaf.ui.LeafDialog; -import leaf.ui.TreeTools; +import com.evolute.adt.TreeTools; +import com.evolute.utils.error.ErrorLogger; + import siprp.database.cayenne.objects.Empresas; import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.objects.HsArea; @@ -210,7 +211,7 @@ public class HigieneSegurancaLogic } catch( Exception e ) { - LeafDialog.error(e); + ErrorLogger.logException(e); } }