From dd5412e5e4fae9071b800614f917c1b7beb22ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Tue, 2 Dec 2008 18:37:05 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@808 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../AdicionarEquipamentosPanel.java | 200 ++++++++++++++++++ .../gestao/equipamentos/EquipamentoNode.java | 17 ++ .../siprp/higiene/gestao/equipamentos/add.png | Bin 0 -> 899 bytes .../higiene/gestao/equipamentos/delete.png | Bin 0 -> 947 bytes .../higiene/relatorio/PanelRelatorio.java | 189 +++++++++++++++-- .../RelatorioHigieneSegurancaWindow.java | 2 + .../siprp/update/updates/V9_0_To_V9_1.java | 2 +- .../siprp/update/updates/V9_9_To_V10_0.java | 6 +- trunk/common/src/SIPRPMap.map.xml | 42 ++-- .../database/cayenne/objects/BaseObject.java | 6 +- .../database/cayenne/objects/Empresas.java | 30 +-- .../database/cayenne/objects/HsArea.java | 12 ++ .../database/cayenne/objects/HsEmail.java | 19 ++ .../cayenne/objects/HsEquipamentoMedicao.java | 7 - .../cayenne/objects/HsEquipamentoMedico.java | 28 +++ .../objects/HsMedidaClassificacao.java | 7 - .../database/cayenne/objects/HsRelatorio.java | 66 +++++- .../HsRelatorioEquipamentoMedicao.java | 7 - .../objects/HsRelatorioEquipamentoMedico.java | 15 ++ .../objects/HsRelatorioMedidaArea.java | 7 - .../objects/HsRelatorioMedidaPosto.java | 7 - .../cayenne/objects/MarcacoesTecnicosHst.java | 20 ++ .../objects/auto/_EmailPlanoDeActuacao.java | 5 +- .../objects/auto/_HsEquipamentoMedicao.java | 34 --- .../objects/auto/_HsEquipamentoMedico.java | 40 ++++ .../objects/auto/_HsMedidaClassificacao.java | 49 ----- .../cayenne/objects/auto/_HsRelatorio.java | 24 ++- .../auto/_HsRelatorioEquipamentoMedicao.java | 29 --- .../auto/_HsRelatorioEquipamentoMedico.java | 39 ++++ .../objects/auto/_HsRelatorioLegislacao.java | 5 +- .../objects/auto/_HsRelatorioMedidaArea.java | 40 ---- .../objects/auto/_HsRelatorioMedidaPosto.java | 35 --- .../auto/_HsRelatorioNormalizacao.java | 5 +- .../database/cayenne/objects/auto/_Image.java | 5 +- .../auto/_TrabalhadoresEcdsAnalise.java | 5 +- 35 files changed, 687 insertions(+), 317 deletions(-) create mode 100644 trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/EquipamentoNode.java create mode 100644 trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/add.png create mode 100644 trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/delete.png delete mode 100644 trunk/common/src/siprp/database/cayenne/objects/HsEquipamentoMedicao.java create mode 100644 trunk/common/src/siprp/database/cayenne/objects/HsEquipamentoMedico.java delete mode 100644 trunk/common/src/siprp/database/cayenne/objects/HsMedidaClassificacao.java delete mode 100644 trunk/common/src/siprp/database/cayenne/objects/HsRelatorioEquipamentoMedicao.java create mode 100644 trunk/common/src/siprp/database/cayenne/objects/HsRelatorioEquipamentoMedico.java delete mode 100644 trunk/common/src/siprp/database/cayenne/objects/HsRelatorioMedidaArea.java delete mode 100644 trunk/common/src/siprp/database/cayenne/objects/HsRelatorioMedidaPosto.java delete mode 100644 trunk/common/src/siprp/database/cayenne/objects/auto/_HsEquipamentoMedicao.java create mode 100644 trunk/common/src/siprp/database/cayenne/objects/auto/_HsEquipamentoMedico.java delete mode 100644 trunk/common/src/siprp/database/cayenne/objects/auto/_HsMedidaClassificacao.java delete mode 100644 trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioEquipamentoMedicao.java create mode 100644 trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioEquipamentoMedico.java delete mode 100644 trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioMedidaArea.java delete mode 100644 trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioMedidaPosto.java diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java index b5c8e270..8ee7e753 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java @@ -1,10 +1,210 @@ package siprp.higiene.gestao.equipamentos; +import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; +import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; +import static com.evolute.utils.strings.UnicodeLatin1Map.eacute; +import info.clearthought.layout.TableLayout; +import info.clearthought.layout.TableLayoutConstraints; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTree; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreePath; +import javax.swing.tree.TreeSelectionModel; + +import leaf.ui.LeafButton; +import leaf.ui.LeafIconButton; +import leaf.ui.TreeTools; +import siprp.database.cayenne.objects.HsEquipamentoMedico; +import siprp.database.cayenne.objects.HsRelatorio; +import siprp.database.cayenne.objects.HsRelatorioEquipamentoMedico; public class AdicionarEquipamentosPanel extends JPanel { private static final long serialVersionUID = 1L; + + public static final String SELECTION_CHANGED = "SELECTION_CHANGED"; + + private static final String ICON_NAME_SAVE = "siprp/higiene/gestao/equipamentos/add.png"; + + private static final String ICON_NAME_REVERT = "siprp/higiene/gestao/equipamentos/delete.png"; + + private final LeafButton buttonAdicionar = LeafIconButton.createButton( ICON_NAME_SAVE ); + + private final LeafButton buttonRemover = LeafIconButton.createButton( ICON_NAME_REVERT ); + + private final DefaultMutableTreeNode root = new DefaultMutableTreeNode(); + + private final DefaultTreeModel model = new DefaultTreeModel( root ); + + public final JTree tree = new JTree( model ); + + private final JScrollPane scroll = new JScrollPane( tree ); + + private HsRelatorio relatorio = null; + + public AdicionarEquipamentosPanel() + { + startupComponents(); + setupLayout(); + placeComponents(); + startupListeners(); + } + + private void startupComponents() + { + buttonAdicionar.setEnabled( false ); + buttonRemover.setEnabled( false ); + buttonAdicionar.setToolTipText( "Adicionar" ); + buttonRemover.setToolTipText( "Remover" ); + tree.setRootVisible( false ); + tree.getSelectionModel().setSelectionMode( TreeSelectionModel.SINGLE_TREE_SELECTION ); + } + + private void setupLayout() + { + TableLayout layout = new TableLayout( + new double[]{ TableLayout.MINIMUM, TableLayout.FILL }, + new double[]{ TableLayout.FILL } + ); + layout.setHGap( 5 ); + layout.setVGap( 5 ); + setLayout( layout ); + } + + private void placeComponents() + { + JPanel panel = new JPanel(); + TableLayout layout = new TableLayout( + new double[]{ TableLayout.MINIMUM }, + new double[]{ TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL } + ); + layout.setHGap( 5 ); + layout.setVGap( 5 ); + panel.setLayout( layout ); + panel.add( buttonAdicionar, new TableLayoutConstraints( 0, 0 ) ); + panel.add( buttonRemover, new TableLayoutConstraints( 0, 1 ) ); + + add( panel, new TableLayoutConstraints( 0, 0 ) ); + add( scroll, new TableLayoutConstraints( 1, 0 ) ); + } + + private void startupListeners() + { + tree.getSelectionModel().addTreeSelectionListener( new TreeSelectionListener(){ + @Override + public void valueChanged( TreeSelectionEvent e ) + { + setEnabled(); + TreePath path = tree.getSelectionPath(); + Object object = path == null ? null : path.getLastPathComponent(); + HsRelatorioEquipamentoMedico rel = object == null ? null : ( (object instanceof HsRelatorioEquipamentoMedico) ? (HsRelatorioEquipamentoMedico) ((EquipamentoNode) object).getUserObject() : null); + firePropertyChange( SELECTION_CHANGED, null, rel == null ? null : rel.getToHsRelatorio() ); + } + } ); + buttonAdicionar.addActionListener( new ActionListener() + { + @Override + public void actionPerformed( ActionEvent e ) + { + add(); + } + } ); + buttonRemover.addActionListener( new ActionListener() + { + @Override + public void actionPerformed( ActionEvent e ) + { + rem(); + } + } ); + } + + private void add() + { + if( relatorio != null ) + { + String equipamentoString = JOptionPane.showInputDialog( this, "Descri" + ccedil + atilde + "o", "Criar novo equipamento m" + eacute + "dico", JOptionPane.QUESTION_MESSAGE ); + if( equipamentoString != null ) + { + HsEquipamentoMedico equipamento = new HsEquipamentoMedico(); + equipamento.setNome( equipamentoString ); + equipamento.save(); + HsRelatorioEquipamentoMedico rel = new HsRelatorioEquipamentoMedico(); + rel.setToHsRelatorio( relatorio ); + rel.setToHsEquipamentoMedico( equipamento ); + rel.save(); + refresh(); + } + } + } + +// private void save( DefaultMutableTreeNode toadd ) +// { +// Object obj = toadd.getUserObject(); +// if( obj instanceof HsPosto ) +// { +// rel.save(); +// } +// else +// { +// for( int i = 0; i < toadd.getChildCount(); ++i ) +// { +// save( (DefaultMutableTreeNode) toadd.getChildAt( i ) ); +// } +// } +// } + + private void rem() + { + TreePath path = tree.getSelectionPath(); + if( path != null ) + { + Object object = path.getLastPathComponent(); + if( object instanceof EquipamentoNode ) + { + HsRelatorioEquipamentoMedico rel = ((HsRelatorioEquipamentoMedico)((EquipamentoNode) object).getUserObject()); + rel.delete(); + } + } + refresh(); + } + + private void setEnabled() + { + buttonAdicionar.setEnabled( relatorio != null && relatorio.getIsSubmetido() == null ); + buttonRemover.setEnabled( tree.getSelectionCount() > 0 ); + } + + public void refresh() + { + root.removeAllChildren(); + if( relatorio != null ) + { + for( HsRelatorioEquipamentoMedico rel : relatorio.getHsRelatorioEquipamentoMedicoArray() ) + { + root.add( new EquipamentoNode(rel) ); + } + } + setEnabled(); + TreeTools.refreshTree( tree, root ); + } + + + public void setRelatorio( HsRelatorio relatorio ) + { + this.relatorio = relatorio; + refresh(); + } + } diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/EquipamentoNode.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/EquipamentoNode.java new file mode 100644 index 00000000..9cea5660 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/EquipamentoNode.java @@ -0,0 +1,17 @@ +package siprp.higiene.gestao.equipamentos; + +import javax.swing.tree.DefaultMutableTreeNode; + +import siprp.database.cayenne.objects.HsRelatorioEquipamentoMedico; + +public class EquipamentoNode extends DefaultMutableTreeNode +{ + + private static final long serialVersionUID = 1L; + + public EquipamentoNode( HsRelatorioEquipamentoMedico equipamento ) + { + super( equipamento ); + } + +} diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/add.png b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/add.png new file mode 100644 index 0000000000000000000000000000000000000000..ff55ed0cead4d965e488ef6e857fa9275e721c31 GIT binary patch literal 899 zcmV-}1AP36P)WdKHUATc!{PH%P~GB7YQATcmHFgQ9gIUp-AF)%RoqGHAX000McNliru z)&&<0F&|D4EYJV|010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00P@d zL_t(|+D%hUPZLoTJ@ZAUv{cGhLs+2EB8rBv&_oPzLE=gg5~D8MxgeTIOo)GgjZ2Lt zE+`mxBr4H02?mX*Ary@oq!3yHp#@5@)0wuk^W}YQ2Y8c{d2{p5opbL!kHgXR6wOdE z)L7rpSLg8tO~c}L(@HEISEi6a2os3VsRF@vDBJ=06>fFN!O;B+{XTaUhZSWR2`vew zn8kKR!>{FyTsB%5!Ap$O=`_J$G{GTXZ|<2G?!F^0Yhi?@XTZl>P)K^w)SAJXl7!nY zNc)o2tJj%2e&a8(@&rr3Gc=#|otk>weOLaN_<(d_7v7x?Ob)z7|EZfuw*A1|(h~M{ z3%u9n@|JMX-ZYl5hYgm5hk~JdUDtf`yR%Sr4Te>&NHa9#Os%vxEen=uqF6M+`>SQN z;|7IK5@fOVn6J+(yYXe3r|)2i(9?DqwqQdPd4$7ZwC!Cf#T&cUF#dfNXz^SEvKTP81JsnHHDG z?vxT3rj4R*m4+jU5+tb#qU0*q zf`oC`V3}CS10?|DA}MG3qPC??Z7E9d&rTfE(I{-&MrWoMRp+Y?T=H;i3`Lui{i~(E zpP|atFw??B^VmdaF|wA^Yy)bc0JT^=lx&u_MVbQglx>6hW=0LnBTnIULQcdaB5Hkp zq#y`SgaF4ef3a?lI?~xndx+dgwn^Gp*nW=;xd2#X1#uNS*W)%GA;=G-!6ieaKk8)C zJoQPThO6{8Vg`N^c@C`pPlOr5wsRLmLI5Xll}yq{bMA&qZiGe2b9xHvnJ^Yewo>}@ z9N`;*m0=uSrg9R0#bL}Ot%Mq9c$J!&>=i=FxlBhBINvhC$4o+yDsi1PjF2JhvrFU< Z{sTHZE)<@5Hy{82002ovPDHLkV1f=Fh(iDX literal 0 HcmV?d00001 diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/delete.png b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..d7cc9c683c1d205a5a2cea10fce5a7faab0ef5ad GIT binary patch literal 947 zcmV;k15EshP)WdKHUATc!{PH%P~GB7YQATcmHFgQ9gIUp-AF)%RoqGHAX000McNliru z)&&<0F*kdqgem|4010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00Rq2 zL_t(|+D(()Z&P&`$3N$sp03+k3Up=Y!gz@gbwGlE8WS&!n1~rhmVkGfcm)?CH)c2d z0lL&)dx2T2IgA6-WA47un@m zOWyDZW=r^|u3!{%bj)T9<0-FSsdD!z%t!!7U(h+4=9*v-eenR{1v~)|y zb)-BAlGfQE&LP@$&sQ4OG*m07@kdnNIY_W7Ew8!D<9Si+Iy>Se2(p|XIQo?`N|la%`hP|+4xn5)l8+br2$8bf<`50$DUDgh>3vP~N3xl-+~+GGLE zwsBtFi63Z~!&iwP*o6M~*@^OhJ)_*C@2P)ZKn*5P=L{?p&WrQMg4H1t&9m)%^7bkQwx)=9Qo1kn zl78U{mL%=`qL5O~XKlO_E - - + ORACLE - hs_equipamento_medicao_id_seq + hs_equipamento_medico_id_seq 1 @@ -298,6 +297,7 @@ + @@ -325,8 +325,8 @@ 1 - - + + @@ -779,7 +779,7 @@ - + @@ -905,8 +905,7 @@ - - + @@ -947,6 +946,7 @@ + @@ -962,16 +962,16 @@ - + - + - + @@ -1002,7 +1002,7 @@ - + @@ -1163,7 +1163,7 @@ - + @@ -1328,6 +1328,9 @@ + + + @@ -1388,7 +1391,7 @@ - + @@ -1406,7 +1409,10 @@ - + + + + @@ -1801,6 +1807,7 @@ + @@ -1820,13 +1827,14 @@ - + - + + diff --git a/trunk/common/src/siprp/database/cayenne/objects/BaseObject.java b/trunk/common/src/siprp/database/cayenne/objects/BaseObject.java index ee131223..d0f3afe8 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/BaseObject.java +++ b/trunk/common/src/siprp/database/cayenne/objects/BaseObject.java @@ -59,13 +59,13 @@ public class BaseObject extends CayenneDataObject protected String parseToUnicode( String string ) { - String result = UnicodeChecker.parseToUnicode( string ); - return result.replaceAll( "\\\\\\\\", "\\\\" ); + String result = string == null ? null : UnicodeChecker.parseToUnicode( string ); + return result == null ? null : result.replaceAll( "\\\\\\\\", "\\\\" ); } protected String parseFromUnicode( String string ) { - return UnicodeChecker.parseFromUnicode( string ); + return string == null ? null : UnicodeChecker.parseFromUnicode( string ); } } diff --git a/trunk/common/src/siprp/database/cayenne/objects/Empresas.java b/trunk/common/src/siprp/database/cayenne/objects/Empresas.java index 449deee2..6ef38306 100755 --- a/trunk/common/src/siprp/database/cayenne/objects/Empresas.java +++ b/trunk/common/src/siprp/database/cayenne/objects/Empresas.java @@ -5,45 +5,19 @@ import java.util.List; import siprp.database.cayenne.objects.auto._Empresas; -import com.evolute.utils.strings.UnicodeChecker; - public class Empresas extends _Empresas { private static final long serialVersionUID = 1L; - - private String name = null; - - private String convertedName = null; @Override public String getDesignacaoSocial() { - String currentName = super.getDesignacaoSocial(); - if( name == null || !name.equals( currentName )) - { - name = currentName; - convertedName = null; - } - return convertName(); + return parseFromUnicode( super.getDesignacaoSocial() ); } @Override public void setDesignacaoSocial( String nome ) { - super.setDesignacaoSocial( parseToUnicode( name ) ); - getDesignacaoSocial(); - } - - private String convertName() - { - if( name == null ) - { - convertedName = null; - } - else - { - convertedName = parseFromUnicode( name ); - } - return convertedName; + super.setDesignacaoSocial( parseToUnicode( nome ) ); } @Override diff --git a/trunk/common/src/siprp/database/cayenne/objects/HsArea.java b/trunk/common/src/siprp/database/cayenne/objects/HsArea.java index bd2f5a7d..23a48cf8 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/HsArea.java +++ b/trunk/common/src/siprp/database/cayenne/objects/HsArea.java @@ -6,6 +6,18 @@ public class HsArea extends _HsArea { private static final long serialVersionUID = 1L; + @Override + public String getDescription() + { + return parseFromUnicode( super.getDescription() ); + } + + @Override + public void setDescription( String nome ) + { + super.setDescription( parseToUnicode( nome ) ); + } + @Override public String toString() { diff --git a/trunk/common/src/siprp/database/cayenne/objects/HsEmail.java b/trunk/common/src/siprp/database/cayenne/objects/HsEmail.java index 3f98c75d..0621c049 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/HsEmail.java +++ b/trunk/common/src/siprp/database/cayenne/objects/HsEmail.java @@ -4,4 +4,23 @@ import siprp.database.cayenne.objects.auto._HsEmail; public class HsEmail extends _HsEmail { + private static final long serialVersionUID = 1L; + + @Override + public String getEmail() + { + return parseFromUnicode( super.getEmail() ); + } + + @Override + public void setEmail( String nome ) + { + super.setEmail( parseToUnicode( nome ) ); + } + + @Override + public String toString() + { + return getEmail(); + } } diff --git a/trunk/common/src/siprp/database/cayenne/objects/HsEquipamentoMedicao.java b/trunk/common/src/siprp/database/cayenne/objects/HsEquipamentoMedicao.java deleted file mode 100644 index cb154a99..00000000 --- a/trunk/common/src/siprp/database/cayenne/objects/HsEquipamentoMedicao.java +++ /dev/null @@ -1,7 +0,0 @@ -package siprp.database.cayenne.objects; - -import siprp.database.cayenne.objects.auto._HsEquipamentoMedicao; - -public class HsEquipamentoMedicao extends _HsEquipamentoMedicao { - -} diff --git a/trunk/common/src/siprp/database/cayenne/objects/HsEquipamentoMedico.java b/trunk/common/src/siprp/database/cayenne/objects/HsEquipamentoMedico.java new file mode 100644 index 00000000..b3d4c603 --- /dev/null +++ b/trunk/common/src/siprp/database/cayenne/objects/HsEquipamentoMedico.java @@ -0,0 +1,28 @@ +package siprp.database.cayenne.objects; + +import siprp.database.cayenne.objects.auto._HsEquipamentoMedico; + +public class HsEquipamentoMedico extends _HsEquipamentoMedico { + + private static final long serialVersionUID = 1L; + + @Override + public String getNome() + { + return parseFromUnicode( super.getNome() ); + } + + @Override + public void setNome( String nome ) + { + super.setNome( parseToUnicode( nome ) ); + } + + @Override + public String toString() + { + return getNome(); + } + + +} diff --git a/trunk/common/src/siprp/database/cayenne/objects/HsMedidaClassificacao.java b/trunk/common/src/siprp/database/cayenne/objects/HsMedidaClassificacao.java deleted file mode 100644 index 3ee53ecd..00000000 --- a/trunk/common/src/siprp/database/cayenne/objects/HsMedidaClassificacao.java +++ /dev/null @@ -1,7 +0,0 @@ -package siprp.database.cayenne.objects; - -import siprp.database.cayenne.objects.auto._HsMedidaClassificacao; - -public class HsMedidaClassificacao extends _HsMedidaClassificacao { - -} diff --git a/trunk/common/src/siprp/database/cayenne/objects/HsRelatorio.java b/trunk/common/src/siprp/database/cayenne/objects/HsRelatorio.java index 8e8dbbf9..6b4a88f4 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/HsRelatorio.java +++ b/trunk/common/src/siprp/database/cayenne/objects/HsRelatorio.java @@ -3,7 +3,71 @@ package siprp.database.cayenne.objects; import siprp.database.cayenne.objects.auto._HsRelatorio; public class HsRelatorio extends _HsRelatorio { - + private static final long serialVersionUID = 1L; + + @Override + public String getAcompanhante1() + { + return parseFromUnicode( super.getAcompanhante1() ); + } + @Override + public String getAcompanhante2() + { + return parseFromUnicode( super.getAcompanhante2() ); + } + @Override + public String getAcompanhante3() + { + return parseFromUnicode( super.getAcompanhante3() ); + } + @Override + public String getFuncaoAcompanhante1() + { + return parseFromUnicode( super.getFuncaoAcompanhante1() ); + } + @Override + public String getFuncaoAcompanhante2() + { + return parseFromUnicode( super.getFuncaoAcompanhante2() ); + } + @Override + public String getFuncaoAcompanhante3() + { + return parseFromUnicode( super.getFuncaoAcompanhante3() ); + } + + + @Override + public void setAcompanhante1( String nome ) + { + super.setAcompanhante1( parseToUnicode( nome ) ); + } + @Override + public void setAcompanhante2( String nome ) + { + super.setAcompanhante2( parseToUnicode( nome ) ); + } + @Override + public void setAcompanhante3( String nome ) + { + super.setAcompanhante3( parseToUnicode( nome ) ); + } + @Override + public void setFuncaoAcompanhante1( String nome ) + { + super.setFuncaoAcompanhante1( parseToUnicode( nome ) ); + } + @Override + public void setFuncaoAcompanhante2( String nome ) + { + super.setFuncaoAcompanhante2( parseToUnicode( nome ) ); + } + @Override + public void setFuncaoAcompanhante3( String nome ) + { + super.setFuncaoAcompanhante3( parseToUnicode( nome ) ); + } + } diff --git a/trunk/common/src/siprp/database/cayenne/objects/HsRelatorioEquipamentoMedicao.java b/trunk/common/src/siprp/database/cayenne/objects/HsRelatorioEquipamentoMedicao.java deleted file mode 100644 index 89ba56d4..00000000 --- a/trunk/common/src/siprp/database/cayenne/objects/HsRelatorioEquipamentoMedicao.java +++ /dev/null @@ -1,7 +0,0 @@ -package siprp.database.cayenne.objects; - -import siprp.database.cayenne.objects.auto._HsRelatorioEquipamentoMedicao; - -public class HsRelatorioEquipamentoMedicao extends _HsRelatorioEquipamentoMedicao { - -} diff --git a/trunk/common/src/siprp/database/cayenne/objects/HsRelatorioEquipamentoMedico.java b/trunk/common/src/siprp/database/cayenne/objects/HsRelatorioEquipamentoMedico.java new file mode 100644 index 00000000..083bce20 --- /dev/null +++ b/trunk/common/src/siprp/database/cayenne/objects/HsRelatorioEquipamentoMedico.java @@ -0,0 +1,15 @@ +package siprp.database.cayenne.objects; + +import siprp.database.cayenne.objects.auto._HsRelatorioEquipamentoMedico; + +public class HsRelatorioEquipamentoMedico extends _HsRelatorioEquipamentoMedico { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() + { + return getToHsEquipamentoMedico().toString(); + } + +} diff --git a/trunk/common/src/siprp/database/cayenne/objects/HsRelatorioMedidaArea.java b/trunk/common/src/siprp/database/cayenne/objects/HsRelatorioMedidaArea.java deleted file mode 100644 index 831081e9..00000000 --- a/trunk/common/src/siprp/database/cayenne/objects/HsRelatorioMedidaArea.java +++ /dev/null @@ -1,7 +0,0 @@ -package siprp.database.cayenne.objects; - -import siprp.database.cayenne.objects.auto._HsRelatorioMedidaArea; - -public class HsRelatorioMedidaArea extends _HsRelatorioMedidaArea { - -} diff --git a/trunk/common/src/siprp/database/cayenne/objects/HsRelatorioMedidaPosto.java b/trunk/common/src/siprp/database/cayenne/objects/HsRelatorioMedidaPosto.java deleted file mode 100644 index 44403f9b..00000000 --- a/trunk/common/src/siprp/database/cayenne/objects/HsRelatorioMedidaPosto.java +++ /dev/null @@ -1,7 +0,0 @@ -package siprp.database.cayenne.objects; - -import siprp.database.cayenne.objects.auto._HsRelatorioMedidaPosto; - -public class HsRelatorioMedidaPosto extends _HsRelatorioMedidaPosto { - -} diff --git a/trunk/common/src/siprp/database/cayenne/objects/MarcacoesTecnicosHst.java b/trunk/common/src/siprp/database/cayenne/objects/MarcacoesTecnicosHst.java index 25244ef6..e6b31e26 100755 --- a/trunk/common/src/siprp/database/cayenne/objects/MarcacoesTecnicosHst.java +++ b/trunk/common/src/siprp/database/cayenne/objects/MarcacoesTecnicosHst.java @@ -4,6 +4,26 @@ import siprp.database.cayenne.objects.auto._MarcacoesTecnicosHst; public class MarcacoesTecnicosHst extends _MarcacoesTecnicosHst { + private static final long serialVersionUID = 1L; + + @Override + public String getNome() + { + return parseFromUnicode( super.getNome() ); + } + + @Override + public void setNome( String nome ) + { + super.setNome( parseToUnicode( nome ) ); + } + + @Override + public String toString() + { + return getNome(); + } + } diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_EmailPlanoDeActuacao.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_EmailPlanoDeActuacao.java index 9b751ac4..e6a75aa0 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_EmailPlanoDeActuacao.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_EmailPlanoDeActuacao.java @@ -1,7 +1,6 @@ package siprp.database.cayenne.objects.auto; -import org.apache.cayenne.CayenneDataObject; - +import siprp.database.cayenne.objects.BaseObject; import siprp.database.cayenne.objects.Estabelecimentos; /** @@ -10,7 +9,7 @@ import siprp.database.cayenne.objects.Estabelecimentos; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _EmailPlanoDeActuacao extends CayenneDataObject { +public abstract class _EmailPlanoDeActuacao extends BaseObject { public static final String DESCRIPTION_PROPERTY = "description"; public static final String TO_ESTABELECIMENTOS_PROPERTY = "toEstabelecimentos"; diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsEquipamentoMedicao.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsEquipamentoMedicao.java deleted file mode 100644 index 538774ff..00000000 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsEquipamentoMedicao.java +++ /dev/null @@ -1,34 +0,0 @@ -package siprp.database.cayenne.objects.auto; - -import java.util.Date; - -import siprp.database.cayenne.objects.BaseObject; - -/** - * Class _HsEquipamentoMedicao was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _HsEquipamentoMedicao extends BaseObject { - - public static final String DELETED_DATE_PROPERTY = "deletedDate"; - public static final String NOME_PROPERTY = "nome"; - - public static final String ID_PK_COLUMN = "id"; - - public void setDeletedDate(Date deletedDate) { - writeProperty("deletedDate", deletedDate); - } - public Date getDeletedDate() { - return (Date)readProperty("deletedDate"); - } - - public void setNome(String nome) { - writeProperty("nome", nome); - } - public String getNome() { - return (String)readProperty("nome"); - } - -} diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsEquipamentoMedico.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsEquipamentoMedico.java new file mode 100644 index 00000000..68c1e03d --- /dev/null +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsEquipamentoMedico.java @@ -0,0 +1,40 @@ +package siprp.database.cayenne.objects.auto; + +import java.util.List; + +import siprp.database.cayenne.objects.BaseObject; +import siprp.database.cayenne.objects.HsRelatorioEquipamentoMedico; + +/** + * Class _HsEquipamentoMedico was generated by Cayenne. + * It is probably a good idea to avoid changing this class manually, + * since it may be overwritten next time code is regenerated. + * If you need to make any customizations, please use subclass. + */ +public abstract class _HsEquipamentoMedico extends BaseObject { + + public static final String NOME_PROPERTY = "nome"; + public static final String HS_RELATORIO_EQUIPAMENTO_MEDICO_ARRAY_PROPERTY = "hsRelatorioEquipamentoMedicoArray"; + + public static final String ID_PK_COLUMN = "id"; + + public void setNome(String nome) { + writeProperty("nome", nome); + } + public String getNome() { + return (String)readProperty("nome"); + } + + public void addToHsRelatorioEquipamentoMedicoArray(HsRelatorioEquipamentoMedico obj) { + addToManyTarget("hsRelatorioEquipamentoMedicoArray", obj, true); + } + public void removeFromHsRelatorioEquipamentoMedicoArray(HsRelatorioEquipamentoMedico obj) { + removeToManyTarget("hsRelatorioEquipamentoMedicoArray", obj, true); + } + @SuppressWarnings("unchecked") + public List getHsRelatorioEquipamentoMedicoArray() { + return (List)readProperty("hsRelatorioEquipamentoMedicoArray"); + } + + +} diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsMedidaClassificacao.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsMedidaClassificacao.java deleted file mode 100644 index 7fa13c32..00000000 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsMedidaClassificacao.java +++ /dev/null @@ -1,49 +0,0 @@ -package siprp.database.cayenne.objects.auto; - -import java.util.Date; -import java.util.List; - -import siprp.database.cayenne.objects.BaseObject; -import siprp.database.cayenne.objects.HsRelatorioMedida; - -/** - * Class _HsMedidaClassificacao was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _HsMedidaClassificacao extends BaseObject { - - public static final String DELETED_DATE_PROPERTY = "deletedDate"; - public static final String DESCRIPTION_PROPERTY = "description"; - public static final String HS_RELATORIO_MEDIDA_ARRAY_PROPERTY = "hsRelatorioMedidaArray"; - - public static final String ID_PK_COLUMN = "id"; - - public void setDeletedDate(Date deletedDate) { - writeProperty("deletedDate", deletedDate); - } - public Date getDeletedDate() { - return (Date)readProperty("deletedDate"); - } - - public void setDescription(String description) { - writeProperty("description", description); - } - public String getDescription() { - return (String)readProperty("description"); - } - - public void addToHsRelatorioMedidaArray(HsRelatorioMedida obj) { - addToManyTarget("hsRelatorioMedidaArray", obj, true); - } - public void removeFromHsRelatorioMedidaArray(HsRelatorioMedida obj) { - removeToManyTarget("hsRelatorioMedidaArray", obj, true); - } - @SuppressWarnings("unchecked") - public List getHsRelatorioMedidaArray() { - return (List)readProperty("hsRelatorioMedidaArray"); - } - - -} diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorio.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorio.java index c08383fe..c0178da8 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorio.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorio.java @@ -4,7 +4,7 @@ import java.util.Date; import java.util.List; import siprp.database.cayenne.objects.BaseObject; -import siprp.database.cayenne.objects.HsRelatorioEquipamentoMedicao; +import siprp.database.cayenne.objects.HsRelatorioEquipamentoMedico; import siprp.database.cayenne.objects.HsRelatorioLegislacao; import siprp.database.cayenne.objects.HsRelatorioNormalizacao; import siprp.database.cayenne.objects.HsRelatorioRisco; @@ -18,6 +18,7 @@ import siprp.database.cayenne.objects.MarcacoesEstabelecimento; */ public abstract class _HsRelatorio extends BaseObject { + public static final String ACOMPANHANTE1_PROPERTY = "acompanhante1"; public static final String ACOMPANHANTE2_PROPERTY = "acompanhante2"; public static final String ACOMPANHANTE3_PROPERTY = "acompanhante3"; public static final String AVALIACAO_INICIAL_PROPERTY = "avaliacaoInicial"; @@ -28,7 +29,7 @@ public abstract class _HsRelatorio extends BaseObject { public static final String FUNCAO_ACOMPANHANTE3_PROPERTY = "funcaoAcompanhante3"; public static final String ID_PROPERTY = "id"; public static final String IS_SUBMETIDO_PROPERTY = "isSubmetido"; - public static final String HS_RELATORIO_EQUIPAMENTO_MEDICAO_ARRAY_PROPERTY = "hsRelatorioEquipamentoMedicaoArray"; + public static final String HS_RELATORIO_EQUIPAMENTO_MEDICO_ARRAY_PROPERTY = "hsRelatorioEquipamentoMedicoArray"; public static final String HS_RELATORIO_LEGISLACAO_ARRAY_PROPERTY = "hsRelatorioLegislacaoArray"; public static final String HS_RELATORIO_NORMALIZACAO_ARRAY_PROPERTY = "hsRelatorioNormalizacaoArray"; public static final String HS_RELATORIO_RISCO_ARRAY_PROPERTY = "hsRelatorioRiscoArray"; @@ -36,6 +37,13 @@ public abstract class _HsRelatorio extends BaseObject { public static final String ID_PK_COLUMN = "id"; + public void setAcompanhante1(String acompanhante1) { + writeProperty("acompanhante1", acompanhante1); + } + public String getAcompanhante1() { + return (String)readProperty("acompanhante1"); + } + public void setAcompanhante2(String acompanhante2) { writeProperty("acompanhante2", acompanhante2); } @@ -106,15 +114,15 @@ public abstract class _HsRelatorio extends BaseObject { return (Date)readProperty("isSubmetido"); } - public void addToHsRelatorioEquipamentoMedicaoArray(HsRelatorioEquipamentoMedicao obj) { - addToManyTarget("hsRelatorioEquipamentoMedicaoArray", obj, true); + public void addToHsRelatorioEquipamentoMedicoArray(HsRelatorioEquipamentoMedico obj) { + addToManyTarget("hsRelatorioEquipamentoMedicoArray", obj, true); } - public void removeFromHsRelatorioEquipamentoMedicaoArray(HsRelatorioEquipamentoMedicao obj) { - removeToManyTarget("hsRelatorioEquipamentoMedicaoArray", obj, true); + public void removeFromHsRelatorioEquipamentoMedicoArray(HsRelatorioEquipamentoMedico obj) { + removeToManyTarget("hsRelatorioEquipamentoMedicoArray", obj, true); } @SuppressWarnings("unchecked") - public List getHsRelatorioEquipamentoMedicaoArray() { - return (List)readProperty("hsRelatorioEquipamentoMedicaoArray"); + public List getHsRelatorioEquipamentoMedicoArray() { + return (List)readProperty("hsRelatorioEquipamentoMedicoArray"); } diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioEquipamentoMedicao.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioEquipamentoMedicao.java deleted file mode 100644 index 90eef2a9..00000000 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioEquipamentoMedicao.java +++ /dev/null @@ -1,29 +0,0 @@ -package siprp.database.cayenne.objects.auto; - -import org.apache.cayenne.CayenneDataObject; - -import siprp.database.cayenne.objects.HsRelatorio; - -/** - * Class _HsRelatorioEquipamentoMedicao was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _HsRelatorioEquipamentoMedicao extends CayenneDataObject { - - public static final String TO_HS_RELATORIO_PROPERTY = "toHsRelatorio"; - - public static final String HS_EQUIPAMENTO_MEDICAO_ID_PK_COLUMN = "hs_equipamento_medicao_id"; - public static final String HS_RELATORIO_ID_PK_COLUMN = "hs_relatorio_id"; - - public void setToHsRelatorio(HsRelatorio toHsRelatorio) { - setToOneTarget("toHsRelatorio", toHsRelatorio, true); - } - - public HsRelatorio getToHsRelatorio() { - return (HsRelatorio)readProperty("toHsRelatorio"); - } - - -} diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioEquipamentoMedico.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioEquipamentoMedico.java new file mode 100644 index 00000000..50720ffa --- /dev/null +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioEquipamentoMedico.java @@ -0,0 +1,39 @@ +package siprp.database.cayenne.objects.auto; + +import siprp.database.cayenne.objects.BaseObject; +import siprp.database.cayenne.objects.HsEquipamentoMedico; +import siprp.database.cayenne.objects.HsRelatorio; + +/** + * Class _HsRelatorioEquipamentoMedico was generated by Cayenne. + * It is probably a good idea to avoid changing this class manually, + * since it may be overwritten next time code is regenerated. + * If you need to make any customizations, please use subclass. + */ +public abstract class _HsRelatorioEquipamentoMedico extends BaseObject { + + public static final String TO_HS_EQUIPAMENTO_MEDICO_PROPERTY = "toHsEquipamentoMedico"; + public static final String TO_HS_RELATORIO_PROPERTY = "toHsRelatorio"; + + public static final String HS_EQUIPAMENTO_MEDICO_ID_PK_COLUMN = "hs_equipamento_medico_id"; + public static final String HS_RELATORIO_ID_PK_COLUMN = "hs_relatorio_id"; + + public void setToHsEquipamentoMedico(HsEquipamentoMedico toHsEquipamentoMedico) { + setToOneTarget("toHsEquipamentoMedico", toHsEquipamentoMedico, true); + } + + public HsEquipamentoMedico getToHsEquipamentoMedico() { + return (HsEquipamentoMedico)readProperty("toHsEquipamentoMedico"); + } + + + public void setToHsRelatorio(HsRelatorio toHsRelatorio) { + setToOneTarget("toHsRelatorio", toHsRelatorio, true); + } + + public HsRelatorio getToHsRelatorio() { + return (HsRelatorio)readProperty("toHsRelatorio"); + } + + +} diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioLegislacao.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioLegislacao.java index 004ed81c..3fb58e3b 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioLegislacao.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioLegislacao.java @@ -1,7 +1,6 @@ package siprp.database.cayenne.objects.auto; -import org.apache.cayenne.CayenneDataObject; - +import siprp.database.cayenne.objects.BaseObject; import siprp.database.cayenne.objects.HsRelatorio; /** @@ -10,7 +9,7 @@ import siprp.database.cayenne.objects.HsRelatorio; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _HsRelatorioLegislacao extends CayenneDataObject { +public abstract class _HsRelatorioLegislacao extends BaseObject { public static final String TO_HS_RELATORIO_PROPERTY = "toHsRelatorio"; diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioMedidaArea.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioMedidaArea.java deleted file mode 100644 index eac9f9a2..00000000 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioMedidaArea.java +++ /dev/null @@ -1,40 +0,0 @@ -package siprp.database.cayenne.objects.auto; - -import java.util.List; - -import siprp.database.cayenne.objects.BaseObject; -import siprp.database.cayenne.objects.HsRelatorioMedidaPosto; - -/** - * Class _HsRelatorioMedidaArea was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _HsRelatorioMedidaArea extends BaseObject { - - public static final String DESCRIPTION_PROPERTY = "description"; - public static final String HS_RELATORIO_MEDIDA_POSTO_ARRAY_PROPERTY = "hsRelatorioMedidaPostoArray"; - - public static final String ID_PK_COLUMN = "id"; - - public void setDescription(String description) { - writeProperty("description", description); - } - public String getDescription() { - return (String)readProperty("description"); - } - - public void addToHsRelatorioMedidaPostoArray(HsRelatorioMedidaPosto obj) { - addToManyTarget("hsRelatorioMedidaPostoArray", obj, true); - } - public void removeFromHsRelatorioMedidaPostoArray(HsRelatorioMedidaPosto obj) { - removeToManyTarget("hsRelatorioMedidaPostoArray", obj, true); - } - @SuppressWarnings("unchecked") - public List getHsRelatorioMedidaPostoArray() { - return (List)readProperty("hsRelatorioMedidaPostoArray"); - } - - -} diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioMedidaPosto.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioMedidaPosto.java deleted file mode 100644 index 585a6611..00000000 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioMedidaPosto.java +++ /dev/null @@ -1,35 +0,0 @@ -package siprp.database.cayenne.objects.auto; - -import siprp.database.cayenne.objects.BaseObject; -import siprp.database.cayenne.objects.HsRelatorioMedidaArea; - -/** - * Class _HsRelatorioMedidaPosto was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _HsRelatorioMedidaPosto extends BaseObject { - - public static final String DESCRIPTION_PROPERTY = "description"; - public static final String TO_HS_RELATORIO_MEDIDA_AREA_PROPERTY = "toHsRelatorioMedidaArea"; - - public static final String ID_PK_COLUMN = "id"; - - public void setDescription(String description) { - writeProperty("description", description); - } - public String getDescription() { - return (String)readProperty("description"); - } - - public void setToHsRelatorioMedidaArea(HsRelatorioMedidaArea toHsRelatorioMedidaArea) { - setToOneTarget("toHsRelatorioMedidaArea", toHsRelatorioMedidaArea, true); - } - - public HsRelatorioMedidaArea getToHsRelatorioMedidaArea() { - return (HsRelatorioMedidaArea)readProperty("toHsRelatorioMedidaArea"); - } - - -} diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioNormalizacao.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioNormalizacao.java index 7ae0732e..680ec1c8 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioNormalizacao.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioNormalizacao.java @@ -1,7 +1,6 @@ package siprp.database.cayenne.objects.auto; -import org.apache.cayenne.CayenneDataObject; - +import siprp.database.cayenne.objects.BaseObject; import siprp.database.cayenne.objects.HsRelatorio; /** @@ -10,7 +9,7 @@ import siprp.database.cayenne.objects.HsRelatorio; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _HsRelatorioNormalizacao extends CayenneDataObject { +public abstract class _HsRelatorioNormalizacao extends BaseObject { public static final String TO_HS_RELATORIO_PROPERTY = "toHsRelatorio"; diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_Image.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_Image.java index 99a293df..bf4420ac 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_Image.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_Image.java @@ -2,8 +2,7 @@ package siprp.database.cayenne.objects.auto; import java.util.List; -import org.apache.cayenne.CayenneDataObject; - +import siprp.database.cayenne.objects.BaseObject; import siprp.database.cayenne.objects.Empresas; /** @@ -12,7 +11,7 @@ import siprp.database.cayenne.objects.Empresas; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _Image extends CayenneDataObject { +public abstract class _Image extends BaseObject { public static final String IMAGE_DATA_PROPERTY = "imageData"; public static final String NAME_PROPERTY = "name"; diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsAnalise.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsAnalise.java index d6d25256..2ce50fce 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsAnalise.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsAnalise.java @@ -2,8 +2,7 @@ package siprp.database.cayenne.objects.auto; import java.util.Date; -import org.apache.cayenne.CayenneDataObject; - +import siprp.database.cayenne.objects.BaseObject; import siprp.database.cayenne.objects.Prestadores; import siprp.database.cayenne.objects.PrtGruposProtocolo; @@ -13,7 +12,7 @@ import siprp.database.cayenne.objects.PrtGruposProtocolo; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _TrabalhadoresEcdsAnalise extends CayenneDataObject { +public abstract class _TrabalhadoresEcdsAnalise extends BaseObject { public static final String DATA_PROPERTY = "data"; public static final String TO_PRESTADORES_PROPERTY = "toPrestadores";