Merge pull request #445 from shuzijun/gradle

fix bug

Author: shuzijun

src/main/java/com/shuzijun/leetcode/plugin/manager/ViewManager.java

@@ -7,6 +7,7 @@
 import com.shuzijun.leetcode.plugin.utils.PropertiesUtils;
 import com.shuzijun.leetcode.plugin.utils.URLUtils;
 import com.shuzijun.leetcode.plugin.window.NavigatorTable;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
@@ -45,7 +46,20 @@ public static void loadServiceData(NavigatorTable navigatorTable, Project projec
             filter.put(Constant.FIND_TYPE_STATUS, QuestionManager.getStatus());
             filter.put(Constant.FIND_TYPE_TAGS, QuestionManager.getTags());
         }
-        filter.put(Constant.FIND_TYPE_LISTS, QuestionManager.getLists());
+        if (CollectionUtils.isNotEmpty(filter.get(Constant.FIND_TYPE_LISTS))) {
+            Map<String, Tag> oldListsMap = Maps.uniqueIndex(filter.get(Constant.FIND_TYPE_LISTS), tag -> tag.getSlug());
+            List<Tag> newLists = QuestionManager.getLists();
+            Map<String, Tag> newListsMap = Maps.uniqueIndex(newLists, tag -> tag.getSlug());
+            newListsMap.forEach((s, tag) -> {
+                if (oldListsMap.containsKey(s)) {
+                    tag.setSelect(oldListsMap.get(s).isSelect());
+                }
+            });
+            filter.put(Constant.FIND_TYPE_LISTS, newLists);
+        } else {
+            filter.put(Constant.FIND_TYPE_LISTS, QuestionManager.getLists());
+        }
+
 
         navigatorTable.loadData(pageInfo);
     }

src/main/java/com/shuzijun/leetcode/plugin/window/NavigatorTable.java

@@ -1,5 +1,6 @@
 package com.shuzijun.leetcode.plugin.window;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
@@ -132,7 +133,7 @@ public Component prepareRenderer(TableCellRenderer renderer, int row, int column
             public void updateTable(Question question) {
                 if (questionList != null) {
                     for (Question q : questionList) {
-                        if(q.getTitleSlug().equals(question.getTitleSlug())){
+                        if (q.getTitleSlug().equals(question.getTitleSlug())) {
                             q.setStatus(question.getStatus());
                             refreshData();
                             break;
@@ -247,19 +248,23 @@ public PageInfo<Question> getPageInfo() {
     }
 
     public void refreshData() {
-        this.tableModel.updateData(questionList);
-        setColumnWidth();
+        ApplicationManager.getApplication().invokeLater(() -> {
+            this.tableModel.updateData(questionList);
+            setColumnWidth();
+        });
     }
 
     public void loadData(PageInfo<Question> pageInfo) {
-        if (this.first) {
-            this.tableModel.setRowCount(0);
-            this.tableModel.setColumnCount(5);
-            this.first = false;
-        }
-        this.questionList = pageInfo.getRows();
-        this.tableModel.updateData(questionList);
-        setColumnWidth();
+        ApplicationManager.getApplication().invokeLater(() -> {
+            if (this.first) {
+                this.tableModel.setRowCount(0);
+                this.tableModel.setColumnCount(5);
+                this.first = false;
+            }
+            this.questionList = pageInfo.getRows();
+            this.tableModel.updateData(questionList);
+            setColumnWidth();
+        });
         if (pageInfo.getPageTotal() != this.page.getItemCount()) {
             this.page.removeAllItems();
             for (int i = 1; i <= pageInfo.getPageTotal(); i++) {
@@ -365,7 +370,7 @@ public void updateData(List<Question> questionList) {
                 }
                 dataVector[i] = line;
             }
-            setDataVector(dataVector, MyTableModel.columnNameShort.clone());
+            setDataVector(dataVector, MyTableModel.columnNameShort);
         }
     }
 }