Merge branch 'rc2'

languages/lang.eng.xml

@@ -118,6 +118,7 @@
     <string name="vacation_house">Vacation house</string>
     <string name="travel">Travel</string>
     <string name="premium">Premium</string>
+    <string name="premium_bonus">Premium after bonus</string>
     <string name="bonus">Bonus</string>
     <string name="amount">Amount</string>
     <string name="deductible">Deductible</string>

languages/lang.it.xml

@@ -114,6 +114,7 @@
     <string name="vacation_house">Casolare</string>
     <string name="travel">Viaggio</string>
     <string name="premium">Premio assicurativo</string>
+    <string name="premium_bonus">Premio assicurativo bonuso</string>
     <string name="bonus">Bonus</string>
     <string name="amount">Cifra assicurativa</string>
     <string name="deductible">detraibile</string>

languages/lang.nor.xml

@@ -118,6 +118,7 @@
     <string name="vacation_house">Feriehus</string>
     <string name="travel">Resie</string>
     <string name="premium">Premium</string>
+    <string name="premium_bonus">Premium etter bonus</string>
     <string name="bonus">Bonus</string>
     <string name="amount">Forsikringsbeløp</string>
     <string name="deductible">Egenandel</string>

release/create.sh

@@ -13,7 +13,7 @@ mkdir $TMP
 mkdir $TMP/data
 mkdir $TMP/preferences
 
-cp ../data/persons_big.dat $TMP/data/demodata.dat
+cp ../data/demodata.dat $TMP/data/demodata.dat
 cp -r ../languages $TMP/
 cp -r ../src $TMP/
 cp -r ../uploads $TMP/

src/main/App.java

@@ -13,7 +13,7 @@
 import java.io.IOException;
 
 /**
- * Created by alex on 4/22/15.
+ * App.java
  */
 public class App extends Application
 {
@@ -60,6 +60,11 @@ public void init()
 
     }
 
+    /**
+     * The entry point of application.
+     *
+     * @param args the input arguments
+     */
     public static void main(String[] args)
     {
         launch(args);

src/main/config/Config.java

@@ -3,7 +3,7 @@
 import javafx.stage.Screen;
 
 /**
- * Config.java;
+ * Config.java
  */
 public class Config
 {
@@ -32,7 +32,8 @@ public class Config
 
     public static final double HEIGHT = Screen.getPrimary().getVisualBounds().getHeight() * 0.9;
     public static final double WIDTH = Screen.getPrimary().getVisualBounds().getWidth() * 0.9;
-    public static final int PD_HEIGHT = 400, PD_WIDTH = 500;
+    public static final int PD_HEIGHT = 400;
+    public static final int PD_WIDTH = 500;
 
     public static final int STANDARD_YEAR = 1970;
     public static final int STANDARD_MONTH = 1;

src/main/controller/AboutController.java

@@ -10,8 +10,13 @@
  */
 public class AboutController
 {
-    private AboutController(){ }
+    private AboutController()
+    {
+    }
 
+    /**
+     * View void.
+     */
     public static void view()
     {
         AboutView view = new AboutView();

src/main/controller/ClaimController.java

@@ -1,6 +1,7 @@
 package main.controller;
 
 import main.config.Config;
+import main.controller.adapter.claim.*;
 import main.localization.Loc;
 import main.model.claim.Claim;
 import main.model.claim.property.PropertyClaim;
@@ -12,16 +13,25 @@
 import main.view.Resources;
 import main.view.concrete.claim.*;
 import main.view.form.Form;
-import main.view.form.adapter.claim.*;
 
 /**
  * ClaimController.java
  */
 public class ClaimController
 {
-    private ClaimController() {}
     private static Form f;
 
+    private ClaimController()
+    {
+    }
+
+    /**
+     * Create void.
+     *
+     * @param type the type
+     * @param person the person
+     * @param insurance the insurance
+     */
     public static void create(Claim.ClaimType type, Person person, Insurance insurance)
     {
         String title;
@@ -56,6 +66,11 @@ public static void create(Claim.ClaimType type, Person person, Insurance insuran
                 f.getForm(), f, Config.CLAIM_TAB_IMAGE, true);
     }
 
+    /**
+     * View void.
+     *
+     * @param claim the claim
+     */
     public static void view(Claim claim)
     {
         // Remove all tabs dealing with this object
@@ -85,6 +100,11 @@ public static void view(Claim claim)
                 view.getNode(), claim, Config.CLAIM_TAB_IMAGE, true);
     }
 
+    /**
+     * Edit void.
+     *
+     * @param claim the claim
+     */
     public static void edit(Claim claim)
     {
         // Remove all tabs dealing with this object

src/main/controller/ImageController.java

@@ -18,9 +18,18 @@ private static String getFileExtension(String fileName)
         return "";
     }
 
+    /**
+     * Store image.
+     *
+     * @param file the file
+     * @param newFileName the new file name
+     * @return the string
+     */
     public static String storeImage(File file, String newFileName)
     {
-        if (file == null) { return null; }
+        if (file == null) {
+            return null;
+        }
 
         String output = "";
 
@@ -31,8 +40,7 @@ public static String storeImage(File file, String newFileName)
 
 
         try (InputStream inputStream = new FileInputStream(file);
-             OutputStream outputStream = new FileOutputStream(dest))
-        {
+             OutputStream outputStream = new FileOutputStream(dest)) {
 
             byte[] buffer = new byte[Config.MAX_UPLOAD_FILESIZE];
             int length;

src/main/controller/InsuranceController.java

@@ -1,6 +1,7 @@
 package main.controller;
 
 import main.config.Config;
+import main.controller.adapter.insurance.*;
 import main.localization.Loc;
 import main.model.insurance.Insurance;
 import main.model.insurance.InsuranceType;
@@ -13,16 +14,24 @@
 import main.view.Resources;
 import main.view.concrete.insurance.*;
 import main.view.form.Form;
-import main.view.form.adapter.insurance.*;
 
 /**
  * InsuranceController.java
  */
 public class InsuranceController
 {
-    private InsuranceController() {}
     private static Form f;
 
+    private InsuranceController()
+    {
+    }
+
+    /**
+     * Create void.
+     *
+     * @param p the p
+     * @param type the type
+     */
     public static void create(Person p, InsuranceType type)
     {
         f = new Form();
@@ -65,6 +74,11 @@ public static void create(Person p, InsuranceType type)
                 f.getForm(), f, icon, true);
     }
 
+    /**
+     * View void.
+     *
+     * @param insurance the insurance
+     */
     public static void view(Insurance insurance)
     {
         // Remove all tabs dealing with this object
@@ -75,27 +89,27 @@ public static void view(Insurance insurance)
 
         switch (insurance.identify()) {
             case CAR:
-                view = new CarView((Car)insurance);
+                view = new CarView((Car) insurance);
                 Resources.inst.getOtp().injectObservableTab(Loc.c("car_insurance"),
                         view.getNode(), insurance, Config.CAR_TAB_IMAGE, true);
                 return;
             case BOAT:
-                view = new BoatView((Boat)insurance);
+                view = new BoatView((Boat) insurance);
                 Resources.inst.getOtp().injectObservableTab(Loc.c("boat_insurance"),
                         view.getNode(), insurance, Config.BOAT_TAB_IMAGE, true);
                 return;
             case HOUSE:
-                view = new HouseView((House)insurance);
+                view = new HouseView((House) insurance);
                 Resources.inst.getOtp().injectObservableTab(Loc.c("house_insurance"),
                         view.getNode(), insurance, Config.HOUSE_TAB_IMAGE, true);
                 return;
             case VACATION_HOUSE:
-                view = new VacationHouseView((VacationHouse)insurance);
+                view = new VacationHouseView((VacationHouse) insurance);
                 Resources.inst.getOtp().injectObservableTab(Loc.c("vacation_house_insurance"),
                         view.getNode(), insurance, Config.HOUSE_TAB_IMAGE, true);
                 return;
             case TRAVEL:
-                view = new TravelView((Travel)insurance);
+                view = new TravelView((Travel) insurance);
                 Resources.inst.getOtp().injectObservableTab(Loc.c("travel_insurance"),
                         view.getNode(), insurance, Config.TRAVEL_TAB_IMAGE, true);
                 return;
@@ -104,6 +118,11 @@ public static void view(Insurance insurance)
         }
     }
 
+    /**
+     * Edit void.
+     *
+     * @param insurance the insurance
+     */
     public static void edit(Insurance insurance)
     {
         // Remove all tabs dealing with this object
@@ -117,27 +136,27 @@ public static void edit(Insurance insurance)
             case CAR:
                 icon = Config.CAR_TAB_IMAGE;
                 insuranceAdapter = new CarAdapter(insurance.getCustomer(),
-                        (Car)insurance);
+                        (Car) insurance);
                 break;
             case BOAT:
                 icon = Config.BOAT_TAB_IMAGE;
                 insuranceAdapter = new BoatAdapter(insurance.getCustomer(),
-                        (Boat)insurance);
+                        (Boat) insurance);
                 break;
             case HOUSE:
                 icon = Config.HOUSE_TAB_IMAGE;
                 insuranceAdapter = new HouseAdapter(insurance.getCustomer(),
-                        (House)insurance);
+                        (House) insurance);
                 break;
             case VACATION_HOUSE:
                 icon = Config.HOUSE_TAB_IMAGE;
                 insuranceAdapter = new VacationHouseAdapter(insurance.getCustomer(),
-                        (VacationHouse)insurance);
+                        (VacationHouse) insurance);
                 break;
             case TRAVEL:
                 icon = Config.TRAVEL_TAB_IMAGE;
                 insuranceAdapter = new TravelAdapter(insurance.getCustomer(),
-                        (Travel)insurance);
+                        (Travel) insurance);
                 break;
             default:
                 throw new IllegalStateException("Unknown Insurance type");

src/main/controller/Mediator.java

@@ -7,8 +7,16 @@ public enum Mediator
 {
     inst;
 
-    Mediator() {}
+    Mediator()
+    {
+    }
 
+    /**
+     * Router void.
+     *
+     * @param s the s
+     * @param p the p
+     */
     public void router(Signal s, Payload p)
     {
         switch (s) {