Skip to content

Commit 8134076

Browse files
committed
Fix GitHubIssuesOptions
- Use option key of GitHubDefaultQueries.Type - Add the getDefaultQueryOptions method
1 parent 0ff8919 commit 8134076

1 file changed

Lines changed: 21 additions & 6 deletions

File tree

src/main/java/com/junichi11/netbeans/modules/github/issues/options/GitHubIssuesOptions.java

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
*/
4242
package com.junichi11.netbeans.modules.github.issues.options;
4343

44+
import com.junichi11.netbeans.modules.github.issues.query.GitHubDefaultQueries;
45+
import com.junichi11.netbeans.modules.github.issues.query.GitHubDefaultQueries.Type;
46+
import java.util.HashMap;
47+
import java.util.Map;
4448
import java.util.prefs.Preferences;
4549
import org.openide.util.NbPreferences;
4650

@@ -52,8 +56,6 @@ public final class GitHubIssuesOptions {
5256

5357
public static final String SUB_PATH = "Team/GitHubIssues"; // NOI18N
5458
private static final String PREFERENCES_PATH = "github.issues"; // NOI18N
55-
private static final String QUERY_ASSIGNED_TO_ME = "query.assigned.to.me"; // NOI18N
56-
private static final String QUERY_CREATED_BY_ME = "query.created.by.me"; // NOI18N
5759
private static final String QUERY_OPEN = "query.open"; // NOI18N
5860
private static final GitHubIssuesOptions INSTANCE = new GitHubIssuesOptions();
5961

@@ -73,19 +75,32 @@ public boolean isOpenQuery() {
7375
}
7476

7577
public void setAssignedToMeQuery(boolean isEnabled) {
76-
getPreferences().putBoolean(QUERY_ASSIGNED_TO_ME, isEnabled);
78+
getPreferences().putBoolean(Type.ASSIGNED_TO_ME.getOptionKey(), isEnabled);
7779
}
7880

7981
public boolean isAssignedToMeQuery() {
80-
return getPreferences().getBoolean(QUERY_ASSIGNED_TO_ME, false);
82+
return isDefaultQuery(Type.ASSIGNED_TO_ME);
8183
}
8284

8385
public void setCreatedByMeQuery(boolean isEnabled) {
84-
getPreferences().putBoolean(QUERY_CREATED_BY_ME, isEnabled);
86+
getPreferences().putBoolean(Type.CREATED_BY_ME.getOptionKey(), isEnabled);
8587
}
8688

8789
public boolean isCreatedByMeQuery() {
88-
return getPreferences().getBoolean(QUERY_CREATED_BY_ME, false);
90+
return isDefaultQuery(Type.CREATED_BY_ME);
91+
}
92+
93+
private boolean isDefaultQuery(Type type) {
94+
boolean defaultValue = false;
95+
return getPreferences().getBoolean(type.getOptionKey(), defaultValue);
96+
}
97+
98+
public Map<GitHubDefaultQueries.Type, Boolean> getDefaultQueryOptions() {
99+
Map<GitHubDefaultQueries.Type, Boolean> map = new HashMap<>();
100+
for (GitHubDefaultQueries.Type type : GitHubDefaultQueries.Type.values()) {
101+
map.put(type, isDefaultQuery(type));
102+
}
103+
return map;
89104
}
90105

91106
private Preferences getPreferences() {

0 commit comments

Comments
 (0)