diff options
author | Ryan D. Brooks | 2021-04-20 05:46:21 +0000 |
---|---|---|
committer | Ryan T. Baldwin | 2021-04-20 05:46:21 +0000 |
commit | 742af2579665329c2cba7b9d1b3d6e080230cc95 (patch) | |
tree | 806b1fcdb4530e040f0f025a972f89e7e913cfa7 /plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee | |
parent | 2e6f512a327dc102cc080046e455cf3cdf07d1f7 (diff) | |
download | org.eclipse.osee-742af2579665329c2cba7b9d1b3d6e080230cc95.tar.gz org.eclipse.osee-742af2579665329c2cba7b9d1b3d6e080230cc95.tar.xz org.eclipse.osee-742af2579665329c2cba7b9d1b3d6e080230cc95.zip |
refactor[TW19034]: Rename IUserGroupService to UserService
Change-Id: Ie8c49fdcf851182de867bb51478c73c327eee937
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee')
8 files changed, 17 insertions, 17 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java index 36bba40c206..64a6dff791a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java @@ -29,7 +29,7 @@ import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; -import org.eclipse.osee.framework.skynet.core.access.UserGroupService; +import org.eclipse.osee.framework.skynet.core.access.UserServiceImpl; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.access.internal.OseeApiService; @@ -160,7 +160,7 @@ public class PolicyTableViewer { if (isArtifact()) { Artifact artifact = (Artifact) object; - IUserGroup oseeAccessGroup = UserGroupService.getOseeAccessAdmin(); + IUserGroup oseeAccessGroup = UserServiceImpl.getOseeAccessAdmin(); boolean isOseeAccessAdmin = oseeAccessGroup.isCurrentUserMember(); boolean canUnlockObject = diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java index 8a3909f2c42..79ce736047f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java @@ -37,7 +37,7 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.access.AccessControlArtifactUtil; -import org.eclipse.osee.framework.skynet.core.access.UserGroupService; +import org.eclipse.osee.framework.skynet.core.access.UserServiceImpl; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; @@ -286,7 +286,7 @@ public class MassXViewer extends XViewer implements IMassViewerEventHandler { mm.insertBefore(XViewer.MENU_GROUP_PRE, deleteAttributeValuesAction); deleteAttributeValuesAction.setEnabled(!getSelectedArtifacts().isEmpty()); - if (UserGroupService.getOseeAdmin().isCurrentUserMember()) { + if (UserServiceImpl.getOseeAdmin().isCurrentUserMember()) { mm.insertBefore(XViewer.MENU_GROUP_PRE, deleteArtifactAction); deleteArtifactAction.setEnabled(!getSelectedArtifacts().isEmpty()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java index b9494d06cb1..c8a78f7f192 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java @@ -25,7 +25,7 @@ import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.ElapsedTime; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects; -import org.eclipse.osee.framework.skynet.core.access.UserGroupService; +import org.eclipse.osee.framework.skynet.core.access.UserServiceImpl; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.xnavigate.IXNavigateCommonItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateCommonItems; @@ -93,7 +93,7 @@ public class BlamContributionManager implements IXNavigateCommonItem { XNavigateItem blamOperationItems = new XNavigateItem(null, "Blam Operations", FrameworkImage.BLAM); ElapsedTime time = new ElapsedTime("NVI - BLAM loadUserGroups", XNavigateCommonItems.debug); - Collection<IUserGroupArtifactToken> userGroups = UserGroupService.getUserGrps(); + Collection<IUserGroupArtifactToken> userGroups = UserServiceImpl.getUserGrps(); time.end(); for (AbstractBlam blamOperation : getBlamOperations()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/BranchTransactionActionBarContributor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/BranchTransactionActionBarContributor.java index de592c906bc..3e07c11b424 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/BranchTransactionActionBarContributor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/BranchTransactionActionBarContributor.java @@ -16,7 +16,7 @@ package org.eclipse.osee.framework.ui.skynet.change; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.Separator; -import org.eclipse.osee.framework.skynet.core.access.UserGroupService; +import org.eclipse.osee.framework.skynet.core.access.UserServiceImpl; import org.eclipse.osee.framework.ui.skynet.artifact.editor.IActionContributor; import org.eclipse.osee.framework.ui.skynet.change.actions.OpenAssociatedArtifact; import org.eclipse.osee.framework.ui.skynet.change.actions.OpenQuickSearchAction; @@ -39,7 +39,7 @@ public class BranchTransactionActionBarContributor implements IActionContributor @Override public void contributeToToolBar(IToolBarManager manager) { ChangeUiData uiData = editor.getEditorInput().getChangeData(); - if (UserGroupService.getOseeAdmin().isCurrentUserMember()) { + if (UserServiceImpl.getOseeAdmin().isCurrentUserMember()) { manager.add(new OpenChangeReportByTransactionIdAction()); } manager.add(getReloadAction()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportActionBarContributor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportActionBarContributor.java index fb071d9507b..fa6638c3d62 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportActionBarContributor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportActionBarContributor.java @@ -16,7 +16,7 @@ package org.eclipse.osee.framework.ui.skynet.change; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.Separator; -import org.eclipse.osee.framework.skynet.core.access.UserGroupService; +import org.eclipse.osee.framework.skynet.core.access.UserServiceImpl; import org.eclipse.osee.framework.ui.skynet.artifact.editor.IActionContributor; import org.eclipse.osee.framework.ui.skynet.change.actions.OpenAssociatedArtifact; import org.eclipse.osee.framework.ui.skynet.change.actions.OpenQuickSearchAction; @@ -39,7 +39,7 @@ public class ChangeReportActionBarContributor implements IActionContributor { @Override public void contributeToToolBar(IToolBarManager manager) { ChangeUiData uiData = editor.getEditorInput().getChangeData(); - if (UserGroupService.getOseeAdmin().isCurrentUserMember()) { + if (UserServiceImpl.getOseeAdmin().isCurrentUserMember()) { manager.add(new OpenChangeReportByTransactionIdAction()); } manager.add(getReloadAction()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java index 9aec8553e50..0d9f5ad8535 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java @@ -35,7 +35,7 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.skynet.core.access.UserGroupService; +import org.eclipse.osee.framework.skynet.core.access.UserServiceImpl; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; import org.eclipse.osee.framework.skynet.core.event.listener.ITransactionEventListener; import org.eclipse.osee.framework.skynet.core.event.model.Sender; @@ -142,7 +142,7 @@ public class BranchTransactionPage extends FormPage implements IBranchWidgetMenu mm.insertBefore(XViewer.MENU_GROUP_PRE, new ShowChangeReportAction(this)); mm.insertBefore(XViewer.MENU_GROUP_PRE, new CreateBranchFromTransactionAction(this.getSelectedTransactionRecords(), this.branch)); - if (UserGroupService.getOseeAdmin().isCurrentUserMember()) { + if (UserServiceImpl.getOseeAdmin().isCurrentUserMember()) { mm.insertBefore(XViewer.MENU_GROUP_PRE, new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); mm.insertBefore(XViewer.MENU_GROUP_PRE, new EditTransactionComment(this)); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/EditorsPreferencePage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/EditorsPreferencePage.java index df6bdc3e6dd..a48252110a2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/EditorsPreferencePage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/EditorsPreferencePage.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; -import org.eclipse.osee.framework.skynet.core.access.UserGroupService; +import org.eclipse.osee.framework.skynet.core.access.UserServiceImpl; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; @@ -246,9 +246,9 @@ public class EditorsPreferencePage extends PreferencePage implements IWorkbenchP boolean editOnOpen = editButton.getSelection(); UserManager.setSetting(UserManager.DOUBLE_CLICK_SETTING_KEY_EDIT, String.valueOf(editOnOpen)); if (editOnOpen) { - UserGroupService.get(CoreUserGroups.DefaultArtifactEditor).removeMember(UserManager.getUser(), true); + UserServiceImpl.get(CoreUserGroups.DefaultArtifactEditor).removeMember(UserManager.getUser(), true); } else { - UserGroupService.get(CoreUserGroups.DefaultArtifactEditor).addMember(UserManager.getUser(), true); + UserServiceImpl.get(CoreUserGroups.DefaultArtifactEditor).addMember(UserManager.getUser(), true); } RendererManager.clearCaches(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java index 9b34ad7ba5f..623ca5cd606 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java @@ -36,7 +36,7 @@ import org.eclipse.osee.framework.core.util.WordMLProducer; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects; -import org.eclipse.osee.framework.skynet.core.access.UserGroupService; +import org.eclipse.osee.framework.skynet.core.access.UserServiceImpl; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; import org.eclipse.osee.framework.ui.skynet.internal.Activator; @@ -296,7 +296,7 @@ public final class RendererManager { public static Boolean isDefaultArtifactEditor() { if (defaultArtifactEditor == null) { - defaultArtifactEditor = UserGroupService.isInUserGrp(CoreUserGroups.DefaultArtifactEditor); + defaultArtifactEditor = UserServiceImpl.isInUserGrp(CoreUserGroups.DefaultArtifactEditor); } return defaultArtifactEditor; } |