Skip to content

Commit 0ca4785

Browse files
committed
Fixed remaining Bugs
1 parent 71b9602 commit 0ca4785

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

src/de/jost_net/JVerein/gui/control/WirtschaftsplanControl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ private EditTreePart generateTree(int art) throws RemoteException
236236
{
237237
PseudoDBObject obj = extendedDBIterator.next();
238238
double soll = getBuchunsklassenSumme(obj);
239-
nodes.get(((String) obj.getAttribute(ID))).setSoll(soll);
239+
nodes.get(obj.getAttribute(ID).toString()).setSoll(soll);
240240
}
241241

242242
extendedDBIterator = new ExtendedDBIterator<>("buchung, buchungsart");
@@ -264,7 +264,7 @@ private EditTreePart generateTree(int art) throws RemoteException
264264
{
265265
PseudoDBObject obj = extendedDBIterator.next();
266266
double ist = getBuchunsklassenSumme(obj);
267-
nodes.get(((String) obj.getAttribute(ID))).setIst(ist);
267+
nodes.get(obj.getAttribute(ID).toString()).setIst(ist);
268268
}
269269

270270
EditTreePart treePart = new EditTreePart(new ArrayList<>(nodes.values()),

src/de/jost_net/JVerein/gui/control/WirtschaftsplanNode.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public WirtschaftsplanNode(Buchungsklasse buchungsklasse, int art,
105105
}
106106

107107
double soll = obj.getDouble(SUMME);
108-
String id = (String) obj.getAttribute(ID);
108+
String id = obj.getAttribute(ID).toString();
109109
// Falls die Buchungsklasse vom Standard abweicht, ist noch keine
110110
// Node vorhanden
111111
if (!nodes.containsKey(id))
@@ -118,7 +118,7 @@ public WirtschaftsplanNode(Buchungsklasse buchungsklasse, int art,
118118
}
119119

120120
extendedDBIterator = new ExtendedDBIterator<>("buchung, buchungsart");
121-
extendedDBIterator.addColumn("buchung.buchungsart as" + ID);
121+
extendedDBIterator.addColumn("buchung.buchungsart as " + ID);
122122
extendedDBIterator.addColumn("sum(buchung.betrag) as " + SUMME);
123123
extendedDBIterator.addFilter("buchung.buchungsart = buchungsart.id");
124124
extendedDBIterator.addFilter("buchung.datum >= ?",
@@ -145,7 +145,11 @@ public WirtschaftsplanNode(Buchungsklasse buchungsklasse, int art,
145145
{
146146
PseudoDBObject obj = extendedDBIterator.next();
147147
DBIterator<Buchungsart> iterator = service.createList(Buchungsart.class);
148-
String key = (String) obj.getAttribute(ID);
148+
if (obj.getAttribute(ID) == null)
149+
{
150+
continue;
151+
}
152+
String key = obj.getAttribute(ID).toString();
149153
iterator.addFilter("id = ?", key);
150154
if (!iterator.hasNext())
151155
{

0 commit comments

Comments
 (0)