fixed claim views - fix

Signed-off-by: Alexander Skjolden <[email protected]>
HCNenseth · May 15, 2015 · 75181ad · 75181ad
1 parent efea333
commit 75181ad
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git 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<BoatClaim>
     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
@@ -15,14 +15,14 @@ public class CarClaimView extends ClaimView<CarClaim>
     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
@@ -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
@@ -12,10 +12,10 @@ public class PropertyClaimView extends ClaimView<PropertyClaim>
     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
@@ -13,18 +13,17 @@ public class TravelClaimView extends ClaimView<TravelClaim>
     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++);
     }
 }