Skip to content

Commit f668a92

Browse files
junichi11junichi11
committed
Use GitHubIcons
1 parent 40e913b commit f668a92

3 files changed

Lines changed: 42 additions & 30 deletions

File tree

‎src/main/java/com/junichi11/netbeans/modules/github/issues/GitHubIcons.java‎

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

44+
import java.awt.Image;
4445
import javax.swing.Icon;
4546
import org.netbeans.api.annotations.common.StaticResource;
4647
import org.openide.util.ImageUtilities;
@@ -53,33 +54,35 @@
5354
public final class GitHubIcons {
5455

5556
@StaticResource
56-
private static final String CLOSED_ISSUE_16 = "com/junichi11/netbeans/modules/github/issues/resources/closed_issue_16.png"; // NOI18N
57+
public static final String CLOSED_ISSUE_16 = "com/junichi11/netbeans/modules/github/issues/resources/closed_issue_16.png"; // NOI18N
5758
@StaticResource
58-
private static final String CLOSED_PULL_REQUEST_16 = "com/junichi11/netbeans/modules/github/issues/resources/closed_pull_request_16.png"; // NOI18N
59+
public static final String CLOSED_PULL_REQUEST_16 = "com/junichi11/netbeans/modules/github/issues/resources/closed_pull_request_16.png"; // NOI18N
5960
@StaticResource
60-
private static final String ERROR_16 = "com/junichi11/netbeans/modules/github/issues/resources/error_icon_16.png"; // NOI18N
61+
public static final String ERROR_16 = "com/junichi11/netbeans/modules/github/issues/resources/error_icon_16.png"; // NOI18N
6162
@StaticResource
62-
private static final String GIT_MERGE_16 = "com/junichi11/netbeans/modules/github/issues/resources/git_merge_16.png"; // NOI18N
63+
public static final String GIT_MERGE_16 = "com/junichi11/netbeans/modules/github/issues/resources/git_merge_16.png"; // NOI18N
6364
@StaticResource
64-
private static final String GIT_PULL_REQUEST_16 = "com/junichi11/netbeans/modules/github/issues/resources/git_pull_request_16.png"; // NOI18N
65+
public static final String GIT_PULL_REQUEST_16 = "com/junichi11/netbeans/modules/github/issues/resources/git_pull_request_16.png"; // NOI18N
6566
@StaticResource
66-
private static final String GITHUB_16 = "com/junichi11/netbeans/modules/github/issues/resources/icon_16.png"; // NOI18N
67+
public static final String GITHUB_16 = "com/junichi11/netbeans/modules/github/issues/resources/icon_16.png"; // NOI18N
6768
@StaticResource
68-
private static final String GITHUB_32 = "com/junichi11/netbeans/modules/github/issues/resources/icon_32.png"; // NOI18N
69+
public static final String GITHUB_32 = "com/junichi11/netbeans/modules/github/issues/resources/icon_32.png"; // NOI18N
6970
@StaticResource
70-
private static final String ISSUE_CLOSED_16 = "com/junichi11/netbeans/modules/github/issues/resources/issue_closed_16.png"; // NOI18N
71+
public static final String ISSUE_CLOSED_16 = "com/junichi11/netbeans/modules/github/issues/resources/issue_closed_16.png"; // NOI18N
7172
@StaticResource
72-
private static final String ISSUE_OPENED_16 = "com/junichi11/netbeans/modules/github/issues/resources/issue_opened_16.png"; // NOI18N
73+
public static final String ISSUE_OPENED_16 = "com/junichi11/netbeans/modules/github/issues/resources/issue_opened_16.png"; // NOI18N
7374
@StaticResource
74-
private static final String MERGED_PULL_REQUEST_16 = "com/junichi11/netbeans/modules/github/issues/resources/merged_pull_request_16.png"; // NOI18N
75+
public static final String MERGED_PULL_REQUEST_16 = "com/junichi11/netbeans/modules/github/issues/resources/merged_pull_request_16.png"; // NOI18N
7576
@StaticResource
76-
private static final String OPEN_ISSUE_16 = "com/junichi11/netbeans/modules/github/issues/resources/open_issue_16.png"; // NOI18N
77+
public static final String OPEN_ISSUE_16 = "com/junichi11/netbeans/modules/github/issues/resources/open_issue_16.png"; // NOI18N
7778
@StaticResource
78-
private static final String OPEN_PULL_REQUEST_16 = "com/junichi11/netbeans/modules/github/issues/resources/open_pull_request_16.png"; // NOI18N
79+
public static final String OPEN_PULL_REQUEST_16 = "com/junichi11/netbeans/modules/github/issues/resources/open_pull_request_16.png"; // NOI18N
7980
@StaticResource
80-
private static final String TEMPLATE_16 = "com/junichi11/netbeans/modules/github/issues/resources/template_16.png"; // NOI18N
81+
public static final String TEMPLATE_16 = "com/junichi11/netbeans/modules/github/issues/resources/template_16.png"; // NOI18N
8182
@StaticResource
82-
private static final String TEMPLATE_SETTINGS_16 = "com/junichi11/netbeans/modules/github/issues/resources/template_settings_16.png"; // NOI18N
83+
public static final String TEMPLATE_SETTINGS_16 = "com/junichi11/netbeans/modules/github/issues/resources/template_settings_16.png"; // NOI18N
84+
85+
// icons
8386
public static final Icon CLOSED_ISSUE_ICON_16 = ImageUtilities.loadImageIcon(CLOSED_ISSUE_16, true);
8487
public static final Icon CLOSED_PULL_REQUEST_ICON_16 = ImageUtilities.loadImageIcon(CLOSED_PULL_REQUEST_16, true);
8588
public static final Icon ERROR_ICON_16 = ImageUtilities.loadImageIcon(ERROR_16, true);
@@ -89,12 +92,28 @@ public final class GitHubIcons {
8992
public static final Icon GITHUB_ICON_32 = ImageUtilities.loadImageIcon(GITHUB_32, true);
9093
public static final Icon ISSUE_OPENED_ICON_16 = ImageUtilities.loadImageIcon(ISSUE_OPENED_16, true);
9194
public static final Icon ISSUE_CLOSED_ICON_16 = ImageUtilities.loadImageIcon(ISSUE_CLOSED_16, true);
92-
public static final Icon MERGE_PULL_REQUEST_ICON_16 = ImageUtilities.loadImageIcon(MERGED_PULL_REQUEST_16, true);
95+
public static final Icon MERGED_PULL_REQUEST_ICON_16 = ImageUtilities.loadImageIcon(MERGED_PULL_REQUEST_16, true);
9396
public static final Icon OPEN_ISSUE_ICON_16 = ImageUtilities.loadImageIcon(OPEN_ISSUE_16, true);
9497
public static final Icon OPEN_PULL_REQUEST_ICON_16 = ImageUtilities.loadImageIcon(OPEN_PULL_REQUEST_16, true);
9598
public static final Icon TEMPLATE_ICON_16 = ImageUtilities.loadImageIcon(TEMPLATE_16, true);
9699
public static final Icon TEMPLATE_SETTINGS_ICON_16 = ImageUtilities.loadImageIcon(TEMPLATE_SETTINGS_16, true);
97100

101+
// images
102+
public static final Image CLOSED_ISSUE_IMAGE_16 = ImageUtilities.loadImage(CLOSED_ISSUE_16, true);
103+
public static final Image CLOSED_PULL_REQUEST_IMAGE_16 = ImageUtilities.loadImage(CLOSED_PULL_REQUEST_16, true);
104+
public static final Image ERROR_IMAGE_16 = ImageUtilities.loadImage(ERROR_16, true);
105+
public static final Image GIT_MERGE_IMAGE_16 = ImageUtilities.loadImage(GIT_MERGE_16, true);
106+
public static final Image GIT_PULL_REQUEST_IMAGE_16 = ImageUtilities.loadImage(GIT_PULL_REQUEST_16, true);
107+
public static final Image GITHUB_IMAGE_16 = ImageUtilities.loadImage(GITHUB_16, true);
108+
public static final Image GITHUB_IMAGE_32 = ImageUtilities.loadImage(GITHUB_32, true);
109+
public static final Image ISSUE_OPENED_IMAGE_16 = ImageUtilities.loadImage(ISSUE_OPENED_16, true);
110+
public static final Image ISSUE_CLOSED_IMAGE_16 = ImageUtilities.loadImage(ISSUE_CLOSED_16, true);
111+
public static final Image MERGED_PULL_REQUEST_IMAGE_16 = ImageUtilities.loadImage(MERGED_PULL_REQUEST_16, true);
112+
public static final Image OPEN_ISSUE_IMAGE_16 = ImageUtilities.loadImage(OPEN_ISSUE_16, true);
113+
public static final Image OPEN_PULL_REQUEST_IMAGE_16 = ImageUtilities.loadImage(OPEN_PULL_REQUEST_16, true);
114+
public static final Image TEMPLATE_IMAGE_16 = ImageUtilities.loadImage(TEMPLATE_16, true);
115+
public static final Image TEMPLATE_SETTINGS_IMAGE_16 = ImageUtilities.loadImage(TEMPLATE_SETTINGS_16, true);
116+
98117
private GitHubIcons() {
99118
}
100119
}

‎src/main/java/com/junichi11/netbeans/modules/github/issues/issue/GitHubIssuePriorityProvider.java‎

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

44+
import com.junichi11.netbeans.modules.github.issues.GitHubIcons;
4445
import com.junichi11.netbeans.modules.github.issues.GitHubIssueState;
4546
import com.junichi11.netbeans.modules.github.issues.utils.GitHubIssuesUtils;
4647
import java.awt.Image;
@@ -49,29 +50,22 @@
4950
import org.eclipse.egit.github.core.Issue;
5051
import org.netbeans.modules.bugtracking.spi.IssuePriorityInfo;
5152
import org.netbeans.modules.bugtracking.spi.IssuePriorityProvider;
52-
import org.openide.util.ImageUtilities;
5353

5454
/**
5555
*
5656
* @author junichi11
5757
*/
5858
public class GitHubIssuePriorityProvider implements IssuePriorityProvider<GitHubIssue> {
5959

60-
private static final Image CLOSED_IMAGE = ImageUtilities.loadImage("com/junichi11/netbeans/modules/github/issues/resources/closed_issue_16.png", true);
61-
private static final Image OPEN_IMAGE = ImageUtilities.loadImage("com/junichi11/netbeans/modules/github/issues/resources/open_issue_16.png", true);
62-
private static final Image CLOSED_PULL_REQUEST_IMAGE = ImageUtilities.loadImage("com/junichi11/netbeans/modules/github/issues/resources/closed_pull_request_16.png", true);
63-
private static final Image OPEN_PULL_REQUEST_IMAGE = ImageUtilities.loadImage("com/junichi11/netbeans/modules/github/issues/resources/open_pull_request_16.png", true);
64-
private static final Image MERGED_PULL_REQUEST_IMAGE = ImageUtilities.loadImage("com/junichi11/netbeans/modules/github/issues/resources/merged_pull_request_16.png", true);
65-
6660
/**
6761
* GitHub Issues doesn't have priorities. Use this feature to show icons.
6862
*/
6963
public enum GitHubIssuePriority {
70-
Open("open", "Open", OPEN_IMAGE), // NOI18N
71-
Closed("closed", "Closed", CLOSED_IMAGE), // NOI18N
72-
OpenPullRequest("open.pull.request", "Open", OPEN_PULL_REQUEST_IMAGE), // NOI18N
73-
ClosedPullRequest("closed.pull.request", "Closed", CLOSED_PULL_REQUEST_IMAGE), // NOI18N
74-
MergedPullRequest("merged.pull.request", "Merged", MERGED_PULL_REQUEST_IMAGE), // NOI18N
64+
Open("open", "Open", GitHubIcons.OPEN_ISSUE_IMAGE_16), // NOI18N
65+
Closed("closed", "Closed", GitHubIcons.CLOSED_ISSUE_IMAGE_16), // NOI18N
66+
OpenPullRequest("open.pull.request", "Open", GitHubIcons.OPEN_PULL_REQUEST_IMAGE_16), // NOI18N
67+
ClosedPullRequest("closed.pull.request", "Closed", GitHubIcons.CLOSED_PULL_REQUEST_IMAGE_16), // NOI18N
68+
MergedPullRequest("merged.pull.request", "Merged", GitHubIcons.MERGED_PULL_REQUEST_IMAGE_16), // NOI18N
7569
None("", "", null); // NOI18N
7670

7771
private final String id;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
package com.junichi11.netbeans.modules.github.issues.repository;
4343

4444
import com.junichi11.netbeans.modules.github.issues.GitHubCache;
45+
import com.junichi11.netbeans.modules.github.issues.GitHubIcons;
4546
import com.junichi11.netbeans.modules.github.issues.GitHubIssuesConfig;
4647
import com.junichi11.netbeans.modules.github.issues.GitHubIssuesConnector;
4748
import com.junichi11.netbeans.modules.github.issues.egit.SearchIssuesParams;
@@ -94,7 +95,6 @@
9495
import org.netbeans.modules.bugtracking.api.Util;
9596
import org.netbeans.modules.bugtracking.spi.RepositoryInfo;
9697
import org.netbeans.modules.bugtracking.spi.RepositoryProvider;
97-
import org.openide.util.ImageUtilities;
9898

9999
/**
100100
*
@@ -120,7 +120,6 @@ public class GitHubRepository {
120120
private static final String PROPERTY_REPOSITORY_AUTHOR = "github.issues.repository.author"; // NOI18N
121121
private static final String PROPERTY_REPOSITORY_NAME = "github.issues.repository.name"; // NOI18N
122122
private static final String PROPERTY_BOOLEAN_PROPERTY_FILE = "github.issues.boolean.property.file"; // NOI18N
123-
private static final Image ICON = ImageUtilities.loadImage("com/junichi11/netbeans/modules/github/issues/resources/icon_16.png", false);
124123
private static final Logger LOGGER = Logger.getLogger(GitHubRepository.class.getName());
125124

126125
public GitHubRepository() {
@@ -166,7 +165,7 @@ public GitHubRepositoryController getController() {
166165
* @return icon
167166
*/
168167
public Image getIcon() {
169-
return ICON;
168+
return GitHubIcons.GITHUB_IMAGE_16;
170169
}
171170

172171
/**

0 commit comments

Comments
 (0)