Skip to content

Commit 7f608af

Browse files
junichi11junichi11
committed
Fix log messages
1 parent ecdcabb commit 7f608af

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public List<User> getCollaborators() {
138138
try {
139139
collaborators = collaboratorService.getCollaborators(ghRepository);
140140
} catch (IOException ex) {
141-
LOGGER.log(Level.WARNING, "{0} : Can't get collaborators.", repository.getFullName()); // NOI18N
141+
LOGGER.log(Level.WARNING, "{0} : Can''t get collaborators. {1}", new Object[]{repository.getFullName(), ex.getMessage()}); // NOI18N
142142
}
143143
}
144144
return collaborators;
@@ -174,7 +174,7 @@ public List<Milestone> getMilestones(boolean force) {
174174
try {
175175
milestones = milestoneService.getMilestones(gHRepository, "open"); // NOI18N
176176
} catch (IOException ex) {
177-
LOGGER.log(Level.WARNING, "{0} : Can't get milestones.", repository.getFullName()); // NOI18N
177+
LOGGER.log(Level.WARNING, "{0} : Can''t get milestones. {1}", new Object[]{repository.getFullName(), ex.getMessage()}); // NOI18N
178178
}
179179
}
180180
return milestones;
@@ -209,7 +209,7 @@ public List<Label> getLabels(boolean force) {
209209
try {
210210
labels = labelService.getLabels(ghRepository);
211211
} catch (IOException ex) {
212-
LOGGER.log(Level.WARNING, "{0} : Can't get labels.", repository.getRepositoryName()); // NOI18N
212+
LOGGER.log(Level.WARNING, "{0} : Can''t get labels. {1}", new Object[]{repository.getFullName(), ex.getMessage()}); // NOI18N
213213
}
214214
}
215215
return labels;
@@ -230,7 +230,7 @@ public User getMySelf() {
230230
try {
231231
myself = userService.getUser();
232232
} catch (IOException ex) {
233-
LOGGER.log(Level.WARNING, "{0} : Can''t get myself.", repository.getRepositoryName()); // NOI18N
233+
LOGGER.log(Level.WARNING, "{0} : Can''t get myself. {1}", new Object[]{repository.getFullName(), ex.getMessage()}); // NOI18N
234234
}
235235
}
236236
return myself;
@@ -304,7 +304,7 @@ public synchronized List<RepositoryBranch> getBranches(boolean force) {
304304
try {
305305
branches = service.getBranches(ghRepository);
306306
} catch (IOException ex) {
307-
LOGGER.log(Level.WARNING, "{0} : Can't get branches.", repository.getRepositoryName()); // NOI18N
307+
LOGGER.log(Level.WARNING, "{0} : Can''t get branches. {1}", new Object[]{repository.getFullName(), ex.getMessage()}); // NOI18N
308308
}
309309
}
310310
return branches;
@@ -328,7 +328,7 @@ public synchronized List<Repository> getForks(boolean force) {
328328
try {
329329
forks = service.getForks(ghRepository);
330330
} catch (IOException ex) {
331-
LOGGER.log(Level.WARNING, "{0} : Can't get forks.", repository.getRepositoryName()); // NOI18N
331+
LOGGER.log(Level.WARNING, "{0} : Can''t get forks. {1}", new Object[]{repository.getFullName(), ex.getMessage()}); // NOI18N
332332
}
333333
}
334334
return forks;
@@ -356,7 +356,7 @@ public static synchronized User getUser(String oAuthToken) {
356356
USERS.put(oAuthToken, user);
357357
}
358358
} catch (IOException ex) {
359-
LOGGER.log(Level.WARNING, "Can't get user."); // NOI18N
359+
LOGGER.log(Level.WARNING, "Can''t get user. {0}", ex.getMessage()); // NOI18N
360360
}
361361
}
362362
return user;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public static boolean toggleState(GitHubIssue gitHubIssue) {
111111
// set original state
112112
issue.setState(state.toString());
113113
LOGGER.log(Level.WARNING, ex.getMessage());
114-
UiUtils.showErrorDialog("Can't change issue status.");
114+
UiUtils.showErrorDialog("Can''t change issue status.");
115115
}
116116
return false;
117117
}
@@ -206,7 +206,7 @@ public static void showInBrowser(GitHubIssue gitHubIssue) {
206206
URL url = new URL(htmlUrl);
207207
HtmlBrowser.URLDisplayer.getDefault().showURL(url);
208208
} catch (MalformedURLException ex) {
209-
LOGGER.log(Level.WARNING, "Can't open the browser:{0}", ex.getMessage()); // NOI18N
209+
LOGGER.log(Level.WARNING, "Can''t open the browser : {0}", ex.getMessage()); // NOI18N
210210
}
211211
}
212212

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ public boolean isCollaborator() {
307307
isCollaborator = collaboratorService.isCollaborator(repository, getUserName());
308308
} catch (IOException ex) {
309309
isCollaborator = false;
310-
LOGGER.log(Level.WARNING, "{0} Can''t check whether user is a collaborator.", ex.getMessage()); // NOI18N
310+
LOGGER.log(Level.WARNING, "{0} : Can''t check whether user is a collaborator. {1}", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
311311
}
312312
}
313313
return isCollaborator;
@@ -361,7 +361,7 @@ public Issue submitNewIssue(CreateIssueParams params) {
361361
try {
362362
createdIssue = issueService.createIssue(repository, issue);
363363
} catch (IOException ex) {
364-
LOGGER.log(Level.WARNING, "{0} Can't create an issue.", ex.getMessage()); // NOI18N
364+
LOGGER.log(Level.WARNING, "{0} : Can''t create an issue. {1}", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
365365
}
366366
return createdIssue;
367367
}
@@ -395,7 +395,7 @@ public Issue editIssue(GitHubIssue gitHubIssue, CreateIssueParams params) {
395395
try {
396396
updatedIssue = issueService.editIssue(repository, issue);
397397
} catch (IOException ex) {
398-
LOGGER.log(Level.WARNING, "{0} Can't edit an issue.", ex.getMessage()); // NOI18N
398+
LOGGER.log(Level.WARNING, "{0} : Can''t edit an issue. {1}", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
399399
}
400400
return updatedIssue;
401401
}
@@ -457,7 +457,7 @@ public Issue getIssue(int id) {
457457
IssueService issueService = new IssueService(client);
458458
return issueService.getIssue(repository, id);
459459
} catch (IOException ex) {
460-
LOGGER.log(Level.WARNING, "{0} Can't get an issue of the id number.", ex.getMessage()); // NOI18N
460+
LOGGER.log(Level.WARNING, "{0} : Can''t get an issue of the id number. {1}", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
461461
}
462462
return null;
463463
}
@@ -484,7 +484,7 @@ public List<GitHubIssue> getIssues(Map<String, String> filter, boolean isRefresh
484484
}
485485
return gitHubIssues;
486486
} catch (IOException ex) {
487-
LOGGER.log(Level.WARNING, "{0}: {1} Can't get issues.", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
487+
LOGGER.log(Level.WARNING, "{0} : Can''t get issues. {1}", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
488488
}
489489
return Collections.emptyList();
490490
}
@@ -529,7 +529,7 @@ private GitHubIssue getIssue(String id) {
529529
return createIssue(i, false);
530530
}
531531
} catch (IOException ex) {
532-
LOGGER.log(Level.WARNING, "{0} : Can't get an issue.", getFullName()); // NOI18N
532+
LOGGER.log(Level.WARNING, "{0} : Can''t get an issue.. {1}", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
533533
}
534534

535535
return null;
@@ -565,7 +565,7 @@ public synchronized PullRequest getPullRequest(int id, boolean force) {
565565
}
566566
return pullRequest;
567567
} catch (IOException ex) {
568-
LOGGER.log(Level.WARNING, "{0} Can't get the pull request of the id number({1}).", new Object[]{ex.getMessage(), id}); // NOI18N
568+
LOGGER.log(Level.WARNING, "{0} : Can''t get the pull request of the id number({1}). {2}", new Object[]{getFullName(), id, ex.getMessage()}); // NOI18N
569569
}
570570
return null;
571571
}
@@ -587,7 +587,7 @@ public List<PullRequest> getPullRequests(String state) {
587587
List<PullRequest> pullRequests = pullRequestService.getPullRequests(repository, state);
588588
return pullRequests;
589589
} catch (IOException ex) {
590-
LOGGER.log(Level.WARNING, "{0}: {1} Can't get pull requests.", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
590+
LOGGER.log(Level.WARNING, "{0} : Can''t get pull requests. {1}", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
591591
}
592592
return Collections.emptyList();
593593
}
@@ -608,7 +608,7 @@ public List<CommitFile> getPullRequestsFiles(int id) {
608608
PullRequestService pullRequestService = new PullRequestService(client);
609609
return pullRequestService.getFiles(repository, id);
610610
} catch (IOException ex) {
611-
LOGGER.log(Level.WARNING, "{0}: {1} Can't get pull request files.", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
611+
LOGGER.log(Level.WARNING, "{0} : Can''t get pull request files. {1}", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
612612
}
613613
return Collections.emptyList();
614614
}
@@ -629,7 +629,7 @@ public List<RepositoryCommit> getCommits(int id) {
629629
PullRequestService pullRequestService = new PullRequestService(client);
630630
return pullRequestService.getCommits(repository, id);
631631
} catch (IOException ex) {
632-
LOGGER.log(Level.WARNING, "{0}: {1} Can't get commits for the id({2}).", new Object[]{getFullName(), ex.getMessage(), id}); // NOI18N
632+
LOGGER.log(Level.WARNING, "{0} : Can''t get commits for the id({1}). {2}", new Object[]{getFullName(), id, ex.getMessage()}); // NOI18N
633633
}
634634
return Collections.emptyList();
635635
}
@@ -645,7 +645,7 @@ public MergeStatus merge(int id, String commitMessage) {
645645
PullRequestService pullRequestService = new PullRequestService(client);
646646
return pullRequestService.merge(repository, id, commitMessage);
647647
} catch (IOException ex) {
648-
LOGGER.log(Level.WARNING, "{0}: {1} Can't merge.", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
648+
LOGGER.log(Level.WARNING, "{0} : Can''t merge. {1}", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
649649
}
650650
return null;
651651
}
@@ -670,7 +670,7 @@ public PullRequest createPullRequest(int issueId, String head, String base) thro
670670
PullRequestService pullRequestService = new PullRequestService(client);
671671
return pullRequestService.createPullRequest(repository, issueId, head, base);
672672
} catch (IOException ex) {
673-
LOGGER.log(Level.WARNING, "{0}:Can't create a pull request. {1}", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
673+
LOGGER.log(Level.WARNING, "{0} : Can''t create a pull request. {1}", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
674674
throw ex;
675675
}
676676
}
@@ -716,7 +716,7 @@ public RepositoryCommitCompare compare(String base, String head) throws IOExcept
716716
CommitService commitService = new CommitService(client);
717717
return commitService.compare(repository, base, head);
718718
} catch (IOException ex) {
719-
LOGGER.log(Level.WARNING, "{0}: {1} Can't compare two commits.", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
719+
LOGGER.log(Level.WARNING, "{0} : Can't compare two commits. {1}", new Object[]{getFullName(), ex.getMessage()}); // NOI18N
720720
throw ex;
721721
}
722722
}
@@ -987,7 +987,7 @@ public Repository getRepository() {
987987
RepositoryService service = new RepositoryService(client);
988988
ghRepository = service.getRepository(getRepositoryAuthor(), getRepositoryName());
989989
} catch (IOException ex) {
990-
LOGGER.log(Level.WARNING, "Invalid repository:{0}", getFullName()); // NOI18N
990+
LOGGER.log(Level.WARNING, "Invalid repository : {0}", getFullName()); // NOI18N
991991
}
992992
}
993993
return ghRepository;

0 commit comments

Comments
 (0)