Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-20 23:56:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with missing update of arbitrator list

Browse Source
This commit is contained in:
Manfred Karrer 2015-12-31 18:55:49 +01:00
parent 16baa3ec8d
commit d580c7866f
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java
View File

@ -26,6 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@ -82,13 +83,19 @@ public class ArbitratorService {
}
public Map<Address, Arbitrator> getArbitrators() {
// TODO java.lang.IllegalStateException: Duplicate key
Set<Arbitrator> set = p2PService.getDataMap().values().stream()
Set<Arbitrator> arbitratorSet = p2PService.getDataMap().values().stream()
.filter(e -> e.expirablePayload instanceof Arbitrator)
.map(e -> (Arbitrator) e.expirablePayload)
.collect(Collectors.toSet());
return set.stream()
.collect(Collectors.toMap(e -> e.getArbitratorAddress(), e -> e));
Map<Address, Arbitrator> map = new HashMap<>();
for (Arbitrator arbitrator : arbitratorSet) {
Address arbitratorAddress = arbitrator.getArbitratorAddress();
if (!map.containsKey(arbitratorAddress))
map.put(arbitratorAddress, arbitrator);
else
log.warn("arbitratorAddress already exist in arbitrator map. Seems an arbitrator object is already registered with the same address.");
}
return map;
}
}

18
gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java
View File

@ -38,6 +38,7 @@ class ArbitratorSelectionViewModel extends ActivatableDataModel {
private final ArbitratorManager arbitratorManager;
private final Preferences preferences;
private final KeyRing keyRing;
private BSFormatter formatter;
final ObservableList<String> languageCodes = FXCollections.observableArrayList();
final ObservableList<ArbitratorListItem> arbitratorListItems = FXCollections.observableArrayList();
final ObservableList<String> allLanguageCodes = FXCollections.observableArrayList(LanguageUtil.getAllLanguageCodes());
@ -50,15 +51,15 @@ class ArbitratorSelectionViewModel extends ActivatableDataModel {
this.arbitratorManager = arbitratorManager;
this.preferences = preferences;
this.keyRing = keyRing;
this.formatter = formatter;
arbitratorMapChangeListener = change -> {
log.debug("getValueAdded " + change.getValueAdded());
log.debug("getValueRemoved " + change.getValueRemoved());
log.debug("values() " + arbitratorManager.getArbitratorsObservableMap().values());
arbitratorListItems.clear();
arbitratorListItems.addAll(arbitratorManager.getArbitratorsObservableMap().values().stream()
.map(e -> new ArbitratorListItem(e, formatter)).collect(Collectors.toList()));
};
arbitratorMapChangeListener = change -> applyArbitratorMap();
}
private void applyArbitratorMap() {
arbitratorListItems.clear();
arbitratorListItems.addAll(arbitratorManager.getArbitratorsObservableMap().values().stream()
.map(e -> new ArbitratorListItem(e, formatter)).collect(Collectors.toList()));
}
@Override
@ -66,6 +67,7 @@ class ArbitratorSelectionViewModel extends ActivatableDataModel {
languageCodes.setAll(user.getAcceptedLanguageLocaleCodes());
arbitratorManager.getArbitratorsObservableMap().addListener(arbitratorMapChangeListener);
arbitratorManager.applyArbitrators();
applyArbitratorMap();
updateAutoSelectArbitrators();
}