diff options
| author | Roberto E. Escobar | 2013-12-04 02:56:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2013-12-05 22:28:12 +0000 |
| commit | 1b72f67088035edd1b438dd0152b1bf24b437856 (patch) | |
| tree | 78141ac8d3b199f3fc414478c7ac069bb5d13985 | |
| parent | 39e025164fe358dc8748763da5e32beb8d5fee94 (diff) | |
| download | org.eclipse.osee-1b72f67088035edd1b438dd0152b1bf24b437856.tar.gz org.eclipse.osee-1b72f67088035edd1b438dd0152b1bf24b437856.tar.xz org.eclipse.osee-1b72f67088035edd1b438dd0152b1bf24b437856.zip | |
refactor: Rename AtsUtilCore to AtsUtilClient
Change-Id: I26124e4bf2ccd8f4dfd79c343955047f37f56d1e
96 files changed, 186 insertions, 207 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF index 95c5ab0189a..6a4b1e320ad 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF @@ -47,6 +47,7 @@ Import-Package: org.eclipse.core.filesystem, org.eclipse.osee.ats.core.config, org.eclipse.osee.ats.core.model, org.eclipse.osee.ats.core.model.impl, + org.eclipse.osee.ats.core.util, org.eclipse.osee.ats.core.workdef, org.eclipse.osee.ats.core.workflow, org.eclipse.osee.ats.core.workflow.state, diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java index 8f17491e8d7..7c9fb2cc8cf 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java @@ -41,7 +41,7 @@ import org.eclipse.osee.ats.core.client.review.ReviewManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.AtsVersionService; @@ -140,7 +140,7 @@ public class PopulateDemoActions extends XNavigateItemAction { } public void run(boolean prompt) throws Exception { - AtsUtilCore.setEmailEnabled(false); + AtsUtilClient.setEmailEnabled(false); if (AtsUtil.isProductionDb()) { throw new IllegalStateException("PopulateDemoActions should not be run on production DB"); } diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java index f4a778f7285..2cf20fdd90b 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java @@ -18,7 +18,7 @@ import org.eclipse.osee.ats.client.demo.DemoSawBuilds; import org.eclipse.osee.ats.client.demo.DemoSubsystems; import org.eclipse.osee.ats.client.demo.DemoUsers; import org.eclipse.osee.ats.core.client.util.AtsGroup; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.core.data.IArtifactToken; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java index f7a9749d853..54b505d25e7 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java @@ -49,7 +49,7 @@ import org.eclipse.osee.ats.core.client.review.ReviewManager; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.workdef.SimpleDecisionReviewOption; @@ -505,7 +505,7 @@ public class AtsTestUtil { public static void cleanupSimpleTest(Collection<String> titles) throws Exception { List<Artifact> artifacts = new ArrayList<Artifact>(); for (String title : titles) { - artifacts.addAll(ArtifactQuery.getArtifactListFromName(title, AtsUtilCore.getAtsBranch(), EXCLUDE_DELETED, + artifacts.addAll(ArtifactQuery.getArtifactListFromName(title, AtsUtilClient.getAtsBranch(), EXCLUDE_DELETED, QueryOptions.CONTAINS_MATCH_OPTIONS)); } Operations.executeWorkAndCheckStatus(new PurgeArtifacts(artifacts)); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/VersionArtifactStoreTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/VersionArtifactStoreTest.java index f39e5ecf305..52e316fb760 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/VersionArtifactStoreTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/VersionArtifactStoreTest.java @@ -19,8 +19,8 @@ import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.config.IAtsConfig; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotificationManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotificationManagerTest.java index 2ddced2e716..e46dda80669 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotificationManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotificationManagerTest.java @@ -33,8 +33,9 @@ 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.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.ChangeType; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.workflow.state.TeamState; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.util.Result; @@ -57,7 +58,7 @@ public class AtsNotificationManagerTest { @BeforeClass public static void setup() { - AtsUtilCore.setEmailEnabled(true); + AtsUtilClient.setEmailEnabled(true); } @AfterClass @@ -69,7 +70,7 @@ public class AtsNotificationManagerTest { AtsNotificationManager.setInTest(true); AtsTestUtil.cleanup(); - AtsUtilCore.setEmailEnabled(false); + AtsUtilClient.setEmailEnabled(false); } @org.junit.Test @@ -400,7 +401,7 @@ public class AtsNotificationManagerTest { changes.execute(); SkynetTransaction transaction2 = - TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName()); + TransactionManager.createTransaction(AtsUtilClient.getAtsBranch(), getClass().getSimpleName()); actionArt.getTeams().iterator().next().deleteAndPersist(transaction2); actionArt.deleteAndPersist(transaction2); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotifyUsersTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotifyUsersTest.java index 3171ad60b78..23ba6d3759f 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotifyUsersTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotifyUsersTest.java @@ -28,7 +28,7 @@ import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager.Configurat import org.eclipse.osee.ats.core.client.notify.AtsNotifyUsers; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.util.SubscribeManager; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; @@ -57,7 +57,7 @@ import org.junit.Assert; public class AtsNotifyUsersTest { @org.junit.BeforeClass public static void setup() throws OseeCoreException { - AtsUtilCore.setEmailEnabled(true); + AtsUtilClient.setEmailEnabled(true); AtsTestUtil.cleanupAndReset(AtsNotificationManagerTest.class.getSimpleName()); cleanUpAction(); } @@ -72,18 +72,18 @@ public class AtsNotifyUsersTest { AtsTestUtil.cleanup(); cleanUpAction(); - AtsUtilCore.setEmailEnabled(false); + AtsUtilClient.setEmailEnabled(false); AtsTestUtil.validateArtifactCache(); - AtsUtilCore.setEmailEnabled(false); + AtsUtilClient.setEmailEnabled(false); } private static void cleanUpAction() throws OseeCoreException { SkynetTransaction changes = - TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), AtsNotifyUsersTest.class.getSimpleName()); + TransactionManager.createTransaction(AtsUtilClient.getAtsBranch(), AtsNotifyUsersTest.class.getSimpleName()); for (Artifact art : ArtifactQuery.getArtifactListFromAttribute(CoreAttributeTypes.Name, - AtsNotifyUsersTest.class.getSimpleName(), AtsUtilCore.getAtsBranch(), QueryOptions.CONTAINS_MATCH_OPTIONS)) { + AtsNotifyUsersTest.class.getSimpleName(), AtsUtilClient.getAtsBranch(), QueryOptions.CONTAINS_MATCH_OPTIONS)) { art.deleteAndPersist(changes); } changes.execute(); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java index 9b5bed931c4..8a66d16581b 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java @@ -21,7 +21,7 @@ import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewManager; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -46,7 +46,7 @@ public class PeerToPeerReviewManagerTest extends PeerToPeerReviewManager { public static void cleanup() throws Exception { AtsTestUtil.cleanup(); SkynetTransaction transaction = - TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), + TransactionManager.createTransaction(AtsUtilClient.getAtsBranch(), PeerToPeerReviewManagerTest.class.getSimpleName()); for (Artifact art : ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.PeerToPeerReview, "PeerToPeerReviewManagerTest", AtsUtil.getAtsBranchToken(), QueryOptions.CONTAINS_MATCH_OPTIONS)) { diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java index f32cf3d4de8..4134e4f48b7 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java @@ -16,9 +16,9 @@ import java.util.List; import java.util.Map; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ConvertWorkflowStatesOperation; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java index 828f7aeb64f..076c0854962 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java @@ -28,7 +28,7 @@ import org.eclipse.osee.ats.core.client.internal.AtsClientService; import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; import org.eclipse.osee.ats.core.config.TeamDefinitions; @@ -56,7 +56,7 @@ public class ActionManager { monitor.subTask("Creating Action"); } ActionArtifact actionArt = - (ActionArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Action, AtsUtilCore.getAtsBranch()); + (ActionArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Action, AtsUtilClient.getAtsBranch()); setArtifactIdentifyData(actionArt, title, desc, changeType, priority, validationRequired, needByDate); // Retrieve Team Definitions corresponding to selected Actionable Items @@ -113,17 +113,17 @@ public class ActionManager { for (TeamWorkFlowArtifact teamArt : ActionManager.getTeams(actionArt)) { if (teamArt.getTeamDefinition().equals(teamDef)) { throw new OseeArgumentException("Team [%s] already exists for Action [%s]", teamDef, - AtsUtilCore.getAtsId(actionArt)); + AtsUtilClient.getAtsId(actionArt)); } } } TeamWorkFlowArtifact teamArt = null; if (guid == null) { - teamArt = (TeamWorkFlowArtifact) ArtifactTypeManager.addArtifact(artifactType, AtsUtilCore.getAtsBranch()); + teamArt = (TeamWorkFlowArtifact) ArtifactTypeManager.addArtifact(artifactType, AtsUtilClient.getAtsBranch()); } else { teamArt = - (TeamWorkFlowArtifact) ArtifactTypeManager.addArtifact(artifactType, AtsUtilCore.getAtsBranch(), null, guid); + (TeamWorkFlowArtifact) ArtifactTypeManager.addArtifact(artifactType, AtsUtilClient.getAtsBranch(), null, guid); } setArtifactIdentifyData(actionArt, teamArt); diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/ev/EarnedValueReportOperation.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/ev/EarnedValueReportOperation.java index 7b004746437..202347076cd 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/ev/EarnedValueReportOperation.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/ev/EarnedValueReportOperation.java @@ -23,8 +23,8 @@ import org.eclipse.osee.ats.api.util.ColumnAdapter; import org.eclipse.osee.ats.api.util.ColumnType; import org.eclipse.osee.ats.api.util.IColumn; import org.eclipse.osee.ats.core.client.internal.Activator; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.PercentCompleteTotalUtil; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/LoadAtsConfigCacheCallable.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/LoadAtsConfigCacheCallable.java index 16b55298e8f..a2e0ac20f03 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/LoadAtsConfigCacheCallable.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/LoadAtsConfigCacheCallable.java @@ -18,7 +18,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.internal.IAtsArtifactStore; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.DeletionFlag; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/ev/AtsEarnedValueImpl.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/ev/AtsEarnedValueImpl.java index 40806dd6eda..e05d33c4823 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/ev/AtsEarnedValueImpl.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/ev/AtsEarnedValueImpl.java @@ -25,8 +25,8 @@ import org.eclipse.osee.ats.api.review.IAtsAbstractReview; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.core.client.ev.WorkPackageArtifact; import org.eclipse.osee.ats.core.client.internal.AtsClientService; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Conditions; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/AbstractAtsArtifactWriter.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/AbstractAtsArtifactWriter.java index ea9cf33de10..d6f8ba1258d 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/AbstractAtsArtifactWriter.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/AbstractAtsArtifactWriter.java @@ -18,7 +18,7 @@ import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.core.client.internal.IAtsArtifactWriter; import org.eclipse.osee.ats.core.client.internal.config.AtsArtifactConfigCache; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/ActionableItemArtifactWriter.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/ActionableItemArtifactWriter.java index edeb2139af7..860c9c44aa6 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/ActionableItemArtifactWriter.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/ActionableItemArtifactWriter.java @@ -17,9 +17,9 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.core.client.internal.config.AtsArtifactConfigCache; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.util.AtsObjects; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/AtsVersionServiceImpl.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/AtsVersionServiceImpl.java index b3831170e4f..ded2e390489 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/AtsVersionServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/AtsVersionServiceImpl.java @@ -26,8 +26,8 @@ import org.eclipse.osee.ats.core.client.internal.IAtsArtifactStore; import org.eclipse.osee.ats.core.client.internal.config.AtsArtifactConfigCache; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.CacheProvider; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.jdk.core.type.Identity; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/TeamDefinitionArtifactWriter.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/TeamDefinitionArtifactWriter.java index 1f33a73b70b..d69999c301e 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/TeamDefinitionArtifactWriter.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/TeamDefinitionArtifactWriter.java @@ -18,9 +18,9 @@ import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.core.client.internal.config.AtsArtifactConfigCache; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.core.util.AtsObjects; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workdef/AtsWorkDefinitionStore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workdef/AtsWorkDefinitionStore.java index 84eac17be39..2e3144e73a9 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workdef/AtsWorkDefinitionStore.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workdef/AtsWorkDefinitionStore.java @@ -16,7 +16,7 @@ import java.util.List; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionStore; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.Pair; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java index 6c8475ba9b4..3d79cc95875 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java @@ -23,7 +23,7 @@ import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.internal.AtsClientService; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; @@ -58,7 +58,7 @@ public class AtsNotificationManager { * Handle notifications for subscription by IAtsTeamDefinition and ActionableItem */ public static void notifySubscribedByTeamOrActionableItem(TeamWorkFlowArtifact teamArt) { - if (isInTest() || !AtsUtilCore.isEmailEnabled() || !isProduction()) { + if (isInTest() || !AtsUtilClient.isEmailEnabled() || !isProduction()) { return; } boolean notificationAdded = false; @@ -130,7 +130,7 @@ public class AtsNotificationManager { } public static void notify(AbstractWorkflowArtifact awa, Collection<? extends IAtsUser> notifyUsers, AtsNotifyType... notifyTypes) throws OseeCoreException { - if (isInTest() || !AtsUtilCore.isEmailEnabled() || !isProduction() || awa.getName().startsWith("tt ")) { + if (isInTest() || !AtsUtilClient.isEmailEnabled() || !isProduction() || awa.getName().startsWith("tt ")) { return; } AtsNotifyUsers.notify(getNotificationManager(), awa, notifyUsers, notifyTypes); diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/operation/MoveTeamWorkflowsOperation.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/operation/MoveTeamWorkflowsOperation.java index 3c79505de32..ba61558fc1b 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/operation/MoveTeamWorkflowsOperation.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/operation/MoveTeamWorkflowsOperation.java @@ -16,7 +16,7 @@ import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -50,7 +50,7 @@ public class MoveTeamWorkflowsOperation extends AbstractOperation { throw new OseeArgumentException("ERROR", "Must provide Destination Team Workflow."); } - SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getName()); + SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtilClient.getAtsBranch(), getName()); if (Strings.isValid(destActionTitle)) { destTeamWorkflow.getParentActionArtifact().setName(destActionTitle); } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManager.java index c31c6009ac9..e0a6fb9ac18 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManager.java @@ -30,7 +30,7 @@ import org.eclipse.osee.ats.api.workflow.transition.TransitionResults; import org.eclipse.osee.ats.core.AtsCore; import org.eclipse.osee.ats.core.client.internal.AtsClientService; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.workdef.SimpleDecisionReviewOption; import org.eclipse.osee.ats.core.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.workflow.transition.TransitionManager; @@ -187,7 +187,7 @@ public class DecisionReviewManager { public static DecisionReviewArtifact createNewDecisionReview(TeamWorkFlowArtifact teamArt, ReviewBlockType reviewBlockType, String title, String relatedToState, String description, Collection<IAtsDecisionReviewOption> options, List<? extends IAtsUser> assignees, Date createdDate, IAtsUser createdBy, IAtsChangeSet changes) throws OseeCoreException { DecisionReviewArtifact decRev = (DecisionReviewArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.DecisionReview, - AtsUtilCore.getAtsBranch(), title); + AtsUtilClient.getAtsBranch(), title); // Initialize state machine decRev.initializeNewStateMachine(assignees, createdDate, createdBy, changes); diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManager.java index 668339e381f..225ade6eabd 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManager.java @@ -33,7 +33,7 @@ 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.UserRoleManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.workflow.transition.TransitionManager; import org.eclipse.osee.framework.core.util.Result; @@ -175,7 +175,7 @@ public class PeerToPeerReviewManager { public static PeerToPeerReviewArtifact createNewPeerToPeerReview(IAtsWorkDefinition workDefinition, TeamWorkFlowArtifact teamArt, String reviewTitle, String againstState, Date createdDate, IAtsUser createdBy, IAtsChangeSet changes) throws OseeCoreException { PeerToPeerReviewArtifact peerToPeerRev = (PeerToPeerReviewArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.PeerToPeerReview, - AtsUtilCore.getAtsBranch(), reviewTitle == null ? "Peer to Peer Review" : reviewTitle); + AtsUtilClient.getAtsBranch(), reviewTitle == null ? "Peer to Peer Review" : reviewTitle); if (teamArt != null) { teamArt.addRelation(AtsRelationTypes.TeamWorkflowToReview_Review, peerToPeerRev); diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRole.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRole.java index 3f4592ddf7b..8c47e049046 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRole.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRole.java @@ -15,7 +15,7 @@ import java.util.logging.Level; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.internal.AtsClientService; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AXml; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/search/AtsArtifactQuery.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/search/AtsArtifactQuery.java index ad89ecd3e80..25e90e7d0d0 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/search/AtsArtifactQuery.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/search/AtsArtifactQuery.java @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/AbstractTaskableArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/AbstractTaskableArtifact.java index 4bfd8d9d633..e68723096a7 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/AbstractTaskableArtifact.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/AbstractTaskableArtifact.java @@ -28,7 +28,7 @@ import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.internal.AtsClientService; import org.eclipse.osee.ats.core.client.util.AtsTaskCache; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.util.PercentCompleteTotalUtil; import org.eclipse.osee.framework.core.data.IArtifactType; @@ -106,7 +106,7 @@ public abstract class AbstractTaskableArtifact extends AbstractWorkflowArtifact public TaskArtifact createNewTask(List<? extends IAtsUser> assignees, String title, Date createdDate, IAtsUser createdBy, String relatedToState, IAtsChangeSet changes) throws OseeCoreException { TaskArtifact taskArt = null; taskArt = - (TaskArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Task, AtsUtilCore.getAtsBranch(), title); + (TaskArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Task, AtsUtilClient.getAtsBranch(), title); addRelation(AtsRelationTypes.TeamWfToTask_Task, taskArt); taskArt.initializeNewStateMachine(assignees, new Date(), diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskManager.java index 89c39263f27..9d200f0352a 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskManager.java @@ -25,7 +25,7 @@ import org.eclipse.osee.ats.core.AtsCore; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.internal.AtsClientService; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.workflow.state.TeamState; import org.eclipse.osee.ats.core.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.workflow.transition.TransitionManager; @@ -121,7 +121,7 @@ public class TaskManager { // Move Tasks SkynetTransaction transaction = - TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "Drop Add Tasks"); + TransactionManager.createTransaction(AtsUtilClient.getAtsBranch(), "Drop Add Tasks"); for (Artifact art : taskArts) { if (art.isOfType(AtsArtifactTypes.Task)) { TaskArtifact taskArt = (TaskArtifact) art; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowArtifact.java index 233a585bd1c..57084e9f8c9 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowArtifact.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowArtifact.java @@ -32,9 +32,9 @@ import org.eclipse.osee.ats.core.client.internal.AtsClientService; import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; import org.eclipse.osee.ats.core.client.review.ReviewManager; import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.config.AtsVersionService; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowManager.java index d3582d9be25..2709daef76c 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowManager.java @@ -33,8 +33,8 @@ import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.transition.TransitionOption; import org.eclipse.osee.ats.api.workflow.transition.TransitionResults; import org.eclipse.osee.ats.core.client.internal.Activator; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.workflow.state.TeamState; import org.eclipse.osee.ats.core.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.workflow.transition.TransitionManager; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java index 8f63c461e46..50ba8907ce6 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java @@ -19,6 +19,7 @@ import org.eclipse.osee.ats.api.util.IExecuteListener; import org.eclipse.osee.ats.api.workflow.IAttribute; import org.eclipse.osee.ats.core.AtsCore; import org.eclipse.osee.ats.core.client.internal.AtsClientService; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilCore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilClient.java index 61186290652..fbcf7160454 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilCore.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilClient.java @@ -17,10 +17,9 @@ import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.internal.Activator; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.core.data.IArtifactToken; -import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.Active; -import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; @@ -36,9 +35,8 @@ import org.eclipse.osee.framework.skynet.core.utility.DbUtil; /** * @author Donald G. Dunne */ -public class AtsUtilCore { +public class AtsUtilClient { private static final String DEFAULT_ATS_ID_VALUE = "0"; - public final static double DEFAULT_HOURS_PER_WORK_DAY = 8; private static ArtifactTypeEventFilter atsObjectArtifactTypesFilter = new ArtifactTypeEventFilter( AtsArtifactTypes.TeamWorkflow, AtsArtifactTypes.Action, AtsArtifactTypes.Task, AtsArtifactTypes.Goal, AtsArtifactTypes.PeerToPeerReview, AtsArtifactTypes.DecisionReview, AtsArtifactTypes.Version); @@ -53,10 +51,6 @@ public class AtsUtilCore { return emailEnabled; } - public static boolean isInTest() { - return Boolean.valueOf(System.getProperty("osee.isInTest")); - } - public static void setEmailEnabled(boolean enabled) { if (!DbUtil.isDbInit() && !AtsUtilCore.isInTest()) { OseeLog.log(Activator.class, Level.INFO, "Email " + (enabled ? "Enabled" : "Disabled")); @@ -103,30 +97,10 @@ public class AtsUtilCore { } } - public static String doubleToI18nString(double d) { - return doubleToI18nString(d, false); - } - - public static String doubleToI18nString(double d, boolean blankIfZero) { - if (blankIfZero && d == 0) { - return ""; - } - // This enables java to use same string for all 0 cases instead of creating new one - else if (d == 0) { - return "0.00"; - } else { - return String.format("%4.2f", d); - } - } - public static Branch getAtsBranch() throws OseeCoreException { return BranchManager.getCommonBranch(); } - public static IOseeBranch getAtsBranchToken() { - return CoreBranches.COMMON; - } - public static String getAtsId(Artifact art) throws OseeCoreException { String toReturn = art.getSoleAttributeValueAsString(AtsAttributeTypes.AtsId, DEFAULT_ATS_ID_VALUE); if (DEFAULT_ATS_ID_VALUE.equals(toReturn)) { @@ -138,7 +112,7 @@ public class AtsUtilCore { public static Artifact getFromToken(IArtifactToken token) { Artifact toReturn = null; try { - toReturn = ArtifactQuery.getArtifactFromToken(token, getAtsBranchToken()); + toReturn = ArtifactQuery.getArtifactFromToken(token, AtsUtilCore.getAtsBranchToken()); } catch (OseeCoreException ex) { // Do Nothing; } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java index 655570a06a2..4d1bc191172 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java @@ -46,11 +46,11 @@ import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; import org.eclipse.osee.ats.core.client.review.ReviewManager; import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.note.ArtifactNote; import org.eclipse.osee.ats.core.client.workflow.note.AtsNote; import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.eclipse.osee.ats.core.util.AtsObjects; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.PercentCompleteTotalUtil; import org.eclipse.osee.ats.core.workflow.state.StateManagerUtility; import org.eclipse.osee.ats.core.workflow.transition.TransitionManager; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/ConvertWorkflowStatesOperation.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/ConvertWorkflowStatesOperation.java index 6ff287425e2..ee2806899f8 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/ConvertWorkflowStatesOperation.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/ConvertWorkflowStatesOperation.java @@ -20,7 +20,7 @@ import java.util.regex.Pattern; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.internal.Activator; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.util.XResultData; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/ArtifactNote.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/ArtifactNote.java index dcfa7ab8431..e1dc1dc9f6a 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/ArtifactNote.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/ArtifactNote.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.internal.Activator; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.eclipse.osee.framework.logging.OseeLog; @@ -73,7 +73,7 @@ public class ArtifactNote implements INoteStorageProvider { @Override public String getNoteId() { try { - return AtsUtilCore.getAtsId(getArtifact()); + return AtsUtilClient.getAtsId(getArtifact()); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/PrivilegedEditAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/PrivilegedEditAction.java index e06be86e2a2..750855b6207 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/PrivilegedEditAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/PrivilegedEditAction.java @@ -16,7 +16,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.user.IAtsUser; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.AtsClientService; @@ -54,7 +54,7 @@ public class PrivilegedEditAction extends AbstractAtsAction { } } else { Set<IAtsUser> users = PrivilegedUserManager.getPrivilegedUsers(sma); - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { users.add(AtsClientService.get().getUserAdmin().getCurrentUser()); } StringBuffer stringBuffer = new StringBuffer(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AnnualCostAvoidanceColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AnnualCostAvoidanceColumn.java index bf91f72e5f8..af96c13f0cd 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AnnualCostAvoidanceColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AnnualCostAvoidanceColumn.java @@ -16,8 +16,8 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DaysInCurrentStateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DaysInCurrentStateColumn.java index f5959add5fc..1ebd732e48c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DaysInCurrentStateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DaysInCurrentStateColumn.java @@ -17,8 +17,8 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursColumn.java index 1765959605a..76eeab1e982 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursColumn.java @@ -13,8 +13,8 @@ package org.eclipse.osee.ats.column; import java.util.logging.Level; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.EstimatedHoursUtil; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentSMAStateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentSMAStateColumn.java index e774482b276..31d3459cd51 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentSMAStateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentSMAStateColumn.java @@ -13,7 +13,7 @@ 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.IAtsWorkItem; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateReviewColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateReviewColumn.java index 01ad026e374..d4f463c7cf6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateReviewColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateReviewColumn.java @@ -13,7 +13,7 @@ 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.IAtsWorkItem; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTasksColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTasksColumn.java index 1c74cebd00c..f67c6d7ce42 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTasksColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTasksColumn.java @@ -13,7 +13,7 @@ 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.IAtsWorkItem; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTotalColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTotalColumn.java index 1d53773f643..95de4a7eefc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTotalColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTotalColumn.java @@ -13,7 +13,7 @@ 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.IAtsWorkItem; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentTotalColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentTotalColumn.java index 9d859d451ca..6ced08438ad 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentTotalColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentTotalColumn.java @@ -13,7 +13,7 @@ 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.IAtsWorkItem; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/RemainingHoursColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/RemainingHoursColumn.java index b5c8f0140ff..4293bbcf8f5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/RemainingHoursColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/RemainingHoursColumn.java @@ -17,8 +17,8 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumn.java index 3dd02dd1e6d..cde373e5b29 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumn.java @@ -29,7 +29,7 @@ import org.eclipse.osee.ats.api.version.VersionLockedType; import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.Versions; @@ -95,8 +95,8 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV } boolean modified = promptChangeVersion(Arrays.asList((TeamWorkFlowArtifact) useArt), - AtsUtilCore.isAtsAdmin() ? VersionReleaseType.Both : VersionReleaseType.UnReleased, - AtsUtilCore.isAtsAdmin() ? VersionLockedType.Both : VersionLockedType.UnLocked); + AtsUtilClient.isAtsAdmin() ? VersionReleaseType.Both : VersionReleaseType.UnReleased, + AtsUtilClient.isAtsAdmin() ? VersionLockedType.Both : VersionLockedType.UnLocked); XViewer xViewer = ((XViewerColumn) treeColumn.getData()).getTreeViewer(); if (modified && isPersistViewer(xViewer)) { useArt.persist("persist goals via alt-left-click"); @@ -114,7 +114,7 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV } public static boolean promptChangeVersion(AbstractWorkflowArtifact sma, VersionReleaseType versionReleaseType, VersionLockedType versionLockType) throws OseeCoreException { - if (AtsUtilCore.isAtsAdmin() && !sma.isTeamWorkflow()) { + if (AtsUtilClient.isAtsAdmin() && !sma.isTeamWorkflow()) { AWorkbench.popup("ERROR ", "Cannot set version for: \n\n" + sma.getName()); return false; } @@ -131,10 +131,10 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV if (AtsVersionService.get().isReleased(teamArt) || AtsVersionService.get().isVersionLocked(teamArt)) { String error = "Team Workflow\n \"" + teamArt.getName() + "\"\n targeted version is locked or already released."; - if (AtsUtilCore.isAtsAdmin() && !MessageDialog.openConfirm(Displays.getActiveShell(), "Change Version", + if (AtsUtilClient.isAtsAdmin() && !MessageDialog.openConfirm(Displays.getActiveShell(), "Change Version", error + "\n\nOverride?")) { return false; - } else if (!AtsUtilCore.isAtsAdmin()) { + } else if (!AtsUtilClient.isAtsAdmin()) { AWorkbench.popup("ERROR", error); continue; } @@ -169,10 +169,10 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV //now check selected version if (newVersion.isVersionLocked()) { String error = "Version \"" + newVersion.getCommitFullDisplayName() + "\" is locked or already released."; - if (AtsUtilCore.isAtsAdmin() && !MessageDialog.openConfirm(Displays.getActiveShell(), "Change Version", + if (AtsUtilClient.isAtsAdmin() && !MessageDialog.openConfirm(Displays.getActiveShell(), "Change Version", error + "\n\nOverride?")) { return false; - } else if (!AtsUtilCore.isAtsAdmin()) { + } else if (!AtsUtilClient.isAtsAdmin()) { AWorkbench.popup("ERROR", error); } } @@ -218,8 +218,8 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV } } - promptChangeVersion(awas, AtsUtilCore.isAtsAdmin() ? VersionReleaseType.Both : VersionReleaseType.UnReleased, - AtsUtilCore.isAtsAdmin() ? VersionLockedType.Both : VersionLockedType.UnLocked); + promptChangeVersion(awas, AtsUtilClient.isAtsAdmin() ? VersionReleaseType.Both : VersionReleaseType.UnReleased, + AtsUtilClient.isAtsAdmin() ? VersionLockedType.Both : VersionLockedType.UnLocked); getXViewer().update(awas.toArray(), null); return; } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkDaysNeededColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkDaysNeededColumn.java index 4203278e316..8a0754540da 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkDaysNeededColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkDaysNeededColumn.java @@ -16,8 +16,8 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java index 2acd173717a..d250f3f4e4b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java @@ -27,7 +27,7 @@ import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.api.workdef.IWorkDefinitionMatch; import org.eclipse.osee.ats.core.client.config.AtsArtifactToken; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.internal.Activator; @@ -177,7 +177,7 @@ public class AtsConfigOperation extends AbstractOperation { Artifact workDefArt = AtsWorkDefinitionImporter.get().importWorkDefinitionToDb(workDefXml, workDef.getName(), name, resultData, changes); - Artifact folder = AtsUtilCore.getFromToken(AtsArtifactToken.WorkDefinitionsFolder); + Artifact folder = AtsUtilClient.getFromToken(AtsArtifactToken.WorkDefinitionsFolder); folder.addChild(workDefArt); changes.add(folder); } catch (Exception ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/ValidateAtsConfiguration.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/ValidateAtsConfiguration.java index b0314a359fb..89a1fcdf8d1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/ValidateAtsConfiguration.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/ValidateAtsConfiguration.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map.Entry; import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.health.ValidateAtsDatabase; import org.eclipse.osee.ats.health.ValidateResults; import org.eclipse.osee.ats.internal.Activator; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java index 21ada92f370..d14c12aa3cb 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java @@ -32,7 +32,7 @@ import org.eclipse.osee.ats.core.client.artifact.GoalArtifact; import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.Activator; @@ -341,7 +341,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IWorldEditor, I private void createAttributesTab() { try { - if (!AtsUtilCore.isAtsAdmin()) { + if (!AtsUtilClient.isAtsAdmin()) { return; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorArtifactEventManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorArtifactEventManager.java index af8c9e4eb77..4de4c329b5c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorArtifactEventManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorArtifactEventManager.java @@ -27,7 +27,7 @@ import org.eclipse.osee.ats.core.client.review.ReviewManager; import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; @@ -69,7 +69,7 @@ public class SMAEditorArtifactEventManager implements IArtifactEventListener { @Override public List<? extends IEventFilter> getEventFilters() { - return AtsUtilCore.getAtsObjectEventFilters(); + return AtsUtilClient.getAtsObjectEventFilters(); } @Override diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEstimatedHoursHeader.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEstimatedHoursHeader.java index f518fceee10..5295d10b1a2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEstimatedHoursHeader.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEstimatedHoursHeader.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.editor; import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.PromptChangeUtil; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAOperationsSection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAOperationsSection.java index 13e673f6f4f..8b0efd8766c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAOperationsSection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAOperationsSection.java @@ -35,7 +35,7 @@ import org.eclipse.osee.ats.actions.ShowWorkDefinitionAction; import org.eclipse.osee.ats.actions.SubscribedAction; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.operation.MoveTeamWorkflowsAction; import org.eclipse.osee.framework.logging.OseeLevel; @@ -182,7 +182,7 @@ public class SMAOperationsSection extends SectionPart { } private void createAdminSection(Composite parent, FormToolkit toolkit) { - if (!AtsUtilCore.isAtsAdmin()) { + if (!AtsUtilClient.isAtsAdmin()) { return; } Section section = toolkit.createSection(parent, ExpandableComposite.TITLE_BAR); @@ -226,7 +226,7 @@ public class SMAOperationsSection extends SectionPart { if (editor.getAwa().getParentAWA() != null) { new XButtonViaAction(new OpenParentAction(editor.getAwa())).createWidgets(sectionBody, 2); } - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { new XButtonViaAction(new OpenInArtifactEditorAction(editor)).createWidgets(sectionBody, 2); } new XButtonViaAction(new ShowWorkDefinitionAction()).createWidgets(sectionBody, 2); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java index 86c66d8db78..0a914f13009 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java @@ -23,12 +23,12 @@ import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; import org.eclipse.osee.ats.core.client.workflow.PriorityUtil; import org.eclipse.osee.ats.core.client.workflow.note.NoteItem; import org.eclipse.osee.ats.core.column.AssigneeColumn; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; import org.eclipse.osee.ats.core.util.PercentCompleteTotalUtil; import org.eclipse.osee.ats.core.workflow.log.AtsLogUtility; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java index 24507b7960a..f350bfba445 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java @@ -15,7 +15,7 @@ import java.util.logging.Level; import org.eclipse.osee.ats.AtsOpenOption; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; @@ -123,7 +123,7 @@ public class SMARelationsHyperlinkComposite extends Composite { this, String.format("\"%s\" - %s", art.getName().length() < 60 ? art.getName() : art.getName().substring(0, 60), - AtsUtilCore.getAtsId(art)), SWT.NONE); + AtsUtilClient.getAtsId(art)), SWT.NONE); link.addHyperlinkListener(new IHyperlinkListener() { @Override diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsSection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsSection.java index 96cd20c20fc..97d902751fd 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsSection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsSection.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.osee.ats.api.data.AtsRelationTypes; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.model.type.RelationType; @@ -45,7 +45,7 @@ public class SMARelationsSection extends RelationsFormSection { protected synchronized void createSection(Section section, FormToolkit toolkit) { super.createSection(section, toolkit); // Don't allow users to see all relations - if (!AtsUtilCore.isAtsAdmin()) { + if (!AtsUtilClient.isAtsAdmin()) { getRelationComposite().getTreeViewer().addFilter(userRelationsFilter); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATargetedVersionHeader.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATargetedVersionHeader.java index 0bc2d889fc1..6536dc13815 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATargetedVersionHeader.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATargetedVersionHeader.java @@ -14,7 +14,7 @@ import java.util.logging.Level; import org.eclipse.osee.ats.api.version.VersionLockedType; import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.column.TargetedVersionColumn; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.Activator; @@ -71,7 +71,7 @@ public class SMATargetedVersionHeader extends Composite { editor.doSave(null); } if (TargetedVersionColumn.promptChangeVersion(sma, - AtsUtilCore.isAtsAdmin() ? VersionReleaseType.Both : VersionReleaseType.UnReleased, + AtsUtilClient.isAtsAdmin() ? VersionReleaseType.Both : VersionReleaseType.UnReleased, VersionLockedType.UnLocked)) { updateLabel(sma); editor.onDirtied(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java index 57a5fdbfbda..64557da4749 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java @@ -46,7 +46,7 @@ import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.note.NoteItem; import org.eclipse.osee.ats.help.ui.AtsHelpContext; @@ -477,7 +477,7 @@ public class SMAWorkFlowTab extends FormPage implements IWorldViewerEventHandler toolBarMgr.add(new AddNoteAction(awa, editor)); toolBarMgr.add(new OpenInAtsWorldAction(awa)); toolBarMgr.add(new OpenActionViewAction()); - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { toolBarMgr.add(new OpenInArtifactEditorAction(editor)); } toolBarMgr.add(new OpenVersionArtifactAction(awa)); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkflowMetricsHeader.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkflowMetricsHeader.java index 2eeb6b611b5..c609ac4f14c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkflowMetricsHeader.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkflowMetricsHeader.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.editor; import java.util.logging.Level; import org.eclipse.osee.ats.column.RemainingHoursColumn; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; import org.eclipse.osee.ats.core.util.PercentCompleteTotalUtil; import org.eclipse.osee.ats.internal.Activator; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WETransitionComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WETransitionComposite.java index 4b21a6d5098..3b87bd9c911 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WETransitionComposite.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WETransitionComposite.java @@ -33,9 +33,9 @@ import org.eclipse.osee.ats.api.workflow.transition.ITransitionListener; import org.eclipse.osee.ats.api.workflow.transition.TransitionResults; import org.eclipse.osee.ats.core.AtsCore; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionToOperation; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.workflow.transition.TransitionHelperAdapter; import org.eclipse.osee.ats.core.workflow.transition.TransitionStatusData; import org.eclipse.osee.ats.editor.stateItem.AtsStateItemManager; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/column/EventColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/column/EventColumn.java index f7536372daa..c9364b08a80 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/column/EventColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/column/EventColumn.java @@ -20,9 +20,9 @@ import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.StateType; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.model.impl.WorkStateImpl; import org.eclipse.osee.ats.core.util.AtsObjects; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.workflow.state.AtsWorkStateFactory; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java index 5ecf65efdfa..b30b2e5fab7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java @@ -28,7 +28,7 @@ import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewManager; import org.eclipse.osee.ats.core.client.review.ReviewManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.workflow.state.TeamState; import org.eclipse.osee.ats.core.workflow.transition.TransitionHelper; @@ -293,7 +293,7 @@ public class ReviewInfoXWidget extends XLabelValueBase { public void addAdminRightClickOption() throws OseeCoreException { // If ATS Admin, allow right-click to auto-complete tasks - if (AtsUtilCore.isAtsAdmin() && !AtsUtil.isProductionDb()) { + if (AtsUtilClient.isAtsAdmin() && !AtsUtil.isProductionDb()) { labelWidget.addListener(SWT.MouseUp, new Listener() { @Override public void handleEvent(Event event) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/TaskInfoXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/TaskInfoXWidget.java index 26d4bcd0e5e..0438a29e91b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/TaskInfoXWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/TaskInfoXWidget.java @@ -21,7 +21,7 @@ import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.task.TaskStates; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.workflow.transition.TransitionManager; import org.eclipse.osee.ats.internal.Activator; @@ -116,7 +116,7 @@ public class TaskInfoXWidget extends XLabelValueBase { public void addAdminRightClickOption() { try { // If ATS Admin, allow right-click to auto-complete tasks - if (AtsUtilCore.isAtsAdmin() && !AtsUtil.isProductionDb()) { + if (AtsUtilClient.isAtsAdmin() && !AtsUtil.isProductionDb()) { labelWidget.addListener(SWT.MouseUp, new Listener() { @Override public void handleEvent(Event event) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/ATSPerspective.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/ATSPerspective.java index 03c6aff1410..d5e08341743 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/ATSPerspective.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/ATSPerspective.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.internal; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.navigate.NavigateView; import org.eclipse.osee.ats.walker.ActionWalkerView; import org.eclipse.osee.framework.ui.skynet.ArtifactExplorer; @@ -64,7 +64,7 @@ public class ATSPerspective implements IPerspectiveFactory { bottomLeft.addView(QuickSearchView.VIEW_ID); right.addView(ArtifactExplorer.VIEW_ID); - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { bottom.addView("org.eclipse.pde.runtime.LogView"); } bottom.addView(BranchView.VIEW_ID); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java index 896df92fddd..5762bfa8e36 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java @@ -26,7 +26,7 @@ import org.eclipse.osee.ats.core.client.search.AtsArtifactQuery; import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; @@ -58,7 +58,7 @@ public class AtsOseeCmService implements IOseeCmService { @Override public boolean isCmAdmin() { - return AtsUtilCore.isAtsAdmin(); + return AtsUtilClient.isAtsAdmin(); } @Override diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java index 68ef5a1ef2a..86ea8bfe596 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.navigate; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.framework.core.exception.OseeWrappedException; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -63,7 +63,7 @@ public class AtsNavigateComposite extends XNavigateComposite { @Override public void refresh() { super.refresh(); - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { for (XNavigateItem item : getInput()) { if (item.getName().equals("Admin")) { filteredTree.getViewer().expandToLevel(item, 1); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java index cc543287a76..12bbdc67b8d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java @@ -31,7 +31,7 @@ import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.config.ValidateAtsConfiguration; import org.eclipse.osee.ats.config.editor.AtsConfigResultsEditorNavigateItem; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.ev.EvNavigateItems; import org.eclipse.osee.ats.goal.GoalSearchWorkflowSearchItem; import org.eclipse.osee.ats.health.ValidateAtsDatabase; @@ -190,7 +190,7 @@ public final class AtsNavigateViewItems implements XNavigateViewItems, IXNavigat } private void createAdminItems(XNavigateItem parent, List<XNavigateItem> items) throws OseeCoreException, OseeArgumentException { - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { XNavigateItem adminItems = new XNavigateItem(parent, "Admin", PluginUiImage.ADMIN); XNavigateItem dbConvertItems = new XNavigateItem(adminItems, "Database Conversions", PluginUiImage.ADMIN); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java index c3a633eee99..45910fd9b10 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java @@ -29,10 +29,10 @@ import org.eclipse.osee.ats.api.workflow.transition.TransitionResults; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; import org.eclipse.osee.ats.core.config.AtsVersionService; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.workflow.state.TeamState; import org.eclipse.osee.ats.core.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.workflow.transition.TransitionManager; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java index e1a8fa1be6b..f0ccc1967fa 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java @@ -20,11 +20,11 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; import org.eclipse.osee.ats.core.client.workflow.PriorityUtil; import org.eclipse.osee.ats.core.config.TeamDefinitions; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.ats.version.VersionMetrics; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java index e9287e9fba4..f3856e1d78f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java @@ -35,7 +35,7 @@ import org.eclipse.osee.ats.actions.OpenChangeReportByIdAction; import org.eclipse.osee.ats.actions.OpenWorkflowByIdAction; import org.eclipse.osee.ats.actions.OpenWorldByIdAction; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.help.ui.AtsHelpContext; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; @@ -188,11 +188,11 @@ public class NavigateView extends ViewPart implements IXNavigateEventListener { public void refreshUserLabel() { String str = getWhoAmI(); - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { str += " - Admin"; } if (!str.equals("")) { - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { userLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); } else { userLabel.setForeground(Displays.getSystemColor(SWT.COLOR_BLUE)); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ToggleAtsAdmin.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ToggleAtsAdmin.java index 3f68f32bd98..6af0f7b39b6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ToggleAtsAdmin.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ToggleAtsAdmin.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.navigate; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.core.client.util.AtsGroup; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; @@ -48,7 +48,7 @@ public class ToggleAtsAdmin extends XNavigateItemAction { AWorkbench.popup("Current User not configured for Temporary Admin"); return; } - boolean isAdmin = AtsUtilCore.isAtsAdmin(); + boolean isAdmin = AtsUtilClient.isAtsAdmin(); String message = "Currently " + (isAdmin ? "ADMIN" : "NOT ADMIN") + " - Toggle?"; if (MessageDialog.openConfirm(Displays.getActiveShell(), "Toggle ATS Admin", message)) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateActionFromTaskBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateActionFromTaskBlam.java index 05bbc3e2b2d..1906b1d5b3d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateActionFromTaskBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateActionFromTaskBlam.java @@ -26,7 +26,7 @@ import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; @@ -103,14 +103,14 @@ public class CreateActionFromTaskBlam extends AbstractBlam { return; } try { - AtsUtilCore.setEmailEnabled(false); + AtsUtilClient.setEmailEnabled(false); Collection<TaskArtifact> taskArts = Collections.castAll(artifacts); Collection<IAtsActionableItem> aias = Collections.castAll(aiasArts); handleCreateActions(taskArts, title, aias, changeType, priority, monitor); } catch (Exception ex) { log(ex); } finally { - AtsUtilCore.setEmailEnabled(true); + AtsUtilClient.setEmailEnabled(true); } } catch (Exception ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java index 01c8c703ee1..9a63375a8bc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java @@ -32,7 +32,7 @@ import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; @@ -104,7 +104,7 @@ public class DuplicateWorkflowBlam extends AbstractBlam { return; } try { - AtsUtilCore.setEmailEnabled(false); + AtsUtilClient.setEmailEnabled(false); Collection<TeamWorkFlowArtifact> teamArts = Collections.castAll(artifacts); if (createNewWorkflow) { handleCreateNewWorkflow(teamArts, title); @@ -114,7 +114,7 @@ public class DuplicateWorkflowBlam extends AbstractBlam { } catch (Exception ex) { log(ex); } finally { - AtsUtilCore.setEmailEnabled(true); + AtsUtilClient.setEmailEnabled(true); } } catch (Exception ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateView.java index 797c546c2ce..4c16a804876 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateView.java @@ -28,7 +28,7 @@ import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.actions.OpenWorkflowByIdAction; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.help.ui.AtsHelpContext; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; @@ -129,11 +129,11 @@ public class ReviewNavigateView extends ViewPart implements IXNavigateEventListe Label label = new Label(xNavComp, SWT.None); String str = getWhoAmI(); - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { str += " - Admin"; } if (!str.equals("")) { - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { label.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); } else { label.setForeground(Displays.getSystemColor(SWT.COLOR_BLUE)); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java index 885acd1f617..381468acd48 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java @@ -26,9 +26,9 @@ import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.config.AtsVersionService; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.AtsMetricsComposite; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java index 4f191955309..abd5f90ed01 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java @@ -20,7 +20,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +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.ats.world.search.ActionableItemWorldSearchItem; @@ -134,8 +135,8 @@ public class AtsArtifactChecks extends ArtifactCheck { } for (User user : users) { UserRelatedToAtsObjectSearch srch = - new UserRelatedToAtsObjectSearch("User search", AtsClientService.get().getUserAdmin().getUserFromOseeUser(user), false, - LoadView.None); + new UserRelatedToAtsObjectSearch("User search", AtsClientService.get().getUserAdmin().getUserFromOseeUser( + user), false, LoadView.None); if (srch.performSearchGetResults().size() > 0) { return String.format( "User name: \"%s\" userId: \"%s\" selected to delete has related ATS Objects; Un-relate to ATS first before deleting.", diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitOperation.java index dee085574b8..2d55ca7f3f9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitOperation.java @@ -21,7 +21,7 @@ import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; import org.eclipse.osee.ats.core.client.review.ReviewManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.eclipse.osee.ats.editor.stateItem.AtsStateItemManager; import org.eclipse.osee.ats.editor.stateItem.IAtsStateItem; @@ -84,7 +84,7 @@ public class AtsBranchCommitOperation extends AbstractOperation { final Result tempResult = item.committing(teamArt); if (tempResult.isFalse()) { // Allow Admin to override state validation - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { Displays.pendInDisplayThread(new Runnable() { @Override public void run() { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java index 7cc076aa2d7..7e85fb50c40 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java @@ -23,7 +23,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.artifact.AbstractAtsArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; @@ -140,7 +140,7 @@ public class AtsDeleteManager { allDeleteArts.add(deleteArt); final Set<Artifact> relatedArts = new HashSet<Artifact>(30); delBuilder.append(String.format("\n<b>Selected</b>:[%s][%s][%s]", deleteArt.getArtifactTypeName(), - AtsUtilCore.getAtsId(deleteArt), deleteArt.getName()) + "\n"); + AtsUtilClient.getAtsId(deleteArt), deleteArt.getName()) + "\n"); if (deleteArt.isOfType(AtsArtifactTypes.Action)) { for (TeamWorkFlowArtifact art : ActionManager.getTeams(deleteArt)) { art.atsDelete(relatedArts, ignoredArts); @@ -151,7 +151,7 @@ public class AtsDeleteManager { for (Artifact loopArt : relatedArts) { if (!loopArt.equals(deleteArt)) { delBuilder.append(String.format(AHTML.addSpace(4) + "<b>Related</b>:[%s][%s][%s]", - loopArt.getArtifactTypeName(), AtsUtilCore.getAtsId(loopArt), loopArt.getName()) + "\n"); + loopArt.getArtifactTypeName(), AtsUtilClient.getAtsId(loopArt), loopArt.getName()) + "\n"); } } } @@ -162,7 +162,7 @@ public class AtsDeleteManager { if (actionArt != null && !allDeleteArts.contains(actionArt) && allDeleteArts.containsAll(ActionManager.getTeams(actionArt))) { relatedArts.add(actionArt); delBuilder.append(String.format(AHTML.addSpace(4) + "<b>Related</b>:[%s][%s][%s]", - actionArt.getArtifactTypeName(), AtsUtilCore.getAtsId(actionArt), actionArt.getName()) + "\n"); + actionArt.getArtifactTypeName(), AtsUtilClient.getAtsId(actionArt), actionArt.getName()) + "\n"); } } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUserNavigateItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUserNavigateItems.java index 7a8f7a23fb1..354708a31e8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUserNavigateItems.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUserNavigateItems.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import org.eclipse.osee.ats.AtsImage; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.navigate.CreateNewUsersByNameItem; import org.eclipse.osee.ats.navigate.SearchNavigateItem; @@ -37,7 +37,7 @@ public class AtsUserNavigateItems implements IUserNavigateItem { @Override public List<XNavigateItem> getNavigateItems(XNavigateItem parentItem) { List<XNavigateItem> items = new ArrayList<XNavigateItem>(); - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { items.add(new XNavigateItemBlam(parentItem, new PurgeUser(), FrameworkImage.X_RED)); items.add(new XNavigateItemBlam(parentItem, new ReAssignATSObjectsToUser(), AtsImage.ACTION)); items.add(new CreateNewUsersByNameItem(parentItem)); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java index b9b24aca1b1..6f9522204a7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java @@ -41,11 +41,12 @@ import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.artifact.GoalArtifact; import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; +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.exception.OseeExceptions; @@ -170,7 +171,7 @@ public class ExcelAtsActionArtifactExtractor { } public void createArtifactsAndNotify(IAtsChangeSet changes) { - AtsUtilCore.setEmailEnabled(false); + AtsUtilClient.setEmailEnabled(false); Set<TeamWorkFlowArtifact> teamWfs = new HashSet<TeamWorkFlowArtifact>(); Date createdDate = new Date(); try { @@ -230,7 +231,7 @@ public class ExcelAtsActionArtifactExtractor { } teamWfs.addAll(newTeamArts); } - AtsUtilCore.setEmailEnabled(true); + AtsUtilClient.setEmailEnabled(true); if (emailPOCs) { for (TeamWorkFlowArtifact team : teamWfs) { AtsNotificationManager.notify(team, AtsNotifyType.Assigned); @@ -239,7 +240,7 @@ public class ExcelAtsActionArtifactExtractor { } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } finally { - AtsUtilCore.setEmailEnabled(true); + AtsUtilClient.setEmailEnabled(true); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java index 2497f769f38..b88677fe4c7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java @@ -30,7 +30,7 @@ import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.task.TaskManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; @@ -160,7 +160,7 @@ public class ExcelAtsTaskArtifactExtractor { if (!valid) { return; } - AtsUtilCore.setEmailEnabled(false); + AtsUtilClient.setEmailEnabled(false); for (int i = 0; i < row.length; i++) { if (headerRow[i] == null) { OseeLog.log(Activator.class, Level.SEVERE, "Null header column => " + i); @@ -188,7 +188,7 @@ public class ExcelAtsTaskArtifactExtractor { OseeLog.log(Activator.class, Level.SEVERE, "Unhandled column => " + headerRow[i]); } } - AtsUtilCore.setEmailEnabled(true); + AtsUtilClient.setEmailEnabled(true); if (taskArt.isCompleted()) { Result result = TaskManager.transitionToCompleted(taskArt, 0.0, 0, changes); if (result.isFalse()) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PrivilegedUserManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PrivilegedUserManager.java index c6f90872401..81bc9fe031d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PrivilegedUserManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PrivilegedUserManager.java @@ -18,7 +18,7 @@ import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; @@ -44,7 +44,7 @@ public class PrivilegedUserManager { if (parentSma != null) { users.addAll(parentSma.getStateMgr().getAssignees()); } - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { users.add(AtsClientService.get().getUserAdmin().getCurrentUser()); } return users; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ArtifactValidationRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ArtifactValidationRule.java index 9e991b28d47..10a152257fd 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ArtifactValidationRule.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ArtifactValidationRule.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.validation.IOseeValidator; @@ -29,7 +29,7 @@ public class ArtifactValidationRule extends AbstractValidationRule { private String getStatusMessage(Artifact itemChecked, IStatus status) throws OseeCoreException { String link = XResultDataUI.getHyperlink(String.format("%s:[%s]", itemChecked.getArtifactTypeName(), itemChecked.getName()), - AtsUtilCore.getAtsId(itemChecked), itemChecked.getFullBranch().getId()); + AtsUtilClient.getAtsId(itemChecked), itemChecked.getFullBranch().getId()); return String.format("%s: %s", link, status.getMessage()); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java index bdd9c9b646b..93e267813ac 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java @@ -19,7 +19,7 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsBranchManager; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -135,7 +135,7 @@ public class ValidationReportOperation extends AbstractOperation { } public static String getRequirementHyperlink(Artifact art) throws OseeCoreException { - String atsId = AtsUtilCore.getAtsId(art); + String atsId = AtsUtilClient.getAtsId(art); String linkName = String.format("%s(%s)", art.getName(), atsId); return XResultDataUI.getHyperlink(linkName, atsId, art.getFullBranch().getId()); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java index a10c7633121..1380ad67330 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java @@ -27,7 +27,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsBranchManager; @@ -145,7 +145,7 @@ public class XCommitManager extends GenericXWidget implements IArtifactWidget, I createTaskActionBar(tableComp); labelWidget.setText(getLabel() + ": ");// If ATS Admin, allow right-click to auto-complete reviews - if (AtsUtilCore.isAtsAdmin() && !AtsUtil.isProductionDb()) { + if (AtsUtilClient.isAtsAdmin() && !AtsUtil.isProductionDb()) { labelWidget.addListener(SWT.MouseUp, new Listener() { @Override public void handleEvent(Event event) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java index cd9f03de896..c8f70c20da7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java @@ -30,7 +30,7 @@ import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectError; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectItem; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectManager; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectValidator; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.util.Result; @@ -570,7 +570,7 @@ public class XDefectViewer extends GenericXWidget implements IArtifactWidget, IA @Override public List<? extends IEventFilter> getEventFilters() { - return Arrays.asList(EventUtil.getCommonBranchFilter(), AtsUtilCore.getReviewArtifactTypeEventFilter()); + return Arrays.asList(EventUtil.getCommonBranchFilter(), AtsUtilClient.getReviewArtifactTypeEventFilter()); } @Override 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 c5e2226d541..13ce80f8e80 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 @@ -18,7 +18,7 @@ import org.eclipse.osee.ats.AtsImage; 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.client.util.AtsUtilCore; +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.ats.util.widgets.defect.DefectSeverityToImage; 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 896a2342750..2cc454b1da0 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 @@ -35,7 +35,7 @@ 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.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -509,7 +509,7 @@ public class XUserRoleViewer extends GenericXWidget implements IArtifactWidget, @Override public List<? extends IEventFilter> getEventFilters() { - return Arrays.asList(EventUtil.getCommonBranchFilter(), AtsUtilCore.getReviewArtifactTypeEventFilter()); + return Arrays.asList(EventUtil.getCommonBranchFilter(), AtsUtilClient.getReviewArtifactTypeEventFilter()); } @Override diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/ReleaseVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/ReleaseVersionItem.java index cf6649b9d5e..9fa7913861c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/ReleaseVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/ReleaseVersionItem.java @@ -19,7 +19,7 @@ import org.eclipse.osee.ats.api.version.VersionLockedType; import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.internal.Activator; @@ -69,7 +69,7 @@ public class ReleaseVersionItem extends XNavigateItemAction { IAtsVersion verArt = (IAtsVersion) ld.getResult()[0]; // Validate team lead status - if (!AtsUtilCore.isAtsAdmin() && !AtsVersionService.get().getTeamDefinition(verArt).getLeads().contains( + if (!AtsUtilClient.isAtsAdmin() && !AtsVersionService.get().getTeamDefinition(verArt).getLeads().contains( AtsClientService.get().getUserAdmin().getCurrentUser())) { AWorkbench.popup("ERROR", "Only lead can release version."); return; @@ -86,7 +86,7 @@ public class ReleaseVersionItem extends XNavigateItemAction { if (errorStr != null) { AWorkbench.popup("ERROR", errorStr); } - if (errorStr != null && !AtsUtilCore.isAtsAdmin()) { + if (errorStr != null && !AtsUtilClient.isAtsAdmin()) { return; } else if (errorStr != null && !MessageDialog.openConfirm(Displays.getActiveShell(), "Override", "ATS Admin Enabled - Override completed condition and release anyway?")) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java index 6d9c7311b75..dbefcfa1245 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java @@ -25,7 +25,7 @@ import org.eclipse.osee.ats.artifact.GoalManager; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.config.Versions; import org.eclipse.osee.ats.core.util.AtsObjects; @@ -157,7 +157,7 @@ public class ActionWalkerView extends GenericViewPart implements IPartListener, if (parentArtifact.isOfType(AtsArtifactTypes.TeamWorkflow)) { artifact = ((TeamWorkFlowArtifact) parentArtifact).getParentActionArtifact(); } else { - OseeLog.log(Activator.class, Level.SEVERE, "Unknown parent " + AtsUtilCore.getAtsId(art)); + OseeLog.log(Activator.class, Level.SEVERE, "Unknown parent " + AtsUtilClient.getAtsId(art)); } } } @@ -292,7 +292,7 @@ public class ActionWalkerView extends GenericViewPart implements IPartListener, @Override public List<? extends IEventFilter> getEventFilters() { - return AtsUtilCore.getAtsObjectEventFilters(); + return AtsUtilClient.getAtsObjectEventFilters(); } @Override diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ValidateWorkspaceToDatabaseWorkDefinitions.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ValidateWorkspaceToDatabaseWorkDefinitions.java index 291f71fb6f5..2cef1d2be3d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ValidateWorkspaceToDatabaseWorkDefinitions.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ValidateWorkspaceToDatabaseWorkDefinitions.java @@ -15,7 +15,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.workdef.WorkDefinitionSheet; import org.eclipse.osee.ats.workdef.AtsDslUtil; import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionDslRenderer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionDslRenderer.java index 79351e9208e..2e3f61bec18 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionDslRenderer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionDslRenderer.java @@ -26,7 +26,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.data.IOseeBranch; @@ -178,7 +178,7 @@ public final class AtsWorkDefinitionDslRenderer extends FileSystemRenderer { @Override protected void doWork(IProgressMonitor monitor) throws Exception { - if (!AtsUtilCore.isAtsAdmin()) { + if (!AtsUtilClient.isAtsAdmin()) { AWorkbench.popup("Must be ATS Admin to make Work Definition changes."); return; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java index b424ba8432e..45c89ae9b95 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java @@ -20,7 +20,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.workdef.WorkDefinitionSheet; import org.eclipse.osee.ats.dsl.ModelUtil; import org.eclipse.osee.ats.dsl.atsDsl.AtsDsl; @@ -94,7 +94,7 @@ public class AtsWorkDefinitionImporter { try { artifact = ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.WorkDefinition, sheetName, - AtsUtilCore.getAtsBranch()); + AtsUtilClient.getAtsBranch()); } catch (ArtifactDoesNotExist ex) { // do nothing; this is what we want } @@ -111,7 +111,7 @@ public class AtsWorkDefinitionImporter { } else { resultData.log(String.format("Imported new WorkDefinition [%s]", workDefName)); artifact = - ArtifactTypeManager.addArtifact(AtsArtifactTypes.WorkDefinition, AtsUtilCore.getAtsBranch(), sheetName); + ArtifactTypeManager.addArtifact(AtsArtifactTypes.WorkDefinition, AtsUtilClient.getAtsBranch(), sheetName); } artifact.setSoleAttributeValue(AtsAttributeTypes.DslSheet, workDefXml); changes.add(artifact); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java index 7924f0bb9a5..bdbe4185e89 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java @@ -30,8 +30,8 @@ import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.actions.ISelectedAtsArtifacts; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; import org.eclipse.osee.ats.core.client.task.TaskArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.search.WorldSearchItem; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java index 58ef96ff1c3..f793b8b9f33 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java @@ -53,7 +53,7 @@ import org.eclipse.osee.ats.core.client.artifact.GoalArtifact; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.workflow.state.TeamState; import org.eclipse.osee.ats.internal.Activator; @@ -399,7 +399,7 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IPer updateEditMenuActions(); - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { mm.insertBefore(XViewer.MENU_GROUP_PRE, new Separator()); mm.insertBefore(XViewer.MENU_GROUP_PRE, deletePurgeAtsObjectAction); deletePurgeAtsObjectAction.setEnabled(getSelectedAtsArtifacts().size() > 0); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java index 372f96e12c5..894493707da 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; import org.eclipse.jface.viewers.IContentProvider; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; @@ -88,7 +88,7 @@ public class WorldXViewerEventManager { @Override public List<? extends IEventFilter> getEventFilters() { - return AtsUtilCore.getAtsObjectEventFilters(); + return AtsUtilClient.getAtsObjectEventFilters(); } private Runnable createDisplayRunnable(ArtifactEvent artifactEvent, Collection<IWorldViewerEventHandler> handlers) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java index 21745a13124..f14d3b0f110 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java @@ -19,6 +19,7 @@ import org.eclipse.osee.ats.column.ActionableItemOwner; import org.eclipse.osee.ats.column.ActionableItemsColumnUI; import org.eclipse.osee.ats.column.AnnualCostAvoidanceColumn; import org.eclipse.osee.ats.column.AssigneeColumnUI; +import org.eclipse.osee.ats.column.AtsIdColumn; import org.eclipse.osee.ats.column.BranchStatusColumn; import org.eclipse.osee.ats.column.CancelledByColumn; import org.eclipse.osee.ats.column.CancelledDateColumn; @@ -46,7 +47,6 @@ import org.eclipse.osee.ats.column.HoursSpentStateReviewColumn; import org.eclipse.osee.ats.column.HoursSpentStateTasksColumn; import org.eclipse.osee.ats.column.HoursSpentStateTotalColumn; import org.eclipse.osee.ats.column.HoursSpentTotalColumn; -import org.eclipse.osee.ats.column.AtsIdColumn; import org.eclipse.osee.ats.column.ImplementorColumnUI; import org.eclipse.osee.ats.column.LastStatusedColumn; import org.eclipse.osee.ats.column.LegacyPcrIdColumn; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchUi.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchUi.java index a44fa93cc9c..4077c3448f9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchUi.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchUi.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.world.search; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.framework.jdk.core.type.MutableBoolean; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; @@ -49,7 +49,7 @@ public class MultipleIdSearchUi { @Override public void run() { EntryDialog ed = null; - if (AtsUtilCore.isAtsAdmin()) { + if (AtsUtilClient.isAtsAdmin()) { ed = new EntryCheckDialog(data.getName(), "Enter Legacy ID, Guid or ID (comma separated)", "Include ArtIds"); } else { |