diff options
Diffstat (limited to 'plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats')
10 files changed, 33 insertions, 25 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewAuthorColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewAuthorColumn.java index 8bcef6f5b88..fbd571bbd8f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewAuthorColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewAuthorColumn.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.column; import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; +import org.eclipse.osee.ats.api.review.Role; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; -import org.eclipse.osee.ats.core.client.review.role.Role; import org.eclipse.osee.ats.core.client.review.role.UserRoleManager; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewModeratorColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewModeratorColumn.java index 79277e30f03..5b59a485dce 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewModeratorColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewModeratorColumn.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.column; import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; +import org.eclipse.osee.ats.api.review.Role; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; -import org.eclipse.osee.ats.core.client.review.role.Role; import org.eclipse.osee.ats.core.client.review.role.UserRoleManager; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewReviewerColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewReviewerColumn.java index 4330dcec9d4..ac0148c749d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewReviewerColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewReviewerColumn.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.column; import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; +import org.eclipse.osee.ats.api.review.Role; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; -import org.eclipse.osee.ats.core.client.review.role.Role; import org.eclipse.osee.ats.core.client.review.role.UserRoleManager; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItem.java index c72c0b651c8..73d55975a70 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItem.java @@ -15,6 +15,7 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.review.IAtsPeerToPeerReview; +import org.eclipse.osee.ats.api.review.UserRole; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workdef.IStateToken; @@ -22,8 +23,8 @@ import org.eclipse.osee.ats.api.workflow.transition.ITransitionListener; import org.eclipse.osee.ats.api.workflow.transition.TransitionResults; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewState; -import org.eclipse.osee.ats.core.client.review.role.UserRole; import org.eclipse.osee.ats.core.client.review.role.UserRoleManager; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; /** @@ -48,7 +49,7 @@ public class AtsPeerToPeerReviewReviewStateItem extends AtsStateItem implements PeerToPeerReviewArtifact peerArt = (PeerToPeerReviewArtifact) workItem; for (UserRole uRole : UserRoleManager.getUserRoles(peerArt)) { if (!uRole.isCompleted()) { - assignees.add(uRole.getUser()); + assignees.add(AtsClientService.get().getUserService().getUserById(uRole.getUserId())); } } assignees.addAll(workItem.getStateMgr().getAssignees()); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/NewRoleDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/NewRoleDialog.java index 21ab36439cd..c60523ee59d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/NewRoleDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/NewRoleDialog.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.util.widgets.role; import java.util.Collection; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.ats.api.review.Role; import org.eclipse.osee.ats.api.user.IAtsUser; -import org.eclipse.osee.ats.core.client.review.role.Role; import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleContentProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleContentProvider.java index 33cc61750fd..2b01c17f449 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleContentProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleContentProvider.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.HashSet; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.osee.ats.core.client.review.role.UserRole; +import org.eclipse.osee.ats.api.review.UserRole; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.ui.swt.Displays; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleLabelProvider.java index ef3bb3b8721..3e7c3e0db66 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleLabelProvider.java @@ -15,9 +15,10 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.api.review.UserRole; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectItem.Severity; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectManager; -import org.eclipse.osee.ats.core.client.review.role.UserRole; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; @@ -46,7 +47,8 @@ public class UserRoleLabelProvider extends XViewerLabelProvider { UserRole roleItem = (UserRole) element; try { if (dCol.equals(UserRoleXViewerFactory.User_Col)) { - return ArtifactImageManager.getImage(AtsClientService.get().getUserServiceClient().getOseeUser(roleItem.getUser())); + return ArtifactImageManager.getImage(AtsClientService.get().getUserServiceClient().getOseeUser( + AtsClientService.get().getUserService().getUserById(roleItem.getUserId()))); } else if (dCol.equals(UserRoleXViewerFactory.Role_Col)) { return ImageManager.getImage(AtsImage.ROLE); } else if (dCol.equals(UserRoleXViewerFactory.Hours_Spent_Col)) { @@ -70,8 +72,9 @@ public class UserRoleLabelProvider extends XViewerLabelProvider { public String getColumnText(Object element, XViewerColumn aCol, int columnIndex) throws OseeCoreException { UserRole defectItem = (UserRole) element; + IAtsUser atsUser = AtsClientService.get().getUserService().getUserById(defectItem.getUserId()); if (aCol.equals(UserRoleXViewerFactory.User_Col)) { - return defectItem.getUser().getName(); + return atsUser.getName(); } else if (aCol.equals(UserRoleXViewerFactory.Hours_Spent_Col)) { return defectItem.getHoursSpent() == null ? "" : AtsUtilCore.doubleToI18nString(defectItem.getHoursSpent(), false); @@ -81,13 +84,13 @@ public class UserRoleLabelProvider extends XViewerLabelProvider { return String.valueOf(defectItem.isCompleted()); } else if (aCol.equals(UserRoleXViewerFactory.Num_Major_Col)) { ReviewDefectManager defectMgr = new ReviewDefectManager(xViewer.getXUserRoleViewer().getReviewArt()); - return defectMgr.getNumMajor(defectItem.getUser()) + ""; + return defectMgr.getNumMajor(atsUser) + ""; } else if (aCol.equals(UserRoleXViewerFactory.Num_Minor_Col)) { ReviewDefectManager defectMgr = new ReviewDefectManager(xViewer.getXUserRoleViewer().getReviewArt()); - return defectMgr.getNumMinor(defectItem.getUser()) + ""; + return defectMgr.getNumMinor(atsUser) + ""; } else if (aCol.equals(UserRoleXViewerFactory.Num_Issues_Col)) { ReviewDefectManager defectMgr = new ReviewDefectManager(xViewer.getXUserRoleViewer().getReviewArt()); - return defectMgr.getNumIssues(defectItem.getUser()) + ""; + return defectMgr.getNumIssues(atsUser) + ""; } return "unhandled column"; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java index 6401cfc6244..36db9b12c7e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java @@ -21,8 +21,8 @@ import org.eclipse.nebula.widgets.xviewer.XPromptChange; import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.util.EnumStringSingleSelectionDialog; -import org.eclipse.osee.ats.core.client.review.role.Role; -import org.eclipse.osee.ats.core.client.review.role.UserRole; +import org.eclipse.osee.ats.api.review.Role; +import org.eclipse.osee.ats.api.review.UserRole; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; @@ -203,8 +203,8 @@ public class UserRoleXViewer extends XViewer { private boolean setUser(Collection<UserRole> userRoles, User user) throws OseeCoreException { boolean modified = false; for (UserRole userRole : userRoles) { - if (user != null && !userRole.getUser().equals(user)) { - userRole.setUser(user); + if (user != null && !userRole.getUserId().equals(user.getUserId())) { + userRole.setUserId(user.getUserId()); if (!modified) { modified = true; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java index 9cb935b2046..5e37fd5f0ae 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java @@ -26,17 +26,19 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.window.Window; +import org.eclipse.osee.ats.api.review.UserRole; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectManager; -import org.eclipse.osee.ats.core.client.review.role.UserRole; import org.eclipse.osee.ats.core.client.review.role.UserRoleError; import org.eclipse.osee.ats.core.client.review.role.UserRoleManager; import org.eclipse.osee.ats.core.client.review.role.UserRoleValidator; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; import org.eclipse.osee.ats.core.client.util.AtsUtilClient; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AHTML; @@ -433,13 +435,14 @@ public class XUserRoleViewer extends GenericXWidget implements IArtifactWidget, "Issues"})); ReviewDefectManager defectMgr = new ReviewDefectManager(reviewArt); for (UserRole item : roleMgr.getUserRoles()) { + IAtsUser atsUser = AtsClientService.get().getUserService().getUserById(item.getUserId()); html.append(AHTML.addRowMultiColumnTable(new String[] { item.getRole().name(), - item.getUser().getName(), - item.getHoursSpentStr(), - defectMgr.getNumMajor(item.getUser()) + "", - defectMgr.getNumMinor(item.getUser()) + "", - defectMgr.getNumIssues(item.getUser()) + ""})); + atsUser.getName(), + AtsUtilCore.doubleToI18nString(item.getHoursSpent(), true), + defectMgr.getNumMajor(atsUser) + "", + defectMgr.getNumMinor(atsUser) + "", + defectMgr.getNumIssues(atsUser) + ""})); } html.append(AHTML.endBorderTable()); } catch (Exception ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerReviewRoleColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerReviewRoleColumn.java index 1b7991887c6..5c58a809698 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerReviewRoleColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerReviewRoleColumn.java @@ -13,10 +13,11 @@ package org.eclipse.osee.ats.util.xviewer.column; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.util.XViewerException; +import org.eclipse.osee.ats.api.review.UserRole; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; -import org.eclipse.osee.ats.core.client.review.role.UserRole; import org.eclipse.osee.ats.core.client.review.role.UserRoleManager; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.swt.SWT; @@ -62,7 +63,7 @@ public class XViewerReviewRoleColumn extends XViewerValueColumn { private static String getRolesStr(AbstractReviewArtifact reviewArt, IAtsUser user) throws OseeCoreException { StringBuilder builder = new StringBuilder(); for (UserRole role : UserRoleManager.getUserRoles(reviewArt)) { - if (role.getUser().equals(user)) { + if (AtsClientService.get().getUserService().getUserById(role.getUserId()).equals(user)) { builder.append(role.getRole().name()); builder.append(", "); } |