summaryrefslogtreecommitdiffstats
path: root/src/de
diff options
context:
space:
mode:
authorStefan Suhren <suhren.stefan@fh-swf.de>2014-10-28 22:14:46 +0100
committerStefan Suhren <suhren.stefan@fh-swf.de>2014-10-28 22:14:46 +0100
commit884b00f0769e95d3820258733f18cf1294596a89 (patch)
tree3e79ff70b2c3c0983af0bb6cf22952d59b7865bc /src/de
parentd76127d98b1314107c5436274a60991fbd011e39 (diff)
downloadJava1-884b00f0769e95d3820258733f18cf1294596a89.tar.gz
Java1-884b00f0769e95d3820258733f18cf1294596a89.zip
Assignment No.2 added getter and implemented main
Diffstat (limited to 'src/de')
-rw-r--r--src/de/fhswf/in/inf/java1/aufgabe5/Bank.java20
-rw-r--r--src/de/fhswf/in/inf/java1/aufgabe5/Konto.java22
-rw-r--r--src/de/fhswf/in/inf/java1/aufgabe5/Person.java10
3 files changed, 50 insertions, 2 deletions
diff --git a/src/de/fhswf/in/inf/java1/aufgabe5/Bank.java b/src/de/fhswf/in/inf/java1/aufgabe5/Bank.java
index 32fd3f5..2878adb 100644
--- a/src/de/fhswf/in/inf/java1/aufgabe5/Bank.java
+++ b/src/de/fhswf/in/inf/java1/aufgabe5/Bank.java
@@ -3,6 +3,8 @@
*/
package de.fhswf.in.inf.java1.aufgabe5;
+import java.math.BigDecimal;
+
/**
* Package for main function.
*
@@ -29,7 +31,23 @@ public final class Bank
*/
public static void main(String[] args)
{
- // TODO Auto-generated method stub
+ Person dieter = new Person("Dieter", "Hallowegers");
+
+ Konto giro = new Konto(dieter, new BigDecimal(100), new BigDecimal(0));
+
+ try
+ {
+ giro.einzahlen(new BigDecimal(100));
+ giro.abheben(new BigDecimal(200));
+
+ System.out.println(giro.getKontostand());
+
+ giro.abheben(new BigDecimal(1));
+ }
+ catch (IllegalArgumentException e)
+ {
+ System.out.println(e);
+ }
}
diff --git a/src/de/fhswf/in/inf/java1/aufgabe5/Konto.java b/src/de/fhswf/in/inf/java1/aufgabe5/Konto.java
index 24194b3..d7dda13 100644
--- a/src/de/fhswf/in/inf/java1/aufgabe5/Konto.java
+++ b/src/de/fhswf/in/inf/java1/aufgabe5/Konto.java
@@ -68,7 +68,7 @@ public class Konto
{
throw new IllegalArgumentException("Betrag can't be negative");
}
- if (guthaben.add(dispo).compareTo(betrag) >= 0)
+ if (guthaben.add(dispo).compareTo(betrag) < 0)
{
throw new IllegalArgumentException("Betrag surpasses dispo limit");
}
@@ -96,4 +96,24 @@ public class Konto
guthaben = guthaben.add(betrag);
}
+ /**
+ * Returns the actual balance.
+ *
+ * @return Returns the actual balance.
+ */
+ public BigDecimal getKontostand()
+ {
+ return guthaben;
+ }
+
+ /**
+ * Just to get the owners name.
+ *
+ * @return Returns the owners name.
+ */
+ public String getBesitzer()
+ {
+ return besitzer.getName();
+ }
+
}
diff --git a/src/de/fhswf/in/inf/java1/aufgabe5/Person.java b/src/de/fhswf/in/inf/java1/aufgabe5/Person.java
index bd7fb8a..bfe19d0 100644
--- a/src/de/fhswf/in/inf/java1/aufgabe5/Person.java
+++ b/src/de/fhswf/in/inf/java1/aufgabe5/Person.java
@@ -45,4 +45,14 @@ public class Person
this.nachname = nachname;
}
+ /**
+ * Just for getting the persons name.
+ *
+ * @return Returns the full name of the person
+ */
+ public String getName()
+ {
+ return vorname + " " + nachname;
+ }
+
}