Deviding statistic into the primary, secondary, pistol data. Integrating

the basestats and brandsets. Additionally the Keener action updates now
the tabletreeview.

Author: mdroll

src/main/java/at/droll/div2builder/core/Manufacturer.java

@@ -1,6 +1,5 @@
 package at.droll.div2builder.core;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/at/droll/div2builder/core/World.java

@@ -1,18 +1,12 @@
 package at.droll.div2builder.core;
 
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.HashMap;
-import java.util.Map;
 
 import at.droll.div2builder.core.attribute.*;
 import at.droll.div2builder.core.item.equipment.Equipment;

src/main/java/at/droll/div2builder/core/inventory/Loadout.java

@@ -43,17 +43,17 @@ public String getName()
 	}
 
 	/**
-	 * Return the invventory
-	 * @return Returns the Inventory
+	 * Returns the inventory
+	 * @return Returns the tnventory
 	 */
-	public Inventory getInvetory() {
+	public Inventory getInventory() {
 		return this.inventory;
 	}	
 
 	/**
 	 * Sets a complete inventory object
 	 * @param inventory Sets the specific inventory in the loadout
-	 * @return Loadout
+	 * @return Returns the loadout
 	 */
 	public Loadout setInventory(Inventory inventory) {
 		this.inventory = inventory;
@@ -62,9 +62,19 @@ public Loadout setInventory(Inventory inventory) {
 
 	/**
 	 * Return the assoicated statistic object
-	 * @return Returns the staticis
+	 * @return Returns the statistic
 	 */
 	public Statistic getStatistic() {
 		return this.statistic;
 	}
+	
+	/**
+	 * Sets a statistic object
+	 * @param stats
+	 * @return Returns the Loadout
+	 */
+	public Loadout setStatistic(Statistic stats) {
+		this.statistic = stats;
+		return this;
+	}
 }

src/main/java/at/droll/div2builder/core/item/weapon/Weapon.java

@@ -1,6 +1,5 @@
 package at.droll.div2builder.core.item.weapon;
 
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;

src/main/java/at/droll/div2builder/core/statistic/Statistic.java

@@ -400,6 +400,37 @@ public Map<Attribute, Double> calculateBrandsetBonus(Inventory inventory) {
 		Map<String, Integer> manuBonus = new HashMap<>();
 		Map<Attribute, Double> brandsetBonus = new HashMap<>();
 
+		sumBrandset(inventory, manuBonus);
+		
+		// Loop over the brandset bonus and sum up all the specific values
+		manuBonus.forEach(
+			(manufacturer, amount) -> {
+				
+				if (amount > 0) {
+					Manufacturer manu = (Manufacturer)World.Registry.get("manufacturer", manufacturer);
+				
+					// Return the bonus for 3, 2 or 1 set item
+					// see Manufacturer class
+					Map<Attribute, Double> attributesAndValuesSingle = manu.getAttributesAndValues(amount);					
+					attributesAndValuesSingle.forEach(
+						(attribute, attributeValue) -> brandsetBonus.merge(attribute, attributeValue, Double::sum)
+					);
+				}
+			}
+		);
+		
+		// i.e. for 2 Parts Providence, 1 Part Overlord, 1 part Grupo, 1 Part Ceska
+		// Result is: Weapon Damage can be read over
+		// {WEAPONDAMAGE=0.0, HEADSHOTDAMAGE=15.0, CRITICALHITCHANCE=20.0, RIFLEDAMAGE=10.0, CRITICALHITDAMAGE=15.0}		
+		return brandsetBonus;
+	}
+
+	/**
+	 * 
+	 * @param inventory Classic inventory
+	 * @param manuBonus Bonus collection where to store the sum for the brandsets
+	 */
+	private void sumBrandset(Inventory inventory, Map<String, Integer> manuBonus) {
 		// Initialize manufacturer bonus array
 		for (String manufacturer : Manufacturer.manufacturerList) {
 			manuBonus.put(manufacturer, 0);
@@ -421,30 +452,31 @@ public Map<Attribute, Double> calculateBrandsetBonus(Inventory inventory) {
 				}
 			}			
 		}
+	}	
+	
+	/**
+	 * Returns the bonus by brandset
+	 * @param inventory
+	 * @return
+	 */
+	public Map<String, Map<Attribute, Double>> getBonusByBrandset(Inventory inventory) {
 
-		// Loop over the brandset bonus and sum up all the specific values
-		manuBonus.forEach(
-			(manufacturer, amount) -> {
-				
-				if (amount > 0) {
-					Manufacturer manu = (Manufacturer)World.Registry.get("manufacturer", manufacturer);
-				
-					// Return the bonus for 3, 2 or 1 set item
-					// see Manufacturer class
-					Map<Attribute, Double> attributesAndValuesSingle = manu.getAttributesAndValues(amount);					
-					attributesAndValuesSingle.forEach(
-						(attribute, attributeValue) -> brandsetBonus.merge(attribute, attributeValue, Double::sum)
-					);
-				}
+		Map<String, Integer> manuBonus = new HashMap<>();		
+		Map<String, Map<Attribute, Double>> returnValue = new HashMap<>(); 
+		
+		sumBrandset(inventory, manuBonus);
+		
+		manuBonus.forEach((manufacturer, amount) -> {
+			if (amount > 0) {				
+				Manufacturer manu = (Manufacturer) World.Registry.get("manufacturer", manufacturer);
+				returnValue.put(manufacturer, manu.getAttributesAndValues(amount));
 			}
-		);
+		});
 
-		// i.e. for 2 Parts Providence, 1 Part Overlord, 1 part Grupo, 1 Part Ceska
-		// Result is: Weapon Damage can be read over
-		// {WEAPONDAMAGE=0.0, HEADSHOTDAMAGE=15.0, CRITICALHITCHANCE=20.0, RIFLEDAMAGE=10.0, CRITICALHITDAMAGE=15.0}		
-		return brandsetBonus;
+		return returnValue;
 	}
 
+	
 	/**
 	 * Calculates the statistics, accumulates them and put in in the internal statistic map
 	 * @param inventory Inventory with all the slots and equipment
@@ -459,12 +491,7 @@ public Map<String, Map<Attribute, Double>> calculate(Inventory inventory) {
 		brandsetStats 	= calculateBrandsetBonus(inventory);
 		weaponStats		= calculateWeaponBonus(inventory);
 		colors 			= determineRedYellowBlueColors(inventory);
-		
-//		System.out.println("Player " + playerStats);
-//		System.out.println("Weapon " + weaponStats.get("PRIMARY"));
-//		System.out.println("Brandset " + brandsetStats);
-//		System.out.println("Equipment " + equipmentStats);
-		
+				
 		// Calculate the bonus for primary weapon, secondary weapon and pistol and combination with the other stats
 		Map<Attribute, Double> attributesAndValues = null;
 		for (String slot : slotList) {

src/main/java/at/droll/div2builder/frontend/App.java

@@ -6,10 +6,7 @@
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
-
 import java.io.IOException;
-import java.util.Locale;
-import java.util.ResourceBundle;
 
 /**
  * div2builder frontend based upon JavaFX