diff --git a/trunk/siprp/SHSTLogger.java b/trunk/siprp/SHSTLogger.java index a60cda8c..fbd5a13e 100644 --- a/trunk/siprp/SHSTLogger.java +++ b/trunk/siprp/SHSTLogger.java @@ -80,7 +80,7 @@ public class SHSTLogger implements Logger } } - public void logException( Exception ex ) + public void logException( Throwable ex ) { StackTraceElement ste[] = ex.getStackTrace(); StringBuffer sb = new StringBuffer(); diff --git a/trunk/siprp/clientes/EmpresaPanel.java b/trunk/siprp/clientes/EmpresaPanel.java index a73b29f3..e71bf0d0 100644 --- a/trunk/siprp/clientes/EmpresaPanel.java +++ b/trunk/siprp/clientes/EmpresaPanel.java @@ -18,6 +18,7 @@ import com.evolute.utils.documents.*; import com.evolute.utils.jdo.*; import com.evolute.utils.tables.*; import com.evolute.utils.ui.*; +import com.evolute.utils.ui.calendar.*; import com.evolute.utils.ui.text.*; import siprp.*; diff --git a/trunk/siprp/clientes/EtiquetaPrinter.java b/trunk/siprp/clientes/EtiquetaPrinter.java index a03c4c0e..aa868078 100644 --- a/trunk/siprp/clientes/EtiquetaPrinter.java +++ b/trunk/siprp/clientes/EtiquetaPrinter.java @@ -136,7 +136,7 @@ public class EtiquetaPrinter //System.out.println( "XSL: " + styleSheet.toString() ); String xml = ""; ByteArrayOutputStream out = new ByteArrayOutputStream(); - FOPCreator creator = new FOPCreator(); + FOPCreator creator = FOPCreator.getFOPCreator(); InputStream xmlIn = new ByteArrayInputStream( xml.getBytes() ); try { @@ -144,7 +144,7 @@ public class EtiquetaPrinter ByteArrayInputStream in = new ByteArrayInputStream( out.toString().getBytes() ); Hashtable printOptions = new Hashtable(); //System.out.println( "OUT: " + out.toString() ); - com.evolute.utils.fop.FOPPrinter printer = new com.evolute.utils.fop.FOPPrinter(); + FOPPrinter printer = FOPPrinter.getFOPPrinter(); printer.printFO( in, false, true, printOptions ); } catch( Exception ex ) diff --git a/trunk/siprp/clientes/HistoricoEstabelecimentoPanel.java b/trunk/siprp/clientes/HistoricoEstabelecimentoPanel.java index e48c55ab..275e7a71 100644 --- a/trunk/siprp/clientes/HistoricoEstabelecimentoPanel.java +++ b/trunk/siprp/clientes/HistoricoEstabelecimentoPanel.java @@ -14,9 +14,8 @@ import java.util.*; 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 siprp.data.*; @@ -26,7 +25,7 @@ import siprp.data.*; * @author fpalma */ public class HistoricoEstabelecimentoPanel extends JPanel - implements ControllableComponent, DocumentListener, ActionListener + implements ControllableComponent, DocumentListener, ChangeListener, ActionListener { protected static final String LIST_PANEL = "LIST_PANEL"; protected static final String FULL_LIST_PANEL = "FULL_LIST_PANEL"; @@ -177,7 +176,7 @@ public class HistoricoEstabelecimentoPanel extends JPanel { if( !filling ) { - calendarPanel.removeDocumentListener( this ); + calendarPanel.removeChangeListener( this ); text.getDocument().removeDocumentListener( this ); changed = true; saveButton.setEnabled( true ); @@ -188,7 +187,7 @@ public class HistoricoEstabelecimentoPanel extends JPanel private void initButtons() { saveButton.setEnabled( false ); - calendarPanel.addDocumentListener( this ); + calendarPanel.addChangeListener( this ); text.getDocument().addDocumentListener( this ); ClassLoader cl = new EVUtilsImageLib().getClass().getClassLoader(); Icon normal = new ImageIcon( cl.getResource( "buttons/save_normal.gif" ) ); @@ -269,4 +268,9 @@ public class HistoricoEstabelecimentoPanel extends JPanel { this.estabelecimento = estabelecimento; } + + public void stateChanged(ChangeEvent e) + { + startEditedState(); + } } diff --git a/trunk/siprp/clientes/MarcacaoEmpresaPanel.java b/trunk/siprp/clientes/MarcacaoEmpresaPanel.java index 56adfc21..4a271a73 100644 --- a/trunk/siprp/clientes/MarcacaoEmpresaPanel.java +++ b/trunk/siprp/clientes/MarcacaoEmpresaPanel.java @@ -17,6 +17,7 @@ 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 siprp.data.*; @@ -184,7 +185,7 @@ public class MarcacaoEmpresaPanel extends JPanel { if( !filling ) { - calendarPanel.removeDocumentListener( this ); + calendarPanel.removeChangeListener( this ); text.getDocument().removeDocumentListener( this ); realizadaCheck.removeChangeListener( this ); changed = true; @@ -196,7 +197,7 @@ public class MarcacaoEmpresaPanel extends JPanel private void initButtons() { saveButton.setEnabled( false ); - calendarPanel.addDocumentListener( this ); + calendarPanel.addChangeListener( this ); realizadaCheck.addChangeListener( this ); text.getDocument().addDocumentListener( this ); ClassLoader cl = new EVUtilsImageLib().getClass().getClassLoader(); diff --git a/trunk/siprp/clientes/MarcacaoPanel.java b/trunk/siprp/clientes/MarcacaoPanel.java index 007feabf..5d1002b7 100644 --- a/trunk/siprp/clientes/MarcacaoPanel.java +++ b/trunk/siprp/clientes/MarcacaoPanel.java @@ -16,6 +16,7 @@ import java.util.*; 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.panel.*; import siprp.*; @@ -117,24 +118,8 @@ System.out.println( "stateChanged2" ); } ); JLabel relatorioLabel = new JLabel( relatorioLabelText ); dataRelatorioPanel = new JCalendarPanel( null ); - dataRelatorioPanel.addDocumentListener( new DocumentListener(){ - public void changedUpdate( DocumentEvent e ) - { - if( !filling ) - { - marcarRelatorio(); - } - } - - public void insertUpdate( DocumentEvent e ) - { - if( !filling ) - { - marcarRelatorio(); - } - } - - public void removeUpdate( DocumentEvent e ) + dataRelatorioPanel.addChangeListener( new ChangeListener(){ + public void stateChanged(ChangeEvent e) { if( !filling ) { @@ -157,24 +142,8 @@ System.out.println( "stateChanged2" ); } ); dataMarcacaoPanel = new JCalendarPanel( null ); - dataMarcacaoPanel.addDocumentListener( new DocumentListener(){ - public void changedUpdate( DocumentEvent e ) - { - if( !filling ) - { - marcar(); - } - } - - public void insertUpdate( DocumentEvent e ) - { - if( !filling ) - { - marcar(); - } - } - - public void removeUpdate( DocumentEvent e ) + dataMarcacaoPanel.addChangeListener( new ChangeListener(){ + public void stateChanged(ChangeEvent e) { if( !filling ) { diff --git a/trunk/siprp/clientes/TrabalhadorPanel.java b/trunk/siprp/clientes/TrabalhadorPanel.java index f19a0eee..4b9f630a 100644 --- a/trunk/siprp/clientes/TrabalhadorPanel.java +++ b/trunk/siprp/clientes/TrabalhadorPanel.java @@ -20,6 +20,7 @@ import com.evolute.utils.date.*; 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.*; diff --git a/trunk/siprp/estatistica/EstatisticaWindow.java b/trunk/siprp/estatistica/EstatisticaWindow.java index 7bdbd736..eb4fed2f 100644 --- a/trunk/siprp/estatistica/EstatisticaWindow.java +++ b/trunk/siprp/estatistica/EstatisticaWindow.java @@ -21,6 +21,7 @@ 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 siprp.data.*; diff --git a/trunk/siprp/ficha/ExamePanel.java b/trunk/siprp/ficha/ExamePanel.java index 01d3392c..f1260a34 100644 --- a/trunk/siprp/ficha/ExamePanel.java +++ b/trunk/siprp/ficha/ExamePanel.java @@ -21,6 +21,7 @@ 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.calendar.*; import com.evolute.utils.ui.panel.*; import com.evolute.utils.ui.text.*; diff --git a/trunk/siprp/ficha/RecomendacoesPanel.java b/trunk/siprp/ficha/RecomendacoesPanel.java index 2e42c33e..0b00cb9e 100644 --- a/trunk/siprp/ficha/RecomendacoesPanel.java +++ b/trunk/siprp/ficha/RecomendacoesPanel.java @@ -11,6 +11,7 @@ import javax.swing.*; import com.evolute.utils.documents.*; import com.evolute.utils.ui.*; +import com.evolute.utils.ui.calendar.*; import com.evolute.utils.ui.text.*; /** diff --git a/trunk/siprp/ficha/TrabalhadorPanel.java b/trunk/siprp/ficha/TrabalhadorPanel.java index 8dc5d8cf..5fd6bbc6 100644 --- a/trunk/siprp/ficha/TrabalhadorPanel.java +++ b/trunk/siprp/ficha/TrabalhadorPanel.java @@ -17,6 +17,7 @@ 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.*; diff --git a/trunk/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java b/trunk/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java index 13d30081..9bb3b888 100644 --- a/trunk/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java +++ b/trunk/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java @@ -8,6 +8,7 @@ import com.evolute.utils.db.*; import com.evolute.utils.documents.*; import com.evolute.utils.sql.*; import com.evolute.utils.ui.*; +import com.evolute.utils.ui.calendar.*; import com.evolute.utils.ui.panel.*; import com.evolute.utils.ui.text.*; import java.awt.*; diff --git a/trunk/siprp/impressaofichas/FichasPrinter.java b/trunk/siprp/impressaofichas/FichasPrinter.java index 5f7c5e22..119c9a22 100644 --- a/trunk/siprp/impressaofichas/FichasPrinter.java +++ b/trunk/siprp/impressaofichas/FichasPrinter.java @@ -85,7 +85,7 @@ public class FichasPrinter extends Thread TransformerFactory tFactory = TransformerFactory.newInstance(); String xml = root.toString(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - FOPCreator creator = new FOPCreator(); + FOPCreator creator = FOPCreator.getFOPCreator(); InputStream xmlIn = new ByteArrayInputStream( xml.getBytes() ); creator.createFOfromXML( xmlIn, FichasPrinter.class.getClassLoader().getResourceAsStream( @@ -95,7 +95,7 @@ public class FichasPrinter extends Thread ByteArrayInputStream in = new ByteArrayInputStream( toPrint ); Hashtable printOptions = new Hashtable(); //System.out.println( "OUT: " + out.toString() ); - new FOPPrinter().printFO( in, false, true, printOptions ); + FOPPrinter.getFOPPrinter().printFO( in, false, true, printOptions ); byte []pdfData = new PDFCreator().createPdfFromFo( toPrint ); File dir = new File( new File( listPath ), StringPlainer.convertString( nomeEmpresa ).replace( ' ', '_' ) ); if( !dir.exists() ) diff --git a/trunk/siprp/impressaofichas/ImpressaoFichasWindow.java b/trunk/siprp/impressaofichas/ImpressaoFichasWindow.java index 65f95930..3b29b698 100644 --- a/trunk/siprp/impressaofichas/ImpressaoFichasWindow.java +++ b/trunk/siprp/impressaofichas/ImpressaoFichasWindow.java @@ -20,6 +20,7 @@ import java.util.*; 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.*; /** diff --git a/trunk/siprp/medicina/MarcacaoConsultaPanel.java b/trunk/siprp/medicina/MarcacaoConsultaPanel.java index e75bdde8..3cccb0d3 100644 --- a/trunk/siprp/medicina/MarcacaoConsultaPanel.java +++ b/trunk/siprp/medicina/MarcacaoConsultaPanel.java @@ -8,6 +8,7 @@ import com.evolute.utils.db.*; import com.evolute.utils.documents.*; import com.evolute.utils.sql.*; import com.evolute.utils.ui.*; +import com.evolute.utils.ui.calendar.*; import com.evolute.utils.ui.panel.*; import com.evolute.utils.ui.text.*; import java.awt.*; diff --git a/trunk/siprp/medicina/MarcacaoExamePanel.java b/trunk/siprp/medicina/MarcacaoExamePanel.java index a4bc1ee5..d1f4fd75 100644 --- a/trunk/siprp/medicina/MarcacaoExamePanel.java +++ b/trunk/siprp/medicina/MarcacaoExamePanel.java @@ -8,6 +8,7 @@ import com.evolute.utils.db.*; import com.evolute.utils.documents.*; import com.evolute.utils.sql.*; import com.evolute.utils.ui.*; +import com.evolute.utils.ui.calendar.*; import com.evolute.utils.ui.panel.*; import com.evolute.utils.ui.text.*; import java.awt.*; diff --git a/trunk/siprp/ui/TimeCalendarDialog.java b/trunk/siprp/ui/TimeCalendarDialog.java deleted file mode 100644 index b4ffc6b0..00000000 --- a/trunk/siprp/ui/TimeCalendarDialog.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * TimeCalendarDialog.java - * - * Created on 28 de Janeiro de 2005, 15:52 - */ - -package siprp.ui; - -import java.awt.*; -import javax.swing.*; - -import com.evolute.utils.ui.*; -/** - * - * @author fpalma - */ -public class TimeCalendarDialog extends JCalendarDialog -{ - protected int interval; - - /** Creates a new instance of TimeCalendarDialog */ - public TimeCalendarDialog( JFrame owner, int interval ) - { - super( owner ); - this.interval = interval; - setupComponents(); - } - - private void setupComponents() - { - - } -}