git-svn-id: https://svn.coded.pt/svn/SIPRP@1215 bb69d46d-e84e-40c8-a05a-06db0d633741

0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Tiago Simão 16 years ago
parent 81573d57ba
commit 728ff21c0e

@ -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<ObjClass extends Object> extends JPanel implements FocusListener, MouseListener, PropertyChangeListener

@ -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<KeyClass extends Object> extends JDialog

@ -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;

@ -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
{

@ -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;

@ -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;

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before

Width:  |  Height:  |  Size: 753 B

After

Width:  |  Height:  |  Size: 753 B

Before

Width:  |  Height:  |  Size: 914 B

After

Width:  |  Height:  |  Size: 914 B

Before

Width:  |  Height:  |  Size: 765 B

After

Width:  |  Height:  |  Size: 765 B

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before

Width:  |  Height:  |  Size: 936 B

After

Width:  |  Height:  |  Size: 936 B

Before

Width:  |  Height:  |  Size: 876 B

After

Width:  |  Height:  |  Size: 876 B

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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

@ -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;

@ -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

@ -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;

@ -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

@ -1,4 +1,4 @@
package leaf.data;
package com.evolute.adt;
import java.util.ArrayList;
import java.util.Collection;

@ -1,100 +1,48 @@
package com.evolute.adt;
public class Pair<CARCLASS extends Object, CDRCLASS extends Object> implements Comparable<Pair<? extends CARCLASS,? extends CDRCLASS>>
public class Pair<CarClass extends Comparable<CarClass>, CdrClass> implements Comparable<Pair<CarClass, CdrClass>>
{
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<? extends CARCLASS, ? extends CDRCLASS> pair)
public int compareTo( Pair<CarClass, CdrClass> 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()) + ")";
}
}

@ -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

@ -1,4 +1,4 @@
package leaf.data;
package com.evolute.adt;
public interface Validator<OBJECT_CLASS extends Object>
{

@ -1,48 +0,0 @@
package leaf.data;
public class Pair<CarClass extends Comparable<CarClass>, CdrClass> implements Comparable<Pair<CarClass, CdrClass>>
{
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<CarClass, CdrClass> 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()) + ")";
}
}

@ -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
{

@ -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;

@ -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;

@ -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);
}
}

Loading…
Cancel
Save