Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Joy2017-02-02 11:12:52 -0500
committerdonald.g.dunne2017-03-20 22:08:07 -0400
commitd662326e40161ea9d2cedfcbb8fa3b78f46c91c1 (patch)
treedf266a06cec36466426e1f5a47b42020dc959418
parent3f5a43f56dd48b2e6da29c195fd3793a9b6ca811 (diff)
downloadorg.eclipse.osee-d662326e40161ea9d2cedfcbb8fa3b78f46c91c1.tar.gz
org.eclipse.osee-d662326e40161ea9d2cedfcbb8fa3b78f46c91c1.tar.xz
org.eclipse.osee-d662326e40161ea9d2cedfcbb8fa3b78f46c91c1.zip
refactor: Change uses in URL strings and queries
Change-Id: Ia61b17b9423fd716c7f64989c8504aa34fadfdb1 Signed-off-by: Mark Joy <mark.joy@boeing.com>
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.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.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java9
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Artifacts.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/GraphitiRenderer.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java7
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/action/CopyArtifactURLAction.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/action/OpenArtifactInBrowserAction.java6
-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/panels/DetailsBrowserComposite.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDslEditorWidgetDam.java4
16 files changed, 32 insertions, 34 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java
index f45630fd96..06a054eb70 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java
@@ -121,7 +121,7 @@ public final class ExportChangeReportOperation extends AbstractOperation {
it.remove();
artIds.remove(endArtifact.getArtId());
logf(
- "skipping: [" + endArtifact.getName() + "] type: [" + endArtifact.getArtifactTypeName() + "] branch: [" + endArtifact.getBranchId() + "] artId: [" + endArtifact.getArtId() + "]");
+ "skipping: [" + endArtifact.getName() + "] type: [" + endArtifact.getArtifactTypeName() + "] branch: [" + endArtifact.getBranch().getIdString() + "] artId: [" + endArtifact.getArtId() + "]");
skippedTypes.add(endArtifact.getArtifactTypeName());
}
}
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 3241bd0771..416294a568 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
@@ -82,7 +82,7 @@ public class AttributeResourceTest {
private String loadAttributeValue(int attrId, TransactionId transactionId, Artifact artifact) {
String appServer = OseeClientProperties.getOseeApplicationServer();
URI uri =
- UriBuilder.fromUri(appServer).path("orcs").path("branch").path(String.valueOf(artifact.getBranchId())).path(
+ UriBuilder.fromUri(appServer).path("orcs").path("branch").path(artifact.getBranch().getIdString()).path(
"artifact").path(artifact.getIdString()).path("attribute").path(String.valueOf(attrId)).path(
"version").path(String.valueOf(transactionId)).path("text").build();
try {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java
index 81783021b9..3031b00264 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java
@@ -360,8 +360,8 @@ public final class ArtifactLoader {
Id4JoinQuery joinQuery = JoinUtility.createId4JoinQuery();
try {
- joinQuery.add(BranchId.valueOf(artifact.getBranchId()), ArtifactId.valueOf(artifact.getId()),
- TransactionId.SENTINEL, artifact.getBranch().getViewId());
+ joinQuery.add(artifact.getBranch(), ArtifactId.valueOf(artifact.getId()), TransactionId.SENTINEL,
+ artifact.getBranch().getViewId());
joinQuery.store();
List<Artifact> artifacts = new ArrayList<>(1);
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 31509ab6f0..3bf6354f62 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
@@ -876,7 +876,7 @@ public class ArtifactQuery {
+ "txs.BRANCH_ID = ? and art.art_id in ( ART_IDS_HERE ) and txs.TX_CURRENT = 1 and attr.ATTR_TYPE_ID = 1152921504606847088 " //
+ "and attr.ART_ID = art.ART_ID and txs.GAMMA_ID = ATTR.GAMMA_ID";
-public static List<ArtifactToken> getArtifactTokenListFromSoleAttributeInherited(IArtifactType artifactType, AttributeTypeId attributetype, String value, BranchId branch) {
+ public static List<ArtifactToken> getArtifactTokenListFromSoleAttributeInherited(IArtifactType artifactType, AttributeTypeId attributetype, String value, BranchId branch) {
ArtifactType artifactTypeFull = ArtifactTypeManager.getType(artifactType);
List<Long> artTypeIds = new LinkedList<>();
@@ -1017,14 +1017,14 @@ public static List<ArtifactToken> getArtifactTokenListFromSoleAttributeInherited
int attrCount = jdbcClient.fetch(-1,
"select count(*) from OSEE_ATTRIBUTE attr, osee_txs txs where attr.art_id = ? and " //
+ "txs.GAMMA_ID = ATTR.GAMMA_ID and txs.BRANCH_ID = ? and txs.TX_CURRENT = 1",
- artifact.getArtId(), artifact.getBranchId());
+ artifact, artifact.getBranch());
if (artifact.getAttributes().size() != attrCount) {
return true;
}
int relCount = jdbcClient.fetch(-1,
"select count(*) from OSEE_RELATION_LINK rel, osee_txs txs where (rel.A_ART_ID = ? or rel.B_ART_ID = ?) " //
+ "and txs.GAMMA_ID = rel.GAMMA_ID and txs.BRANCH_ID = ? and txs.TX_CURRENT = 1",
- artifact.getArtId(), artifact.getArtId(), artifact.getBranchId());
+ artifact, artifact, artifact.getBranch());
if (!artifact.isHistorical() && artifact.getRelationsAll(DeletionFlag.EXCLUDE_DELETED).size() != relCount) {
return true;
}
@@ -1052,8 +1052,7 @@ public static List<ArtifactToken> getArtifactTokenListFromSoleAttributeInherited
"and txs.BRANCH_ID = ?) " //
// order by latest transaction
+ "order by transaction_id desc ";
- long transactionId = jdbcClient.fetch(-1L, query, artifact.getArtId(), artifact.getBranchId(),
- artifact.getArtId(), artifact.getBranchId());
+ long transactionId = jdbcClient.fetch(-1L, query, artifact, artifact.getBranch(), artifact, artifact.getBranch());
return !artifact.getTransaction().getId().equals(transactionId);
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Artifacts.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Artifacts.java
index 13e69ab341..40d4f79783 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Artifacts.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Artifacts.java
@@ -172,7 +172,7 @@ public final class Artifacts {
details.put("GUID", String.valueOf(Xml.escape(artifact.getGuid())));
details.put("Artifact Token", String.format("[%s]-[%d]", artifact.getSafeName(), artifact.getUuid()));
details.put("Branch", String.valueOf(Xml.escape(artifact.getBranchToken().getName())));
- details.put("Branch Uuid", String.valueOf(artifact.getBranchId()));
+ details.put("Branch Uuid", artifact.getBranch().getIdString());
details.put("Artifact Type Name", String.valueOf(Xml.escape(artifact.getArtifactTypeName())));
details.put("Artifact Type Id", String.valueOf(artifact.getArtTypeId()));
details.put("Gamma Id", String.valueOf(artifact.getGammaId()));
diff --git a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/GraphitiRenderer.java b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/GraphitiRenderer.java
index 9bade1b62d..da01556262 100644
--- a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/GraphitiRenderer.java
+++ b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/GraphitiRenderer.java
@@ -75,8 +75,8 @@ public class GraphitiRenderer extends DefaultArtifactRenderer {
for (Artifact artifact : artifacts) {
Integer attributeId = artifact.getAttributeIds(GraphitiDiagram).get(0);
- URI diagramUri = URI.createURI(String.format("osee://branch/%d/artifact/%s/attribute/%d",
- artifact.getBranchId(), artifact.getUuid(), attributeId));
+ URI diagramUri = URI.createURI(String.format("osee://branch/%s/artifact/%s/attribute/%d",
+ artifact.getBranch().getIdString(), artifact.getIdString(), attributeId));
DiagramEditorInput editorInput = new DiagramEditorInput(diagramUri, null);
activePage.openEditor(editorInput, GraphitiDiagramArtifactEditor.EDITOR_ID, true);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java
index de12635dc4..59554bdce0 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java
@@ -430,7 +430,7 @@ public class ArtifactImportPage extends WizardDataTransferPage {
Artifact artifact = getDestinationArtifact();
if (artifact != null) {
settings.put("destination.artifact.guid", artifact.getGuid());
- settings.put("destination.branch.uuid", artifact.getBranchId());
+ settings.put("destination.branch.uuid", artifact.getBranch().getId());
}
settings.put("is.update.existing.selected", isUpdateExistingSelected());
}
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 feb0cc15b3..16616ac28a 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
@@ -140,10 +140,9 @@ public class WasIsCompareEditorAction extends Action {
protected String loadAttributeValue(AttributeId attrId, TransactionId transactionId, Artifact artifact) {
String appServer = OseeClientProperties.getOseeApplicationServer();
- URI uri =
- UriBuilder.fromUri(appServer).path("orcs").path("branch").path(String.valueOf(artifact.getBranchId())).path(
- "artifact").path(artifact.getIdString()).path("attribute").path(String.valueOf(attrId)).path(
- "version").path(String.valueOf(transactionId)).path("text").build();
+ URI uri = UriBuilder.fromUri(appServer).path("orcs").path("branch").path(artifact.getBranch().getIdString()).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);
} catch (Exception ex) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java
index d05cd30160..5763be3ddd 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java
@@ -167,6 +167,6 @@ public class ArtifactTransfer extends ByteArrayTransfer {
*/
private void writeArtifact(DataOutputStream dataOut, Artifact artifact) throws IOException, OseeCoreException {
dataOut.writeInt(artifact.getArtId());
- dataOut.writeLong(artifact.getBranchId());
+ dataOut.writeLong(artifact.getBranch().getId());
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/action/CopyArtifactURLAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/action/CopyArtifactURLAction.java
index 51db24f0f7..f3c610e05b 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/action/CopyArtifactURLAction.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/action/CopyArtifactURLAction.java
@@ -48,14 +48,14 @@ public final class CopyArtifactURLAction extends Action {
Clipboard clipboard = null;
try {
String urlString =
- String.format("%sorcs/branch/%d/artifact/%d/attribute/type/%s", ArtifactURL.getSelectedPermanenrLinkUrl(),
- artifact.getBranchId(), artifact.getId(), getAttributeTypeId().getIdString());
+ String.format("%sorcs/branch/%s/artifact/%s/attribute/type/%s", ArtifactURL.getSelectedPermanenrLinkUrl(),
+ artifact.getBranch().getIdString(), artifact.getIdString(), getAttributeTypeId().getIdString());
URL url = new URL(urlString);
clipboard = new Clipboard(null);
clipboard.setContents(new Object[] {url.toString()}, new Transfer[] {TextTransfer.getInstance()});
} catch (Exception ex) {
OseeLog.logf(Activator.class, Level.SEVERE, ex, "Error obtaining url for - guid: [%s] branch:[%s]",
- artifact.getGuid(), artifact.getBranch());
+ artifact.getGuid(), artifact.getBranch().getIdString());
} finally {
if (clipboard != null && !clipboard.isDisposed()) {
clipboard.dispose();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/action/OpenArtifactInBrowserAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/action/OpenArtifactInBrowserAction.java
index 8265aa5507..578cc1e1c9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/action/OpenArtifactInBrowserAction.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/action/OpenArtifactInBrowserAction.java
@@ -38,12 +38,12 @@ public final class OpenArtifactInBrowserAction extends Action {
@Override
public void run() {
try {
- String urlString = String.format("%sorcs/branch/%d/artifact/%d", ArtifactURL.getSelectedPermanenrLinkUrl(),
- artifact.getBranchId(), artifact.getUuid());
+ String urlString = String.format("%sorcs/branch/%s/artifact/%s", ArtifactURL.getSelectedPermanenrLinkUrl(),
+ artifact.getBranch().getIdString(), artifact.getIdString());
Program.launch(urlString);
} catch (Exception ex) {
OseeLog.logf(Activator.class, Level.SEVERE, ex, "Error obtaining url for - guid: [%s] branch:[%s]",
- artifact.getGuid(), artifact.getBranch());
+ artifact.getGuid(), artifact.getBranch().getIdString());
}
}
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 caca4546eb..a6129bae41 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
@@ -364,7 +364,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
if (explorerRoot != null) {
memento.putString(ROOT_UUID, explorerRoot.getIdString());
try {
- memento.putString(ROOT_BRANCH, String.valueOf(explorerRoot.getBranchId()));
+ memento.putString(ROOT_BRANCH, explorerRoot.getBranch().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/DetailsBrowserComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/DetailsBrowserComposite.java
index fca7519de3..dc2bbf248a 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/DetailsBrowserComposite.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/DetailsBrowserComposite.java
@@ -30,8 +30,8 @@ public class DetailsBrowserComposite extends BrowserComposite {
try {
addData(sb, "GUID", artifact.getGuid());
addData(sb, "Branch", artifact.getBranchToken().getName());
- addData(sb, "Branch Uuid", String.valueOf(artifact.getBranchId()));
- addData(sb, "Artifact Id", String.valueOf(artifact.getArtId()));
+ addData(sb, "Branch Uuid", artifact.getBranch().getIdString());
+ addData(sb, "Artifact Id", artifact.getIdString());
addData(sb, "Artifact Type Name", artifact.getArtifactTypeName());
addData(sb, "Artifact Type Id", String.valueOf(artifact.getArtTypeId()));
addData(sb, "Gamma Id", String.valueOf(artifact.getGammaId()));
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java
index c6bb56e7a2..da69c5dd1d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java
@@ -142,7 +142,7 @@ public final class SkyWalkerOptions {
public String toXml() throws OseeCoreException {
StringBuffer sb = new StringBuffer();
sb.append(AXml.addTagData("guid", artifact.getGuid()));
- sb.append(AXml.addTagData("branchUuid", artifact.getBranchId() + ""));
+ sb.append(AXml.addTagData("branchUuid", artifact.getBranch().getIdString() + ""));
sb.append(AXml.addTagData("artTypes",
org.eclipse.osee.framework.jdk.core.util.Collections.toString(",", getSelectedArtTypes())));
sb.append(AXml.addTagData("relTypes",
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java
index 79275705cf..7a8dd6f244 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java
@@ -72,7 +72,7 @@ public class SkyWalkerView extends GenericViewPart {
private static final String GUID_KEY = "guid";
private static final String BRANCHID_KEY = "branchUuid";
private String storedGuid;
- private String storedBrandId;
+ private String storedBranchId;
private final SkyWalkerOptions options = new SkyWalkerOptions();
private final List<Artifact> history = new LinkedList<>();
private Action filterAction;
@@ -155,7 +155,7 @@ public class SkyWalkerView extends GenericViewPart {
// Restore current artifact if stored upon shutdown
try {
if (storedGuid != null) {
- Artifact art = ArtifactQuery.getArtifactFromId(storedGuid, BranchId.valueOf(storedBrandId));
+ Artifact art = ArtifactQuery.getArtifactFromId(storedGuid, BranchId.valueOf(storedBranchId));
if (art != null) {
explore(art);
}
@@ -357,7 +357,7 @@ public class SkyWalkerView extends GenericViewPart {
memento = memento.createChild(INPUT_KEY);
memento.putString(GUID_KEY, artifact.getGuid());
try {
- memento.putString(BRANCHID_KEY, String.valueOf(artifact.getBranchId()));
+ memento.putString(BRANCHID_KEY, artifact.getBranch().getIdString());
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, Level.WARNING, "Sky Walker error on save: ", ex);
}
@@ -371,7 +371,7 @@ public class SkyWalkerView extends GenericViewPart {
memento = memento.getChild(INPUT_KEY);
if (memento != null) {
storedGuid = memento.getString(GUID_KEY);
- storedBrandId = memento.getString(BRANCHID_KEY);
+ storedBranchId = memento.getString(BRANCHID_KEY);
}
}
} catch (Exception ex) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDslEditorWidgetDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDslEditorWidgetDam.java
index 2eafe4f0dc..88a88e5679 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDslEditorWidgetDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDslEditorWidgetDam.java
@@ -97,8 +97,8 @@ public class XDslEditorWidgetDam extends XDslEditorWidget implements IAttributeW
} catch (Exception ex) {
OseeCoreException.wrapAndThrow(ex);
}
- String uriString = String.format("branch/%s/artifact/%s/%s.%s", artifact.getBranchId(), artifact.getGuid(),
- encodedName, extension);
+ String uriString = String.format("branch/%s/artifact/%s/%s.%s", artifact.getBranch().getIdString(),
+ artifact.getGuid(), encodedName, extension);
return URI.createURI(uriString);
}

Back to the top