Skip to content

Pull request refactoring #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AdemarTCFilho wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pull request refactoring #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20f43c6
Primeiro refatorando class
AdemarTCFilho Nov 23, 2022
853a8b0
refatorando segunda e terceira atividade
AdemarTCFilho Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path=""/>
<classpathentry kind="output" path=""/>
</classpath>
17 changes: 17 additions & 0 deletions src/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>src</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Binary file added src/module-info.class
View file
Open in desktop
Binary file not shown.
Binary file added src/primeiroRefactoring/Endereco.class
View file
Open in desktop
Binary file not shown.
34 changes: 34 additions & 0 deletions src/primeiroRefactoring/Endereco.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package primeiroRefactoring;

public class Endereco {

private String logradouro;
private String complemento;
private String cep;

public Endereco(String logradouro, String complemento, String cep) {
this.logradouro = logradouro;
this.complemento = complemento;
this.cep = cep;
}

public String getLogradouro() {
return logradouro;
}
public void setLogradouro(String logradouro) {
this.logradouro = logradouro;
}
public String getComplemento() {
return complemento;
}
public void setComplemento(String complemento) {
this.complemento = complemento;
}
public String getCep() {
return cep;
}
public void setCep(String cep) {
this.cep = cep;
}

}
Binary file added src/primeiroRefactoring/Pessoa.class
View file
Open in desktop
Binary file not shown.
31 changes: 4 additions & 27 deletions src/primeiroRefactoring/Pessoa.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,16 @@ public class Pessoa {
private Date dataNascimento;
private String nomePai;
private String nomeMae;
private String logradouro;
private String complemento;
private String cep;

public Pessoa(String nome, String cpf, String registroGeral, Date dataNascimento, String nomePai, String nomeMae,
String logradouro, String complemento, String cep) {

public Pessoa(String nome, String cpf, String registroGeral, Date dataNascimento, String nomePai, String nomeMae) {
super();
this.nome = nome;
this.cpf = cpf;
this.registroGeral = registroGeral;
this.dataNascimento = dataNascimento;
this.nomePai = nomePai;
this.nomeMae = nomeMae;
this.logradouro = logradouro;
this.complemento = complemento;
this.cep = cep;

}
public String getNome() {
return nome;
Expand Down Expand Up @@ -63,22 +57,5 @@ public String getNomeMae() {
public void setNomeMae(String nomeMae) {
this.nomeMae = nomeMae;
}
public String getLogradouro() {
return logradouro;
}
public void setLogradouro(String logradouro) {
this.logradouro = logradouro;
}
public String getComplemento() {
return complemento;
}
public void setComplemento(String complemento) {
this.complemento = complemento;
}
public String getCep() {
return cep;
}
public void setCep(String cep) {
this.cep = cep;
}

}
Binary file added src/segundoRefactoring/Quicksort.class
View file
Open in desktop
Binary file not shown.
19 changes: 15 additions & 4 deletions src/segundoRefactoring/Quicksort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,25 @@ public class Quicksort {
public static void main(String[] args) throws IOException {
int quantidade = 10000;
int[] vetor = new int[quantidade];

vetor = preencherTextoVetorAleatorio(vetor);

textVetor(vetor, "Vetor desordenado: ");
quickSort(vetor, 0, vetor.length - 1);
textVetor(vetor, "Vetor ordenado: ");

System.out.println("Vetor desordenado: ");
}

private static int[] preencherTextoVetorAleatorio(vetor) {
for (int i = 0; i < vetor.length; i++) {
vetor[i] = (int) (Math.random() * quantidade);
System.out.print(i + " ");
}
quickSort(vetor, 0, vetor.length - 1);
System.out.println("\nVetor ordenado: ");

return vetor;
}

private static void textVetor(vetor, texto) {
System.out.print(texto);
for (int i : vetor) {
System.out.print(i + " ");
}
Expand Down
Binary file added src/terceiroRefactoring/Discente.class
View file
Open in desktop
Binary file not shown.
28 changes: 20 additions & 8 deletions src/terceiroRefactoring/Discente.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,22 @@

import java.util.Date;

public class Discente {
public class Discente extends Pessoa {

private String[] disciplinasCursadas;
private Date dataIngresso;
private int numeroPeriodosCursados;
private String emailPessoal;
private String matricula;
private double coeficienteRendimento;

public Discente(String[] disciplinasCursadas, Date dataIngresso, int numeroPeriodosCursados, String emailPessoal) {
public Discente(String[] disciplinasCursadas, Date dataIngresso, int numeroPeriodosCursados, String matricula, double coeficienteRendimento) {
super();
this.disciplinasCursadas = disciplinasCursadas;
this.dataIngresso = dataIngresso;
this.numeroPeriodosCursados = numeroPeriodosCursados;
this.emailPessoal = emailPessoal;
this.matricula = matricula;
this.coeficienteRendimento = coeficienteRendimento;

}

public String[] getDisciplinasCursadas() {
Expand All @@ -41,11 +44,20 @@ public void setNumeroPeriodosCursados(int numeroPeriodosCursados) {
this.numeroPeriodosCursados = numeroPeriodosCursados;
}

public String getEmailPessoal() {
return emailPessoal;
public String getMatricula() {
return matricula;
}

public void setEmailPessoal(String emailPessoal) {
this.emailPessoal = emailPessoal;
public void setMatricula(String matricula) {
this.matricula = matricula;
}

public double getCoeficienteRendimento() {
return coeficienteRendimento;
}

public void setCoeficienteRendimento(double coeficienteRendimento) {
this.coeficienteRendimento = coeficienteRendimento;
}

}
Binary file added src/terceiroRefactoring/Docente.class
View file
Open in desktop
Binary file not shown.
14 changes: 12 additions & 2 deletions src/terceiroRefactoring/Docente.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@

import java.util.Date;

public class Docente {
public class Docente extends Pessoa {

private String[] disciplinasMinistradas;
private Date dataAdmissao;
private String emailInstitucional;
private double remuneracao;
private String siape;

public Docente(String[] disciplinasMinistradas, Date dataAdmissao, String emailInstitucional, double remuneracao) {
public Docente(String[] disciplinasMinistradas, Date dataAdmissao, String emailInstitucional, double remuneracao, String siape) {
super();
this.disciplinasMinistradas = disciplinasMinistradas;
this.dataAdmissao = dataAdmissao;
this.emailInstitucional = emailInstitucional;
this.remuneracao = remuneracao;
this.siape = siape;
}

public String[] getDisciplinasMinistradas() {
Expand Down Expand Up @@ -48,4 +50,12 @@ public double getRemuneracao() {
public void setRemuneracao(double remuneracao) {
this.remuneracao = remuneracao;
}

public String getSiape() {
return siape;
}

public void setSiape(String siape) {
this.siape = siape;
}
}
Binary file added src/terceiroRefactoring/Pessoa.class
View file
Open in desktop
Binary file not shown.
38 changes: 10 additions & 28 deletions src/terceiroRefactoring/Pessoa.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,19 @@ public class Pessoa {
private Date dataNascimento;
private String nomePai;
private String nomeMae;
private String siape;
private String matricula;
private double coeficienteRendimento;

private String emailPessoal;

public Pessoa(String nomeCompleto, String cpf, String registroGeral, Date dataNascimento, String nomePai,
String nomeMae, String siape, String matricula, double coeficienteRendimento) {
String nomeMae, String emailPessoal) {
super();
this.nomeCompleto = nomeCompleto;
this.cpf = cpf;
this.registroGeral = registroGeral;
this.dataNascimento = dataNascimento;
this.nomePai = nomePai;
this.nomeMae = nomeMae;
this.siape = siape;
this.matricula = matricula;
this.coeficienteRendimento = coeficienteRendimento;
this.emailPessoal = emailPessoal;

}

public String getNomeCompleto() {
Expand Down Expand Up @@ -76,27 +73,12 @@ public void setNomeMae(String nomeMae) {
this.nomeMae = nomeMae;
}

public String getSiape() {
return siape;
}

public void setSiape(String siape) {
this.siape = siape;
}

public String getMatricula() {
return matricula;
}

public void setMatricula(String matricula) {
this.matricula = matricula;
}

public double getCoeficienteRendimento() {
return coeficienteRendimento;

public String getEmailPessoal() {
return emailPessoal;
}

public void setCoeficienteRendimento(double coeficienteRendimento) {
this.coeficienteRendimento = coeficienteRendimento;
public void setEmailPessoal(String emailPessoal) {
this.emailPessoal = emailPessoal;
}
}