summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Suhren <suhren.stefan@fh-swf.de>2015-01-12 19:46:17 +0100
committerStefan Suhren <suhren.stefan@fh-swf.de>2015-01-12 19:46:17 +0100
commit1b7c58e24ac4a143521aa0a77f6a1a486a1dca39 (patch)
tree95f4b7859e2603d187d3ce3df1f320dab7075542 /src
parentb2a66673c2d7d67fbb967c17c038814c4cec166c (diff)
downloadJava1-1b7c58e24ac4a143521aa0a77f6a1a486a1dca39.tar.gz
Java1-1b7c58e24ac4a143521aa0a77f6a1a486a1dca39.zip
Cleans up some checkstyle and java errors.
Diffstat (limited to 'src')
-rw-r--r--src/de/fhswf/in/inf/java1/aufgabe05/Bank.java9
-rw-r--r--src/de/fhswf/in/inf/java1/aufgabe05/Konto.java8
-rw-r--r--src/de/fhswf/in/inf/java1/aufgabe05/Person.java4
-rw-r--r--src/de/fhswf/in/inf/java1/aufgabe07/Simulation.java6
-rw-r--r--src/de/fhswf/in/inf/java1/aufgabe08/Lottery6OutOf49.java9
-rw-r--r--src/de/fhswf/in/inf/java1/aufgabe13/BinaryOperatorTests.java5
6 files changed, 24 insertions, 17 deletions
diff --git a/src/de/fhswf/in/inf/java1/aufgabe05/Bank.java b/src/de/fhswf/in/inf/java1/aufgabe05/Bank.java
index d90c447..fcc1920 100644
--- a/src/de/fhswf/in/inf/java1/aufgabe05/Bank.java
+++ b/src/de/fhswf/in/inf/java1/aufgabe05/Bank.java
@@ -33,12 +33,15 @@ public final class Bank
{
Person dieter = new Person("Dieter", "Hallowegers");
- Konto giro = new Konto(dieter, new BigDecimal(100));
+ final int dispo = 100;
+ Konto giro = new Konto(dieter, new BigDecimal(dispo));
try
{
- giro.einzahlen(new BigDecimal(100));
- giro.abheben(new BigDecimal(200));
+ final int deposit = 100;
+ final int withdraw = 200;
+ giro.einzahlen(new BigDecimal(deposit));
+ giro.abheben(new BigDecimal(withdraw));
System.out.println(giro.getKontostand());
diff --git a/src/de/fhswf/in/inf/java1/aufgabe05/Konto.java b/src/de/fhswf/in/inf/java1/aufgabe05/Konto.java
index 235f9af..774c281 100644
--- a/src/de/fhswf/in/inf/java1/aufgabe05/Konto.java
+++ b/src/de/fhswf/in/inf/java1/aufgabe05/Konto.java
@@ -58,7 +58,7 @@ public class Konto
* @param betrag
* Amount of cash to be withdrawn
*/
- public void abheben(BigDecimal betrag)
+ public final void abheben(BigDecimal betrag)
{
if (betrag == null)
{
@@ -82,7 +82,7 @@ public class Konto
* @param betrag
* Amount of cash to be disposed
*/
- public void einzahlen(BigDecimal betrag)
+ public final void einzahlen(BigDecimal betrag)
{
if (betrag == null)
{
@@ -101,7 +101,7 @@ public class Konto
*
* @return Returns the actual balance.
*/
- public BigDecimal getKontostand()
+ public final BigDecimal getKontostand()
{
return guthaben;
}
@@ -111,7 +111,7 @@ public class Konto
*
* @return Returns the owners name.
*/
- public Person getBesitzer()
+ public final Person getBesitzer()
{
return besitzer;
}
diff --git a/src/de/fhswf/in/inf/java1/aufgabe05/Person.java b/src/de/fhswf/in/inf/java1/aufgabe05/Person.java
index 18b619d..29065fa 100644
--- a/src/de/fhswf/in/inf/java1/aufgabe05/Person.java
+++ b/src/de/fhswf/in/inf/java1/aufgabe05/Person.java
@@ -56,7 +56,7 @@ public class Person
* @return Returns the full name of the person
*/
@Override
- public String toString()
+ public final String toString()
{
return vorname + " " + nachname;
}
@@ -67,7 +67,7 @@ public class Person
* @param konto
* Konto that will be added to the person.
*/
- public void addKonto(Konto konto)
+ public final void addKonto(Konto konto)
{
if (konto == null)
{
diff --git a/src/de/fhswf/in/inf/java1/aufgabe07/Simulation.java b/src/de/fhswf/in/inf/java1/aufgabe07/Simulation.java
index 1c6622c..904e539 100644
--- a/src/de/fhswf/in/inf/java1/aufgabe07/Simulation.java
+++ b/src/de/fhswf/in/inf/java1/aufgabe07/Simulation.java
@@ -65,11 +65,13 @@ public final class Simulation
public static void main(String[] args)
{
+ final double wahrscheinlichkeit = 0.5;
Spieler[] spieler = {new GleichSpieler(), new WechselSpieler(),
- new ZufallsSpieler(0.5)};
+ new ZufallsSpieler(wahrscheinlichkeit)};
Spiel spiel = new Spiel();
+ final int prozent = 100;
for (int i = 0; i < spieler.length; i++)
{
int spielerGewinne = nDurchlaufeAusfuehren(spiel, spieler[i],
@@ -77,7 +79,7 @@ public final class Simulation
double spielerProb = wahrscheinlichkeitErrechnen(spielerGewinne,
VERSUCHE);
System.out.printf("%17s war %05.2f%s erfolgreich\n", spieler[i]
- .getClass().getSimpleName(), spielerProb * 100, "%");
+ .getClass().getSimpleName(), spielerProb * prozent, "%");
}
}
diff --git a/src/de/fhswf/in/inf/java1/aufgabe08/Lottery6OutOf49.java b/src/de/fhswf/in/inf/java1/aufgabe08/Lottery6OutOf49.java
index b7c43f1..6358561 100644
--- a/src/de/fhswf/in/inf/java1/aufgabe08/Lottery6OutOf49.java
+++ b/src/de/fhswf/in/inf/java1/aufgabe08/Lottery6OutOf49.java
@@ -42,9 +42,10 @@ public class Lottery6OutOf49
* Does the next draw.
*
*/
- public void nextDraw()
+ public final void nextDraw()
{
- lastDraw = FloydAndBentley.sample(lotteryNumbers, 7);
+ final int countDraws = 7;
+ lastDraw = FloydAndBentley.sample(lotteryNumbers, countDraws);
superzahl = lastDraw.remove(lastDraw.size() - 1);
lastDraw.sort(null);
@@ -55,7 +56,7 @@ public class Lottery6OutOf49
*
* @return Returns an immutable list of the last draw.
*/
- public List<Integer> getLastDraw()
+ public final List<Integer> getLastDraw()
{
if (lastDraw == null)
{
@@ -69,7 +70,7 @@ public class Lottery6OutOf49
*
* @return The super number of the last draw.
*/
- public Integer getSuperzahl()
+ public final Integer getSuperzahl()
{
if (superzahl == null)
{
diff --git a/src/de/fhswf/in/inf/java1/aufgabe13/BinaryOperatorTests.java b/src/de/fhswf/in/inf/java1/aufgabe13/BinaryOperatorTests.java
index 14c0b90..238c865 100644
--- a/src/de/fhswf/in/inf/java1/aufgabe13/BinaryOperatorTests.java
+++ b/src/de/fhswf/in/inf/java1/aufgabe13/BinaryOperatorTests.java
@@ -76,7 +76,8 @@ public class BinaryOperatorTests
// Test
Stack<Double> test = new Stack<>();
- test.add(3.0);
+ final double firstOperator = 3.0;
+ test.add(firstOperator);
test.add(2.0);
tester.eval(test);
@@ -135,7 +136,7 @@ public class BinaryOperatorTests
Stack<Double> test = new Stack<>();
final double exponent = 3.0;
-
+
test.add(2.0);
test.add(exponent);
tester.eval(test);