Skip to content

Commit

Permalink
Update backlog4j and NetBeans versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@junichi11
junichi11 committed Aug 12, 2017
1 parent 4e8ca0c commit 88af35b
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<dependency>
<groupId>com.nulab-inc</groupId>
<artifactId>backlog4j</artifactId>
<version>2.1.4</version>
<version>2.1.5</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
Expand All @@ -157,7 +157,7 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.api.version>RELEASE81-BETA</netbeans.api.version>
<netbeans.api.version>RELEASE82</netbeans.api.version>
</properties>
<name>Backlog</name>
<description>This plugin provides support for &lt;a href ="http://backlogtool.com/?lang=1"&gt;backlog&lt;/a&gt;.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/junichi11/netbeans/modules/backlog/issue/BacklogIssue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/junichi11/netbeans/modules/backlog/issue/ui/BacklogIssuePanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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());
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/junichi11/netbeans/modules/backlog/query/AssignedToMeQuery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/junichi11/netbeans/modules/backlog/query/BacklogQuery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/junichi11/netbeans/modules/backlog/query/BacklogQueryController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/junichi11/netbeans/modules/backlog/query/GetIssuesParamsSupport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public synchronized GetIssuesParams newGetIssuesParams() {
.categoryIds(getCategoryIds())
.versionIds(getVersionIds())
.milestoneIds(getMilestoneIds())
.assignerIds(getAssigneeIds())
.assigneeIds(getAssigneeIds())
.createdUserIds(getCreatedUserIds())
.priorities(getPriorities())
.resolutions(getResolutions())
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/junichi11/netbeans/modules/backlog/query/ui/GeneralPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ public List<StatusType> getStatus() {
}
List<StatusType> 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);
}
Expand All @@ -309,7 +309,7 @@ public List<PriorityType> getPriories() {
}
List<PriorityType> priorities = new ArrayList<>(selectedValues.size());
for (Priority selectedValue : selectedValues) {
PriorityType priority = selectedValue.getPriority();
PriorityType priority = selectedValue.getPriorityType();
if (priority != null) {
priorities.add(priority);
}
Expand All @@ -324,7 +324,7 @@ public List<ResolutionType> getResolutions() {
}
List<ResolutionType> 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);
}
Expand Down Expand Up @@ -962,7 +962,7 @@ public String getName() {
}

@Override
public ResolutionType getResolution() {
public ResolutionType getResolutionType() {
return ResolutionType.NotSet;
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/junichi11/netbeans/modules/backlog/utils/BacklogImage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/junichi11/netbeans/modules/backlog/query/BacklogQueryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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<Long> ids = new ArrayList<>();
ids.add(4L);
Expand Down

0 comments on commit 88af35b

Please sign in to comment.