From 88af35b0a90029a0a6a157cdf3fb828ea60bd04d Mon Sep 17 00:00:00 2001 From: junichi11 Date: Sat, 12 Aug 2017 12:05:21 +0900 Subject: [PATCH] Update backlog4j and NetBeans versions --- pom.xml | 4 ++-- .../netbeans/modules/backlog/issue/BacklogIssue.java | 4 ++-- .../modules/backlog/issue/ui/BacklogIssuePanel.java | 12 ++++++------ .../modules/backlog/query/AssignedToMeQuery.java | 2 +- .../netbeans/modules/backlog/query/BacklogQuery.java | 2 +- .../backlog/query/BacklogQueryController.java | 2 +- .../backlog/query/GetIssuesParamsSupport.java | 2 +- .../modules/backlog/query/ui/GeneralPanel.java | 8 ++++---- .../netbeans/modules/backlog/utils/BacklogImage.java | 4 ++-- .../modules/backlog/query/BacklogQueryTest.java | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index b975dad..7b5f34b 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ com.nulab-inc backlog4j - 2.1.4 + 2.1.5 org.netbeans.api @@ -157,7 +157,7 @@ UTF-8 - RELEASE81-BETA + RELEASE82 Backlog This plugin provides support for <a href ="http://backlogtool.com/?lang=1">backlog</a>. diff --git a/src/main/java/com/junichi11/netbeans/modules/backlog/issue/BacklogIssue.java b/src/main/java/com/junichi11/netbeans/modules/backlog/issue/BacklogIssue.java index 008d708..9851877 100644 --- a/src/main/java/com/junichi11/netbeans/modules/backlog/issue/BacklogIssue.java +++ b/src/main/java/com/junichi11/netbeans/modules/backlog/issue/BacklogIssue.java @@ -826,7 +826,7 @@ public void addComment(String comment, boolean resolveAsFixed) { UpdateIssueParams updateIssueParams = new UpdateIssueParams(issue.getIssueKey()); Resolution resolution = issue.getResolution(); if (resolution != null) { - Issue.ResolutionType resolutionType = resolution.getResolution(); + Issue.ResolutionType resolutionType = resolution.getResolutionType(); if (resolutionType == Issue.ResolutionType.Fixed) { LOGGER.log(Level.INFO, "Resolution is already FIXED."); // NOI18N return; @@ -850,7 +850,7 @@ public void setSchedule(IssueScheduleInfo scheduleInfo) { public IssueScheduleInfo getSchedule() { com.nulabinc.backlog4j.Status issueStatus = getIssueStatus(); - if (issueStatus == null || issueStatus.getStatus() == Issue.StatusType.Closed) { + if (issueStatus == null || issueStatus.getStatusType()== Issue.StatusType.Closed) { return null; } if (scheduleInfo == null) { diff --git a/src/main/java/com/junichi11/netbeans/modules/backlog/issue/ui/BacklogIssuePanel.java b/src/main/java/com/junichi11/netbeans/modules/backlog/issue/ui/BacklogIssuePanel.java index 5421718..6163415 100644 --- a/src/main/java/com/junichi11/netbeans/modules/backlog/issue/ui/BacklogIssuePanel.java +++ b/src/main/java/com/junichi11/netbeans/modules/backlog/issue/ui/BacklogIssuePanel.java @@ -728,7 +728,7 @@ private void setPriorities(BacklogData data) { priorityComboBoxModel.removeAllElements(); for (Priority priority : priorities) { priorityComboBoxModel.addElement(priority); - Issue.PriorityType priorityType = priority.getPriority(); + Issue.PriorityType priorityType = priority.getPriorityType(); if (priorityType == PriorityType.Normal) { priorityComboBoxModel.setSelectedItem(priority); } @@ -1831,7 +1831,7 @@ private CreateIssueParams createCreateIssueParams() { if (project == null) { return null; } - CreateIssueParams issueParams = new CreateIssueParams(project.getId(), getSummary(), getIssueType().getId(), getPriority().getPriority()) + CreateIssueParams issueParams = new CreateIssueParams(project.getId(), getSummary(), getIssueType().getId(), getPriority().getPriorityType()) .description(getDescription()) .categoryIds(getCategoryIds()) .versionIds(getVersionIds()) @@ -1882,7 +1882,7 @@ private UpdateIssueParams createUpdateIssueParams() { .summary(getSummary()) .description(getDescription()) .issueTypeId(getIssueType().getId()) - .priority(getPriority().getPriority()) + .priority(getPriority().getPriorityType()) .categoryIds(getCategoryIds()) .versionIds(getVersionIds()) .milestoneIds(getMilestonIds()); @@ -1891,7 +1891,7 @@ private UpdateIssueParams createUpdateIssueParams() { // if we change resolution to empty, set null value Resolution resolution = getResolution(); if (!StringUtils.isEmpty(resolution.getName())) { - issueParams = issueParams.resolution(resolution.getResolution()); + issueParams = issueParams.resolution(resolution.getResolutionType()); } else { issueParams = issueParams.resolution(null); } @@ -1905,8 +1905,8 @@ private UpdateIssueParams createUpdateIssueParams() { // check status // Can't change to the same status Issue existingIssue = issue.getIssue(); - Issue.StatusType originalStatus = existingIssue.getStatus().getStatus(); - Issue.StatusType newStatus = getStatus().getStatus(); + Issue.StatusType originalStatus = existingIssue.getStatus().getStatusType(); + Issue.StatusType newStatus = getStatus().getStatusType(); if (originalStatus != newStatus) { issueParams = issueParams.status(newStatus); } diff --git a/src/main/java/com/junichi11/netbeans/modules/backlog/query/AssignedToMeQuery.java b/src/main/java/com/junichi11/netbeans/modules/backlog/query/AssignedToMeQuery.java index d1070eb..54dc36c 100644 --- a/src/main/java/com/junichi11/netbeans/modules/backlog/query/AssignedToMeQuery.java +++ b/src/main/java/com/junichi11/netbeans/modules/backlog/query/AssignedToMeQuery.java @@ -75,7 +75,7 @@ protected GetIssuesParams getGetIssuesParams(GetIssuesParams issuesParams) { User myself = data.getMyself(); if (myself != null) { // #2 exclude the closed status - issuesParams = issuesParams.assignerIds(Collections.singletonList(myself.getId())) + issuesParams = issuesParams.assigneeIds(Collections.singletonList(myself.getId())) .statuses(QueryUtils.NOT_CLOSED_STATUS); } return issuesParams; diff --git a/src/main/java/com/junichi11/netbeans/modules/backlog/query/BacklogQuery.java b/src/main/java/com/junichi11/netbeans/modules/backlog/query/BacklogQuery.java index 6636296..42e3716 100644 --- a/src/main/java/com/junichi11/netbeans/modules/backlog/query/BacklogQuery.java +++ b/src/main/java/com/junichi11/netbeans/modules/backlog/query/BacklogQuery.java @@ -216,7 +216,7 @@ protected GetIssuesParams getGetIssuesParams(GetIssuesParams issuesParams) { .categoryIds(getCategoryIds()) .versionIds(getVersionIds()) .milestoneIds(getMilestoneIds()) - .assignerIds(getAssigneeIds()) + .assigneeIds(getAssigneeIds()) .createdUserIds(getCreatedUserIds()) .priorities(getPriorities()) .resolutions(getResolutions()) diff --git a/src/main/java/com/junichi11/netbeans/modules/backlog/query/BacklogQueryController.java b/src/main/java/com/junichi11/netbeans/modules/backlog/query/BacklogQueryController.java index 1d6d025..9a382e6 100644 --- a/src/main/java/com/junichi11/netbeans/modules/backlog/query/BacklogQueryController.java +++ b/src/main/java/com/junichi11/netbeans/modules/backlog/query/BacklogQueryController.java @@ -368,7 +368,7 @@ private GetIssuesParams createIssuesParams() { .statuses(generalPanel.getStatus()) .priorities(generalPanel.getPriories()) .categoryIds(generalPanel.getCategoryIds()) - .assignerIds(generalPanel.getAssignerIds()) + .assigneeIds(generalPanel.getAssignerIds()) .versionIds(generalPanel.getVersionIds()) .createdUserIds(generalPanel.getCreatedUserIds()) .milestoneIds(generalPanel.getMilestoneIds()) diff --git a/src/main/java/com/junichi11/netbeans/modules/backlog/query/GetIssuesParamsSupport.java b/src/main/java/com/junichi11/netbeans/modules/backlog/query/GetIssuesParamsSupport.java index 631f1a8..da9749f 100644 --- a/src/main/java/com/junichi11/netbeans/modules/backlog/query/GetIssuesParamsSupport.java +++ b/src/main/java/com/junichi11/netbeans/modules/backlog/query/GetIssuesParamsSupport.java @@ -269,7 +269,7 @@ public synchronized GetIssuesParams newGetIssuesParams() { .categoryIds(getCategoryIds()) .versionIds(getVersionIds()) .milestoneIds(getMilestoneIds()) - .assignerIds(getAssigneeIds()) + .assigneeIds(getAssigneeIds()) .createdUserIds(getCreatedUserIds()) .priorities(getPriorities()) .resolutions(getResolutions()) diff --git a/src/main/java/com/junichi11/netbeans/modules/backlog/query/ui/GeneralPanel.java b/src/main/java/com/junichi11/netbeans/modules/backlog/query/ui/GeneralPanel.java index 6689cba..d59f214 100644 --- a/src/main/java/com/junichi11/netbeans/modules/backlog/query/ui/GeneralPanel.java +++ b/src/main/java/com/junichi11/netbeans/modules/backlog/query/ui/GeneralPanel.java @@ -294,7 +294,7 @@ public List getStatus() { } List status = new ArrayList<>(selectedValues.size()); for (Status selectedValue : selectedValues) { - Issue.StatusType statusType = selectedValue.getStatus(); + Issue.StatusType statusType = selectedValue.getStatusType(); if (statusType != null) { status.add(statusType); } @@ -309,7 +309,7 @@ public List getPriories() { } List priorities = new ArrayList<>(selectedValues.size()); for (Priority selectedValue : selectedValues) { - PriorityType priority = selectedValue.getPriority(); + PriorityType priority = selectedValue.getPriorityType(); if (priority != null) { priorities.add(priority); } @@ -324,7 +324,7 @@ public List getResolutions() { } List resolutions = new ArrayList<>(selectedValues.size()); for (Resolution selectedValue : selectedValues) { - ResolutionType resolution = selectedValue.getResolution(); + ResolutionType resolution = selectedValue.getResolutionType(); if (selectedValue.getName() != null && resolution != null) { resolutions.add(resolution); } @@ -962,7 +962,7 @@ public String getName() { } @Override - public ResolutionType getResolution() { + public ResolutionType getResolutionType() { return ResolutionType.NotSet; } diff --git a/src/main/java/com/junichi11/netbeans/modules/backlog/utils/BacklogImage.java b/src/main/java/com/junichi11/netbeans/modules/backlog/utils/BacklogImage.java index f773810..0ba9e58 100644 --- a/src/main/java/com/junichi11/netbeans/modules/backlog/utils/BacklogImage.java +++ b/src/main/java/com/junichi11/netbeans/modules/backlog/utils/BacklogImage.java @@ -85,11 +85,11 @@ public static final BacklogImage getPriorityIcon(Priority priority) { if (priority == null) { return null; } - Issue.PriorityType priorityType = priority.getPriority(); + Issue.PriorityType priorityType = priority.getPriorityType(); if (priorityType == null) { return null; } - switch (priority.getPriority()) { + switch (priority.getPriorityType()) { case High: return PRIORITY_HIGH; case Normal: diff --git a/src/test/java/com/junichi11/netbeans/modules/backlog/query/BacklogQueryTest.java b/src/test/java/com/junichi11/netbeans/modules/backlog/query/BacklogQueryTest.java index 13b8fef..e68032a 100644 --- a/src/test/java/com/junichi11/netbeans/modules/backlog/query/BacklogQueryTest.java +++ b/src/test/java/com/junichi11/netbeans/modules/backlog/query/BacklogQueryTest.java @@ -171,7 +171,7 @@ public void testGetQueryParam() { @Test public void testSetQueryParam() { GetIssuesParams params = new GetIssuesParams(Collections.singletonList(1L)); - params = params.assignerIds(Arrays.asList(1L, 2L)) + params = params.assigneeIds(Arrays.asList(1L, 2L)) .attachment(true) .sharedFile(false) .categoryIds(Arrays.asList(3L)); @@ -285,7 +285,7 @@ public void testGetAssigneeIds() { assertEquals(Collections.emptyList(), query.getAssigneeIds()); GetIssuesParams params = new GetIssuesParams(Collections.singletonList(1L)); - params = params.assignerIds(Arrays.asList(4L, 5L)); + params = params.assigneeIds(Arrays.asList(4L, 5L)); query.setQueryParam(params); ArrayList ids = new ArrayList<>(); ids.add(4L);