From 75181adb18d066ecbbbe71986afd71fad1587816 Mon Sep 17 00:00:00 2001 From: Alexander Skjolden Date: Fri, 15 May 2015 23:46:33 +0200 Subject: [PATCH] fixed claim views - fix Signed-off-by: Alexander Skjolden --- src/main/view/concrete/claim/BoatClaimView.java | 6 +++--- src/main/view/concrete/claim/CarClaimView.java | 6 +++--- src/main/view/concrete/claim/ClaimView.java | 6 +++++- src/main/view/concrete/claim/PropertyClaimView.java | 4 ++-- src/main/view/concrete/claim/TravelClaimView.java | 9 ++++----- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/view/concrete/claim/BoatClaimView.java b/src/main/view/concrete/claim/BoatClaimView.java index 01e4f75..d67c2d7 100644 --- a/src/main/view/concrete/claim/BoatClaimView.java +++ b/src/main/view/concrete/claim/BoatClaimView.java @@ -12,13 +12,13 @@ public class BoatClaimView extends ClaimView public BoatClaimView(BoatClaim claim) { super(claim); - addFields(); } - private void addFields() + @Override + public void childFields() { // type add(new Label(Loc.c("type")), 0, rowNum); - add(new Label(claim.identify().getValue()), 1, rowNum++); + add(new Label(claim.getType().getValue()), 1, rowNum++); } } diff --git a/src/main/view/concrete/claim/CarClaimView.java b/src/main/view/concrete/claim/CarClaimView.java index cde5929..410acec 100644 --- a/src/main/view/concrete/claim/CarClaimView.java +++ b/src/main/view/concrete/claim/CarClaimView.java @@ -15,14 +15,14 @@ public class CarClaimView extends ClaimView public CarClaimView(CarClaim claim) { super(claim); - addFields(); } - private void addFields() + @Override + public void childFields() { // type add(new Label(Loc.c("type")), 0, rowNum); - add(new Label(claim.identify().getValue()), 1, rowNum++); + add(new Label(claim.getType().getValue()), 1, rowNum++); // damage report if (!claim.getDamageReportFileName().equals("")) { diff --git a/src/main/view/concrete/claim/ClaimView.java b/src/main/view/concrete/claim/ClaimView.java index 1ccca86..c3247b9 100644 --- a/src/main/view/concrete/claim/ClaimView.java +++ b/src/main/view/concrete/claim/ClaimView.java @@ -34,12 +34,13 @@ private void draw() { if (drawn) { - getChildren(); + getChildren().clear(); rowNum = 0; } initButtonPanel(); initFields(); + childFields(); drawn = true; } @@ -132,6 +133,9 @@ public void initFields() } + /* ABSTRACT */ + public abstract void childFields(); + @Override public StandardGridPane getNode() { diff --git a/src/main/view/concrete/claim/PropertyClaimView.java b/src/main/view/concrete/claim/PropertyClaimView.java index 962567b..00a42d8 100644 --- a/src/main/view/concrete/claim/PropertyClaimView.java +++ b/src/main/view/concrete/claim/PropertyClaimView.java @@ -12,10 +12,10 @@ public class PropertyClaimView extends ClaimView public PropertyClaimView(PropertyClaim claim) { super(claim); - addFields(); } - private void addFields() + @Override + public void childFields() { // type add(new Label(Loc.c("type")), 0, rowNum); diff --git a/src/main/view/concrete/claim/TravelClaimView.java b/src/main/view/concrete/claim/TravelClaimView.java index 072482e..a342e6d 100644 --- a/src/main/view/concrete/claim/TravelClaimView.java +++ b/src/main/view/concrete/claim/TravelClaimView.java @@ -13,18 +13,17 @@ public class TravelClaimView extends ClaimView public TravelClaimView(TravelClaim claim) { super(claim); - - addFields(); } - private void addFields() + @Override + public void childFields() { // type add(new Label(Loc.c("type")), 0, rowNum); - add(new Label(claim.identify().getValue()), 1, rowNum++); + add(new Label(claim.getType().getValue()), 1, rowNum++); // continent add(new Label(Loc.c("continent")), 0, rowNum); - add(new Label(claim.getType().getValue()), 1, rowNum++); + add(new Label(claim.getContinent().getValue()), 1, rowNum++); } }