Merge branch 'dev'

# Conflicts:
#	src/main/resources/gui/Window.fxml

pom.xml

@@ -21,6 +21,14 @@
             <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
+
+        <!--  Gson: Java to Json conversion -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/org/victoria2/tools/vic2sgea/main/Country.java → src/main/java/org/victoria2/tools/vic2sgea/entities/Country.java

@@ -1,6 +1,5 @@
-package org.victoria2.tools.vic2sgea.main;
+package org.victoria2.tools.vic2sgea.entities;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -32,19 +31,22 @@ public class Country extends EconomySubject implements Comparable<Country> {
      * Summ for country
      */
     public long workforceRGO;
+
+    @NonSerializable //too expensive to serialize this
     private Map<String, ProductStorage> storageMap = new HashMap<>();
+    @NonSerializable
     private String officialName = "";
 
     private float GDPPart;
 
-    int GDPPlace;
+    private int GDPPlace;
     /**
      * Summ for country in pounds
      */
-    float goldIncome;
-    ArrayList<Province> provinces = new ArrayList<>();
+    private float goldIncome;
     private String tag;
 
+    @NonSerializable //temporary variable
     private Map<Product, Float> intermediate = new HashMap<>();
 
     public void add(Country that) {
@@ -125,12 +127,17 @@ public long getPopulation() {
         return population;
     }
 
+    public float getUnemploymentRate() {
+        long totalWorkforce = workforceRGO + workforceFactory;
+        return (float) totalWorkforce * 4 / population * 100;
+    }
+
     public float getUnemploymentRateRgo() {
         return (float) ((workforceRGO - employmentRGO) * 4. / population * 100);
     }
 
     public float getUnemploymentRateFactory() {
-        return (workforceFactory - employmentFactory) * 4 / (float) population * 100;
+        return (workforceFactory - employmentFactory) / (float) workforceFactory * 100;
     }
 
     public long getWorkforceRgo() {
@@ -201,4 +208,23 @@ public Map<String, ProductStorage> getStorage() {
         return storageMap;
     }
 
+    public void setGDPPlace(int GDPPlace) {
+        this.GDPPlace = GDPPlace;
+    }
+
+    public void addPopulation(int value) {
+        population += value;
+    }
+
+    public void addEmploymentRgo(int value) {
+        employmentRGO += value;
+    }
+
+    public void addEmploymentFactory(int value) {
+        employmentFactory += value;
+    }
+
+    public void addGoldIncome(float value) {
+        goldIncome += value;
+    }
 }

src/main/java/org/victoria2/tools/vic2sgea/main/EconomySubject.java → src/main/java/org/victoria2/tools/vic2sgea/entities/EconomySubject.java

@@ -1,4 +1,4 @@
-package org.victoria2.tools.vic2sgea.main;
+package org.victoria2.tools.vic2sgea.entities;
 
 /**
  * By Anton Krylov (anthony.kryloff@gmail.com)

src/main/java/org/victoria2/tools/vic2sgea/entities/NonSerializable.java

@@ -0,0 +1,14 @@
+package org.victoria2.tools.vic2sgea.entities;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Created by anth on 12.02.2017.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+public @interface NonSerializable {
+}

src/main/java/org/victoria2/tools/vic2sgea/main/Product.java → src/main/java/org/victoria2/tools/vic2sgea/entities/Product.java

@@ -1,4 +1,4 @@
-package org.victoria2.tools.vic2sgea.main;
+package org.victoria2.tools.vic2sgea.entities;
 
 import javafx.scene.paint.Color;
 
@@ -41,14 +41,14 @@ public class Product implements Comparable<Product> {
      */
     public float actualSupply;
     /**
-     * global, in pieces, how much was thrown to global market
+     * How much was thrown to the world market
      */
-    public float worldmarketPool;
+    float worldmarketPool;
     /**
-     * global, in pieces
+     * How much was sold on the world market
      */
-    public float actualSoldWorld;
-    String name = "";
+    float actualSoldWorld;
+    final String name;
 
     private Color color;
 
@@ -70,11 +70,7 @@ public float getPrice() {
     }
 
     public float getConsumption() {
-        if (supply >= consumption && consumption <= demand)
-            return Math.min(supply, demand);
-        else
-            return consumption;
-
+        return consumption;
     }
 
     public float getSupply() {
@@ -129,6 +125,10 @@ public void setConsumption(float consumption) {
         this.consumption = consumption;
     }
 
+    public void incConsumption(float value) {
+        consumption += value;
+    }
+
     public void setSupply(float supply) {
         this.supply = supply;
     }

src/main/java/org/victoria2/tools/vic2sgea/main/ProductStorage.java → src/main/java/org/victoria2/tools/vic2sgea/entities/ProductStorage.java

@@ -1,7 +1,7 @@
-package org.victoria2.tools.vic2sgea.main;
+package org.victoria2.tools.vic2sgea.entities;
 
 public class ProductStorage extends EconomySubject {
-    public ProductStorage(Product igood) {
+    ProductStorage(Product igood) {
         product = igood;
     }
 
@@ -53,6 +53,7 @@ public double getGdpPounds() {
 
     public void innerCalculations() {
         // calculating actual supply
+        //todo handle common market
         float thrownToMarket = (totalSupply - soldDomestic);
         if (thrownToMarket <= 0)
             sold = totalSupply;

src/main/java/org/victoria2/tools/vic2sgea/main/Province.java → src/main/java/org/victoria2/tools/vic2sgea/entities/Province.java

@@ -1,4 +1,4 @@
-package org.victoria2.tools.vic2sgea.main;
+package org.victoria2.tools.vic2sgea.entities;
 
 public class Province {
     private int id;

src/main/java/org/victoria2/tools/vic2sgea/gui/BaseController.java

@@ -1,10 +1,18 @@
 package org.victoria2.tools.vic2sgea.gui;
 
+import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Label;
 import javafx.scene.control.TableColumn;
+import javafx.scene.control.TextArea;
 import javafx.scene.control.cell.TextFieldTableCell;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Priority;
 import javafx.util.StringConverter;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.function.Function;
 
 /**
@@ -29,4 +37,41 @@ protected static <T, S> void setFactory(TableColumn<T, S> column, Function<? sup
     protected static <T, S> void setCellFactory(TableColumn<T, S> column, StringConverter<S> converter) {
         column.setCellFactory(TextFieldTableCell.forTableColumn(converter));
     }
+
+    protected static void errorAlert(Throwable e, String text) {
+        Platform.runLater(() -> {
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setContentText(text);
+
+            StringWriter sw = new StringWriter();
+            PrintWriter pw = new PrintWriter(sw);
+            e.printStackTrace(pw);
+            String exceptionText = sw.toString();
+
+            Label label = new Label("The exception stacktrace was:");
+
+            TextArea textArea = new TextArea(exceptionText);
+            textArea.setEditable(false);
+            textArea.setWrapText(true);
+
+            textArea.setMaxWidth(Double.MAX_VALUE);
+            textArea.setMaxHeight(Double.MAX_VALUE);
+            GridPane.setVgrow(textArea, Priority.ALWAYS);
+            GridPane.setHgrow(textArea, Priority.ALWAYS);
+
+            GridPane expContent = new GridPane();
+            expContent.setMaxWidth(Double.MAX_VALUE);
+            expContent.add(label, 0, 0);
+            expContent.add(textArea, 0, 1);
+
+            // Set expandable Exception into the dialog pane.
+            alert.getDialogPane().setExpandableContent(expContent);
+
+            alert.show();
+        });
+    }
+
+    public void exit() {
+        Platform.exit();
+    }
 }

src/main/java/org/victoria2/tools/vic2sgea/gui/CountryController.java

@@ -2,7 +2,11 @@
 
 import javafx.scene.chart.PieChart;
 import javafx.scene.paint.Color;
-import org.victoria2.tools.vic2sgea.main.*;
+import org.victoria2.tools.vic2sgea.entities.Country;
+import org.victoria2.tools.vic2sgea.entities.EconomySubject;
+import org.victoria2.tools.vic2sgea.entities.Product;
+import org.victoria2.tools.vic2sgea.entities.ProductStorage;
+import org.victoria2.tools.vic2sgea.main.Report;
 
 import java.util.List;
 import java.util.Map;