lxbfYeaa
/
SIPRP
forked from Coded/SIPRP
0
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Tiago Simão 18 years ago
parent fab607db5b
commit 0447e07c9f
11 changed files with 57 additions and 79 deletions
Show Stats Download Patch File Download Diff File

18
trunk/SIPRPSoft/src/siprp/logic/SIPRPLogic.java → trunk/SIPRPSoft/src/leaf/LeafLogic.java
Unescape View File

@ -1,13 +1,12 @@
package siprp.logic; package leaf;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import siprp.ui.SIPRPWindow;
public class SIPRPLogic public class LeafLogic
{ {
/** /**
@ -61,17 +60,20 @@ public class SIPRPLogic
@Action(isSave = false) @Action(isSave = false)
public static final String ACTION_STARTUP = "ACTION_STARTUP"; public static final String ACTION_STARTUP = "ACTION_STARTUP";
@Action(isSave = false)
public static final String ACTION_CANCEL = "ACTION_CANCEL";
private List<SIPRPWindow> registeredWindows = new ArrayList<SIPRPWindow>(); private List<LeafWindow> registeredWindows = new ArrayList<LeafWindow>();
public void addWindow(SIPRPWindow window) public void addWindow(LeafWindow window)
{ {
registeredWindows .add(window); registeredWindows .add(window);
} }
public void runAction( String actionName ) public void runAction( String actionName )
{ {
for( SIPRPWindow window : registeredWindows ) for( LeafWindow window : registeredWindows )
{ {
window.runAction( actionName ); window.runAction( actionName );
} }
@ -79,7 +81,7 @@ public class SIPRPLogic
public void runAction( String actionName, Object argument ) public void runAction( String actionName, Object argument )
{ {
for( SIPRPWindow window : registeredWindows ) for( LeafWindow window : registeredWindows )
{ {
window.runAction( actionName, argument ); window.runAction( actionName, argument );
} }
@ -87,7 +89,7 @@ public class SIPRPLogic
public void runActionLater( String actionName ) public void runActionLater( String actionName )
{ {
for( SIPRPWindow window : registeredWindows ) for( LeafWindow window : registeredWindows )
{ {
window.runActionLater( actionName ); window.runActionLater( actionName );
} }

17
trunk/SIPRPSoft/src/siprp/ui/SIPRPWindow.java → trunk/SIPRPSoft/src/leaf/LeafWindow.java
Unescape View File

@ -1,6 +1,6 @@
package siprp.ui; package leaf;
import static siprp.logic.SIPRPLogic.ACTION_STARTUP; import static leaf.LeafLogic.ACTION_STARTUP;
import java.awt.Cursor; import java.awt.Cursor;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
@ -32,10 +32,9 @@ import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener; import javax.swing.event.TreeSelectionListener;
import javax.swing.table.TableModel; import javax.swing.table.TableModel;
import siprp.logic.SIPRPLogic; import leaf.LeafLogic.Action;
import siprp.logic.SIPRPLogic.Action; import leaf.LeafLogic.LeafLogicActionBinding;
import siprp.logic.SIPRPLogic.LeafLogicActionBinding; import leaf.LeafLogic.LeafUIActionBinding;
import siprp.logic.SIPRPLogic.LeafUIActionBinding;
import siprp.medicina.processo.ui.LeafInputField; import siprp.medicina.processo.ui.LeafInputField;
import com.evolute.utils.tables.BaseTable; import com.evolute.utils.tables.BaseTable;
@ -43,7 +42,7 @@ import com.evolute.utils.tables.ColumnizedMappable;
import com.evolute.utils.tables.VectorTableModel; import com.evolute.utils.tables.VectorTableModel;
import com.evolute.utils.tracker.TrackableWindow; import com.evolute.utils.tracker.TrackableWindow;
public class SIPRPWindow extends JFrame implements TrackableWindow, ListSelectionListener, TreeSelectionListener, ActionListener, PropertyChangeListener public class LeafWindow extends JFrame implements TrackableWindow, ListSelectionListener, TreeSelectionListener, ActionListener, PropertyChangeListener
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -105,7 +104,7 @@ public class SIPRPWindow extends JFrame implements TrackableWindow, ListSelectio
/** /**
* This window's logic controller * This window's logic controller
*/ */
private final SIPRPLogic logicController; private final LeafLogic logicController;
private List<JPanel> subPanels = new ArrayList<JPanel>(); private List<JPanel> subPanels = new ArrayList<JPanel>();
@ -139,7 +138,7 @@ public class SIPRPWindow extends JFrame implements TrackableWindow, ListSelectio
*/ */
private Queue<String> listRunLater = new LinkedList<String>(); private Queue<String> listRunLater = new LinkedList<String>();
public SIPRPWindow(SIPRPLogic logicController) throws IllegalArgumentException, IllegalAccessException public LeafWindow(LeafLogic logicController) throws IllegalArgumentException, IllegalAccessException
{ {
super(); super();
this.logicController = logicController; this.logicController = logicController;

6
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Prestadores.java
Unescape View File

@ -1,11 +1,13 @@
package siprp.database.cayenne.objects; package siprp.database.cayenne.objects;
import com.evolute.utils.strings.UnicodeChecker;
import siprp.database.cayenne.objects.auto._Prestadores; import siprp.database.cayenne.objects.auto._Prestadores;
import com.evolute.utils.strings.UnicodeChecker;
public class Prestadores extends _Prestadores { public class Prestadores extends _Prestadores {
private static final long serialVersionUID = 1L;
private String name = null; private String name = null;
private String convertedName = null; private String convertedName = null;

34
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java
Unescape View File

@ -1,14 +1,11 @@
package siprp.database.cayenne.objects; package siprp.database.cayenne.objects;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import com.evolute.utils.strings.StringConverter;
import com.evolute.utils.strings.UnicodeChecker;
import siprp.database.cayenne.objects.auto._Trabalhadores; import siprp.database.cayenne.objects.auto._Trabalhadores;
import com.evolute.utils.strings.UnicodeChecker;
public class Trabalhadores extends _Trabalhadores public class Trabalhadores extends _Trabalhadores
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -17,37 +14,10 @@ public class Trabalhadores extends _Trabalhadores
private String convertedName = null; private String convertedName = null;
// private String getCapitalizedName()
// {
// String result = "";
// String[] names = getNomePlain().split( " " );
// if( names != null && names.length > 0 )
// {
// for( String name : names )
// {
// if( name != null && name.length() > 0 )
// {
// result += ("" + name.charAt( 0 )).toUpperCase();
// if( name.length() > 1 )
// {
// result += name.substring( 1 );
// }
// result += " ";
// }
// }
// }
// return result.trim();
// }
public String getDataNascimentoString() public String getDataNascimentoString()
{ {
return getDataNascimento() == null ? "" : sdf.format( getDataNascimento() ); return getDataNascimento() == null ? "" : sdf.format( getDataNascimento() );
} }
// public String getNomePlainCapital()
// {
// return getNomePlain() == null ? "" : getCapitalizedName();
// }
@Override @Override
public String getNome() public String getNome()

1
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java
Unescape View File

@ -6,7 +6,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import siprp.database.cayenne.objects.auto._TrabalhadoresEcdsDatas; import siprp.database.cayenne.objects.auto._TrabalhadoresEcdsDatas;
import siprp.database.cayenne.providers.MedicinaDAO;
import siprp.medicina.MedicinaConstants; import siprp.medicina.MedicinaConstants;
import siprp.medicina.processo.ui.OrderedMap; import siprp.medicina.processo.ui.OrderedMap;

7
trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java
Unescape View File

@ -6,6 +6,9 @@ import java.util.Vector;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import leaf.LeafLogic;
import leaf.LeafWindow.LeafObject;
import siprp.database.cayenne.objects.BaseObject; import siprp.database.cayenne.objects.BaseObject;
import siprp.database.cayenne.objects.Prestadores; import siprp.database.cayenne.objects.Prestadores;
import siprp.database.cayenne.objects.Trabalhadores; import siprp.database.cayenne.objects.Trabalhadores;
@ -20,16 +23,14 @@ import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasEmails;
import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasObservacoes; import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasObservacoes;
import siprp.database.cayenne.objects.TrabalhadoresProcesso; import siprp.database.cayenne.objects.TrabalhadoresProcesso;
import siprp.database.cayenne.providers.MedicinaDAO; import siprp.database.cayenne.providers.MedicinaDAO;
import siprp.logic.SIPRPLogic;
import siprp.medicina.MedicinaConstants; import siprp.medicina.MedicinaConstants;
import siprp.medicina.processo.ProcessoConstants; import siprp.medicina.processo.ProcessoConstants;
import siprp.medicina.processo.detalhes.EstadoChooser; import siprp.medicina.processo.detalhes.EstadoChooser;
import siprp.medicina.processo.estrutura.FichaAptidaoMutableTreeNode; import siprp.medicina.processo.estrutura.FichaAptidaoMutableTreeNode;
import siprp.ui.SIPRPWindow.LeafObject;
import com.evolute.utils.tables.ColumnizedMappable; import com.evolute.utils.tables.ColumnizedMappable;
public class MedicinaProcessoLogic extends SIPRPLogic public class MedicinaProcessoLogic extends LeafLogic
{ {
@Action(isSave = false) @Action(isSave = false)
public static final String SELECT_EMPRESA = "SELECT_EMPRESA"; public static final String SELECT_EMPRESA = "SELECT_EMPRESA";

7
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java
Unescape View File

@ -11,15 +11,16 @@ import java.util.Map;
import javax.swing.JSeparator; import javax.swing.JSeparator;
import leaf.LeafWindow;
import leaf.LeafLogic.LeafUIActionBinding;
import siprp.database.cayenne.objects.PrtGruposProtocolo; import siprp.database.cayenne.objects.PrtGruposProtocolo;
import siprp.database.cayenne.objects.TrabalhadoresEcd; import siprp.database.cayenne.objects.TrabalhadoresEcd;
import siprp.database.cayenne.objects.TrabalhadoresEcdsDatas; import siprp.database.cayenne.objects.TrabalhadoresEcdsDatas;
import siprp.logic.SIPRPLogic.LeafUIActionBinding;
import siprp.medicina.MedicinaConstants; import siprp.medicina.MedicinaConstants;
import siprp.medicina.processo.logic.MedicinaProcessoLogic; import siprp.medicina.processo.logic.MedicinaProcessoLogic;
import siprp.ui.SIPRPWindow;
public class MedicinaProcessoWindow extends SIPRPWindow public class MedicinaProcessoWindow extends LeafWindow
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

9
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java
Unescape View File

@ -29,6 +29,9 @@ import javax.swing.JComponent;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JPanel; import javax.swing.JPanel;
import leaf.LeafWindow;
import leaf.LeafWindow.ActionActivation;
import org.apache.cayenne.conf.Configuration; import org.apache.cayenne.conf.Configuration;
import siprp.database.cayenne.objects.Trabalhadores; import siprp.database.cayenne.objects.Trabalhadores;
@ -43,14 +46,12 @@ import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasObservacoes;
import siprp.database.cayenne.objects.TrabalhadoresProcesso; import siprp.database.cayenne.objects.TrabalhadoresProcesso;
import siprp.medicina.MedicinaConstants; import siprp.medicina.MedicinaConstants;
import siprp.medicina.processo.ProcessoConstants; import siprp.medicina.processo.ProcessoConstants;
import siprp.ui.SIPRPWindow;
import siprp.ui.SIPRPWindow.ActionActivation;
public class ProcessoAccoesPanel extends JPanel public class ProcessoAccoesPanel extends JPanel
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final SIPRPWindow parentWindow; private final LeafWindow parentWindow;
private static final String PANEL_START_NAME = "START_PANEL"; private static final String PANEL_START_NAME = "START_PANEL";
@ -159,7 +160,7 @@ public class ProcessoAccoesPanel extends JPanel
// control // control
public ProcessoAccoesPanel(SIPRPWindow parentWindow) public ProcessoAccoesPanel(LeafWindow parentWindow)
{ {
this.parentWindow = parentWindow; this.parentWindow = parentWindow;
setupLayout(); setupLayout();

11
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
Unescape View File

@ -48,6 +48,10 @@ import javax.swing.JFrame;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import leaf.LeafWindow;
import leaf.LeafLogic.LeafUIActionBinding;
import leaf.LeafWindow.ActionActivation;
import siprp.database.cayenne.objects.PrtGruposProtocolo; import siprp.database.cayenne.objects.PrtGruposProtocolo;
import siprp.database.cayenne.objects.Trabalhadores; import siprp.database.cayenne.objects.Trabalhadores;
import siprp.database.cayenne.objects.TrabalhadoresConsultas; import siprp.database.cayenne.objects.TrabalhadoresConsultas;
@ -59,16 +63,13 @@ import siprp.database.cayenne.objects.TrabalhadoresEcdsDatas;
import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasEmails; import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasEmails;
import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasObservacoes; import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasObservacoes;
import siprp.database.cayenne.objects.TrabalhadoresProcesso; import siprp.database.cayenne.objects.TrabalhadoresProcesso;
import siprp.logic.SIPRPLogic.LeafUIActionBinding;
import siprp.medicina.MedicinaConstants; import siprp.medicina.MedicinaConstants;
import siprp.medicina.processo.mail.MailDialog; import siprp.medicina.processo.mail.MailDialog;
import siprp.ui.SIPRPWindow;
import siprp.ui.SIPRPWindow.ActionActivation;
public class ProcessoDadosPanel extends JPanel public class ProcessoDadosPanel extends JPanel
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final SIPRPWindow parentWindow; private final LeafWindow parentWindow;
private static final String PANEL_START_NAME = "START_PANEL"; private static final String PANEL_START_NAME = "START_PANEL";
@ -195,7 +196,7 @@ public class ProcessoDadosPanel extends JPanel
// observacao marcacao exame // observacao marcacao exame
public final LeafInputField<String> inputExameMarcacaoObsMensagem = new LeafInputField<String>(); public final LeafInputField<String> inputExameMarcacaoObsMensagem = new LeafInputField<String>();
public ProcessoDadosPanel(SIPRPWindow parentWindow) public ProcessoDadosPanel(LeafWindow parentWindow)
{ {
this.parentWindow = parentWindow; this.parentWindow = parentWindow;
setupLayout(); setupLayout();

13
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java
Unescape View File

@ -20,6 +20,11 @@ import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath; import javax.swing.tree.TreePath;
import leaf.LeafWindow;
import leaf.LeafLogic.LeafLogicActionBinding;
import leaf.LeafLogic.LeafUIActionBinding;
import leaf.LeafWindow.ActionActivation;
import org.apache.cayenne.CayenneDataObject; import org.apache.cayenne.CayenneDataObject;
import siprp.database.cayenne.objects.Trabalhadores; import siprp.database.cayenne.objects.Trabalhadores;
@ -32,8 +37,6 @@ import siprp.database.cayenne.objects.TrabalhadoresEcdsDatas;
import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasEmails; import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasEmails;
import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasObservacoes; import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasObservacoes;
import siprp.database.cayenne.objects.TrabalhadoresProcesso; import siprp.database.cayenne.objects.TrabalhadoresProcesso;
import siprp.logic.SIPRPLogic.LeafLogicActionBinding;
import siprp.logic.SIPRPLogic.LeafUIActionBinding;
import siprp.medicina.MarcacaoConsultaExtendedPanel; import siprp.medicina.MarcacaoConsultaExtendedPanel;
import siprp.medicina.processo.ProcessoDataProvider; import siprp.medicina.processo.ProcessoDataProvider;
import siprp.medicina.processo.estrutura.ConsultaMutableTreeNode; import siprp.medicina.processo.estrutura.ConsultaMutableTreeNode;
@ -45,14 +48,12 @@ import siprp.medicina.processo.estrutura.MarcacaoMutableTreeNode;
import siprp.medicina.processo.estrutura.ObservacoesMutableTreeNode; import siprp.medicina.processo.estrutura.ObservacoesMutableTreeNode;
import siprp.medicina.processo.estrutura.ProcessoMutableTreeNode; import siprp.medicina.processo.estrutura.ProcessoMutableTreeNode;
import siprp.medicina.processo.estrutura.TrabalhadorMutableTreeNode; import siprp.medicina.processo.estrutura.TrabalhadorMutableTreeNode;
import siprp.ui.SIPRPWindow;
import siprp.ui.SIPRPWindow.ActionActivation;
public class ProcessoTreePanel extends JPanel public class ProcessoTreePanel extends JPanel
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final SIPRPWindow parentWindow; private final LeafWindow parentWindow;
private final JScrollPane mainScroll = new JScrollPane();; private final JScrollPane mainScroll = new JScrollPane();;
@ -65,7 +66,7 @@ public class ProcessoTreePanel extends JPanel
protected ProcessoDataProvider provider; protected ProcessoDataProvider provider;
public ProcessoTreePanel(SIPRPWindow parentWindow) public ProcessoTreePanel(LeafWindow parentWindow)
{ {
super(); super();
this.parentWindow = parentWindow; this.parentWindow = parentWindow;

13
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/TrabalhadoresChooserPanel.java
Unescape View File

@ -1,6 +1,6 @@
package siprp.medicina.processo.ui; package siprp.medicina.processo.ui;
import static siprp.logic.SIPRPLogic.ACTION_STARTUP; import static leaf.LeafLogic.ACTION_STARTUP;
import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_EMPRESA; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_EMPRESA;
import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_ESTABELECIMENTO; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_ESTABELECIMENTO;
import static siprp.medicina.processo.logic.MedicinaProcessoLogic.LOAD_TRABALHADOR; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.LOAD_TRABALHADOR;
@ -14,9 +14,10 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.ListSelectionModel; import javax.swing.ListSelectionModel;
import siprp.logic.SIPRPLogic.LeafUIActionBinding; import leaf.LeafWindow;
import siprp.ui.SIPRPWindow; import leaf.LeafLogic.LeafUIActionBinding;
import siprp.ui.SIPRPWindow.ActionActivation; import leaf.LeafWindow.ActionActivation;
import com.evolute.utils.tables.BaseTable; import com.evolute.utils.tables.BaseTable;
import com.evolute.utils.tables.ColumnizedMappable; import com.evolute.utils.tables.ColumnizedMappable;
@ -26,7 +27,7 @@ public class TrabalhadoresChooserPanel extends JPanel
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final SIPRPWindow parentWindow; private final LeafWindow parentWindow;
@ActionActivation(onSelect = SELECT_EMPRESA, onChange = "") @ActionActivation(onSelect = SELECT_EMPRESA, onChange = "")
public BaseTable empresasTable; public BaseTable empresasTable;
@ -40,7 +41,7 @@ public class TrabalhadoresChooserPanel extends JPanel
public BaseTable trabalhadoresTable; public BaseTable trabalhadoresTable;
public VectorTableModel trabalhadoresModel; public VectorTableModel trabalhadoresModel;
public TrabalhadoresChooserPanel(SIPRPWindow parentWindow) public TrabalhadoresChooserPanel(LeafWindow parentWindow)
{ {
super(); super();
this.parentWindow = parentWindow; this.parentWindow = parentWindow;

Write Preview
Loading…
Cancel
Save