Cache milestones per state

Author: junichi11

src/main/java/com/junichi11/netbeans/modules/github/issues/GitHubCache.java

@@ -82,7 +82,7 @@ public final class GitHubCache {
     // @GuardedBy("this")
     private List<User> collaborators;
     // @GuardedBy("this")
-    private List<Milestone> milestones;
+    private final Map<String, List<Milestone>> milestoneMap = Collections.synchronizedMap(new HashMap<String, List<Milestone>>());
     // @GuardedBy("this")
     private List<Label> labels;
     // @GuardedBy("this")
@@ -152,23 +152,26 @@ public synchronized List<User> getCollaborators() {
     /**
      * Get milestones. If there is a cache, it is returned.
      *
+     * @param state open, closed or all
      * @return milestones
      */
-    public List<Milestone> getMilestones() {
-        return getMilestones(false);
+    public List<Milestone> getMilestones(String state) {
+        return getMilestones(state, false);
     }
 
     /**
      * Get milestones.
      *
+     * @param state open, closed or all
      * @param force {@code true} if don't use cache data, otherwise
      * {@code false}
      * @return milestones
      */
-    public synchronized List<Milestone> getMilestones(boolean force) {
-        if (milestones == null || force) {
-            if (milestones != null) {
-                milestones.clear();
+    public synchronized List<Milestone> getMilestones(String state, boolean force) {
+        List<Milestone> milestone = milestoneMap.get(state);
+        if (milestone == null || force) {
+            if (milestone != null) {
+                milestone.clear();
             }
             Repository gHRepository = repository.getRepository();
             GitHubClient client = repository.createGitHubClient();
@@ -177,12 +180,13 @@ public synchronized List<Milestone> getMilestones(boolean force) {
             }
             MilestoneService milestoneService = new MilestoneService(client);
             try {
-                milestones = milestoneService.getMilestones(gHRepository, "open"); // NOI18N
+                milestone = milestoneService.getMilestones(gHRepository, state);
+                milestoneMap.put(state, milestone);
             } catch (IOException ex) {
                 LOGGER.log(Level.WARNING, "{0} : Can''t get milestones. {1}", new Object[]{repository.getFullName(), ex.getMessage()}); // NOI18N
             }
         }
-        return milestones;
+        return milestone;
     }
 
     /**

src/main/java/com/junichi11/netbeans/modules/github/issues/issue/ui/GitHubIssuePanel.java

@@ -98,6 +98,7 @@
 import org.eclipse.egit.github.core.PullRequestMarker;
 import org.eclipse.egit.github.core.RepositoryCommit;
 import org.eclipse.egit.github.core.User;
+import org.eclipse.egit.github.core.service.IssueService;
 import org.netbeans.api.annotations.common.CheckForNull;
 import org.openide.DialogDescriptor;
 import org.openide.DialogDisplayer;
@@ -454,7 +455,7 @@ public void update() {
     }
 
     private void updateMilestones(GitHubCache cache, boolean force) {
-        List<Milestone> milestones = cache.getMilestones(force);
+        List<Milestone> milestones = cache.getMilestones(IssueService.STATE_OPEN, force);
         milestoneComboBoxModel.removeAllElements();
         milestoneComboBoxModel.addElement(null);
         for (Milestone milestone : milestones) {
@@ -1310,15 +1311,15 @@ private void newMilestoneButtonActionPerformed(java.awt.event.ActionEvent evt) {
         if (repository == null) {
             return;
         }
-        GitHubCache cache = GitHubCache.create(repository);
-        Milestone milestone = MilestonePanel.showDialog(cache.getMilestones());
+        Milestone milestone = MilestonePanel.showDialog(repository.getMilestones("all", false)); // NOI18N
         if (milestone != null) {
             Milestone newMilestone = repository.addMilestone(milestone);
             if (newMilestone == null) {
                 // show dialog
                 UiUtils.showErrorDialog(Bundle.GitHubIssuePanel_message_addMilestone_error());
                 return;
             }
+            GitHubCache cache = GitHubCache.create(repository);
             updateMilestones(cache, true);
             Issue issue = getIssue().getIssue();
             if (issue != null) {

src/main/java/com/junichi11/netbeans/modules/github/issues/query/ui/GitHubQueryPanel.java

@@ -137,7 +137,7 @@ public GitHubQueryPanel(GitHubQuery query, JComponent table) {
 
         // milestone
         GitHubRepository repository = query.getRepository();
-        List<Milestone> milestones = repository.getMilestones();
+        List<Milestone> milestones = repository.getMilestones("all", false); // NOI18N
         setComboBox(milestoneComboBox, milestoneComboBoxModel, milestones.toArray());
 
         // add listener

src/main/java/com/junichi11/netbeans/modules/github/issues/repository/GitHubRepository.java

@@ -282,11 +282,13 @@ private String getPropertyValue(String propertyName) {
     /**
      * Get milestones.
      *
+     * @param state open, closed or all
+     * @param force {@code true} if refresh the cache, otherwise {@code false}
      * @return milestones
      */
-    public List<Milestone> getMilestones() {
+    public List<Milestone> getMilestones(String state, boolean force) {
         GitHubCache cache = GitHubCache.create(this);
-        return cache.getMilestones();
+        return cache.getMilestones(state, force);
     }
 
     /**