1.1 --- a/src/main/java/de/uapcore/lightpit/viewmodel/ProjectView.java Sat Aug 22 18:34:36 2020 +0200 1.2 +++ b/src/main/java/de/uapcore/lightpit/viewmodel/ProjectView.java Sun Aug 23 15:10:49 2020 +0200 1.3 @@ -1,82 +1,33 @@ 1.4 package de.uapcore.lightpit.viewmodel; 1.5 1.6 -import de.uapcore.lightpit.entities.Issue; 1.7 -import de.uapcore.lightpit.entities.IssueSummary; 1.8 -import de.uapcore.lightpit.entities.Project; 1.9 import de.uapcore.lightpit.entities.Version; 1.10 1.11 import java.util.ArrayList; 1.12 -import java.util.Collections; 1.13 import java.util.List; 1.14 1.15 public class ProjectView { 1.16 1.17 - private final Project project; 1.18 - private List<Version> versions = Collections.emptyList(); 1.19 - private List<Issue> issues = Collections.emptyList(); 1.20 + private final List<ProjectInfo> projectList = new ArrayList<>(); 1.21 + private ProjectInfo projectInfo; 1.22 + private Version versionFilter; 1.23 1.24 - private IssueSummary issuesTotal; 1.25 - private List<Issue> issuesWithoutVersion; 1.26 - private IssueSummary issuesWithoutVersionTotal; 1.27 - private List<VersionInfo> versionInfos = Collections.emptyList(); 1.28 - 1.29 - public ProjectView(Project project) { 1.30 - this.project = project; 1.31 + public List<ProjectInfo> getProjectList() { 1.32 + return projectList; 1.33 } 1.34 1.35 - public Project getProject() { 1.36 - return project; 1.37 + public ProjectInfo getProjectInfo() { 1.38 + return projectInfo; 1.39 } 1.40 1.41 - public List<Issue> getIssues() { 1.42 - return issues; 1.43 + public void setProjectInfo(ProjectInfo projectInfo) { 1.44 + this.projectInfo = projectInfo; 1.45 } 1.46 1.47 - public void setIssues(List<Issue> issues) { 1.48 - this.issues = issues; 1.49 - issuesTotal = new IssueSummary(); 1.50 - issuesWithoutVersion = new ArrayList<>(); 1.51 - issuesWithoutVersionTotal = new IssueSummary(); 1.52 - for (Issue issue : issues) { 1.53 - issuesTotal.add(issue); 1.54 - // we want to list all issues that do not have a target version 1.55 - if (issue.getResolvedVersions().isEmpty()) { 1.56 - issuesWithoutVersion.add(issue); 1.57 - issuesWithoutVersionTotal.add(issue); 1.58 - } 1.59 - } 1.60 + public Version getVersionFilter() { 1.61 + return versionFilter; 1.62 } 1.63 1.64 - public List<Version> getVersions() { 1.65 - return versions; 1.66 - } 1.67 - 1.68 - public void setVersions(List<Version> versions) { 1.69 - this.versions = versions; 1.70 - } 1.71 - 1.72 - public void updateVersionInfo() { 1.73 - versionInfos = new ArrayList<>(); 1.74 - for (Version version : versions) { 1.75 - final var info = new VersionInfo(version); 1.76 - info.collectIssues(issues); 1.77 - versionInfos.add(info); 1.78 - } 1.79 - } 1.80 - 1.81 - public IssueSummary getIssuesTotal() { 1.82 - return issuesTotal; 1.83 - } 1.84 - 1.85 - public List<Issue> getIssuesWithoutVersion() { 1.86 - return issuesWithoutVersion; 1.87 - } 1.88 - 1.89 - public IssueSummary getIssuesWithoutVersionTotal() { 1.90 - return issuesWithoutVersionTotal; 1.91 - } 1.92 - 1.93 - public List<VersionInfo> getVersionInfos() { 1.94 - return versionInfos; 1.95 + public void setVersionFilter(Version versionFilter) { 1.96 + this.versionFilter = versionFilter; 1.97 } 1.98 }