Skip to content

Commit

Permalink
Bug Fix: Fixed tree tool parent items not having the correct total fo…
Browse files Browse the repository at this point in the history
…r sub items when sorted repeatedly
  • Loading branch information
GoldenGnu committed Jul 10, 2021
1 parent 61b1315 commit b0de0a6
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/main/java/net/nikr/eve/jeveasset/gui/tabs/tree/TreeTab.java
Expand Up @@ -191,17 +191,18 @@ public TreeTab(final Program program) {
myEventList.getReadWriteLock().readLock().lock();
sortedListEmpty = new SortedList<>(myEventList);
myEventList.getReadWriteLock().readLock().unlock();
//Filter (must be done before sorting for totals to match up - for reason beyond my comprehension)
eventList.getReadWriteLock().readLock().lock();
sortedList = new SortedList<>(eventList);
filterList = new FilterList<>(eventList);
eventList.getReadWriteLock().readLock().unlock();
//Filter
//Sorting
eventList.getReadWriteLock().readLock().lock();
filterList = new FilterList<>(sortedList);
sortedList = new SortedList<>(filterList);
eventList.getReadWriteLock().readLock().unlock();
filterList.addListEventListener(listener);
//Tree
expansionModel = new AssetTreeExpansionModel();
treeList = new TreeList<>(filterList, new AssetTreeFormat(sortedList), expansionModel);
treeList = new TreeList<>(sortedList, new AssetTreeFormat(sortedList), expansionModel);
//Table Model
tableModel = EventModels.createTableModel(treeList, tableFormat);
//Table
Expand Down Expand Up @@ -372,6 +373,7 @@ public void updateData() {
parentKey = parentKey + cacheKey;
locationTree.add(divisionAsset);
}
//Flags
if (parent == null) {
for (Map.Entry<Flag, Set<String>> entry: flags.entrySet()) {
if (entry.getValue().contains(parentAsset.getFlag())) {
Expand Down

0 comments on commit b0de0a6

Please sign in to comment.