Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2017-02-06 12:07:04 -0500
committerDavid W. Miller2017-02-06 12:07:04 -0500
commitb3579a765453332d53294591d85b562d9e736bb7 (patch)
tree72a809b339f74b8a16dd353df30ebec7c38f8e06
parentce69c621a34a14497a4b0a4086700d67f2132f7f (diff)
downloadorg.eclipse.osee-b3579a765453332d53294591d85b562d9e736bb7.tar.gz
org.eclipse.osee-b3579a765453332d53294591d85b562d9e736bb7.tar.xz
org.eclipse.osee-b3579a765453332d53294591d85b562d9e736bb7.zip
refactor: Use getIdString where appropriate
- An automated refactor to replace calls to getId().toString() and - getUuid().toString() with getIdString() Change-Id: I1751097dcdb2860540b9ea5fdb823278ce4ffbd3
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java14
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java2
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/UuidColumn.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/version/AbstractAtsVersionServiceImpl.java6
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkingBranchUuidColumn.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XProgramSelectionWidget.java2
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributeResourceTest.java2
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchFavoriteTest.java4
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java8
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java21
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoItemArtifact.java2
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoSetArtifact.java2
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResource.java2
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/IdSerializer.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelationReorder1.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java4
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/UpdateBranchOperation.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/TupleChange.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AccessTopicEventPayload.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java7
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorInputFactory.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java5
-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/group/GroupExplorer.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/HTMLRenderer.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectByWidgetDam.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidgetDam.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/OseeDatastoreMigrationResource.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeTypeResource.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TypesEndpointImpl.java2
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java3
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java2
54 files changed, 91 insertions, 101 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java
index 99219aa23d..91689dfb30 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java
@@ -144,7 +144,7 @@ public class AtsBranchConfigurationTest {
Assert.assertNotNull(versionToTarget);
IAtsChangeSet changes = AtsClientService.get().createChangeSet(getClass().getSimpleName());
changes.setSoleAttributeValue(versionToTarget, AtsAttributeTypes.BaselineBranchUuid,
- viaTeamDefBranch.getUuid().toString());
+ viaTeamDefBranch.getIdString());
changes.setSoleAttributeValue(versionToTarget, AtsAttributeTypes.AllowCommitBranch, true);
changes.setSoleAttributeValue(versionToTarget, AtsAttributeTypes.AllowCreateBranch, true);
changes.execute();
@@ -252,8 +252,7 @@ public class AtsBranchConfigurationTest {
}
IAtsTeamDefinition teamDef = operation.getTeamDefinition();
IAtsChangeSet changes = AtsClientService.get().createChangeSet(getClass().getSimpleName());
- changes.setSoleAttributeValue(teamDef, AtsAttributeTypes.BaselineBranchUuid,
- viaTeamDefBranch.getUuid().toString());
+ changes.setSoleAttributeValue(teamDef, AtsAttributeTypes.BaselineBranchUuid, viaTeamDefBranch.getIdString());
// setup team def to allow create/commit of branch
changes.setSoleAttributeValue(teamDef, AtsAttributeTypes.AllowCommitBranch, true);
changes.setSoleAttributeValue(teamDef, AtsAttributeTypes.AllowCreateBranch, true);
@@ -348,7 +347,8 @@ public class AtsBranchConfigurationTest {
transaction.execute();
// Delete Team Definitions
- transaction = TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), "Branch Configuration Test");
+ transaction =
+ TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), "Branch Configuration Test");
for (Artifact teamDefArt : ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.TeamDefinition,
branch.getName(), AtsClientService.get().getAtsBranch())) {
teamDefArt.deleteAndPersist(transaction, false);
@@ -360,7 +360,8 @@ public class AtsBranchConfigurationTest {
transaction.execute();
// Delete AIs
- transaction = TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), "Branch Configuration Test");
+ transaction =
+ TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), "Branch Configuration Test");
for (Artifact aiaArt : ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.ActionableItem,
branch.getName(), AtsClientService.get().getAtsBranch())) {
for (Artifact childArt : aiaArt.getChildren()) {
@@ -384,7 +385,8 @@ public class AtsBranchConfigurationTest {
Collection<Artifact> arts =
ArtifactQuery.getArtifactListFromType(AtsArtifactTypes.WorkDefinition, AtsClientService.get().getAtsBranch());
if (arts.size() > 0) {
- transaction = TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), "Branch Configuration Test");
+ transaction =
+ TransactionManager.createTransaction(AtsClientService.get().getAtsBranch(), "Branch Configuration Test");
for (Artifact workArt : arts) {
if (workArt.getName().startsWith(namespace)) {
workArt.deleteAndPersist(transaction, true);
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 add6ff2593..b5930f956f 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
@@ -792,7 +792,7 @@ public class AtsTestUtil {
Artifact verArt = ((Artifact) version.getStoreObject());
verArt.setSoleAttributeValue(AtsAttributeTypes.AllowCreateBranch, true);
verArt.setSoleAttributeValue(AtsAttributeTypes.AllowCommitBranch, true);
- verArt.setSoleAttributeValue(AtsAttributeTypes.BaselineBranchUuid, SAW_Bld_1.getUuid().toString());
+ verArt.setSoleAttributeValue(AtsAttributeTypes.BaselineBranchUuid, SAW_Bld_1.getIdString());
verArt.setRelations(AtsRelationTypes.TeamWorkflowTargetedForVersion_Workflow,
Arrays.asList((Artifact) getTeamWf().getStoreObject()));
verArt.persist(AtsTestUtil.class.getSimpleName() + "-SetTeamWfTargetedVer1");
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java
index 41c31e19ba..0266d5ab0e 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java
@@ -64,7 +64,7 @@ public class AtsBranchServiceImplTest {
//Test Team Def-base Team Arts
IAtsChangeSet changes = AtsClientService.get().createChangeSet(getClass().getSimpleName());
IAtsTeamDefinition teamDef = teamArt.getTeamDefinition();
- changes.setSoleAttributeValue(teamDef, AtsAttributeTypes.BaselineBranchUuid, SAW_Bld_1.getUuid().toString());
+ changes.setSoleAttributeValue(teamDef, AtsAttributeTypes.BaselineBranchUuid, SAW_Bld_1.getIdString());
// clear versions to config item is from teamDef
for (IAtsVersion version : teamDef.getVersions()) {
changes.deleteArtifact(version.getStoreObject());
@@ -106,7 +106,7 @@ public class AtsBranchServiceImplTest {
TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf();
IAtsChangeSet changes = AtsClientService.get().createChangeSet(getClass().getSimpleName());
IAtsTeamDefinition teamDef = teamArt.getTeamDefinition();
- changes.setSoleAttributeValue(teamDef, AtsAttributeTypes.BaselineBranchUuid, SAW_Bld_1.getUuid().toString());
+ changes.setSoleAttributeValue(teamDef, AtsAttributeTypes.BaselineBranchUuid, SAW_Bld_1.getIdString());
// clear versions to config item is from teamDef
for (IAtsVersion version : teamDef.getVersions()) {
changes.deleteArtifact(version.getStoreObject());
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/UuidColumn.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/UuidColumn.java
index 1bec405c31..ca5a9284a9 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/UuidColumn.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/UuidColumn.java
@@ -24,6 +24,6 @@ public class UuidColumn extends AbstractServicesColumn {
@Override
public String getText(IAtsObject atsObject) {
- return atsObject.getId().toString();
+ return atsObject.getIdString();
}
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
index 7c41c7cfda..9fa6c4e647 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
@@ -322,7 +322,7 @@ public abstract class AtsCoreServiceImpl implements IAtsServices {
@Override
public void storeAtsBranch(BranchId branch, String name) {
- AtsPreferencesService.get().put(ATS_BRANCH_UUID, String.valueOf(branch.getUuid()));
+ AtsPreferencesService.get().put(ATS_BRANCH_UUID, branch.getIdString());
AtsPreferencesService.get().put(ATS_BRANCH_NAME, name);
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/version/AbstractAtsVersionServiceImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/version/AbstractAtsVersionServiceImpl.java
index 914157801f..56a76c1c91 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/version/AbstractAtsVersionServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/version/AbstractAtsVersionServiceImpl.java
@@ -108,9 +108,9 @@ public abstract class AbstractAtsVersionServiceImpl implements IAtsVersionServic
public void changesStored(IAtsChangeSet changes) {
try {
HashMap<String, Object> properties = new HashMap<String, Object>();
- properties.put(AtsTopicEvent.WORK_ITEM_UUIDS_KEY, teamWf.getId().toString());
- properties.put(AtsTopicEvent.NEW_ATS_VERSION_ID, newVersion.getId().toString());
- properties.put(AtsTopicEvent.PREVIOUS_ATS_VERSION_ID, previousVersion.getId().toString());
+ properties.put(AtsTopicEvent.WORK_ITEM_UUIDS_KEY, teamWf.getIdString());
+ properties.put(AtsTopicEvent.NEW_ATS_VERSION_ID, newVersion.getIdString());
+ properties.put(AtsTopicEvent.PREVIOUS_ATS_VERSION_ID, previousVersion.getIdString());
Event event = new Event(AtsTopicEvent.TARGETED_VERSION_MODIFIED, properties);
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java
index 966aed8b8a..349a7fde78 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java
@@ -672,8 +672,8 @@ public class AgileEndpointImpl implements AgileEndpointApi {
burndownqry = burndownqry.replace("BASE_URI", uriInfo.getBaseUri().toString());
IAgileTeam team =
atsServer.getConfigItemFactory().getAgileTeam(atsServer.getArtifact(sprint.getTeamUuid()));
- burndownqry = burndownqry.replace("TEAM_ID", team.getId().toString());
- burndownqry = burndownqry.replace("SPRINT_ID", sprintArt.getId().toString());
+ burndownqry = burndownqry.replace("TEAM_ID", team.getIdString());
+ burndownqry = burndownqry.replace("SPRINT_ID", sprintArt.getIdString());
ArtifactId burndownQryArt =
changes.createArtifact(CoreArtifactTypes.GeneralDocument, "OSEE_Sprint_Burndown");
changes.setSoleAttributeValue(burndownQryArt, CoreAttributeTypes.Extension, "iqy");
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkingBranchUuidColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkingBranchUuidColumn.java
index 435ffb60b3..2505a1f06f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkingBranchUuidColumn.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkingBranchUuidColumn.java
@@ -40,7 +40,7 @@ public class WorkingBranchUuidColumn extends AbstractBranchColumn {
@Override
String getColumnText(Branch branch) {
- return String.valueOf(branch.getUuid());
+ return branch.getIdString();
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java
index 3d0e281b58..c745f44628 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java
@@ -740,7 +740,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction {
if (!branchesCommittedTo.isEmpty()) {
results.log(artifact, "testAtsBranchManagerA",
"Error: TeamWorkflow " + XResultDataUI.getHyperlink(
- teamArt) + " has committed branches but working branch [" + workingBranch.getUuid() + "] != COMMITTED");
+ teamArt) + " has committed branches but working branch [" + workingBranch + "] != COMMITTED");
}
} else if (!BranchManager.isArchived(workingBranch)) {
Collection<BranchId> branchesLeftToCommit =
@@ -748,7 +748,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction {
if (branchesLeftToCommit.isEmpty()) {
results.log(artifact, "testAtsBranchManagerA",
"Error: TeamWorkflow " + XResultDataUI.getHyperlink(
- teamArt) + " has committed all branches but working branch [" + workingBranch.getUuid() + "] != ARCHIVED");
+ teamArt) + " has committed all branches but working branch [" + workingBranch + "] != ARCHIVED");
}
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XProgramSelectionWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XProgramSelectionWidget.java
index 4f0dfcf97a..bc1b5ea45b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XProgramSelectionWidget.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XProgramSelectionWidget.java
@@ -40,7 +40,7 @@ public class XProgramSelectionWidget extends XArtifactSelectWidgetWithSave {
AtsClientService.get().getProgramService().getPrograms(AtsArtifactTypes.Program);
for (IAtsProgram program : programs) {
if (program.isActive()) {
- programArts.add(AtsClientService.get().getArtifactById(program.getId().toString()));
+ programArts.add(AtsClientService.get().getArtifactById(program.getIdString()));
}
}
}
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributeResourceTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributeResourceTest.java
index 93a99d68f2..3241bd0771 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributeResourceTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributeResourceTest.java
@@ -83,7 +83,7 @@ public class AttributeResourceTest {
String appServer = OseeClientProperties.getOseeApplicationServer();
URI uri =
UriBuilder.fromUri(appServer).path("orcs").path("branch").path(String.valueOf(artifact.getBranchId())).path(
- "artifact").path(artifact.getUuid().toString()).path("attribute").path(String.valueOf(attrId)).path(
+ "artifact").path(artifact.getIdString()).path("attribute").path(String.valueOf(attrId)).path(
"version").path(String.valueOf(transactionId)).path("text").build();
try {
return JaxRsClient.newClient().target(uri).request(MediaType.TEXT_PLAIN).get(String.class);
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchFavoriteTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchFavoriteTest.java
index 3c83f5de5a..9d9020fc79 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchFavoriteTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchFavoriteTest.java
@@ -79,8 +79,8 @@ public class BranchFavoriteTest {
assertFalse(joeSmith.isFavoriteBranch(SAW_Bld_2));
assertEquals(0, joeSmith.getAttributeCount(CoreAttributeTypes.FavoriteBranch));
- joeSmith.addAttribute(CoreAttributeTypes.FavoriteBranch, String.valueOf(SAW_Bld_1.getUuid()));
- joeSmith.addAttribute(CoreAttributeTypes.FavoriteBranch, String.valueOf(SAW_Bld_1.getUuid()));
+ joeSmith.addAttribute(CoreAttributeTypes.FavoriteBranch, SAW_Bld_1.getIdString());
+ joeSmith.addAttribute(CoreAttributeTypes.FavoriteBranch, SAW_Bld_1.getIdString());
joeSmith.persist(testInfo.getTestName() + " - testFavoriteBranchCleanup");
assertEquals(2, joeSmith.getAttributeCount(CoreAttributeTypes.FavoriteBranch));
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java
index c52d5065e3..deebb83976 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java
@@ -60,13 +60,13 @@ public class DispositionInitializer {
TransactionBuilder tx =
orcsApi.getTransactionFactory().createTransaction(CoreBranches.COMMON, oseeSystem, "Create Dispo Config");
ArtifactId createArtifact = tx.createArtifact(CoreArtifactTypes.GeneralData, DispoStrings.Dispo_Config_Art);
- StringBuffer sb = new StringBuffer(String.valueOf(SAW_Bld_1.getUuid()));
+ StringBuffer sb = new StringBuffer(SAW_Bld_1.getIdString());
sb.append(":");
- sb.append(SAW_Bld_1_FOR_DISPO.getGuid());
+ sb.append(SAW_Bld_1_FOR_DISPO.getIdString());
sb.append("\n");
- sb.append(SAW_Bld_1.getUuid());
+ sb.append(SAW_Bld_1.getIdString());
sb.append(":");
- sb.append(SAW_Bld_1_FOR_DISPO.getUuid());
+ sb.append(SAW_Bld_1_FOR_DISPO.getIdString());
tx.createAttributeFromString(createArtifact, CoreAttributeTypes.GeneralStringData, sb.toString());
tx.commit();
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java
index 5cf9e22089..b19b645326 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java
@@ -10,14 +10,12 @@
*******************************************************************************/
package org.eclipse.osee.disposition.rest.resources;
+import static org.eclipse.osee.framework.core.enums.CoreBranches.SYSTEM_ROOT;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import java.util.Collections;
-import java.util.List;
import javax.ws.rs.core.Response;
import org.eclipse.osee.disposition.rest.DispoApi;
-import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -33,39 +31,30 @@ public class DispoProgramResourceTest {
@Mock
private DispoApi dispoApi;
- @Mock
- private BranchId id1;
- @Mock
- private BranchId id2;
-
private DispoProgramResource resource;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
resource = new DispoProgramResource(dispoApi);
- when(id1.getUuid()).thenReturn(23L);
- when(id2.getUuid()).thenReturn(25L);
}
@Test
public void testGetAll() throws JSONException {
// No Sets
- List<IOseeBranch> emptyResultSet = Collections.emptyList();
- when(dispoApi.getDispoPrograms()).thenReturn(emptyResultSet);
+ when(dispoApi.getDispoPrograms()).thenReturn(Collections.emptyList());
+
Response noProgramsResponse = resource.getAllPrograms();
String messageActual = (String) noProgramsResponse.getEntity();
assertEquals(Response.Status.NOT_FOUND.getStatusCode(), noProgramsResponse.getStatus());
assertEquals("[]", messageActual);
- IOseeBranch branch = IOseeBranch.create(id1.getUuid(), "dispotestGetAll");
- List<IOseeBranch> branchList = Collections.singletonList(branch);
+ when(dispoApi.getDispoPrograms()).thenReturn(Collections.singletonList(SYSTEM_ROOT));
- when(dispoApi.getDispoPrograms()).thenReturn(branchList);
Response oneSetResponse = resource.getAllPrograms();
JSONArray entity = new JSONArray((String) oneSetResponse.getEntity());
JSONObject programFromEntity = entity.getJSONObject(0);
assertEquals(Response.Status.OK.getStatusCode(), oneSetResponse.getStatus());
- assertEquals(String.valueOf(id1.getUuid()), programFromEntity.getString("value"));
+ assertEquals(SYSTEM_ROOT.getIdString(), programFromEntity.getString("value"));
}
}
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoItemArtifact.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoItemArtifact.java
index ddd751cbdc..8aa9c923a5 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoItemArtifact.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoItemArtifact.java
@@ -37,7 +37,7 @@ public class DispoItemArtifact extends BaseIdentity<String> implements DispoItem
private boolean isIncludeDetails;
public DispoItemArtifact(ArtifactReadable artifact) {
- super(String.valueOf(artifact.getUuid()));
+ super(artifact.getIdString());
this.artifact = artifact;
}
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoSetArtifact.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoSetArtifact.java
index ae01dfb36f..46ae2ce0e5 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoSetArtifact.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoSetArtifact.java
@@ -32,7 +32,7 @@ public class DispoSetArtifact extends BaseIdentity<String> implements DispoSet {
private final ArtifactReadable artifact;
public DispoSetArtifact(ArtifactReadable artifact) {
- super(String.valueOf(artifact.getUuid()));
+ super(artifact.getIdString());
this.artifact = artifact;
}
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResource.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResource.java
index 0f01033629..5ab8210d5b 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResource.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResource.java
@@ -101,7 +101,7 @@ public class DispoProgramResource {
for (IOseeBranch branch : allPrograms) {
JSONObject jobject = new JSONObject();
- String uuid = String.valueOf(branch.getUuid());
+ String uuid = branch.getIdString();
jobject.put("value", uuid);
jobject.put("text", branch.getName());
jarray.put(jobject);
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/IdSerializer.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/IdSerializer.java
index 9a39df37f4..519d7d78d2 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/IdSerializer.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/IdSerializer.java
@@ -30,7 +30,7 @@ public class IdSerializer extends SerializerBase<Id> {
@Override
public void serialize(Id id, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonGenerationException {
- jgen.writeString(id.getId().toString());
+ jgen.writeString(id.getIdString());
}
/**
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java
index 6611ca4890..883339260e 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java
@@ -102,7 +102,7 @@ public class RemoteBasicGuidArtifact1 extends RemoteEvent {
public void setBranch(BranchId branch) {
this.branch = branch;
- this.branchGuid = branch.getId().toString();
+ this.branchGuid = branch.getIdString();
}
/**
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java
index 0d38357a8f..618f919f21 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java
@@ -108,7 +108,7 @@ public class RemoteBasicGuidRelation1 extends RemoteEvent {
* @param value allowed object is {@link String }
*/
public void setBranchGuid(BranchId branch) {
- this.branchGuid = branch.getId().toString();
+ this.branchGuid = branch.getIdString();
}
/**
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelationReorder1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelationReorder1.java
index 7f7cbfb1e9..6b2949a248 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelationReorder1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelationReorder1.java
@@ -79,7 +79,7 @@ public class RemoteBasicGuidRelationReorder1 extends RemoteEvent {
}
public void setBranchGuid(BranchId branch) {
- this.branchGuid = branch.getId().toString();
+ this.branchGuid = branch.getIdString();
}
/**
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
index 13d762bec3..c50e2c41b3 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
@@ -79,7 +79,7 @@ public class RemoteBranchEvent1 extends RemoteEvent {
}
public void setBranch(BranchId banch) {
- this.branchGuid = banch.getId().toString();
+ this.branchGuid = banch.getIdString();
}
public String getDestinationBranchGuid() {
@@ -91,7 +91,7 @@ public class RemoteBranchEvent1 extends RemoteEvent {
}
public void setDestinationBranch(BranchId branch) {
- this.destinationBranchGuid = branch == null ? null : branch.getId().toString();
+ this.destinationBranchGuid = branch == null ? null : branch.getIdString();
}
/**
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java
index 7d0cc38ef7..5f1800a141 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java
@@ -73,7 +73,7 @@ public class RemotePersistEvent1 extends RemoteEvent {
}
public void setBranchGuid(BranchId branch) {
- this.branchGuid = branch.getId().toString();
+ this.branchGuid = branch.getIdString();
}
/**
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java
index b1f5ad3264..e5627ba5b1 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java
@@ -117,10 +117,10 @@ public class User extends Artifact {
}
if (!found) {
- addAttribute(CoreAttributeTypes.FavoriteBranch, String.valueOf(favoriteBranch.getUuid()));
+ addAttribute(CoreAttributeTypes.FavoriteBranch, favoriteBranch.getIdString());
}
- setSetting(CoreAttributeTypes.FavoriteBranch.getName(), String.valueOf(favoriteBranch.getUuid()));
+ setSetting(CoreAttributeTypes.FavoriteBranch.getName(), favoriteBranch.getIdString());
saveSettings();
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/UpdateBranchOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/UpdateBranchOperation.java
index 0b60d9419f..2af70957ee 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/UpdateBranchOperation.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/UpdateBranchOperation.java
@@ -63,7 +63,7 @@ public class UpdateBranchOperation extends AbstractOperation {
BranchId parentBranch = BranchManager.getParentBranch(originalBranch);
proxy.logBranchActivity(
String.format("Branch Operation Update Branch {branchUUID: %s, branchName: %s parentBranchId: %s",
- originalBranch.getUuid(), originalBranch.getName(), parentBranch.getId()));
+ originalBranch.getIdString(), originalBranch.getName(), parentBranch.getId()));
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java
index cd6758b2c2..31509ab6f0 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java
@@ -883,7 +883,7 @@ public static List<ArtifactToken> getArtifactTokenListFromSoleAttributeInherited
String ids = "";
for (ArtifactType artType : artifactTypeFull.getAllDescendantTypes()) {
artTypeIds.add(artType.getId());
- ids += artType.getId().toString() + ",";
+ ids += artType.getIdString() + ",";
}
artTypeIds.add(artifactTypeFull.getId());
ids = ids.replaceFirst(",$", "");
@@ -997,7 +997,7 @@ public static List<ArtifactToken> getArtifactTokenListFromSoleAttributeInherited
org.eclipse.osee.framework.jdk.core.util.Collections.toString(",", artIds));
chStmt.runPreparedQuery(query, branchId.getId());
for (ArtifactToken token : extractTokensFromQuery(chStmt)) {
- guidToToken.put(token.getId().toString(), token);
+ guidToToken.put(token.getIdString(), token);
}
} finally {
chStmt.close();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java
index 79ed29c0cd..8d1629399a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java
@@ -358,7 +358,7 @@ public class ArtifactQueryBuilder {
message.append("\"");
}
message.append(" on branch \"");
- message.append(branch.getUuid());
+ message.append(branch.getIdString());
message.append("\"");
return message.toString();
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java
index fcadc82192..5f0fac240f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java
@@ -23,7 +23,7 @@ public class ArtifactReferenceAttribute extends IdentityReferenceAttribute<Artif
@Override
protected boolean subClassSetValue(Artifact artifact) throws OseeCoreException {
rawValue = artifact == null ? null : artifact.getUuid();
- return getAttributeDataProvider().setValue(artifact == null ? "" : String.valueOf(artifact.getUuid()));
+ return getAttributeDataProvider().setValue(artifact == null ? "" : artifact.getIdString());
}
public Long getRawValue() {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java
index d7c9233708..5f4a558ae2 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java
@@ -17,7 +17,7 @@ public class BranchReferenceAttribute extends IdentityReferenceAttribute<IOseeBr
@Override
protected boolean subClassSetValue(IOseeBranch value) throws OseeCoreException {
- return getAttributeDataProvider().setValue(value == null ? "" : String.valueOf(value.getUuid()));
+ return getAttributeDataProvider().setValue(value == null ? "" : value.getIdString());
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java
index 6829426c71..4c342ad92d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java
@@ -30,7 +30,7 @@ public final class ErrorChange extends Change {
super(branch, GammaId.valueOf(0L), artId, null, null, false, null, null);
this.errorMessage = String.format("%s %s", ERROR_STRING, exception);
this.name = String.format("%s ArtID: %s BranchUuid: %s - %s", ERROR_STRING, getArtId(),
- branch == null ? null : branch.getUuid(), exception);
+ branch == null ? null : branch.getIdString(), exception);
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/TupleChange.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/TupleChange.java
index a160ec12ec..7a7f5eafe8 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/TupleChange.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/TupleChange.java
@@ -54,7 +54,7 @@ public class TupleChange extends Change {
@Override
public String getItemTypeName() throws OseeCoreException {
- return itemTypeId.getId().toString();
+ return itemTypeId.getIdString();
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AccessTopicEventPayload.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AccessTopicEventPayload.java
index 6ba36930c5..d31cdcbdd9 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AccessTopicEventPayload.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AccessTopicEventPayload.java
@@ -64,7 +64,7 @@ public class AccessTopicEventPayload implements ISerializeableTopicPayload {
*/
public boolean matches(ArtifactToken artifact) {
if (!artifactUuids.isEmpty()) {
- return artifact.getBranchId().equals(branch) && artifactUuids.contains(String.valueOf(artifact.getUuid()));
+ return artifact.isOnBranch(branch) && artifactUuids.contains(artifact.getIdString());
}
return false;
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java
index a504e799fe..409969643e 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java
@@ -103,6 +103,7 @@ public class OseeLinkBuilder {
public OseeLinkBuilder() {
super();
}
+
public String getWordMlLink(LinkType destLinkType, Artifact artifact) throws OseeCoreException {
return getWordMlLink(destLinkType, artifact, PresentationType.DEFAULT_OPEN);
}
@@ -116,13 +117,13 @@ public class OseeLinkBuilder {
public String getUnknownArtifactLink(String guid, BranchId branch) {
String processType = "unknown";
- return getArtifactLinkWithMessage(processType, guid, branch, String.format(
- "Invalid Link: artifact with guid:[%s] on branchUuid:[%s] does not exist", guid, branch.getUuid()));
+ return getArtifactLinkWithMessage(processType, guid, branch,
+ String.format("Invalid Link: artifact with guid:[%s] on branch:[%s] does not exist", guid, branch));
}
private String getArtifactLinkWithMessage(String processType, String guid, BranchId branch, String message) {
String internalLink =
- String.format("http://none/%s?guid=%s&amp;branchUuid=%s", processType, guid, branch.getUuid());
+ String.format("http://none/%s?guid=%s&amp;branchUuid=%s", processType, guid, branch.getIdString());
return String.format(WORDML_LINK_FORMAT, internalLink, message);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java
index c2b9adf438..feb0cc15b3 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java
@@ -142,7 +142,7 @@ public class WasIsCompareEditorAction extends Action {
String appServer = OseeClientProperties.getOseeApplicationServer();
URI uri =
UriBuilder.fromUri(appServer).path("orcs").path("branch").path(String.valueOf(artifact.getBranchId())).path(
- "artifact").path(artifact.getUuid().toString()).path("attribute").path(String.valueOf(attrId)).path(
+ "artifact").path(artifact.getIdString()).path("attribute").path(String.valueOf(attrId)).path(
"version").path(String.valueOf(transactionId)).path("text").build();
try {
return JaxRsClient.newClient().target(uri).request(MediaType.TEXT_PLAIN).get(String.class);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorInputFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorInputFactory.java
index 5b0786cb55..058ba469a7 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorInputFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorInputFactory.java
@@ -51,7 +51,7 @@ public class ArtifactEditorInputFactory implements IElementFactory {
String title = input.getName();
Artifact artifact = input.getArtifact();
if (artifact != null) {
- String artUuid = artifact.getUuid().toString();
+ String artUuid = artifact.getIdString();
long branchUuid = artifact.getBranchId();
if (Strings.isValid(artUuid) && branchUuid > 0 && Strings.isValid(title)) {
memento.putString(BRANCH_KEY, String.valueOf(branchUuid));
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java
index ad620f6915..b5437cf567 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java
@@ -71,11 +71,11 @@ public class ChangeReportEditorInputFactory implements IElementFactory {
public static void saveState(IMemento memento, ChangeReportEditorInput input) {
TransactionDelta txDelta = input.getChangeData().getTxDelta();
- memento.putString(START_TX_KEY, txDelta.getStartTx().getId().toString());
- memento.putString(END_TX_KEY, txDelta.getEndTx().getId().toString());
+ memento.putString(START_TX_KEY, txDelta.getStartTx().getIdString());
+ memento.putString(END_TX_KEY, txDelta.getEndTx().getIdString());
memento.putString(COMPARE_TYPE, input.getChangeData().getCompareType().name());
if (input.getBranch() != null) {
- memento.putString(BRANCH_ID_KEY, String.valueOf(input.getBranch().getUuid()));
+ memento.putString(BRANCH_ID_KEY, input.getBranch().getIdString());
memento.putBoolean(TRANSACTION_TAB_ACTIVE_KEY, input.isTransactionTabActive());
}
}
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 c1eb167ee9..b25ce2e73d 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
@@ -89,11 +89,10 @@ public class CommitIntoParentCompoundContributionItem extends CompoundContributi
private CommandContributionItem createCommand(IOseeBranch branch, String commandId) throws OseeCoreException {
Map<String, String> parameters = new HashMap<>();
- parameters.put(BranchView.BRANCH_ID, Long.toString(branch.getUuid()));
+ parameters.put(BranchView.BRANCH_ID, branch.getIdString());
parameters.put(CommitBranchParameter.ARCHIVE_PARENT_BRANCH, "true");
CommandContributionItem contributionItem;
- String label =
- "Commit into Parent Branch: " + BranchManager.getBranchName(BranchManager.getParentBranch(branch));
+ String label = "Commit into Parent Branch: " + BranchManager.getBranchName(BranchManager.getParentBranch(branch));
contributionItem = new CommandContributionItem(
new CommandContributionItemParameter(PlatformUI.getWorkbench().getActiveWorkbenchWindow(), label, commandId,
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 55b6b40759..caca4546eb 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
@@ -362,7 +362,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
super.saveState(memento);
if (DbConnectionExceptionComposite.dbConnectionIsOk()) {
if (explorerRoot != null) {
- memento.putString(ROOT_UUID, String.valueOf(explorerRoot.getUuid()));
+ memento.putString(ROOT_UUID, explorerRoot.getIdString());
try {
memento.putString(ROOT_BRANCH, String.valueOf(explorerRoot.getBranchId()));
} catch (OseeCoreException ex) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
index 38ce0ae6a7..9090b14841 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
@@ -452,7 +452,7 @@ public class GroupExplorer extends GenericViewPart implements IArtifactEventList
memento = memento.createChild(INPUT);
if (branch != null) {
try {
- memento.putString(BRANCH_ID, Long.toString(branch.getUuid()));
+ memento.putString(BRANCH_ID, branch.getIdString());
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java
index e1cd8dd02d..b5a19518b4 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java
@@ -143,7 +143,7 @@ public class BranchSelectSimpleComposite extends Composite implements Listener {
this.branchSelectCombo.setItems(newItems);
selectionIndex = oldLength;
branchSelectCombo.setData(branch.getName(), branch);
- branchSelectCombo.setData(String.valueOf(branch.getUuid()), branch);
+ branchSelectCombo.setData(branch.getIdString(), branch);
}
this.branchSelectCombo.select(selectionIndex);
}
@@ -152,7 +152,7 @@ public class BranchSelectSimpleComposite extends Composite implements Listener {
public void restoreWidgetValues(String[] branchUuids, String lastSelected) {
// Add stored directories into selector
if (Strings.isValid(lastSelected) == false && currentBranch != null) {
- lastSelected = Long.toString(currentBranch.getUuid());
+ lastSelected = currentBranch.getIdString();
}
if (branchUuids == null) {
@@ -187,7 +187,7 @@ public class BranchSelectSimpleComposite extends Composite implements Listener {
String branchName = branch.getName();
branchSelectCombo.add(branchName);
- branchSelectCombo.setData(String.valueOf(branch.getUuid()), branch);
+ branchSelectCombo.setData(branch.getIdString(), branch);
branchSelectCombo.setData(branchName, branch);
if (toStore.equals(lastSelected)) {
toSelect = i;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/HTMLRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/HTMLRenderer.java
index 7606ccc8cb..2e732ff212 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/HTMLRenderer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/HTMLRenderer.java
@@ -148,7 +148,7 @@ public class HTMLRenderer extends FileSystemRenderer {
if (a instanceof CompressedContentAttribute) {
CompressedContentAttribute c = (CompressedContentAttribute) a;
InputStream stream = c.getValue();
- String attrId = c.getId().toString();
+ String attrId = c.getIdString();
String workingFileString =
RenderingUtil.getRenderPath(this, branch, PresentationType.PREVIEW, "", "", "") + "-" + attrId;
fileNameReplace.put(attrId, workingFileString);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java
index 0b8a12b790..94bc28d81a 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java
@@ -99,7 +99,7 @@ public class QuickSearchView extends GenericViewPart {
memento.putString(LAST_QUERY_KEY_ID, attrSearchComposite.getQuery());
BranchId branch = branchSelect.getData();
if (branch != null) {
- memento.putString(LAST_BRANCH_UUID, String.valueOf(branch.getUuid()));
+ memento.putString(LAST_BRANCH_UUID, branch.getIdString());
}
StringBuilder builder = new StringBuilder();
String[] queries = attrSearchComposite.getQueryHistory();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectByWidgetDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectByWidgetDam.java
index cfc1f1c35b..2cc018befc 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectByWidgetDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectByWidgetDam.java
@@ -52,7 +52,7 @@ public class XBranchSelectByWidgetDam extends XBranchSelectWidget implements IAt
if (selection == null) {
artifact.deleteAttributes(attributeType);
} else {
- artifact.setSoleAttributeValue(attributeType, String.valueOf(selection.getUuid()));
+ artifact.setSoleAttributeValue(attributeType, selection.getIdString());
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidgetDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidgetDam.java
index 59da160a6b..2d7aef69eb 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidgetDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidgetDam.java
@@ -58,7 +58,7 @@ public class XBranchSelectWidgetDam extends XBranchSelectWidget implements IAttr
if (selection == null) {
artifact.deleteAttributes(attributeType);
} else {
- artifact.setSoleAttributeValue(attributeType, String.valueOf(selection.getUuid()));
+ artifact.setSoleAttributeValue(attributeType, selection.getIdString());
}
}
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 040f9f47fd..7b667e76a3 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
@@ -142,9 +142,9 @@ public class XBranchLabelProvider extends XViewerLabelProvider {
} else if (cCol.equals(BranchXViewerFactory.branchType)) {
return BranchManager.getType(branch).name();
} else if (cCol.equals(BranchXViewerFactory.branchId)) {
- return String.valueOf(branch.getUuid());
+ return branch.getIdString();
} else if (cCol.equals(BranchXViewerFactory.branchId)) {
- return String.valueOf(branch.getUuid());
+ return branch.getIdString();
} else if (cCol.equals(BranchXViewerFactory.parentBranch)) {
try {
return branch.equals(CoreBranches.SYSTEM_ROOT) ? "none" : BranchManager.getBranchName(
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 4659811958..c978763343 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
@@ -247,16 +247,16 @@ public class MergeView extends GenericViewPart implements IBranchEventListener,
try {
IMemento childMemento = memento.createChild(INPUT);
if (commitTrans != null) {
- childMemento.putString(COMMIT_NUMBER, commitTrans.getId().toString());
+ childMemento.putString(COMMIT_NUMBER, commitTrans.getIdString());
}
if (sourceBranch != null) {
- childMemento.putString(SOURCE_BRANCH_ID, Long.toString(sourceBranch.getUuid()));
+ childMemento.putString(SOURCE_BRANCH_ID, sourceBranch.getIdString());
}
if (destBranch != null) {
- childMemento.putString(DEST_BRANCH_ID, Long.toString(destBranch.getUuid()));
+ childMemento.putString(DEST_BRANCH_ID, destBranch.getIdString());
}
if (transactionId != null) {
- childMemento.putString(TRANSACTION_NUMBER, transactionId.getId().toString());
+ childMemento.putString(TRANSACTION_NUMBER, transactionId.getIdString());
}
} catch (Exception ex) {
OseeLog.log(Activator.class, Level.WARNING, "Merge View save state error", ex);
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java
index 9b8d1b8007..16fd0fbe83 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java
@@ -133,7 +133,7 @@ public class OrcsAccountStorage extends AbstractOrcsStorage implements AccountSt
}
private String asString(ArtifactId artId, Map<String, String> preferences) {
- PropertyStore settings = new PropertyStore(Long.toString(artId.getUuid()));
+ PropertyStore settings = new PropertyStore(artId.getIdString());
for (Entry<String, String> entry : preferences.entrySet()) {
settings.put(entry.getKey(), entry.getValue());
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java
index b40b480d6f..338ca02ae1 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java
@@ -311,7 +311,7 @@ public class ArtifactReadOnlyImpl extends AbstractProxied<Artifact> implements A
@Override
public String toString() {
- return String.format("Artifact: Id [%s] Type [%s] Name [%s]", getId().toString(), getArtifactType().getName(),
+ return String.format("Artifact: Id [%s] Type [%s] Name [%s]", getIdString(), getArtifactType().getName(),
getName());
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/OseeDatastoreMigrationResource.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/OseeDatastoreMigrationResource.java
index ce1eb8fcc4..8890cf8d5c 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/OseeDatastoreMigrationResource.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/OseeDatastoreMigrationResource.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.orcs.db.internal.resource;
-import static org.eclipse.osee.framework.core.enums.CoreBranches.SYSTEM_ROOT_ID;
+import static org.eclipse.osee.framework.core.enums.CoreBranches.SYSTEM_ROOT;
import java.net.URL;
import java.util.Map;
import org.eclipse.osee.framework.core.data.OseeData;
@@ -39,6 +39,6 @@ public class OseeDatastoreMigrationResource extends AbstractJdbcMigrationResourc
placeholders.put(SYS_ROOT_TYPE_PLACEHOLDER, String.valueOf(BranchType.SYSTEM_ROOT.getValue()));
placeholders.put(SYS_ROOT_STATE_PLACEHOLDER, String.valueOf(BranchState.MODIFIED.getValue()));
placeholders.put(SYS_ROOT_NAME_PLACEHOLDER, CoreBranches.SYSTEM_ROOT.getName());
- placeholders.put(SYS_ROOT_ID_PLACEHOLDER, SYSTEM_ROOT_ID.toString());
+ placeholders.put(SYS_ROOT_ID_PLACEHOLDER, SYSTEM_ROOT.getIdString());
}
}
diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java
index 9025eb172e..9aaae1dcb1 100644
--- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java
@@ -132,9 +132,9 @@ public class PredicateFactoryImpl implements PredicateFactory {
List<String> values = new LinkedList<>();
String side = relationTypeSide.getSide().isSideA() ? "A" : "B";
for (ArtifactId id : ids) {
- values.add(id.getId().toString());
+ values.add(id.getIdString());
}
- return new Predicate(SearchMethod.RELATED_TO, Arrays.asList(side + relationTypeSide.getId().toString()), values);
+ return new Predicate(SearchMethod.RELATED_TO, Arrays.asList(side + relationTypeSide.getIdString()), values);
}
private List<String> getLongIds(Collection<? extends Id> types) {
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeTypeResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeTypeResource.java
index fd343da075..f1c5c5c8b9 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeTypeResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeTypeResource.java
@@ -92,7 +92,7 @@ public class AttributeTypeResource {
sb.append(AHTML.addRowMultiColumnTable(AHTML.bold("Name:"), attrType.getName()));
sb.append(AHTML.addRowMultiColumnTable(AHTML.bold("AttributeTypeId:"),
AHTML.getHyperlink(String.format("/orcs/branch/%d/artifact/%d/attribute/type/%d", branchId,
- artifactUuid, attrType.getId()), attrType.getId().toString())));
+ artifactUuid, attrType.getId()), attrType.getIdString())));
sb.append(AHTML.addRowMultiColumnTable(""));
}
sb.append(AHTML.endMultiColumnTable());
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TypesEndpointImpl.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TypesEndpointImpl.java
index bc91dd810f..e9c84258d7 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TypesEndpointImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TypesEndpointImpl.java
@@ -190,7 +190,7 @@ public class TypesEndpointImpl implements TypesEndpoint {
enumAttr.setMediaType(attributeTypes.getMediaType(type));
EnumType enumType = attributeTypes.getEnumType(type);
enumAttr.setEnumTypeName(enumType.getName());
- enumAttr.setEnumTypeUuid(enumType.getId().toString());
+ enumAttr.setEnumTypeUuid(enumType.getIdString());
for (EnumEntry enumEntry : enumType.values()) {
JaxEnumEntry entry = new JaxEnumEntry();
entry.setName(enumEntry.getName());
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java
index 45886de5c4..ec0e644d75 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java
@@ -21,7 +21,6 @@ import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.window.Window;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.TestRunStorageKey;
-import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
@@ -127,7 +126,7 @@ public class BranchComboDialog extends TitleAreaDialog implements Listener {
try {
BranchId branch = getSelection();
if (branch != null) {
- String lastBranchSelected = Long.toString(branch.getUuid());
+ String lastBranchSelected = branch.getIdString();
List<String> history = new ArrayList<>(Arrays.asList(branchUuids));
history.remove(lastBranchSelected);
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
index ce770526fb..7f3c314c03 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
@@ -306,7 +306,7 @@ public class OutfileImportPage extends WizardDataTransferPage {
BranchId branch = branchSelect.getData();
try {
if (branch != null) {
- String lastBranchSelected = Long.toString(branch.getUuid());
+ String lastBranchSelected = branch.getIdString();
branchUuids = addToHistory(branchUuids, lastBranchSelected);
settings.put(TestRunStorageKey.BRANCH_IDS, branchUuids);

Back to the top