Changeset 14344 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-10-17T17:25:28+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #6524, fix #11240 - add synchronization in ChangesetListModel

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java

@@ -41 +41 @@
      * @return The selected changesets
      */
-    public Set<Changeset> getSelectedChangesets() {
+    public synchronized Set<Changeset> getSelectedChangesets() {
         Set<Changeset> ret = new HashSet<>();
         for (int i = 0; i < getSize(); i++) {
@@ -55 +55 @@
      * @return The selected ids
      */
-    public Set<Integer> getSelectedChangesetIds() {
+    public synchronized Set<Integer> getSelectedChangesetIds() {
         Set<Integer> ret = new HashSet<>();
         for (int i = 0; i < getSize(); i++) {
@@ -69 +69 @@
      * @param changesets The changesets
      */
-    public void setSelectedChangesets(Collection<Changeset> changesets) {
+    public synchronized void setSelectedChangesets(Collection<Changeset> changesets) {
         selectionModel.setValueIsAdjusting(true);
         selectionModel.clearSelection();
@@ -91 +91 @@
     }
 
-    private void updateModel() {
+    private synchronized void updateModel() {
         Set<Changeset> sel = getSelectedChangesets();
         data.clear();
@@ -164 +164 @@
 
     @Override
-    public Changeset getElementAt(int idx) {
+    public synchronized Changeset getElementAt(int idx) {
         return data.get(idx);
     }
 
     @Override
-    public int getSize() {
+    public synchronized int getSize() {
         return data.size();
     }
 
-    protected void sort() {
+    protected synchronized void sort() {
         data.sort(Comparator.comparingInt(Changeset::getId).reversed());
     }
@@ -191 +191 @@
      * @return the selected open changesets
      */
-    public List<Changeset> getSelectedOpenChangesets() {
+    public synchronized List<Changeset> getSelectedOpenChangesets() {
         List<Changeset> ret = new ArrayList<>();
         for (int i = 0; i < getSize(); i++) {
@@ -208 +208 @@
     /* ---------------------------------------------------------------------------- */
     @Override
-    public void changesetCacheUpdated(ChangesetCacheEvent event) {
+    public synchronized void changesetCacheUpdated(ChangesetCacheEvent event) {
         Set<Changeset> sel = getSelectedChangesets();
         for (Changeset cs: event.getAddedChangesets()) {