diff -r 5c406eef0e5c -r a369fb1b3aa2 src/main/java/de/uapcore/lightpit/viewmodel/ProjectView.java --- a/src/main/java/de/uapcore/lightpit/viewmodel/ProjectView.java Sat Aug 22 18:34:36 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/viewmodel/ProjectView.java Sun Aug 23 15:10:49 2020 +0200 @@ -1,82 +1,33 @@ package de.uapcore.lightpit.viewmodel; -import de.uapcore.lightpit.entities.Issue; -import de.uapcore.lightpit.entities.IssueSummary; -import de.uapcore.lightpit.entities.Project; import de.uapcore.lightpit.entities.Version; import java.util.ArrayList; -import java.util.Collections; import java.util.List; public class ProjectView { - private final Project project; - private List versions = Collections.emptyList(); - private List issues = Collections.emptyList(); + private final List projectList = new ArrayList<>(); + private ProjectInfo projectInfo; + private Version versionFilter; - private IssueSummary issuesTotal; - private List issuesWithoutVersion; - private IssueSummary issuesWithoutVersionTotal; - private List versionInfos = Collections.emptyList(); - - public ProjectView(Project project) { - this.project = project; + public List getProjectList() { + return projectList; } - public Project getProject() { - return project; + public ProjectInfo getProjectInfo() { + return projectInfo; } - public List getIssues() { - return issues; + public void setProjectInfo(ProjectInfo projectInfo) { + this.projectInfo = projectInfo; } - public void setIssues(List issues) { - this.issues = issues; - issuesTotal = new IssueSummary(); - issuesWithoutVersion = new ArrayList<>(); - issuesWithoutVersionTotal = new IssueSummary(); - for (Issue issue : issues) { - issuesTotal.add(issue); - // we want to list all issues that do not have a target version - if (issue.getResolvedVersions().isEmpty()) { - issuesWithoutVersion.add(issue); - issuesWithoutVersionTotal.add(issue); - } - } + public Version getVersionFilter() { + return versionFilter; } - public List getVersions() { - return versions; - } - - public void setVersions(List versions) { - this.versions = versions; - } - - public void updateVersionInfo() { - versionInfos = new ArrayList<>(); - for (Version version : versions) { - final var info = new VersionInfo(version); - info.collectIssues(issues); - versionInfos.add(info); - } - } - - public IssueSummary getIssuesTotal() { - return issuesTotal; - } - - public List getIssuesWithoutVersion() { - return issuesWithoutVersion; - } - - public IssueSummary getIssuesWithoutVersionTotal() { - return issuesWithoutVersionTotal; - } - - public List getVersionInfos() { - return versionInfos; + public void setVersionFilter(Version versionFilter) { + this.versionFilter = versionFilter; } }