2martens
/
dis
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Simplified if statements and restricted var access where applicable 

Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
Jim Martens 2017-05-01 15:25:08 +02:00
parent ce68e751fc
commit 6b796d80c1
8 changed files with 53 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
03/src/de/dis2013/data/Haus.java
View File

@ -52,20 +52,15 @@ public class Haus extends Immobilie {
return false;
Haus other = (Haus)obj;
if(other.getId() != getId() ||
other.getPlz() != getPlz() ||
other.getFlaeche() != getFlaeche() ||
!Helper.compareObjects(this.getOrt(), other.getOrt()) ||
!Helper.compareObjects(this.getStrasse(), other.getStrasse()) ||
!Helper.compareObjects(this.getHausnummer(), other.getHausnummer()) ||
getStockwerke() != other.getStockwerke() ||
getKaufpreis() != other.getKaufpreis() ||
isGarten() != other.isGarten())
{
return false;
}
return true;
return !(other.getId() != getId() ||
other.getPlz() != getPlz() ||
other.getFlaeche() != getFlaeche() ||
!Helper.compareObjects(this.getOrt(), other.getOrt()) ||
!Helper.compareObjects(this.getStrasse(), other.getStrasse()) ||
!Helper.compareObjects(this.getHausnummer(), other.getHausnummer()) ||
getStockwerke() != other.getStockwerke() ||
getKaufpreis() != other.getKaufpreis() ||
isGarten() != other.isGarten());
}
}

19
03/src/de/dis2013/data/Immobilie.java
View File

@ -13,7 +13,7 @@ public abstract class Immobilie {
private String hausnummer;
private int flaeche;
private Makler verwalter;
static int currentId = 0;
private static int currentId = 0;
public Immobilie() {
this.id = currentId++;
@ -83,17 +83,12 @@ public abstract class Immobilie {
return false;
Immobilie other = (Immobilie)obj;
if(other.getId() != getId() ||
other.getPlz() != getPlz() ||
other.getFlaeche() != getFlaeche() ||
!Helper.compareObjects(this.getOrt(), other.getOrt()) ||
!Helper.compareObjects(this.getStrasse(), other.getStrasse()) ||
!Helper.compareObjects(this.getHausnummer(), other.getHausnummer()))
{
return false;
}
return true;
return !(other.getId() != getId() ||
other.getPlz() != getPlz() ||
other.getFlaeche() != getFlaeche() ||
!Helper.compareObjects(this.getOrt(), other.getOrt()) ||
!Helper.compareObjects(this.getStrasse(), other.getStrasse()) ||
!Helper.compareObjects(this.getHausnummer(), other.getHausnummer()));
}
}

15
03/src/de/dis2013/data/Kaufvertrag.java
View File

@ -53,16 +53,11 @@ public class Kaufvertrag extends Vertrag {
return false;
Kaufvertrag other = (Kaufvertrag)obj;
if(other.getVertragsnummer() != getVertragsnummer() ||
!Helper.compareObjects(this.getDatum(), other.getDatum()) ||
!Helper.compareObjects(this.getOrt(), other.getOrt()) ||
other.getAnzahlRaten() != getAnzahlRaten() ||
other.getRatenzins() != getRatenzins())
{
return false;
}
return true;
return !(other.getVertragsnummer() != getVertragsnummer() ||
!Helper.compareObjects(this.getDatum(), other.getDatum()) ||
!Helper.compareObjects(this.getOrt(), other.getOrt()) ||
other.getAnzahlRaten() != getAnzahlRaten() ||
other.getRatenzins() != getRatenzins());
}
}

15
03/src/de/dis2013/data/Makler.java
View File

@ -87,16 +87,11 @@ public class Makler {
return false;
Makler other = (Makler)obj;
if(other.getId() != getId() ||
!Helper.compareObjects(getName(), other.getName()) ||
!Helper.compareObjects(getAdresse(), other.getAdresse()) ||
!Helper.compareObjects(getLogin(), other.getLogin()) ||
!Helper.compareObjects(getPasswort(), other.getPasswort()))
{
return false;
}
return true;
return !(other.getId() != getId() ||
!Helper.compareObjects(getName(), other.getName()) ||
!Helper.compareObjects(getAdresse(), other.getAdresse()) ||
!Helper.compareObjects(getLogin(), other.getLogin()) ||
!Helper.compareObjects(getPasswort(), other.getPasswort()));
}
}

17
03/src/de/dis2013/data/Mietvertrag.java
View File

@ -63,17 +63,12 @@ public class Mietvertrag extends Vertrag {
return false;
Mietvertrag other = (Mietvertrag)obj;
if(other.getVertragsnummer() != getVertragsnummer() ||
!Helper.compareObjects(this.getDatum(), other.getDatum()) ||
!Helper.compareObjects(this.getOrt(), other.getOrt()) ||
other.getDauer() != getDauer() ||
other.getNebenkosten() != getNebenkosten() ||
!Helper.compareObjects(other.getMietbeginn(), getMietbeginn()))
{
return false;
}
return true;
return !(other.getVertragsnummer() != getVertragsnummer() ||
!Helper.compareObjects(this.getDatum(), other.getDatum()) ||
!Helper.compareObjects(this.getOrt(), other.getOrt()) ||
other.getDauer() != getDauer() ||
other.getNebenkosten() != getNebenkosten() ||
!Helper.compareObjects(other.getMietbeginn(), getMietbeginn()));
}
}

13
03/src/de/dis2013/data/Person.java
View File

@ -58,15 +58,10 @@ public class Person {
return false;
Person other = (Person)obj;
if(other.getId() != getId() ||
!Helper.compareObjects(this.getVorname(), other.getVorname()) ||
!Helper.compareObjects(this.getNachname(), other.getNachname()) ||
!Helper.compareObjects(this.getAdresse(), other.getAdresse()))
{
return false;
}
return true;
return !(other.getId() != getId() ||
!Helper.compareObjects(this.getVorname(), other.getVorname()) ||
!Helper.compareObjects(this.getNachname(), other.getNachname()) ||
!Helper.compareObjects(this.getAdresse(), other.getAdresse()));
}
}

17
03/src/de/dis2013/data/Vertrag.java
View File

@ -11,9 +11,9 @@ public abstract class Vertrag {
private int vertragsnummer = -1;
private Date datum;
private String ort;
static int currentId = 0;
int id;
Person vertragspartner;
private static int currentId = 0;
private int id;
private Person vertragspartner;
public Vertrag() {
this.id = currentId++;
@ -72,14 +72,9 @@ public abstract class Vertrag {
return false;
Vertrag other = (Vertrag)obj;
if(other.getVertragsnummer() != getVertragsnummer() ||
!Helper.compareObjects(this.getDatum(), other.getDatum()) ||
!Helper.compareObjects(this.getOrt(), other.getOrt()))
{
return false;
}
return true;
return !(other.getVertragsnummer() != getVertragsnummer() ||
!Helper.compareObjects(this.getDatum(), other.getDatum()) ||
!Helper.compareObjects(this.getOrt(), other.getOrt()));
}
}

27
03/src/de/dis2013/data/Wohnung.java
View File

@ -69,22 +69,17 @@ public class Wohnung extends Immobilie {
return false;
Wohnung other = (Wohnung)obj;
if(other.getId() != getId() ||
other.getPlz() != getPlz() ||
other.getFlaeche() != getFlaeche() ||
!Helper.compareObjects(this.getOrt(), other.getOrt()) ||
!Helper.compareObjects(this.getStrasse(), other.getStrasse()) ||
!Helper.compareObjects(this.getHausnummer(), other.getHausnummer()) ||
getStockwerk() != other.getStockwerk() ||
getMietpreis() != other.getMietpreis() ||
getZimmer() != other.getZimmer() ||
isBalkon() != other.isBalkon() ||
isEbk() != other.isEbk())
{
return false;
}
return true;
return !(other.getId() != getId() ||
other.getPlz() != getPlz() ||
other.getFlaeche() != getFlaeche() ||
!Helper.compareObjects(this.getOrt(), other.getOrt()) ||
!Helper.compareObjects(this.getStrasse(), other.getStrasse()) ||
!Helper.compareObjects(this.getHausnummer(), other.getHausnummer()) ||
getStockwerk() != other.getStockwerk() ||
getMietpreis() != other.getMietpreis() ||
getZimmer() != other.getZimmer() ||
isBalkon() != other.isBalkon() ||
isEbk() != other.isEbk());
}
}