Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2017-08-30 13:14:05 -0400
committerRyan D. Brooks2017-08-31 18:47:48 -0400
commit02dfd3ab272b26a8c348958c1312e319cbc68118 (patch)
treee8f51e5550f12c08ec1594e4932817a016760836
parent25097b6223d840fdb93252a0ed440b3cc7e8b1be (diff)
downloadorg.eclipse.osee-02dfd3ab272b26a8c348958c1312e319cbc68118.tar.gz
org.eclipse.osee-02dfd3ab272b26a8c348958c1312e319cbc68118.tar.xz
org.eclipse.osee-02dfd3ab272b26a8c348958c1312e319cbc68118.zip
refactor: Use notEqual where applicable
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/AtsUser.java5
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActionableItemsColumnTest.java1
-rw-r--r--plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtilityTest.java7
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/AgileBacklogWriter.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/AgileFactory.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/ActionableItemsColumn.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/program/AtsProgramService.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ActionFactory.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtility.java2
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/WorkItemNotificationProcessor.java2
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintItems.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumnUI.java14
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeActionableItemHeader.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeArtifactEventManager.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java4
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java3
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java4
-rw-r--r--plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/SkynetDbBranchDataImport.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/DefaultArtifactFactory.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CommitBranchHttpRequestOperation.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ViewIdUtility.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/GeneralPurposeRendererHandler.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerViewApplicability.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/column/HierarchyIndexColumn.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java1
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CreateBranchDatabaseTxCallable.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsVersionedObjectImpl.java2
52 files changed, 72 insertions, 64 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/AtsUser.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/AtsUser.java
index acb6b2ad93..b2f2ca839f 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/AtsUser.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/AtsUser.java
@@ -15,6 +15,7 @@ import org.eclipse.osee.ats.api.config.JaxAtsObject;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.ArtifactTypeId;
import org.eclipse.osee.framework.core.data.IArtifactType;
+import org.eclipse.osee.framework.core.data.UserToken;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.jdk.core.type.Id;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -34,6 +35,10 @@ public class AtsUser extends JaxAtsObject implements IAtsUser {
// for jax-rs instantiation
}
+ public AtsUser(UserToken user) {
+ this(user.getId(), user.getName(), user.getUserId(), user.getEmail(), user.isActive());
+ }
+
public AtsUser(Long id, String name, String userId, String email, boolean active) {
this.userId = userId;
this.email = email;
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 8a595ed3a9..42045b15d2 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
@@ -170,7 +170,7 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple
List<RelationLink> relatives = getRelationsAll(DeletionFlag.EXCLUDE_DELETED);
for (RelationLink link : relatives) {
Artifact sideB = link.getArtifactB();
- if (!sideB.equals(this)) {
+ if (sideB.notEqual(this)) {
sideBArtifacts.add(sideB);
}
}
diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActionableItemsColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActionableItemsColumnTest.java
index 1b586c8544..e700e9d647 100644
--- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActionableItemsColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActionableItemsColumnTest.java
@@ -79,6 +79,7 @@ public class ActionableItemsColumnTest {
public void testGetActionableItems_review_peerToPeerInheritsParent() throws Exception {
IAtsPeerToPeerReview peer = Mockito.mock(IAtsPeerToPeerReview.class);
when(peer.getParentTeamWorkflow()).thenReturn(teamWf1);
+ when(teamWf1.notEqual(peer)).thenReturn(true);
Collection<IAtsActionableItem> ais = ActionableItemsColumn.getActionableItems(peer);
diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtilityTest.java
index 01d00acf8c..a3db74f9b2 100644
--- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtilityTest.java
+++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtilityTest.java
@@ -17,6 +17,7 @@ import java.util.List;
import org.eclipse.osee.ats.api.IAtsServices;
import org.eclipse.osee.ats.api.IAtsWorkItem;
import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
+import org.eclipse.osee.ats.api.user.AtsUser;
import org.eclipse.osee.ats.api.user.IAtsUser;
import org.eclipse.osee.ats.api.user.IAtsUserService;
import org.eclipse.osee.ats.api.util.IAtsChangeSet;
@@ -31,6 +32,7 @@ import org.eclipse.osee.ats.api.workflow.state.IAtsWorkStateFactory;
import org.eclipse.osee.ats.core.internal.state.AtsWorkStateFactory;
import org.eclipse.osee.ats.core.internal.state.StateManager;
import org.eclipse.osee.ats.core.workflow.TestState;
+import org.eclipse.osee.framework.core.enums.DemoUsers;
import org.eclipse.osee.framework.core.util.Result;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.junit.Assert;
@@ -42,14 +44,13 @@ import org.mockito.MockitoAnnotations;
/**
* Test Case for {@link StateManagerUtility}
- *
+ *
* @author Donald G. Dunne
*/
public class StateManagerUtilityTest {
// @formatter:off
@Mock IAtsWorkItem workItem;
- @Mock IAtsUser Joe, Kay;
@Mock IAtsChangeSet changes;
@Mock IAtsWorkDefinition workDef;
@Mock IAtsStateDefinition analyzeState, completedState;
@@ -60,6 +61,8 @@ public class StateManagerUtilityTest {
@Mock IAtsLogFactory logFactory;
@Mock IAtsServices services;
// @formatter:on
+ private static final IAtsUser Joe = new AtsUser(DemoUsers.Joe_Smith);
+ private static final IAtsUser Kay = new AtsUser(DemoUsers.Kay_Jones);
@Before
public void setup() throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/AgileBacklogWriter.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/AgileBacklogWriter.java
index 3938b09557..ce7f93e240 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/AgileBacklogWriter.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/AgileBacklogWriter.java
@@ -69,7 +69,7 @@ public class AgileBacklogWriter {
AtsRelationTypes.AgileTeamToBacklog_AgileTeam) > 0) {
ArtifactToken currentTeamArt = services.getRelationResolver().getRelatedOrNull(updateBacklogArt,
AtsRelationTypes.AgileTeamToBacklog_AgileTeam);
- if (!updatedTeamArt.equals(currentTeamArt)) {
+ if (updatedTeamArt.notEqual(currentTeamArt)) {
changes.unrelate(currentTeamArt, AtsRelationTypes.AgileTeamToBacklog_Backlog, updateBacklogArt);
changes.add(currentTeamArt);
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/AgileFactory.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/AgileFactory.java
index a46bbcea63..2a1b22b7ab 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/AgileFactory.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/AgileFactory.java
@@ -59,7 +59,7 @@ public class AgileFactory {
changes.createArtifact(AtsArtifactTypes.AgileTeam, newTeam.getName(), GUID.create(), newTeam.getUuid());
changes.setSoleAttributeValue(agileTeamArt, AtsAttributeTypes.Active, true);
ArtifactId topAgileFolder = AgileFolders.getOrCreateTopAgileFolder(services, userArt, changes);
- if (!topAgileFolder.equals(services.getRelationResolver().getParent(agileTeamArt))) {
+ if (topAgileFolder.notEqual(services.getRelationResolver().getParent(agileTeamArt))) {
changes.unrelateFromAll(CoreRelationTypes.Default_Hierarchical__Parent, agileTeamArt);
changes.addChild(topAgileFolder, agileTeamArt);
}
@@ -90,7 +90,7 @@ public class AgileFactory {
}
changes.setSoleAttributeValue(agileTeamArt, AtsAttributeTypes.Active, team.isActive());
ArtifactId topAgileFolder = AgileFolders.getOrCreateTopAgileFolder(services, userArt, changes);
- if (!topAgileFolder.equals(services.getRelationResolver().getParent(agileTeamArt))) {
+ if (topAgileFolder.notEqual(services.getRelationResolver().getParent(agileTeamArt))) {
changes.unrelateFromAll(CoreRelationTypes.Default_Hierarchical__Parent, agileTeamArt);
changes.addChild(topAgileFolder, agileTeamArt);
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/ActionableItemsColumn.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/ActionableItemsColumn.java
index 7be9264e99..b23b7ecf72 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/ActionableItemsColumn.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/ActionableItemsColumn.java
@@ -78,7 +78,7 @@ public class ActionableItemsColumn extends AbstractServicesColumn {
// Children work items inherit the actionable items of their parent team workflow
if (atsObject instanceof IAtsWorkItem) {
IAtsTeamWorkflow teamWf = ((IAtsWorkItem) atsObject).getParentTeamWorkflow();
- if (teamWf != null && !teamWf.equals(atsObject)) {
+ if (teamWf != null && teamWf.notEqual(atsObject)) {
ais.addAll(getActionableItems(teamWf));
}
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/program/AtsProgramService.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/program/AtsProgramService.java
index fdc88cf74a..5930c46b29 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/program/AtsProgramService.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/program/AtsProgramService.java
@@ -230,7 +230,7 @@ public class AtsProgramService implements IAtsProgramService {
}
if (program == null) {
IAtsTeamDefinition topTeamDef = teamDef.getTeamDefinitionHoldingVersions();
- if (topTeamDef != null && !teamDef.equals(topTeamDef)) {
+ if (topTeamDef != null && teamDef.notEqual(topTeamDef)) {
program = loadProgram(teamDef.getParentTeamDef());
}
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java
index eed0f66579..80b0920922 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java
@@ -186,8 +186,8 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
public boolean isBranchesAllCommittedExcept(IAtsTeamWorkflow teamWf, BranchId branchToExclude) {
Collection<BranchId> committedTo = getBranchesCommittedTo(teamWf);
for (BranchId destBranch : getBranchesToCommitTo(teamWf)) {
- if (!destBranch.equals(branchToExclude) && !committedTo.contains(destBranch) && !isNoCommitNeeded(teamWf,
- destBranch)) {
+ if (destBranch.notEqual(
+ branchToExclude) && !committedTo.contains(destBranch) && !isNoCommitNeeded(teamWf, destBranch)) {
return false;
}
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ActionFactory.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ActionFactory.java
index 85828f8acc..2e53ac6420 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ActionFactory.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ActionFactory.java
@@ -400,7 +400,7 @@ public class ActionFactory implements IAtsActionFactory {
IAtsAction action = getAction(teamWf);
for (IAtsTeamWorkflow teamChild : services.getRelationResolver().getRelated(action,
AtsRelationTypes.ActionToWorkflow_WorkFlow, IAtsTeamWorkflow.class)) {
- if (!teamChild.equals(teamWf)) {
+ if (teamChild.notEqual(teamWf)) {
teams.add(teamChild);
}
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtility.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtility.java
index 4698661205..c3a6fdb7b7 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtility.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtility.java
@@ -44,7 +44,7 @@ public class StateManagerUtility {
((StateManager) stateMgr).setStateType(workPage.getStateType());
if (workPage.getStateType().isWorkingState()) {
if (assignees.isEmpty()) {
- if (!currentUser.equals(AtsCoreUsers.SYSTEM_USER)) {
+ if (currentUser.notEqual(AtsCoreUsers.SYSTEM_USER)) {
stateMgr.setAssignees(Arrays.asList(currentUser));
} else {
stateMgr.setAssignee(AtsCoreUsers.UNASSIGNED_USER);
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/WorkItemNotificationProcessor.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/WorkItemNotificationProcessor.java
index 25eefa0a13..5f936fef1c 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/WorkItemNotificationProcessor.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/WorkItemNotificationProcessor.java
@@ -88,7 +88,7 @@ public class WorkItemNotificationProcessor {
if (originator.isActive()) {
if (!EmailUtil.isEmailValid(originator.getEmail()) && !AtsCoreUsers.isAtsCoreUser(originator)) {
logger.info("Email [%s] invalid for user [%s]", originator.getEmail(), originator.getName());
- } else if (!fromUser.equals(originator)) {
+ } else if (fromUser.notEqual(originator)) {
notifications.addNotificationEvent(
AtsNotificationEventFactory.getNotificationEvent(getFromUser(event), Arrays.asList(originator),
getIdString(workItem), AtsNotifyType.Originator.name(), getUrl(workItem),
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java
index fe63ee4890..b398ca63c0 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java
@@ -134,7 +134,7 @@ public class ActionPage {
results = atsServer.getArtifact(artId).getName();
} else {
ArtifactReadable teamWf = getParentTeamWf(action);
- if (teamWf != null && !teamWf.equals(action)) {
+ if (teamWf != null && teamWf.notEqual(action)) {
results = getTeamStr(atsServer, teamWf);
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintItems.java
index 5fb1ce08df..c4566f423c 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintItems.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintItems.java
@@ -56,7 +56,7 @@ public class SprintItems {
noBacklogDetected = true;
} else if (commonBacklog == null) {
commonBacklog = relatedBacklogArt;
- } else if (!commonBacklog.equals(relatedBacklogArt)) {
+ } else if (commonBacklog.notEqual(relatedBacklogArt)) {
multipleBacklogsDetected = true;
}
} catch (ArtifactDoesNotExist ex) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumnUI.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumnUI.java
index 9faa329fa2..7952bfe132 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumnUI.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumnUI.java
@@ -28,7 +28,6 @@ import org.eclipse.osee.ats.api.version.IAtsVersion;
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.AtsUtilClient;
import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
import org.eclipse.osee.ats.core.column.AtsColumnToken;
import org.eclipse.osee.ats.internal.Activator;
@@ -124,15 +123,15 @@ public class TargetedVersionColumnUI extends XViewerAtsColumnIdColumn implements
teamArt) || AtsClientService.get().getVersionService().isVersionLocked(teamArt)) {
String error =
"Team Workflow\n \"" + teamArt.getName() + "\"\n targeted version is locked or already released.";
- if (AtsClientService.get().getUserService().isAtsAdmin() && !MessageDialog.openConfirm(Displays.getActiveShell(), "Change Version",
- error + "\n\nOverride?")) {
+ if (AtsClientService.get().getUserService().isAtsAdmin() && !MessageDialog.openConfirm(
+ Displays.getActiveShell(), "Change Version", error + "\n\nOverride?")) {
return false;
} else if (!AtsClientService.get().getUserService().isAtsAdmin()) {
AWorkbench.popup("ERROR", error);
continue;
}
}
- if (teamDefHoldingVersions != null && !teamDefHoldingVersions.equals(
+ if (teamDefHoldingVersions != null && teamDefHoldingVersions.notEqual(
teamArt.getTeamDefinition().getTeamDefinitionHoldingVersions())) {
AWorkbench.popup("ERROR", "Can't change version on Workflows that have different release version sets.");
return false;
@@ -161,8 +160,8 @@ public class TargetedVersionColumnUI extends XViewerAtsColumnIdColumn implements
//now check selected version
if (newVersion != null && newVersion.isVersionLocked()) {
String error = "Version \"" + newVersion.getCommitFullDisplayName() + "\" is locked or already released.";
- if (AtsClientService.get().getUserService().isAtsAdmin() && !MessageDialog.openConfirm(Displays.getActiveShell(), "Change Version",
- error + "\n\nOverride?")) {
+ if (AtsClientService.get().getUserService().isAtsAdmin() && !MessageDialog.openConfirm(
+ Displays.getActiveShell(), "Change Version", error + "\n\nOverride?")) {
return false;
} else if (!AtsClientService.get().getUserService().isAtsAdmin()) {
AWorkbench.popup("ERROR", error);
@@ -194,7 +193,8 @@ public class TargetedVersionColumnUI extends XViewerAtsColumnIdColumn implements
}
}
- promptChangeVersion(awas, AtsClientService.get().getUserService().isAtsAdmin() ? VersionReleaseType.Both : VersionReleaseType.UnReleased,
+ promptChangeVersion(awas,
+ AtsClientService.get().getUserService().isAtsAdmin() ? VersionReleaseType.Both : VersionReleaseType.UnReleased,
AtsClientService.get().getUserService().isAtsAdmin() ? VersionLockedType.Both : VersionLockedType.UnLocked);
((XViewer) getXViewer()).update(awas.toArray(), null);
return;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java
index 2594df0eab..1844dda5f3 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java
@@ -85,7 +85,7 @@ public class CopyAtsValidation {
resultData.errorf("Could not get new name from name conversion for ActionableItem [%s]", aiArt.getName());
}
for (IAtsActionableItem childAiArt : ActionableItems.getActionableItemsFromItemAndChildren(aiArt)) {
- if (!aiArt.equals(childAiArt)) {
+ if (aiArt.notEqual(childAiArt)) {
validateActionableItem(childAiArt);
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeActionableItemHeader.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeActionableItemHeader.java
index 1d3994d5f0..33045dd8a3 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeActionableItemHeader.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeActionableItemHeader.java
@@ -105,7 +105,7 @@ public class WfeActionableItemHeader extends Composite {
if (AtsClientService.get().getWorkItemService().getTeams(parentAction).size() > 1) {
sb.append(" Other: ");
for (IAtsTeamWorkflow workflow : AtsClientService.get().getWorkItemService().getTeams(parentAction)) {
- if (!workflow.equals(teamWf)) {
+ if (workflow.notEqual(teamWf)) {
sb.append(
AtsClientService.get().getWorkItemService().getActionableItemService().getActionableItemsStr(
workflow));
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeArtifactEventManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeArtifactEventManager.java
index ea6efed8cc..fbf3bdb0fd 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeArtifactEventManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeArtifactEventManager.java
@@ -180,7 +180,7 @@ public class WfeArtifactEventManager implements IArtifactEventListener {
for (IAtsTeamWorkflow teamWf : AtsClientService.get().getWorkItemService().getTeams(
awa.getParentAction())) {
IAtsAction parentAction = teamWf.getParentAction();
- if (!awa.equals(teamWf) && artifactEvent.isHasEvent(
+ if (awa.notEqual(teamWf) && artifactEvent.isHasEvent(
(Artifact) teamWf.getStoreObject()) && parentAction != null && artifactEvent.isRelAddedChangedDeleted(
(Artifact) parentAction.getStoreObject())) {
refreshed = true;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java
index 9182a0967c..b8160d664e 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java
@@ -137,7 +137,7 @@ public class ArtifactImpactToActionSearchItem extends XNavigateItemAction {
if (branches != null) {
for (BranchId branch : branches) {
Artifact assocArt = BranchManager.getAssociatedArtifact(branch);
- if (assocArt != null && !assocArt.equals(AtsCoreUsers.SYSTEM_USER)) {
+ if (assocArt != null && assocArt.notEqual(AtsCoreUsers.SYSTEM_USER)) {
rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {
assocArt.getArtifactTypeName(),
"Working",
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java
index ac6a0e6243..f6cb9efcda 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java
@@ -235,7 +235,7 @@ public class ModifyActionableItemsBlam extends AbstractBlam {
Set<IAtsActionableItem> ais = new HashSet<>();
for (TeamWorkFlowArtifact team : teamWf.getParentActionArtifact().getTeams()) {
- if (!team.equals(teamWf)) {
+ if (team.notEqual(teamWf)) {
ais.addAll(team.getActionableItems());
}
}
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 3f67db9e62..cc76d5caae 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
@@ -148,7 +148,7 @@ public class AtsDeleteManager {
WorkflowEditor.close(java.util.Collections.singleton((AbstractWorkflowArtifact) deleteArt), true);
((AbstractWorkflowArtifact) deleteArt).atsDelete(relatedArts, ignoredArts);
for (Artifact loopArt : relatedArts) {
- if (!loopArt.equals(deleteArt)) {
+ if (loopArt.notEqual(deleteArt)) {
delBuilder.append(
String.format(AHTML.addSpace(4) + "<b>Related</b>:[%s][%s][%s]", loopArt.getArtifactTypeName(),
AtsClientService.get().getAtsId(loopArt), loopArt.getName()) + "\n");
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java
index 6834817fb4..0b90ee3f59 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java
@@ -194,7 +194,7 @@ public class UserRoleXViewer extends XViewer {
boolean modified = false;
for (UserRole userRole : userRoles) {
IAtsUser atsUser = AtsClientService.get().getUserService().getUserById(userRole.getUserId());
- if (user != null && !atsUser.equals(user)) {
+ if (user != null && atsUser.notEqual(user)) {
userRole.setUserId(atsUser.getUserId());
if (!modified) {
modified = true;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java
index f7ba43a1f4..4afeccdb02 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java
@@ -126,7 +126,7 @@ public class ImportAIsAndTeamDefinitionsToDb {
newTeam = ArtifactTypeManager.addArtifact(AtsArtifactTypes.TeamDefinition,
AtsClientService.get().getAtsBranch(), dslTeamName, null, uuid);
}
- if (parentArtifact != null && !parentArtifact.equals(newTeam)) {
+ if (parentArtifact != null && parentArtifact.notEqual(newTeam)) {
parentArtifact.addChild(newTeam);
}
newTeams.put(newTeam.getName(), newTeam);
@@ -245,7 +245,7 @@ public class ImportAIsAndTeamDefinitionsToDb {
newAi = ArtifactTypeManager.addArtifact(AtsArtifactTypes.ActionableItem,
AtsClientService.get().getAtsBranch(), dslAIName, null, uuid);
}
- if (parentArtifact != null && !parentArtifact.equals(newAi)) {
+ if (parentArtifact != null && parentArtifact.notEqual(newAi)) {
parentArtifact.addChild(newAi);
}
newAIs.put(newAi.getName(), newAi);
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java
index b30fdb7d9b..0b47b450d4 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java
@@ -25,7 +25,6 @@ import org.eclipse.osee.client.test.framework.OseeLogMonitorRule;
import org.eclipse.osee.client.test.framework.TestInfo;
import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.TransactionToken;
import org.eclipse.osee.framework.core.enums.BranchType;
@@ -129,7 +128,7 @@ public class ArtifactQueryTest {
if (firstId.isInvalid()) {
firstId = a.getBranch();
} else {
- if (!firstId.equals(a.getBranch())) {
+ if (firstId.notEqual(a.getBranch())) {
pass = true;
break;
}
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
index d665e09f58..0120d0726c 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
@@ -311,7 +311,7 @@ public class AccessControlService implements IAccessControlService {
private void addLockAccessControl(ArtifactToken userArtifact, Collection<?> objectsToCheck, AccessData accessData) throws OseeCoreException {
for (Object obj : objectsToCheck) {
Artifact subject = getSubjectFromLockedObject(obj);
- if (subject != null && !subject.equals(userArtifact)) {
+ if (subject != null && subject.notEqual(userArtifact)) {
accessData.add(obj,
new AccessDetail<ArtifactToken>((Artifact) obj, PermissionEnum.LOCK, Scope.createArtifactLockScope()));
}
@@ -439,8 +439,8 @@ public class AccessControlService implements IAccessControlService {
}
}
if (userPermission == null) {
- if (!CoreBranches.COMMON.equals(accessObject.getBranch()) && BranchManager.getType(
- accessObject.getBranch()).isBaselineBranch()) {
+ if (CoreBranches.COMMON.notEqual(
+ accessObject.getBranch()) && BranchManager.getType(accessObject.getBranch()).isBaselineBranch()) {
userPermission = PermissionEnum.READ;
} else {
userPermission = PermissionEnum.FULLACCESS;
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java
index 5af26d6200..f087915351 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java
@@ -18,9 +18,9 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.Callable;
import org.eclipse.osee.cache.admin.Cache;
-import org.eclipse.osee.framework.core.data.UserToken;
import org.eclipse.osee.framework.core.data.OseeCredential;
import org.eclipse.osee.framework.core.data.OseeSessionGrant;
+import org.eclipse.osee.framework.core.data.UserToken;
import org.eclipse.osee.framework.core.enums.SystemUser;
import org.eclipse.osee.framework.core.server.IAuthenticationManager;
import org.eclipse.osee.framework.core.server.ISession;
@@ -67,7 +67,7 @@ public final class SessionManagerImpl implements ISessionManager {
Integer.valueOf(credential.getClientPort()));
// if the user is BootStrap we do not want to insert into database since tables may not exist
- if (!SystemUser.BootStrap.equals(userToken)) {
+ if (SystemUser.BootStrap.notEqual(userToken)) {
storeDataAccessor.create(Collections.singleton(session));
}
diff --git a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/SkynetDbBranchDataImport.java b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/SkynetDbBranchDataImport.java
index 9a7c06c43e..be91429bed 100644
--- a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/SkynetDbBranchDataImport.java
+++ b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/SkynetDbBranchDataImport.java
@@ -57,7 +57,7 @@ public class SkynetDbBranchDataImport implements IDbInitializationTask {
// Clean up and delete all branches except Common
for (BranchId branch : BranchManager.getBranches(BranchArchivedState.UNARCHIVED, BranchType.WORKING,
BranchType.BASELINE)) {
- if (!branch.equals(CoreBranches.COMMON)) {
+ if (branch.notEqual(CoreBranches.COMMON)) {
BranchManager.purgeBranch(branch);
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
index e2f9a005ac..d2838c510a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
@@ -1566,7 +1566,7 @@ public class Artifact extends NamedIdBase implements IArtifact, Adaptable, Fully
* Changes the artifact type.
*/
public final void setArtifactType(ArtifactTypeId artifactTypeId) {
- if (!this.artifactTypeId.equals(artifactTypeId)) {
+ if (this.artifactTypeId.notEqual(artifactTypeId)) {
this.artifactTypeId = artifactTypeId;
objectEditState = EditState.ARTIFACT_TYPE_MODIFIED;
if (isInDb()) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
index a8042895d4..ce2a5327ba 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
@@ -589,7 +589,7 @@ public final class BranchManager {
public static boolean isChangeManaged(BranchId branch) {
ArtifactId associatedArtifactId = getAssociatedArtifactId(branch);
- return associatedArtifactId.isValid() && !associatedArtifactId.equals(OseeSystem);
+ return associatedArtifactId.isValid() && associatedArtifactId.notEqual(OseeSystem);
}
public static void setAssociatedArtifactId(BranchId branch, ArtifactId artifactId) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/DefaultArtifactFactory.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/DefaultArtifactFactory.java
index 4437e1dea6..06ece79e70 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/DefaultArtifactFactory.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/factory/DefaultArtifactFactory.java
@@ -32,6 +32,6 @@ public final class DefaultArtifactFactory extends ArtifactFactory {
@Override
public boolean isUserCreationEnabled(ArtifactTypeId artifactType) {
- return !artifactType.equals(CoreArtifactTypes.RootArtifact);
+ return artifactType.notEqual(CoreArtifactTypes.RootArtifact);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CommitBranchHttpRequestOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CommitBranchHttpRequestOperation.java
index 0e1248f49f..4c1e6453dc 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CommitBranchHttpRequestOperation.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CommitBranchHttpRequestOperation.java
@@ -133,7 +133,7 @@ public final class CommitBranchHttpRequestOperation extends AbstractOperation {
// Update commit artifact cache with new information
Artifact associatedArtifact = BranchManager.getAssociatedArtifact(sourceBranch);
- if (!associatedArtifact.equals(SystemUser.OseeSystem)) {
+ if (associatedArtifact.notEqual(SystemUser.OseeSystem)) {
TransactionManager.cacheCommittedArtifactTransaction(associatedArtifact, newTransaction);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java
index 66988cb667..b2426bf8ac 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java
@@ -118,7 +118,7 @@ public final class ChangeManager {
joinQuery.add(branch, artifact, transaction, branch.getViewId());
// for each combination of artifact and its branch hierarchy
- while (!branch.equals(CoreBranches.SYSTEM_ROOT)) {
+ while (branch.notEqual(CoreBranches.SYSTEM_ROOT)) {
transaction = BranchManager.getSourceTransaction(branch);
branch = BranchManager.getParentBranch(branch);
joinQuery.add(branch, artifact, transaction);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ViewIdUtility.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ViewIdUtility.java
index ea5e3d472c..09c64e247b 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ViewIdUtility.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ViewIdUtility.java
@@ -27,7 +27,7 @@ public class ViewIdUtility {
public static Set<ArtifactId> findExcludedArtifactsByView(ArtifactId viewId, BranchId branch) {
Set<ArtifactId> excludedArtifactIdMap = new HashSet<>();
- if (!viewId.equals(ArtifactId.SENTINEL)) {
+ if (viewId.isValid()) {
Object[] objs = {branch, viewId, branch};
List<ArtifactId> excludedArtifacts =
ArtifactLoader.selectArtifactIds(OseeSql.LOAD_EXCLUDED_ARTIFACT_IDS.getSql(), objs, 300);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java
index e1371962ea..2fba283d7d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java
@@ -30,7 +30,7 @@ public class AttributeTypeUtil {
public static List<AttributeTypeToken> getEmptyTypes(Artifact artifact) throws OseeCoreException {
List<AttributeTypeToken> items = new ArrayList<>();
for (AttributeTypeToken type : artifact.getAttributeTypes()) {
- if (!CoreAttributeTypes.Name.equals(type) && artifact.getAttributes(type).isEmpty()) {
+ if (CoreAttributeTypes.Name.notEqual(type) && artifact.getAttributes(type).isEmpty()) {
items.add(type);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java
index 3f41cb7e97..772a1a7f4c 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java
@@ -83,7 +83,7 @@ public class ExportArtifacts extends AbstractBlam {
row[1] = artifact.getArtifactTypeName();
row[2] = artifact.getName();
for (AttributeTypeId attributeType : artifact.getAttributeTypes()) {
- if (!attributeType.equals(CoreAttributeTypes.Name)) {
+ if (attributeType.notEqual(CoreAttributeTypes.Name)) {
String value = artifact.getAttributesToString(attributeType);
if (!value.equals("")) {
row[NUM_FIXED_COLUMNS + Arrays.binarySearch(attributeColumns, attributeType)] = value;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java
index b6d2622f15..f3f849e5e9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java
@@ -119,7 +119,7 @@ public abstract class CommitHandler extends CommandHandler {
}
protected boolean useParentBranchValid(IOseeBranch branch) throws OseeCoreException {
- return !branch.equals(CoreBranches.SYSTEM_ROOT) && useParentBranch && !BranchManager.isChangeManaged(
+ return branch.notEqual(CoreBranches.SYSTEM_ROOT) && useParentBranch && !BranchManager.isChangeManaged(
branch) && !BranchManager.isArchived(branch);
}
protected class CommitJob extends Job {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java
index b25ce2e73d..62647f1a25 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java
@@ -66,7 +66,7 @@ public class CommitIntoParentCompoundContributionItem extends CompoundContributi
if (!branches.isEmpty()) {
IOseeBranch selectedBranch = branches.iterator().next();
- if (selectedBranch != null && !selectedBranch.equals(CoreBranches.SYSTEM_ROOT)) {
+ if (selectedBranch != null && selectedBranch.notEqual(CoreBranches.SYSTEM_ROOT)) {
try {
String commandId = "org.eclipse.osee.framework.ui.skynet.branch.BranchView.commitIntoParent";
Command command = configCommandParameter(commandId);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/GeneralPurposeRendererHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/GeneralPurposeRendererHandler.java
index eba4dacf1a..6b883af4fe 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/GeneralPurposeRendererHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/GeneralPurposeRendererHandler.java
@@ -37,7 +37,6 @@ public class GeneralPurposeRendererHandler extends AbstractEditorHandler {
String openOption = event.getParameter(RendererOption.OPEN_OPTION.getKey());
ArtifactId view = Handlers.getViewId();
-
PresentationType presentationType = PresentationType.valueOf(presentationTypeStr);
if (template != null) {
rendererOptions.put(RendererOption.TEMPLATE_OPTION, template);
@@ -45,7 +44,7 @@ public class GeneralPurposeRendererHandler extends AbstractEditorHandler {
if (openOption != null) {
rendererOptions.put(RendererOption.OPEN_OPTION, openOption);
}
- if (!view.equals(ArtifactId.SENTINEL)) {
+ if (view.isValid()) {
rendererOptions.put(RendererOption.VIEW, view);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java
index b7d328fa2c..06ff01e505 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java
@@ -422,7 +422,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
}
public void initializeSelectionBox() {
- if (branch != null && branchSelect != null && !branch.equals(branchSelect.getData())) {
+ if (branch != null && branchSelect != null && branch.notEqual(branchSelect.getData())) {
branchSelect.setSelection(branch);
refreshBranchWarning();
refreshView();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerViewApplicability.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerViewApplicability.java
index 91759d4da6..9a43c380d4 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerViewApplicability.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerViewApplicability.java
@@ -97,7 +97,7 @@ public class ArtifactExplorerViewApplicability {
button.setEnabled(false);
} else {
ArtifactId viewId = branch.getViewId();
- if (viewId != null && !viewId.equals(ArtifactId.SENTINEL)) {
+ if (viewId != null && viewId.isValid()) {
button.setEnabled(false);
} else {
button.setEnabled(true);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
index fa96e6ab8c..b74828c0e9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
@@ -705,7 +705,7 @@ public class WordTemplateProcessor {
if (((boolean) renderer.getRendererOptionValue(RendererOption.ALL_ATTRIBUTES)) || attributeName.equals("*")) {
for (AttributeTypeToken attributeType : RendererManager.getAttributeTypeOrderList(artifact)) {
- if (!outlining || !attributeType.equals(headingAttributeType)) {
+ if (!outlining || attributeType.notEqual(headingAttributeType)) {
processAttribute(artifact, wordMl, attributeElement, attributeType, true, presentationType,
publishInLine, footer);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java
index ead8bc3a6b..d7f4680d09 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java
@@ -56,7 +56,7 @@ public class ArtifactTypeContentProvider implements IGraphEntityContentProvider
}
}
return artifactTypes.toArray();
- } else if (selectedArtType.equals(entity) && !selectedArtType.equals(CoreArtifactTypes.Artifact)) {
+ } else if (selectedArtType.equals(entity) && selectedArtType.notEqual(CoreArtifactTypes.Artifact)) {
Set<IArtifactType> artifactTypes = new HashSet<>();
// parents
for (IArtifactType childType : artifactType.getSuperArtifactTypes()) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java
index 99fe96ba8f..6de18c55e8 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java
@@ -51,7 +51,7 @@ public class BranchXViewer extends XViewer {
ArrayList<BranchId> branches = xBranchViewer.getSelectedBranches();
if (branches != null && !branches.isEmpty()) {
for (BranchId branch : branches) {
- if (!branch.equals(CoreBranches.SYSTEM_ROOT)) {
+ if (branch.notEqual(CoreBranches.SYSTEM_ROOT)) {
if (!BranchManager.getType(branch).isMergeBranch()) {
ArtifactExplorer.exploreBranch(branch);
BranchManager.setLastBranch(branch);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java
index 7b667e76a3..b483e3e69f 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java
@@ -215,7 +215,7 @@ public class XBranchLabelProvider extends XViewerLabelProvider {
if (element instanceof BranchId) {
try {
Artifact associatedArtifact = BranchManager.getAssociatedArtifact((BranchId) element);
- if (!associatedArtifact.equals(SystemUser.OseeSystem)) {
+ if (associatedArtifact.notEqual(SystemUser.OseeSystem)) {
return ArtifactImageManager.getImage(associatedArtifact);
}
} catch (OseeCoreException ex) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
index 614735999e..90bf6fd680 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
@@ -346,7 +346,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener,
BranchId mergeBranch = null;
try {
mergeBranch = BranchManager.getMergeBranch(sourceBranch, destBranch);
- if (mergeBranch == null || !mergeBranch.equals(artifactEvent.getBranch())) {
+ if (mergeBranch == null || mergeBranch.notEqual(artifactEvent.getBranch())) {
return;
}
if (!isApplicableEvent(artifactEvent.getBranch(), mergeBranch)) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
index 40f0e6f265..1c2ead48d1 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
@@ -599,7 +599,7 @@ public class MergeXWidget extends GenericXWidget implements IOseeTreeReportProvi
IOseeCmService cmService = ServiceUtil.getOseeCmService();
if (cmService.isPcrArtifact(associatedArtifact)) {
cmService.openArtifact(associatedArtifact, OseeCmEditor.CmPcrEditor);
- } else if (!associatedArtifact.equals(UserManager.getUser(SystemUser.OseeSystem))) {
+ } else if (associatedArtifact.notEqual(SystemUser.OseeSystem)) {
RendererManager.open(associatedArtifact, PresentationType.SPECIALIZED_EDIT);
} else {
AWorkbench.popup("ERROR", "Unknown branch association");
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/column/HierarchyIndexColumn.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/column/HierarchyIndexColumn.java
index dd53f6ff36..2f9d3ec622 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/column/HierarchyIndexColumn.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/column/HierarchyIndexColumn.java
@@ -76,7 +76,7 @@ public class HierarchyIndexColumn extends XViewerColumn implements IXViewerPreCo
StringBuilder builder = new StringBuilder(20);
String error = Strings.emptyString();
- while (!artifactCursor.equals(CoreArtifactTokens.DefaultHierarchyRoot)) {
+ while (artifactCursor.notEqual(CoreArtifactTokens.DefaultHierarchyRoot)) {
Artifact parent = null;
try {
parent = artifactCursor.getParent();
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java
index 89b8fd8c73..b6dc13ed83 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java
@@ -339,6 +339,7 @@ public class TxDataManagerTest {
@Test
public void testGetForWriteDuringWrite() throws OseeCoreException {
when(txData.add(artifact1)).thenReturn(artifact3);
+ when(artifact3.notEqual(artifact1)).thenReturn(true);
when(artifactFactory.clone(session, artifact1)).thenReturn(artifact1);
ArtifactData data = Mockito.mock(ArtifactData.class);
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java
index fa4a9f9c66..57c8034a5c 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java
@@ -478,7 +478,7 @@ public abstract class AttributeManagerImpl extends BaseId implements HasOrcsData
//////////////////////////////////////////////////////////////
private void checkTypeValid(AttributeTypeId attributeType) throws OseeCoreException {
- if (!CoreAttributeTypes.Name.equals(attributeType)) {
+ if (CoreAttributeTypes.Name.notEqual(attributeType)) {
if (!isAttributeTypeValid(attributeType)) {
throw new OseeArgumentException("The attribute type [%s] is not valid for artifacts [%s]", attributeType,
getExceptionString());
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java
index cf7bb1e9aa..25365689d5 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java
@@ -336,7 +336,7 @@ public class TxDataManager {
private void checkAndAdd(TxData txData, Artifact artifact) throws OseeCoreException {
checkChangesAllowed(txData);
Artifact oldArtifact = txData.add(artifact);
- boolean isDifferent = oldArtifact != null && !oldArtifact.equals(artifact);
+ boolean isDifferent = oldArtifact != null && oldArtifact.notEqual(artifact);
Conditions.checkExpressionFailOnTrue(isDifferent,
"Another instance of writeable detected - writeable tracking would be inconsistent");
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CreateBranchDatabaseTxCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CreateBranchDatabaseTxCallable.java
index 3911b79c70..2fa9d8c585 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CreateBranchDatabaseTxCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CreateBranchDatabaseTxCallable.java
@@ -118,7 +118,7 @@ public class CreateBranchDatabaseTxCallable extends JdbcTransaction {
ArtifactId associatedArtifactId = newBranchData.getAssociatedArtifact();
// this checks to see if there are any branches that aren't either DELETED or REBASELINED with the same artifact ID
- if (associatedArtifactId.isValid() && !SystemUser.OseeSystem.equals(associatedArtifactId)) {
+ if (associatedArtifactId.isValid() && SystemUser.OseeSystem.notEqual(associatedArtifactId)) {
int count = jdbcClient.fetch(connection, 0,
"SELECT (1) FROM osee_branch WHERE associated_art_id = ? AND branch_state NOT IN (?, ?)",
newBranchData.getAssociatedArtifact(), BranchState.DELETED.getValue(),
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsVersionedObjectImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsVersionedObjectImpl.java
index 9afb693f16..f2f0fe8424 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsVersionedObjectImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsVersionedObjectImpl.java
@@ -104,7 +104,7 @@ public abstract class OrcsVersionedObjectImpl extends OrcsObjectImpl<Integer> im
@Override
public void setApplicabilityId(ApplicabilityId applicId) {
- if (this.applicId != null && !this.applicId.equals(applicId)) {
+ if (this.applicId != null && this.applicId.notEqual(applicId)) {
if (!dirtyState.isDirty()) {
applicDirty = true;
dirtyState = DirtyState.APPLICABILITY_ONLY;

Back to the top