diff --git a/i18n/Babydatenbank-labels_de.properties b/i18n/Babydatenbank-labels_de.properties index 8b13438..4f31618 100644 --- a/i18n/Babydatenbank-labels_de.properties +++ b/i18n/Babydatenbank-labels_de.properties @@ -19,7 +19,9 @@ condition=Zustand size=Größe articleCount=Anzahl Artikel -originalPriceSum=Summe der Originalpreise +originalPriceSum=Summe Originalpreise +buyPriceSum=Summe Einkaufspreise +sellPriceSum=Summe Verkaufspreise # ??? Cards=Karten and=und \ No newline at end of file diff --git a/src/com/yourcompany/babydatenbank/model/Brand.java b/src/com/yourcompany/babydatenbank/model/Brand.java index 3864887..9896513 100644 --- a/src/com/yourcompany/babydatenbank/model/Brand.java +++ b/src/com/yourcompany/babydatenbank/model/Brand.java @@ -58,8 +58,13 @@ public class Brand { public BigDecimal getOriginalPriceSum() { BigDecimal r = BigDecimal.ZERO; - for (Article e : articles) { - r = r.add(e.getOriginalPrice()); + for (Article elem : articles) { + try { + r = r.add(elem.getOriginalPrice()); + } + catch(NullPointerException e) { + r = r.add(BigDecimal.ZERO); + } } return r; @@ -70,8 +75,13 @@ public class Brand { public BigDecimal getBuyPriceSum() { BigDecimal r = BigDecimal.ZERO; - for (Article e : articles) { - r = r.add(e.getBuyPrice()); + for (Article elem : articles) { + try { + r = r.add(elem.getBuyPrice()); + } + catch(NullPointerException e) { + r = r.add(BigDecimal.ZERO); + } } return r; @@ -82,8 +92,13 @@ public class Brand { public BigDecimal getSellPriceSum() { BigDecimal r = BigDecimal.ZERO; - for(Article e : articles) { - r = r.add(e.getSellPrice()); + for(Article elem : articles) { + try { + r = r.add(elem.getSellPrice()); + } + catch(NullPointerException e) { + r = r.add(BigDecimal.ZERO); + } } return r; } diff --git a/src/com/yourcompany/babydatenbank/model/Category.java b/src/com/yourcompany/babydatenbank/model/Category.java index 1173f9c..9c681de 100644 --- a/src/com/yourcompany/babydatenbank/model/Category.java +++ b/src/com/yourcompany/babydatenbank/model/Category.java @@ -56,8 +56,13 @@ public class Category { public BigDecimal getOriginalPriceSum() { BigDecimal r = BigDecimal.ZERO; - for (Article e : articles) { - r = r.add(e.getOriginalPrice()); + for (Article elem : articles) { + try { + r = r.add(elem.getOriginalPrice()); + } + catch(NullPointerException e) { + r = r.add(BigDecimal.ZERO); + } } return r; @@ -68,8 +73,13 @@ public class Category { public BigDecimal getBuyPriceSum() { BigDecimal r = BigDecimal.ZERO; - for (Article e : articles) { - r = r.add(e.getBuyPrice()); + for (Article elem : articles) { + try { + r = r.add(elem.getBuyPrice()); + } + catch(NullPointerException e) { + r = r.add(BigDecimal.ZERO); + } } return r; @@ -80,8 +90,13 @@ public class Category { public BigDecimal getSellPriceSum() { BigDecimal r = BigDecimal.ZERO; - for(Article e : articles) { - r = r.add(e.getSellPrice()); + for(Article elem : articles) { + try { + r = r.add(elem.getSellPrice()); + } + catch(NullPointerException e) { + r = r.add(BigDecimal.ZERO); + } } return r; } diff --git a/src/com/yourcompany/babydatenbank/model/Pattern.java b/src/com/yourcompany/babydatenbank/model/Pattern.java index e774e3e..e124e4a 100644 --- a/src/com/yourcompany/babydatenbank/model/Pattern.java +++ b/src/com/yourcompany/babydatenbank/model/Pattern.java @@ -57,8 +57,13 @@ public class Pattern { public BigDecimal getOriginalPriceSum() { BigDecimal r = BigDecimal.ZERO; - for (Article e : articles) { - r = r.add(e.getOriginalPrice()); + for (Article elem : articles) { + try { + r = r.add(elem.getOriginalPrice()); + } + catch(NullPointerException e) { + r = r.add(BigDecimal.ZERO); + } } return r; @@ -69,8 +74,13 @@ public class Pattern { public BigDecimal getBuyPriceSum() { BigDecimal r = BigDecimal.ZERO; - for (Article e : articles) { - r = r.add(e.getBuyPrice()); + for (Article elem : articles) { + try { + r = r.add(elem.getBuyPrice()); + } + catch(NullPointerException e) { + r = r.add(BigDecimal.ZERO); + } } return r; @@ -81,11 +91,16 @@ public class Pattern { public BigDecimal getSellPriceSum() { BigDecimal r = BigDecimal.ZERO; - for(Article e : articles) { - r = r.add(e.getSellPrice()); + for(Article elem : articles) { + try { + r = r.add(elem.getSellPrice()); + } + catch(NullPointerException e) { + r = r.add(BigDecimal.ZERO); + } } + return r; } - }