From 0447e07c9fb9d5e5f4b744bf0beff29ae34700bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Thu, 3 Jan 2008 18:35:22 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@640 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../SIPRPLogic.java => leaf/LeafLogic.java} | 18 +++++----- .../SIPRPWindow.java => leaf/LeafWindow.java} | 17 +++++----- .../database/cayenne/objects/Prestadores.java | 6 ++-- .../cayenne/objects/Trabalhadores.java | 34 ++----------------- .../objects/TrabalhadoresEcdsDatas.java | 1 - .../processo/logic/MedicinaProcessoLogic.java | 7 ++-- .../processo/ui/MedicinaProcessoWindow.java | 7 ++-- .../processo/ui/ProcessoAccoesPanel.java | 9 ++--- .../processo/ui/ProcessoDadosPanel.java | 11 +++--- .../processo/ui/ProcessoTreePanel.java | 13 +++---- .../ui/TrabalhadoresChooserPanel.java | 13 +++---- 11 files changed, 57 insertions(+), 79 deletions(-) rename trunk/SIPRPSoft/src/{siprp/logic/SIPRPLogic.java => leaf/LeafLogic.java} (78%) rename trunk/SIPRPSoft/src/{siprp/ui/SIPRPWindow.java => leaf/LeafWindow.java} (97%) diff --git a/trunk/SIPRPSoft/src/siprp/logic/SIPRPLogic.java b/trunk/SIPRPSoft/src/leaf/LeafLogic.java similarity index 78% rename from trunk/SIPRPSoft/src/siprp/logic/SIPRPLogic.java rename to trunk/SIPRPSoft/src/leaf/LeafLogic.java index f725ab39..ed5d5d80 100755 --- a/trunk/SIPRPSoft/src/siprp/logic/SIPRPLogic.java +++ b/trunk/SIPRPSoft/src/leaf/LeafLogic.java @@ -1,13 +1,12 @@ -package siprp.logic; +package leaf; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.List; -import siprp.ui.SIPRPWindow; -public class SIPRPLogic +public class LeafLogic { /** @@ -61,17 +60,20 @@ public class SIPRPLogic @Action(isSave = false) public static final String ACTION_STARTUP = "ACTION_STARTUP"; + @Action(isSave = false) + public static final String ACTION_CANCEL = "ACTION_CANCEL"; + - private List registeredWindows = new ArrayList(); + private List registeredWindows = new ArrayList(); - public void addWindow(SIPRPWindow window) + public void addWindow(LeafWindow window) { registeredWindows .add(window); } public void runAction( String actionName ) { - for( SIPRPWindow window : registeredWindows ) + for( LeafWindow window : registeredWindows ) { window.runAction( actionName ); } @@ -79,7 +81,7 @@ public class SIPRPLogic public void runAction( String actionName, Object argument ) { - for( SIPRPWindow window : registeredWindows ) + for( LeafWindow window : registeredWindows ) { window.runAction( actionName, argument ); } @@ -87,7 +89,7 @@ public class SIPRPLogic public void runActionLater( String actionName ) { - for( SIPRPWindow window : registeredWindows ) + for( LeafWindow window : registeredWindows ) { window.runActionLater( actionName ); } diff --git a/trunk/SIPRPSoft/src/siprp/ui/SIPRPWindow.java b/trunk/SIPRPSoft/src/leaf/LeafWindow.java similarity index 97% rename from trunk/SIPRPSoft/src/siprp/ui/SIPRPWindow.java rename to trunk/SIPRPSoft/src/leaf/LeafWindow.java index 82d4a0fb..724fa1ca 100755 --- a/trunk/SIPRPSoft/src/siprp/ui/SIPRPWindow.java +++ b/trunk/SIPRPSoft/src/leaf/LeafWindow.java @@ -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.event.ActionEvent; @@ -32,10 +32,9 @@ import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.table.TableModel; -import siprp.logic.SIPRPLogic; -import siprp.logic.SIPRPLogic.Action; -import siprp.logic.SIPRPLogic.LeafLogicActionBinding; -import siprp.logic.SIPRPLogic.LeafUIActionBinding; +import leaf.LeafLogic.Action; +import leaf.LeafLogic.LeafLogicActionBinding; +import leaf.LeafLogic.LeafUIActionBinding; import siprp.medicina.processo.ui.LeafInputField; 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.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; @@ -105,7 +104,7 @@ public class SIPRPWindow extends JFrame implements TrackableWindow, ListSelectio /** * This window's logic controller */ - private final SIPRPLogic logicController; + private final LeafLogic logicController; private List subPanels = new ArrayList(); @@ -139,7 +138,7 @@ public class SIPRPWindow extends JFrame implements TrackableWindow, ListSelectio */ private Queue listRunLater = new LinkedList(); - public SIPRPWindow(SIPRPLogic logicController) throws IllegalArgumentException, IllegalAccessException + public LeafWindow(LeafLogic logicController) throws IllegalArgumentException, IllegalAccessException { super(); this.logicController = logicController; diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Prestadores.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Prestadores.java index 171fec39..80e60a5e 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Prestadores.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Prestadores.java @@ -1,11 +1,13 @@ package siprp.database.cayenne.objects; -import com.evolute.utils.strings.UnicodeChecker; - import siprp.database.cayenne.objects.auto._Prestadores; +import com.evolute.utils.strings.UnicodeChecker; + public class Prestadores extends _Prestadores { + private static final long serialVersionUID = 1L; + private String name = null; private String convertedName = null; diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java index 84a8e9b3..e6aef124 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java @@ -1,14 +1,11 @@ package siprp.database.cayenne.objects; -import java.util.ArrayList; 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 com.evolute.utils.strings.UnicodeChecker; + public class Trabalhadores extends _Trabalhadores { private static final long serialVersionUID = 1L; @@ -17,37 +14,10 @@ public class Trabalhadores extends _Trabalhadores 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() { return getDataNascimento() == null ? "" : sdf.format( getDataNascimento() ); } - -// public String getNomePlainCapital() -// { -// return getNomePlain() == null ? "" : getCapitalizedName(); -// } @Override public String getNome() diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java index 30f3290a..2e7c2e2d 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java @@ -6,7 +6,6 @@ import java.util.HashMap; import java.util.List; import siprp.database.cayenne.objects.auto._TrabalhadoresEcdsDatas; -import siprp.database.cayenne.providers.MedicinaDAO; import siprp.medicina.MedicinaConstants; import siprp.medicina.processo.ui.OrderedMap; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java index ebe9086e..6080a237 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java @@ -6,6 +6,9 @@ import java.util.Vector; import javax.swing.tree.DefaultMutableTreeNode; +import leaf.LeafLogic; +import leaf.LeafWindow.LeafObject; + import siprp.database.cayenne.objects.BaseObject; import siprp.database.cayenne.objects.Prestadores; 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.TrabalhadoresProcesso; import siprp.database.cayenne.providers.MedicinaDAO; -import siprp.logic.SIPRPLogic; import siprp.medicina.MedicinaConstants; import siprp.medicina.processo.ProcessoConstants; import siprp.medicina.processo.detalhes.EstadoChooser; import siprp.medicina.processo.estrutura.FichaAptidaoMutableTreeNode; -import siprp.ui.SIPRPWindow.LeafObject; import com.evolute.utils.tables.ColumnizedMappable; -public class MedicinaProcessoLogic extends SIPRPLogic +public class MedicinaProcessoLogic extends LeafLogic { @Action(isSave = false) public static final String SELECT_EMPRESA = "SELECT_EMPRESA"; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java index dae0b44a..eeafeed7 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java @@ -11,15 +11,16 @@ import java.util.Map; import javax.swing.JSeparator; +import leaf.LeafWindow; +import leaf.LeafLogic.LeafUIActionBinding; + import siprp.database.cayenne.objects.PrtGruposProtocolo; import siprp.database.cayenne.objects.TrabalhadoresEcd; import siprp.database.cayenne.objects.TrabalhadoresEcdsDatas; -import siprp.logic.SIPRPLogic.LeafUIActionBinding; import siprp.medicina.MedicinaConstants; 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; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java index f43faecd..343db7e9 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java @@ -29,6 +29,9 @@ import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JPanel; +import leaf.LeafWindow; +import leaf.LeafWindow.ActionActivation; + import org.apache.cayenne.conf.Configuration; import siprp.database.cayenne.objects.Trabalhadores; @@ -43,14 +46,12 @@ import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasObservacoes; import siprp.database.cayenne.objects.TrabalhadoresProcesso; import siprp.medicina.MedicinaConstants; import siprp.medicina.processo.ProcessoConstants; -import siprp.ui.SIPRPWindow; -import siprp.ui.SIPRPWindow.ActionActivation; public class ProcessoAccoesPanel extends JPanel { private static final long serialVersionUID = 1L; - private final SIPRPWindow parentWindow; + private final LeafWindow parentWindow; private static final String PANEL_START_NAME = "START_PANEL"; @@ -159,7 +160,7 @@ public class ProcessoAccoesPanel extends JPanel // control - public ProcessoAccoesPanel(SIPRPWindow parentWindow) + public ProcessoAccoesPanel(LeafWindow parentWindow) { this.parentWindow = parentWindow; setupLayout(); diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java index 7c3036d2..869d35f9 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java @@ -48,6 +48,10 @@ import javax.swing.JFrame; import javax.swing.JLabel; 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.Trabalhadores; 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.TrabalhadoresEcdsDatasObservacoes; import siprp.database.cayenne.objects.TrabalhadoresProcesso; -import siprp.logic.SIPRPLogic.LeafUIActionBinding; import siprp.medicina.MedicinaConstants; import siprp.medicina.processo.mail.MailDialog; -import siprp.ui.SIPRPWindow; -import siprp.ui.SIPRPWindow.ActionActivation; public class ProcessoDadosPanel extends JPanel { private static final long serialVersionUID = 1L; - private final SIPRPWindow parentWindow; + private final LeafWindow parentWindow; private static final String PANEL_START_NAME = "START_PANEL"; @@ -195,7 +196,7 @@ public class ProcessoDadosPanel extends JPanel // observacao marcacao exame public final LeafInputField inputExameMarcacaoObsMensagem = new LeafInputField(); - public ProcessoDadosPanel(SIPRPWindow parentWindow) + public ProcessoDadosPanel(LeafWindow parentWindow) { this.parentWindow = parentWindow; setupLayout(); diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java index a91233b2..00da19ed 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java @@ -20,6 +20,11 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; 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 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.TrabalhadoresEcdsDatasObservacoes; import siprp.database.cayenne.objects.TrabalhadoresProcesso; -import siprp.logic.SIPRPLogic.LeafLogicActionBinding; -import siprp.logic.SIPRPLogic.LeafUIActionBinding; import siprp.medicina.MarcacaoConsultaExtendedPanel; import siprp.medicina.processo.ProcessoDataProvider; 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.ProcessoMutableTreeNode; import siprp.medicina.processo.estrutura.TrabalhadorMutableTreeNode; -import siprp.ui.SIPRPWindow; -import siprp.ui.SIPRPWindow.ActionActivation; public class ProcessoTreePanel extends JPanel { private static final long serialVersionUID = 1L; - private final SIPRPWindow parentWindow; + private final LeafWindow parentWindow; private final JScrollPane mainScroll = new JScrollPane();; @@ -65,7 +66,7 @@ public class ProcessoTreePanel extends JPanel protected ProcessoDataProvider provider; - public ProcessoTreePanel(SIPRPWindow parentWindow) + public ProcessoTreePanel(LeafWindow parentWindow) { super(); this.parentWindow = parentWindow; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/TrabalhadoresChooserPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/TrabalhadoresChooserPanel.java index cc14cdaa..5f452122 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/TrabalhadoresChooserPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/TrabalhadoresChooserPanel.java @@ -1,6 +1,6 @@ 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_ESTABELECIMENTO; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.LOAD_TRABALHADOR; @@ -14,9 +14,10 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.ListSelectionModel; -import siprp.logic.SIPRPLogic.LeafUIActionBinding; -import siprp.ui.SIPRPWindow; -import siprp.ui.SIPRPWindow.ActionActivation; +import leaf.LeafWindow; +import leaf.LeafLogic.LeafUIActionBinding; +import leaf.LeafWindow.ActionActivation; + import com.evolute.utils.tables.BaseTable; import com.evolute.utils.tables.ColumnizedMappable; @@ -26,7 +27,7 @@ public class TrabalhadoresChooserPanel extends JPanel { private static final long serialVersionUID = 1L; - private final SIPRPWindow parentWindow; + private final LeafWindow parentWindow; @ActionActivation(onSelect = SELECT_EMPRESA, onChange = "") public BaseTable empresasTable; @@ -40,7 +41,7 @@ public class TrabalhadoresChooserPanel extends JPanel public BaseTable trabalhadoresTable; public VectorTableModel trabalhadoresModel; - public TrabalhadoresChooserPanel(SIPRPWindow parentWindow) + public TrabalhadoresChooserPanel(LeafWindow parentWindow) { super(); this.parentWindow = parentWindow;