Skip to content

Commit

Permalink
Merge origin/master
Browse files Browse the repository at this point in the history
  • Loading branch information
danielaraujos committed May 19, 2016
2 parents 4244cf6 + f0a8006 commit a583f19
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
Binary file modified ponto.h2.db
Binary file not shown.
5 changes: 4 additions & 1 deletion src/Model/Usuario.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,8 @@ public Usuario(int matricula, String nome, int departamento, String cargo) {
this.cargo = cargo;
}


@Override
public String toString() {
return "[" + this.getMatricula() + "]" + this.getNome();
}
}
5 changes: 5 additions & 0 deletions src/View/PrincipalCliente.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
package View;

import Dao.UsuarioDao;
import javax.swing.JFrame;

/**
Expand All @@ -19,6 +20,10 @@ public class PrincipalCliente extends javax.swing.JFrame {
public PrincipalCliente() {
initComponents();
setLocationRelativeTo( null ); // Centralizar a tela no meio

UsuarioDao u = new UsuarioDao(null);
System.out.println( u.getByMatricula(3621) );

}

/**
Expand Down

0 comments on commit a583f19

Please sign in to comment.