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

trunk/SIPRPSoft/src/leaf/ui/LeafOptionDialog.java

@@ -15,7 +15,6 @@ import java.util.Map;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JRootPane;
@@ -24,6 +23,8 @@ import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.ScrollPaneConstants;
 
+import siprp.ui.SIPRPFrame;
+
 import com.evolute.adt.OrderedMap;
 
 
@@ -122,7 +123,7 @@ public class LeafOptionDialog<KeyClass extends Object> extends JDialog
 		}
 		setupComponents( map == null ? orderedMap.iterator() : map.keySet().iterator(), map == null ? orderedMap.rows() : map.keySet().size(), map == null ? true : false );
 		setUndecorated( true );
-		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+		setDefaultCloseOperation( SIPRPFrame.DO_NOTHING_ON_CLOSE );
 		getRootPane().setWindowDecorationStyle(JRootPane.NONE);
 		setSize( getLayout().minimumLayoutSize( getRootPane() ) );
 		setLocationRelativeTo( getParent() );

trunk/SIPRPSoft/src/leaf/ui/LeafTextDialog.java

@@ -10,11 +10,12 @@ import java.awt.event.ActionListener;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JRootPane;
 import javax.swing.JTextArea;
 
+import siprp.ui.SIPRPFrame;
+
 public class LeafTextDialog extends JDialog
 {
 	private static final long serialVersionUID = 1L;
@@ -53,7 +54,7 @@ public class LeafTextDialog extends JDialog
 		okButton.setPreferredSize( buttonSize );
 		setupLayout();
 		setUndecorated( true );
-		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+		setDefaultCloseOperation( SIPRPFrame.DO_NOTHING_ON_CLOSE );
 		getRootPane().setWindowDecorationStyle(JRootPane.PLAIN_DIALOG);
 		setLocationRelativeTo( null );
 		this.expanded = expanded;

trunk/SIPRPSoft/src/leaf/ui/LeafWindow.java

@@ -28,7 +28,6 @@ import javax.swing.BorderFactory;
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.JButton;
 import javax.swing.JComponent;
-import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JTree;
 import javax.swing.SwingUtilities;
@@ -41,6 +40,7 @@ import javax.swing.table.TableModel;
 import leaf.ui.LeafLogic.Action;
 import leaf.ui.LeafLogic.LeafLogicActionBinding;
 import leaf.ui.LeafLogic.LeafUIActionBinding;
+import siprp.ui.SIPRPFrame;
 
 import com.evolute.adt.Pair;
 import com.evolute.utils.tables.BaseTable;
@@ -48,7 +48,7 @@ import com.evolute.utils.tables.ColumnizedMappable;
 import com.evolute.utils.tables.VectorTableModel;
 import com.evolute.utils.tracker.TrackableWindow;
 
-public class LeafWindow extends JFrame implements TrackableWindow, ListSelectionListener, TreeSelectionListener, ActionListener, PropertyChangeListener
+public class LeafWindow extends SIPRPFrame implements TrackableWindow, ListSelectionListener, TreeSelectionListener, ActionListener, PropertyChangeListener
 {
 
 	private static final long serialVersionUID = 1L;
@@ -683,7 +683,7 @@ public class LeafWindow extends JFrame implements TrackableWindow, ListSelection
 
 	private void addListenerForField( ActionActivation annotation, Field field, Object instance )
 	{
-		if( instance instanceof JFrame || instance instanceof JPanel )
+		if( instance instanceof SIPRPFrame || instance instanceof JPanel )
 		{
 			try
 			{

trunk/SIPRPSoft/src/siprp/clientes/ClientesWindow.java

@@ -45,6 +45,7 @@ import siprp.data.outer.ExamesData;
 import siprp.data.outer.TrabalhadoresData;
 import siprp.ficha.ExamePDF;
 import siprp.importer.Importer;
+import siprp.ui.SIPRPEditorWindow;
 
 import com.evolute.entity.ProviderInterface;
 import com.evolute.utils.Singleton;
@@ -61,13 +62,12 @@ import com.evolute.utils.ui.dialog.LongMessageDialog;
 import com.evolute.utils.ui.search.SearchDialog;
 import com.evolute.utils.ui.text.CopyPasteHandler;
 import com.evolute.utils.ui.window.ActionHandler;
-import com.evolute.utils.ui.window.EditorWindow;
 
 /**
  *
  * @author  fpalma
  */
-public class ClientesWindow extends EditorWindow
+public class ClientesWindow extends SIPRPEditorWindow
 	implements ListSelectionListener
 {
 	/**

trunk/SIPRPSoft/src/siprp/clientes/EtiquetaChooserDialog.java

@@ -15,9 +15,10 @@ import java.awt.event.ActionListener;
 import java.util.Hashtable;
 
 import javax.swing.JButton;
-import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 
+import siprp.ui.SIPRPFrame;
+
 import com.evolute.utils.ui.CustomJDialog;
 
 /**
@@ -34,7 +35,7 @@ public class EtiquetaChooserDialog extends CustomJDialog
 	private int choice[];
 	
 	/** Creates a new instance of EtiquetaChooserPanel */
-	public EtiquetaChooserDialog( JFrame owner, int rows, int cols )
+	public EtiquetaChooserDialog( SIPRPFrame owner, int rows, int cols )
 	{
 		super( owner, true );
 		this.rows = rows;

trunk/SIPRPSoft/src/siprp/clientes/NoticiasDialog.java

@@ -12,10 +12,11 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 import javax.swing.JButton;
-import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 
+import siprp.ui.SIPRPEditorWindow;
+
 import com.evolute.utils.ui.CustomJDialog;
 import com.evolute.utils.ui.DialogException;
 import com.evolute.utils.ui.panel.HTMLEditorPanel;
@@ -33,7 +34,7 @@ public class NoticiasDialog extends CustomJDialog
 	protected NoticiasDataProvider provider;
 	
 	/** Creates a new instance of NoticiasPanel */
-	public NoticiasDialog( JFrame owner )
+	public NoticiasDialog( SIPRPEditorWindow owner )
 		throws Exception
 	{
 		super( owner, true );

trunk/SIPRPSoft/src/siprp/clientes/UserPanel.java

@@ -44,7 +44,7 @@ public class UserPanel extends JPanel
 	
 //	public static void main( String args[] )
 //	{
-//		JFrame frame = new JFrame();
+//		SIPRPFrame frame = new SIPRPFrame();
 //		frame.setSize( 300, 200 );
 //		frame.getContentPane().setLayout( new GridLayout( 1, 1 ) );
 //		frame.getContentPane().add( new UserPanel() );

trunk/SIPRPSoft/src/siprp/clientes/UserWindow.java

@@ -8,9 +8,8 @@ package siprp.clientes;
 
 import java.awt.BorderLayout;
 
-import javax.swing.JFrame;
-
 import siprp.data.outer.EmpresasData;
+import siprp.ui.SIPRPEditorWindow;
 
 import com.evolute.entity.ProviderInterface;
 import com.evolute.utils.Singleton;
@@ -27,7 +26,7 @@ public class UserWindow extends CustomJDialog
 	protected Integer empresaID;
 	
 	/** Creates a new instance of UserWindow */
-	public UserWindow( JFrame owner, Integer empresaID )
+	public UserWindow( SIPRPEditorWindow owner, Integer empresaID )
 		throws Exception
 	{
 		super( owner, true );

trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaWindow.java

@@ -27,7 +27,6 @@ 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;
@@ -39,6 +38,7 @@ import javax.swing.event.ListSelectionListener;
 import siprp.data.outer.EmpresasData;
 import siprp.data.outer.EstabelecimentosData;
 import siprp.pesquisas.PesquisasProvider;
+import siprp.ui.SIPRPFrame;
 
 import com.evolute.entity.ProviderInterface;
 import com.evolute.utils.Singleton;
@@ -55,7 +55,7 @@ import com.evolute.utils.ui.text.CopyPasteHandler;
  *
  * @author  fpalma
  */
-public class EstatisticaWindow extends JFrame
+public class EstatisticaWindow extends SIPRPFrame
 	implements TrackableWindow, ListSelectionListener, ActionListener, ItemListener
 {
 	public static final DateFormat DF = DateFormat.getDateInstance( DateFormat.SHORT );

trunk/SIPRPSoft/src/siprp/estatisticas/EstatisticasWindow.java

@@ -9,14 +9,14 @@ package siprp.estatisticas;
 import javax.swing.JComboBox;
 import javax.swing.JPanel;
 
-import com.evolute.utils.ui.window.CustomJFrame;
+import siprp.ui.SIPRPFrame;
 
 /**
  *
  * @author  fpalma
  */
 public class EstatisticasWindow
-	extends CustomJFrame
+	extends SIPRPFrame
 {
 	private JPanel filtrosPanel;
 	private JPanel agrupamentosPanel;

trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java

@@ -40,6 +40,7 @@ import siprp.importer.Importer;
 import siprp.lembretes.LembretesDataProvider;
 import siprp.medicina.MarcacoesMedicinaHandler;
 import siprp.printer.Printer;
+import siprp.ui.SIPRPTabbedWindow;
 
 import com.evolute.entity.ProviderInterface;
 import com.evolute.utils.Singleton;
@@ -51,13 +52,12 @@ import com.evolute.utils.ui.dialog.ListActionDialog;
 import com.evolute.utils.ui.search.SearchDialog;
 import com.evolute.utils.ui.window.ActionHandler;
 import com.evolute.utils.ui.window.ProgressDialog;
-import com.evolute.utils.ui.window.TabbedWindow;
 
 /**
  *
  * @author  fpalma
  */
-public class FichaWindow extends TabbedWindow
+public class FichaWindow extends SIPRPTabbedWindow
 	implements ListAction, FichaAptidaoConstants
 {	
 	private ProviderInterface JDO;

trunk/SIPRPSoft/src/siprp/ficha/MedicoEditor.java

@@ -16,7 +16,6 @@ import java.awt.event.ActionListener;
 import java.util.Vector;
 
 import javax.swing.JButton;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -27,6 +26,7 @@ import javax.swing.event.ListSelectionListener;
 
 import siprp.FichaDataProvider;
 import siprp.data.outer.MedicosData;
+import siprp.ui.SIPRPTabbedWindow;
 
 import com.evolute.entity.ProviderInterface;
 import com.evolute.utils.Singleton;
@@ -57,7 +57,7 @@ public class MedicoEditor extends CustomJDialog
 	private boolean isNew = false;
 	
 	/** Creates a new instance of MedicoEditor */
-	public MedicoEditor( JFrame owner )
+	public MedicoEditor( SIPRPTabbedWindow owner )
 		throws Exception
 	{
 		super( owner, true );

trunk/SIPRPSoft/src/siprp/ficha/UpperPanel.java

@@ -13,7 +13,6 @@ import java.awt.event.ItemListener;
 import java.util.Hashtable;
 
 import javax.swing.JComboBox;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -24,6 +23,7 @@ import siprp.data.outer.EmpresasData;
 import siprp.data.outer.EstabelecimentosData;
 import siprp.data.outer.MedicosData;
 import siprp.data.outer.TrabalhadoresData;
+import siprp.ui.SIPRPTabbedWindow;
 
 import com.evolute.entity.ProviderInterface;
 import com.evolute.utils.Singleton;
@@ -42,7 +42,7 @@ public class UpperPanel extends JPanel
 {
 	protected ProviderInterface JDO;
 	
-	protected JFrame owner;
+	protected SIPRPTabbedWindow owner;
 	private JTextField empresaText;
 	private JTextField nomeText;
 	private JComboBox medicosCombo;

trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java

@@ -6,13 +6,14 @@ import static com.evolute.utils.strings.UnicodeLatin1Map.oacute;
 
 import java.awt.Dimension;
 
-import javax.swing.JFrame;
 import javax.swing.JTabbedPane;
 import javax.swing.SwingUtilities;
 
+import siprp.ui.SIPRPFrame;
+
 import com.evolute.utils.tracker.TrackableWindow;
 
-public class GestaoRelatorioWindow extends JFrame implements TrackableWindow
+public class GestaoRelatorioWindow extends SIPRPFrame implements TrackableWindow
 {
 
 	public static final String TITLE = "Gest" + atilde + "o de Relat" + oacute + "rio de Higiene e Seguran" + ccedil + "a";
@@ -30,7 +31,7 @@ public class GestaoRelatorioWindow extends JFrame implements TrackableWindow
 	public static void main( String[] args )
 	{
 		GestaoRelatorioWindow window = new GestaoRelatorioWindow();
-		window.setDefaultCloseOperation( JFrame.EXIT_ON_CLOSE );
+		window.setDefaultCloseOperation( SIPRPFrame.EXIT_ON_CLOSE );
 		window.open();
 	}
 	

trunk/SIPRPSoft/src/siprp/higiene/legislacoes/GestaoLegislacoesWindow.java

@@ -4,12 +4,13 @@ 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 siprp.ui.SIPRPFrame;
+
 import com.evolute.utils.tracker.TrackableWindow;
 
-public class GestaoLegislacoesWindow extends JFrame implements TrackableWindow
+public class GestaoLegislacoesWindow extends SIPRPFrame implements TrackableWindow
 {
 
 	private static final long serialVersionUID = 1L;
@@ -47,7 +48,7 @@ public class GestaoLegislacoesWindow extends JFrame implements TrackableWindow
 //	public static void main( String[] args )
 //	{
 //		GestaoLegislacoesWindow window = new GestaoLegislacoesWindow();
-//		window.setDefaultCloseOperation( JFrame.EXIT_ON_CLOSE );
+//		window.setDefaultCloseOperation( SIPRPFrame.EXIT_ON_CLOSE );
 //		window.setVisible( true );
 //	}
 	

trunk/SIPRPSoft/src/siprp/higiene/mapa/MapaHigieneWindow.java

@@ -8,22 +8,21 @@ import java.awt.event.ActionListener;
 import java.util.Calendar;
 
 import javax.swing.JButton;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
 import siprp.higiene.HigieneDataProvider;
+import siprp.ui.SIPRPEditorWindow;
 
 import com.evolute.utils.documents.YearDocument;
 import com.evolute.utils.ui.DialogException;
-import com.evolute.utils.ui.window.EditorWindow;
 
 /**
  *
  * @author fpalma
  */
-public class MapaHigieneWindow extends EditorWindow implements ActionListener
+public class MapaHigieneWindow extends SIPRPEditorWindow implements ActionListener
 {
 
 	private static final long serialVersionUID = 1L;
@@ -43,7 +42,7 @@ public class MapaHigieneWindow extends EditorWindow implements ActionListener
 		throws Exception
 	{
 		
-		JFrame frm = new MapaHigieneWindow();
+		SIPRPEditorWindow frm = new MapaHigieneWindow();
 		frm.setVisible( true );
 	}
 	

trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java

@@ -39,6 +39,7 @@ import siprp.data.outer.ContactosData;
 import siprp.data.outer.EstabelecimentosData;
 import siprp.data.outer.MarcacoesEstabelecimentoData;
 import siprp.higiene.HigieneDataProvider;
+import siprp.ui.SIPRPEditorWindow;
 
 import com.evolute.entity.ProviderInterface;
 import com.evolute.utils.Singleton;
@@ -47,13 +48,12 @@ import com.evolute.utils.data.MappableObject;
 import com.evolute.utils.ui.DialogException;
 import com.evolute.utils.ui.panel.TableEditorPanel;
 import com.evolute.utils.ui.text.CopyPasteHandler;
-import com.evolute.utils.ui.window.EditorWindow;
 
 /**
  *
  * @author fpalma
  */
-public class MarcacoesHigieneWindow extends EditorWindow
+public class MarcacoesHigieneWindow extends SIPRPEditorWindow
 		implements ItemListener, ActionListener, ListSelectionListener, MarcacoesHigieneInterface
 {
 

trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoEditor.java

@@ -15,7 +15,6 @@ import java.util.Vector;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -28,6 +27,7 @@ import javax.swing.event.ListSelectionListener;
 
 import siprp.data.outer.MarcacoesTecnicosHstData;
 import siprp.higiene.HigieneDataProvider;
+import siprp.ui.SIPRPEditorWindow;
 
 import com.evolute.entity.ProviderInterface;
 import com.evolute.utils.Singleton;
@@ -65,7 +65,7 @@ public class TecnicoEditor extends CustomJDialog
 	private JRadioButton cores[];
 	
 	/** Creates a new instance of MedicoEditor */
-	public TecnicoEditor( JFrame owner )
+	public TecnicoEditor( SIPRPEditorWindow owner )
 		throws Exception
 	{
 		super( owner, true );

trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java

@@ -29,7 +29,6 @@ import java.util.Vector;
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
 import javax.swing.JFileChooser;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -56,6 +55,7 @@ import siprp.logic.HigieneSegurancaLogic;
 import siprp.medicina.processo.mail.MailDialog;
 import siprp.medicina.processo.mail.MailSender;
 import siprp.planoactuacao.print.PlanoActuacaoPDFCreator;
+import siprp.ui.SIPRPFrame;
 
 import com.evolute.adt.Validator;
 import com.evolute.utils.ui.calendar.JCalendarPanel;
@@ -466,10 +466,10 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe
 		return pdf != null;
 	}
 	
-	private JFrame getFrame( )
+	private SIPRPFrame getFrame( )
 	{
 		Component comp = this;
-		JFrame frame = null;
+		SIPRPFrame frame = null;
 		while( comp != null )
 		{
 			if( comp.getParent() instanceof RelatorioHigieneSegurancaWindow )

trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioHigieneSegurancaWindow.java

@@ -16,7 +16,6 @@ import java.util.List;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComboBox;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.SwingUtilities;
 
@@ -26,10 +25,11 @@ import siprp.database.cayenne.objects.Estabelecimentos;
 import siprp.database.cayenne.objects.HsRelatorio;
 import siprp.database.cayenne.objects.MarcacoesEstabelecimento;
 import siprp.logic.HigieneSegurancaLogic;
+import siprp.ui.SIPRPFrame;
 
 import com.evolute.utils.tracker.TrackableWindow;
 
-public class RelatorioHigieneSegurancaWindow extends JFrame implements TrackableWindow
+public class RelatorioHigieneSegurancaWindow extends SIPRPFrame implements TrackableWindow
 {
 	private static final long serialVersionUID = 1L;
 	
@@ -237,6 +237,6 @@ public class RelatorioHigieneSegurancaWindow extends JFrame implements Trackable
 	{
 		RelatorioHigieneSegurancaWindow window = new RelatorioHigieneSegurancaWindow();
 		window.setVisible( true );
-		window.setDefaultCloseOperation( JFrame.EXIT_ON_CLOSE );
+		window.setDefaultCloseOperation( SIPRPFrame.EXIT_ON_CLOSE );
 	}
 }

trunk/SIPRPSoft/src/siprp/importer/DataChooserWindow.java

@@ -16,10 +16,11 @@ import java.util.Hashtable;
 
 import javax.swing.JButton;
 import javax.swing.JComboBox;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
+import siprp.ui.SIPRPFrame;
+
 import com.evolute.utils.ui.CustomJDialog;
 /**
  *
@@ -37,12 +38,12 @@ public class DataChooserWindow extends CustomJDialog
 	private boolean canceled = false;
 	
 	/** Creates a new instance of DataChooserWindow */
-	public DataChooserWindow( JFrame modalFrame, String names[], Object data[][] )
+	public DataChooserWindow( SIPRPFrame modalFrame, String names[], Object data[][] )
 	{
 		this( modalFrame, names, data, null );
 	}
 	
-	public DataChooserWindow( JFrame modalFrame, String names[], Object data[][], int selected[] )
+	public DataChooserWindow( SIPRPFrame modalFrame, String names[], Object data[][], int selected[] )
 	{
 		super( modalFrame, true );
 		labels = names;

trunk/SIPRPSoft/src/siprp/impressaofichas/ImpressaoFichasWindow.java

@@ -36,6 +36,8 @@ import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
+import siprp.ui.SIPRPEditorWindow;
+
 import com.evolute.utils.properties.PropertyHandler;
 import com.evolute.utils.tables.BaseTable;
 import com.evolute.utils.tables.ColumnizedMappable;
@@ -43,13 +45,12 @@ 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;
 
 /**
  *
  * @author Frederico
  */
-public class ImpressaoFichasWindow extends EditorWindow
+public class ImpressaoFichasWindow extends SIPRPEditorWindow
 	implements ListSelectionListener, ActionListener
 {
 	public final static String TITLE = "Impress\u00e3o de Fichas de Aptid\u00e3o";

trunk/SIPRPSoft/src/siprp/lembretes/LembretesWindow.java

@@ -26,7 +26,6 @@ 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;
@@ -44,6 +43,7 @@ import siprp.database.cayenne.providers.MedicinaDAO;
 import siprp.lembretes.externos.LembretesExternosPanel;
 import siprp.lembretes.marcacoes.LembretesMarcacaoPanel;
 import siprp.lembretes.remarcacoes.LembretesRemarcacaoPanel;
+import siprp.ui.SIPRPFrame;
 
 import com.evolute.utils.tables.BaseTable;
 import com.evolute.utils.tables.ColumnizedObjectArray;
@@ -55,7 +55,7 @@ import com.evolute.utils.ui.DialogException;
  *
  * @author Frederico
  */
-public class LembretesWindow extends JFrame
+public class LembretesWindow extends SIPRPFrame
 	implements ActionListener, TrackableWindow, ListSelectionListener,
 				LembretesConstants
 {

trunk/SIPRPSoft/src/siprp/medicina/MedicinaWindow.java

@@ -39,6 +39,7 @@ import siprp.data.outer.ContactosData;
 import siprp.data.outer.EstabelecimentosData;
 import siprp.data.outer.MarcacoesTrabalhadorData;
 import siprp.data.outer.TrabalhadoresData;
+import siprp.ui.SIPRPTabbedWindow;
 
 import com.evolute.entity.ProviderInterface;
 import com.evolute.utils.Singleton;
@@ -48,12 +49,11 @@ import com.evolute.utils.ui.DialogException;
 import com.evolute.utils.ui.panel.CheckBoxPanel;
 import com.evolute.utils.ui.panel.TableEditorPanel;
 import com.evolute.utils.ui.text.CopyPasteHandler;
-import com.evolute.utils.ui.window.TabbedWindow;
 /**
  *
  * @author fpalma
  */
-public class MedicinaWindow extends TabbedWindow
+public class MedicinaWindow extends SIPRPTabbedWindow
 		implements ActionListener, ListSelectionListener, MedicinaWindowInterface
 {
 	private static int iPermissionArray[][] = 

trunk/SIPRPSoft/src/siprp/medicina/Test.java

@@ -10,7 +10,7 @@
 
 package siprp.medicina;
 
-import javax.swing.JFrame;
+import siprp.ui.SIPRPTabbedWindow;
 /**
  *
  * @author fpalma
@@ -21,7 +21,7 @@ public class Test
 	public static void main( String args[] )
 		throws Exception
 	{
-		JFrame frm = new MedicinaWindow();
+		SIPRPTabbedWindow frm = new MedicinaWindow();
 //		frm.getContentPane().setLayout( new GridLayout() );
 //		frm.getContentPane().add( new MedicinaUpperPanel() );
 //		frm.setSize( new Dimension( 600, 600 ) );

trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindow.java

@@ -14,7 +14,6 @@ import java.util.Locale;
 
 import javax.swing.JButton;
 import javax.swing.JComboBox;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
@@ -22,6 +21,8 @@ import javax.swing.WindowConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import siprp.ui.SIPRPFrame;
+
 import com.evolute.utils.data.IDObject;
 import com.evolute.utils.dataui.ControllableComponent;
 import com.evolute.utils.tracker.TrackableWindow;
@@ -29,7 +30,7 @@ import com.evolute.utils.ui.DialogException;
 import com.evolute.utils.ui.calendar.JCalendarPanel;
 import com.evolute.utils.ui.panel.CheckBoxPanel;
 
-public class EnviarAnalisesWindow extends JFrame
+public class EnviarAnalisesWindow extends SIPRPFrame
 	implements TrackableWindow, ActionListener, ChangeListener, ControllableComponent
 {
 	/**

trunk/SIPRPSoft/src/siprp/medicina/locais_realizacao/LocaisRealizacaoWindow.java

@@ -25,7 +25,6 @@ import java.util.Vector;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -38,6 +37,7 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
 import siprp.medicina.prestadores.PrestadoresDataProvider;
+import siprp.ui.SIPRPFrame;
 
 import com.evolute.utils.data.IDObject;
 import com.evolute.utils.tables.BaseTable;
@@ -51,7 +51,7 @@ import com.evolute.utils.ui.calendar.JCalendarPanel;
  *
  * @author fpalma
  */
-public class LocaisRealizacaoWindow extends JFrame
+public class LocaisRealizacaoWindow extends SIPRPFrame
 		implements ActionListener, TrackableWindow, ListSelectionListener
 {
 	/**

trunk/SIPRPSoft/src/siprp/medicina/presencas/DetalhesRealizacaoDialog.java

@@ -15,10 +15,11 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 import javax.swing.JButton;
-import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 
+import siprp.ui.SIPRPFrame;
+
 import com.evolute.utils.data.IDObject;
 import com.evolute.utils.ui.CustomJDialog;
 import com.evolute.utils.ui.panel.CheckBoxPanel;
@@ -39,7 +40,7 @@ public class DetalhesRealizacaoDialog extends CustomJDialog
 	protected Integer selected[];
 	
 	/** Creates a new instance of DetalhesRealizacaoDialog */
-	public DetalhesRealizacaoDialog( JFrame owner, IDObject opcoes[] )
+	public DetalhesRealizacaoDialog( SIPRPFrame owner, IDObject opcoes[] )
 	{
 		super( owner, true );
 		this.opcoes = opcoes;

trunk/SIPRPSoft/src/siprp/medicina/presencas/ImpressaoAuxiliaresWindow.java

@@ -10,16 +10,17 @@
 package siprp.medicina.presencas;
 
 import javax.swing.JButton;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 
+import siprp.ui.SIPRPFrame;
+
 import com.evolute.utils.ui.calendar.JCalendarPanel;
 
 /**
  *
  * @author fpalma
  */
-public class ImpressaoAuxiliaresWindow extends JFrame
+public class ImpressaoAuxiliaresWindow extends SIPRPFrame
 {
 	protected JCalendarPanel calendarPanel;
 	protected JButton imprimirButton;

trunk/SIPRPSoft/src/siprp/medicina/presencas/RegistarPresencasWindow.java

@@ -29,7 +29,6 @@ import java.util.Vector;
 
 import javax.swing.JButton;
 import javax.swing.JComboBox;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -44,6 +43,7 @@ import org.jdom.output.XMLOutputter;
 import siprp.clientes.ClientesDataProvider;
 import siprp.medicina.MedicinaDataProvider;
 import siprp.medicina.prestadores.PrestadoresDataProvider;
+import siprp.ui.SIPRPFrame;
 import siprp.util.fop.FOPCreator;
 import siprp.util.fop.FOPPrinter;
 
@@ -58,7 +58,7 @@ import com.evolute.utils.ui.panel.multipleactionlist.MultipleActionListPanel;
  *
  * @author fpalma
  */
-public class RegistarPresencasWindow extends JFrame
+public class RegistarPresencasWindow extends SIPRPFrame
 		implements ActionListener, TrackableWindow
 {
 	protected static final String PRINT_TEMPLATE = "/siprp/medicina/presencas/auxiliares.xsl";

trunk/SIPRPSoft/src/siprp/medicina/prestadores/PrestadoresWindow.java

@@ -44,6 +44,7 @@ import siprp.data.outer.PrestadoresData;
 import siprp.database.cayenne.objects.Prestadores;
 import siprp.database.cayenne.objects.PrtGruposProtocolo;
 import siprp.database.cayenne.providers.MedicinaDAO;
+import siprp.ui.SIPRPEditorWindow;
 
 import com.evolute.entity.ProviderInterface;
 import com.evolute.utils.Singleton;
@@ -55,13 +56,12 @@ import com.evolute.utils.dataui.JTextComponentPlainFillerSaver;
 import com.evolute.utils.ui.DialogException;
 import com.evolute.utils.ui.panel.CheckBoxPanel;
 import com.evolute.utils.ui.search.SearchDialog;
-import com.evolute.utils.ui.window.EditorWindow;
 
 /**
  * 
  * @author fpalma
  */
-public class PrestadoresWindow extends EditorWindow
+public class PrestadoresWindow extends SIPRPEditorWindow
 {
 	private static final long serialVersionUID = 1L;
 

trunk/SIPRPSoft/src/siprp/medicina/processo/mail/ColorChooserDialog.java

@@ -8,11 +8,12 @@ import java.awt.event.ActionListener;
 
 import javax.swing.JButton;
 import javax.swing.JColorChooser;
-import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.colorchooser.AbstractColorChooserPanel;
 
+import siprp.ui.SIPRPFrame;
+
 import com.evolute.utils.ui.CustomJDialog;
 
 public class ColorChooserDialog extends CustomJDialog
@@ -30,7 +31,7 @@ public class ColorChooserDialog extends CustomJDialog
 	protected Color initialColor;
 	protected Color selectedColor;
 	
-	public ColorChooserDialog( JFrame owner, Color color )
+	public ColorChooserDialog( SIPRPFrame owner, Color color )
 	{
 		super( owner, true );
 		initialColor = color;

trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailDialog.java

@@ -25,7 +25,6 @@ import javax.swing.Action;
 import javax.swing.ActionMap;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -40,6 +39,8 @@ import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledEditorKit;
 import javax.swing.text.html.HTMLEditorKit;
 
+import siprp.ui.SIPRPFrame;
+
 import com.evolute.utils.images.ImageIconLoader;
 import com.evolute.utils.tables.BaseTable;
 import com.evolute.utils.tables.VectorTableModel;
@@ -54,7 +55,7 @@ public class MailDialog extends CustomJDialog
 	protected StyledEditorKit.FontSizeAction FONT_SIZE_ACTIONS[];
 	protected int FONT_SIZES[];
 	
-	protected JFrame owner;
+	protected SIPRPFrame owner;
 	
 	protected JTextField toText;
 	protected JTextField bccText;
@@ -112,7 +113,7 @@ public class MailDialog extends CustomJDialog
 	
 	private final String[] additionalBCCs;
 	
-	public MailDialog( JFrame owner, String to, String bcc, String subject, String message, Vector<File> files, String ... additionalBCCs)
+	public MailDialog( SIPRPFrame owner, String to, String bcc, String subject, String message, Vector<File> files, String ... additionalBCCs)
 	throws Exception
 	{
 		super( owner, true );
@@ -130,7 +131,7 @@ public class MailDialog extends CustomJDialog
 		setVisible( true );
 	}
 	
-//	public MailDialog( JFrame owner )
+//	public MailDialog( SIPRPFrame owner )
 //		throws Exception
 //	{
 //		super( owner, true );

trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java

@@ -25,7 +25,6 @@ import java.util.Vector;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JEditorPane;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -38,6 +37,7 @@ import javax.swing.event.ListSelectionListener;
 import siprp.data.outer.ContactosData;
 import siprp.data.outer.EmpresasData;
 import siprp.data.outer.EstabelecimentosData;
+import siprp.ui.SIPRPFrame;
 
 import com.evolute.entity.ProviderInterface;
 import com.evolute.utils.Singleton;
@@ -54,7 +54,7 @@ import com.evolute.utils.ui.text.CopyPasteHandler;
  *
  * @author  fpalma
  */
-public class PesquisasWindow extends JFrame
+public class PesquisasWindow extends SIPRPFrame
 	implements TrackableWindow, ListSelectionListener, ActionListener
 {
 	private ProviderInterface JDO;

trunk/SIPRPSoft/src/siprp/ui/SIPRPEditorWindow.java

@@ -0,0 +1,29 @@
+package siprp.ui;
+
+import com.evolute.utils.image.EvoImage;
+import com.evolute.utils.ui.window.EditorWindow;
+
+public class SIPRPEditorWindow extends EditorWindow
+{
+	private static final long serialVersionUID = 1L;
+
+	public SIPRPEditorWindow() throws Exception
+	{
+		super();
+	}
+	
+	public SIPRPEditorWindow( boolean[][] permittedActions ) throws Exception
+	{
+		super( permittedActions );
+		setIconImage( new EvoImage( "logo/icon.png" ).getImage() );
+		centerLater();
+	}
+	
+	public SIPRPEditorWindow( int[][] permittedActions ) throws Exception
+	{
+		super( permittedActions );
+		setIconImage( new EvoImage( "logo/icon.png" ).getImage() );
+		centerLater();
+	}
+	
+}

trunk/SIPRPSoft/src/siprp/ui/SIPRPFrame.java

@@ -0,0 +1,22 @@
+package siprp.ui;
+
+import com.evolute.swing.frame.EvoFrame;
+import com.evolute.utils.image.EvoImage;
+
+public class SIPRPFrame extends EvoFrame 
+{
+	private static final long serialVersionUID = 1L;
+
+	public SIPRPFrame()
+	{
+		this( "" );
+	}
+	
+	public SIPRPFrame( String title )
+	{
+		super( title );
+		setIconImage( new EvoImage( "logo/icon.png" ).getImage() );
+		centerLater();
+	}
+	
+}

trunk/SIPRPSoft/src/siprp/ui/SIPRPTabbedWindow.java

@@ -0,0 +1,36 @@
+package siprp.ui;
+
+import javax.swing.JPanel;
+
+import com.evolute.utils.image.EvoImage;
+import com.evolute.utils.ui.window.TabbedWindow;
+
+public class SIPRPTabbedWindow extends TabbedWindow 
+{
+	private static final long serialVersionUID = 1L;
+
+	public SIPRPTabbedWindow( JPanel upperPanel, String[] tabNames, boolean[][] activeActions )
+		throws Exception
+	{
+		super( upperPanel, tabNames, activeActions );
+		setIconImage( new EvoImage( "logo/icon.png" ).getImage() );
+		centerLater();
+	}
+	
+	public SIPRPTabbedWindow( boolean upperPanel, String[] tabNames, double weight, boolean[][] activeActions )
+		throws Exception
+	{
+		super( upperPanel, tabNames, weight, activeActions );
+		setIconImage( new EvoImage( "logo/icon.png" ).getImage() );
+		centerLater();
+	}
+	
+	public SIPRPTabbedWindow( JPanel upperPanel, String[] tabNames, double weight, boolean[][] activeActions )
+		throws Exception
+	{
+		super( upperPanel, tabNames, weight, activeActions );
+		setIconImage( new EvoImage( "logo/icon.png" ).getImage() );
+		centerLater();
+	}
+	
+}

trunk/SIPRPSoft/src/siprp/web/WebUpdater.java

@@ -29,13 +29,14 @@ import java.util.Properties;
 import java.util.Vector;
 
 import javax.swing.JButton;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.event.DocumentListener;
 
+import siprp.ui.SIPRPFrame;
+
 //import siprp.*;
 //import siprp.clientes.*;
 
@@ -43,7 +44,7 @@ import javax.swing.event.DocumentListener;
  *
  * @author  fpalma
  */
-public class WebUpdater extends JFrame
+public class WebUpdater extends SIPRPFrame
 	implements ActionListener, Runnable, DocumentListener
 {
 	private Connection softwareConnection;